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.279 by root, Sat Jan 21 14:25:05 2006 UTC vs.
Revision 1.396 by ayin, Sun Jan 20 14:12:39 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
… …
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; 307 unsigned int newlen;
303 KeySym keysym; 308 KeySym keysym;
304#ifdef DEBUG_CMD
305 static int debug_key = 1; /* accessible by a debugger only */
306#endif
307 int valid_keysym; 309 int valid_keysym;
308 char kbuf[KBUFSZ]; 310 char kbuf[KBUFSZ];
311
312#if ISO_14755
313 if (iso14755buf & ISO_14755_52)
314 return;
315#endif
309 316
310 /* 317 /*
311 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 318 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
312 * escape sequence to toggle the Keypad. 319 * escape sequence to toggle the Keypad.
313 * 320 *
… …
493# if ISO_14755 500# if ISO_14755
494 iso14755_51 (0); 501 iso14755_51 (0);
495# endif 502# endif
496 return; 503 return;
497 } 504 }
505 else if (keysym == XK_BackSpace)
506 {
507 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
508# if ISO_14755
509 iso14755_51 (iso14755buf & ISO_14755_MASK);
510# endif
511 return;
512 }
498 else if ((hv = hex_keyval (ev)) >= 0) 513 else if ((hv = hex_keyval (ev)) >= 0)
499 { 514 {
500 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK) 515 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
501 | hv | ISO_14755_51; 516 | hv | ISO_14755_51;
502# if ISO_14755 517# if ISO_14755
… …
504# endif 519# endif
505 return; 520 return;
506 } 521 }
507 else 522 else
508 { 523 {
509# if ENABLE_OVERLAY 524# if ISO_14755
510 scr_overlay_off (); 525 scr_overlay_off ();
511# endif 526# endif
512 iso14755buf = 0; 527 iso14755buf = 0;
513 } 528 }
514 } 529 }
515 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 530 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
516 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 531 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
517 if (!(iso14755buf & ISO_14755_STARTED)) 532 if (!(iso14755buf & ISO_14755_STARTED))
518 { 533 {
519 iso14755buf |= ISO_14755_STARTED; 534 iso14755buf |= ISO_14755_STARTED;
520# if ENABLE_OVERLAY 535# if ISO_14755
521 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 536 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
522 scr_overlay_set (0, 0, "ISO 14755 mode"); 537 scr_overlay_set (0, 0, "ISO 14755 mode");
523# endif 538# endif
524 } 539 }
525#endif 540#endif
526 541
527#ifdef PRINTPIPE 542#ifdef PRINTPIPE
528 if (keysym == XK_Print) 543 if (keysym == XK_Print)
529 { 544 {
530 scr_printscreen (ctrl | shft); 545 scr_printscreen (ctrl | shft);
531 return; 546 return;
… …
533#endif 548#endif
534 549
535 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 550 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
536 { 551 {
537 { 552 {
553 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
538 newlen = 1; 554 newlen = 1;
555#ifdef XK_KP_Home
556 static const KeySym keypadtrans[] = {
557 XK_KP_7, // XK_KP_Home
558 XK_KP_4, // XK_KP_Left
559 XK_KP_8, // XK_KP_Up
560 XK_KP_6, // XK_KP_Right
561 XK_KP_2, // XK_KP_Down
562#ifndef UNSHIFTED_SCROLLKEYS
563 XK_KP_9, // XK_KP_Prior
564 XK_KP_3, // XK_KP_Next
565#else
566 XK_Prior,
567 XK_Next,
568#endif
569 XK_KP_1, // XK_KP_End
570 XK_KP_5, // XK_KP_Begin
571 };
572
573 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
574 {
575 unsigned int index = keysym - XK_KP_Home;
576 keysym = kp ? keypadtrans[index] : XK_Home + index;
577 }
578 else if (keysym == XK_KP_Insert)
579 keysym = kp ? XK_KP_0 : XK_Insert;
580#ifndef NO_DELETE_KEY
581 else if (keysym == XK_KP_Delete)
582 keysym = kp ? XK_KP_Decimal : XK_Delete;
583#endif
584#endif
539 switch (keysym) 585 switch (keysym)
540 { 586 {
541#ifndef NO_BACKSPACE_KEY 587#ifndef NO_BACKSPACE_KEY
542 case XK_BackSpace: 588 case XK_BackSpace:
543 if (priv_modes & PrivMode_HaveBackSpace) 589 if (priv_modes & PrivMode_HaveBackSpace)
… …
545 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace) 591 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
546 ^ !!ctrl) ? '\b' : '\177'; 592 ^ !!ctrl) ? '\b' : '\177';
547 kbuf[1] = '\0'; 593 kbuf[1] = '\0';
548 } 594 }
549 else 595 else
550 strcpy (kbuf, key_backspace); 596 strcpy (kbuf, rs[Rs_backspace_key]);
551 break; 597 break;
552#endif 598#endif
553#ifndef NO_DELETE_KEY 599#ifndef NO_DELETE_KEY
554# ifdef XK_KP_Prior
555 case XK_KP_Delete:
556 /* allow shift to override */
557 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
558 {
559 strcpy (kbuf, "\033On");
560 break;
561 }
562 /* FALLTHROUGH */
563# endif
564 case XK_Delete: 600 case XK_Delete:
565 strcpy (kbuf, key_delete); 601 strcpy (kbuf, rs[Rs_delete_key]);
566 break; 602 break;
567#endif 603#endif
568 case XK_Tab: 604 case XK_Tab:
569 if (shft) 605 if (shft)
570 strcpy (kbuf, "\033[Z"); 606 strcpy (kbuf, "\033[Z");
… …
580#endif 616#endif
581 newlen = 0; 617 newlen = 0;
582 } 618 }
583 break; 619 break;
584 620
585#ifdef XK_KP_Left
586 case XK_KP_Up: /* \033Ox or standard */
587 case XK_KP_Down: /* \033Or or standard */
588 case XK_KP_Right: /* \033Ov or standard */
589 case XK_KP_Left: /* \033Ot or standard */
590 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
591 {
592 strcpy (kbuf, "\033OZ");
593 kbuf[2] = "txvr"[keysym - XK_KP_Left];
594 break;
595 }
596 else
597 /* translate to std. cursor key */
598 keysym = XK_Left + (keysym - XK_KP_Left);
599 /* FALLTHROUGH */
600#endif
601 case XK_Up: /* "\033[A" */ 621 case XK_Up: /* "\033[A" */
602 case XK_Down: /* "\033[B" */ 622 case XK_Down: /* "\033[B" */
603 case XK_Right: /* "\033[C" */ 623 case XK_Right: /* "\033[C" */
604 case XK_Left: /* "\033[D" */ 624 case XK_Left: /* "\033[D" */
605 strcpy (kbuf, "\033[Z"); 625 strcpy (kbuf, "\033[Z");
… …
615 else if (priv_modes & PrivMode_aplCUR) 635 else if (priv_modes & PrivMode_aplCUR)
616 kbuf[1] = 'O'; 636 kbuf[1] = 'O';
617 break; 637 break;
618 638
619#ifndef UNSHIFTED_SCROLLKEYS 639#ifndef UNSHIFTED_SCROLLKEYS
620# ifdef XK_KP_Prior
621 case XK_KP_Prior:
622 /* allow shift to override */
623 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
624 {
625 strcpy (kbuf, "\033Oy");
626 break;
627 }
628 /* FALLTHROUGH */
629# endif
630 case XK_Prior: 640 case XK_Prior:
631 strcpy (kbuf, "\033[5~"); 641 strcpy (kbuf, "\033[5~");
632 break; 642 break;
633# ifdef XK_KP_Next
634 case XK_KP_Next:
635 /* allow shift to override */
636 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
637 {
638 strcpy (kbuf, "\033Os");
639 break;
640 }
641 /* FALLTHROUGH */
642# endif
643 case XK_Next: 643 case XK_Next:
644 strcpy (kbuf, "\033[6~"); 644 strcpy (kbuf, "\033[6~");
645 break; 645 break;
646#endif 646#endif
647 case XK_KP_Enter: 647 case XK_KP_Enter:
648 /* allow shift to override */ 648 /* allow shift to override */
649 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 649 if (kp)
650 { 650 {
651 strcpy (kbuf, "\033OM"); 651 strcpy (kbuf, "\033OM");
652 break; 652 break;
653 } 653 }
654 654
… …
666 kbuf[0] = '\015'; 666 kbuf[0] = '\015';
667 kbuf[1] = '\0'; 667 kbuf[1] = '\0';
668 } 668 }
669 break; 669 break;
670 670
671#ifdef XK_KP_Begin
672 case XK_KP_Begin:
673 strcpy (kbuf, "\033Ou");
674 break;
675
676#endif
677 case XK_KP_F1: /* "\033OP" */ 671 case XK_KP_F1: /* "\033OP" */
678 case XK_KP_F2: /* "\033OQ" */ 672 case XK_KP_F2: /* "\033OQ" */
679 case XK_KP_F3: /* "\033OR" */ 673 case XK_KP_F3: /* "\033OR" */
680 case XK_KP_F4: /* "\033OS" */ 674 case XK_KP_F4: /* "\033OS" */
681 strcpy (kbuf, "\033OP"); 675 strcpy (kbuf, "\033OP");
… …
697 case XK_KP_6: /* "\033Ov" : "6" */ 691 case XK_KP_6: /* "\033Ov" : "6" */
698 case XK_KP_7: /* "\033Ow" : "7" */ 692 case XK_KP_7: /* "\033Ow" : "7" */
699 case XK_KP_8: /* "\033Ox" : "8" */ 693 case XK_KP_8: /* "\033Ox" : "8" */
700 case XK_KP_9: /* "\033Oy" : "9" */ 694 case XK_KP_9: /* "\033Oy" : "9" */
701 /* allow shift to override */ 695 /* allow shift to override */
702 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 696 if (kp)
703 { 697 {
704 strcpy (kbuf, "\033Oj"); 698 strcpy (kbuf, "\033Oj");
705 kbuf[2] += (keysym - XK_KP_Multiply); 699 kbuf[2] += (keysym - XK_KP_Multiply);
706 } 700 }
707 else 701 else
… …
713 707
714 case XK_Find: 708 case XK_Find:
715 strcpy (kbuf, "\033[1~"); 709 strcpy (kbuf, "\033[1~");
716 break; 710 break;
717 711
718#ifdef XK_KP_End
719 case XK_KP_Insert:
720 /* allow shift to override */
721 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
722 {
723 strcpy (kbuf, "\033Op");
724 break;
725 }
726 /* FALLTHROUGH */
727#endif
728 case XK_Insert: 712 case XK_Insert:
729 strcpy (kbuf, "\033[2~"); 713 strcpy (kbuf, "\033[2~");
730 break; 714 break;
731#ifdef DXK_Remove /* support for DEC remove like key */ 715#ifdef DXK_Remove /* support for DEC remove like key */
732 case DXK_Remove: 716 case DXK_Remove:
… …
736 strcpy (kbuf, "\033[3~"); 720 strcpy (kbuf, "\033[3~");
737 break; 721 break;
738 case XK_Select: 722 case XK_Select:
739 strcpy (kbuf, "\033[4~"); 723 strcpy (kbuf, "\033[4~");
740 break; 724 break;
741#ifdef XK_KP_End
742 case XK_KP_End:
743 /* allow shift to override */
744 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
745 {
746 strcpy (kbuf, "\033Oq");
747 break;
748 }
749 /* FALLTHROUGH */
750#endif
751 case XK_End: 725 case XK_End:
752 strcpy (kbuf, KS_END); 726 strcpy (kbuf, KS_END);
753 break; 727 break;
754#ifdef XK_KP_Home
755 case XK_KP_Home:
756 /* allow shift to override */
757 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
758 {
759 strcpy (kbuf, "\033Ow");
760 break;
761 }
762 /* FALLTHROUGH */
763#endif
764 case XK_Home: 728 case XK_Home:
765 strcpy (kbuf, KS_HOME); 729 strcpy (kbuf, KS_HOME);
766 break; 730 break;
767 731
768#define FKEY(n, fkey) \ 732#define FKEY(n, fkey) \
… …
870 return; 834 return;
871 835
872 if (len <= 0) 836 if (len <= 0)
873 return; /* not mapped */ 837 return; /* not mapped */
874 838
875 if (OPTION (Opt_scrollTtyKeypress)) 839 if (option (Opt_scrollTtyKeypress))
876 if (view_start) 840 if (view_start)
877 { 841 {
878 view_start = 0; 842 view_start = 0;
879 want_refresh = 1; 843 want_refresh = 1;
880 } 844 }
… …
902 { 866 {
903 const char ch = C0_ESC; 867 const char ch = C0_ESC;
904 tt_write (&ch, 1); 868 tt_write (&ch, 1);
905 } 869 }
906 870
907#if defined(DEBUG_CMD)
908 /* Display keyboard buffer contents */
909 unsigned char *p;
910 int i;
911
912 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
913 for (i = 0, p = kbuf; i < len; i++, p++)
914 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
915 fprintf (stderr, "'\n");
916#endif /* DEBUG_CMD */
917 tt_write (kbuf, (unsigned int)len); 871 tt_write (kbuf, (unsigned int)len);
918} 872}
919/*}}} */ 873
874void
875rxvt_term::key_release (XKeyEvent &ev)
876{
877#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
878 KeySym keysym;
879
880 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
881#endif
882
883#if ENABLE_FRILLS || ISO_14755
884 // ISO 14755 support
885 if (iso14755buf)
886 if (iso14755buf & ISO_14755_52)
887 {
888# if ISO_14755
889 scr_overlay_off ();
890# endif
891# if ISO_14755
892 // iso14755 part 5.2 handling: release time
893 // first: controls
894 if ((ev.state & ControlMask)
895 && ((keysym >= 0x40 && keysym <= 0x5f)
896 || (keysym >= 0x61 && keysym <= 0x7f)))
897 {
898 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
899 commit_iso14755 ();
900
901 return;
902 }
903
904 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
905 if (i[0] == keysym)
906 {
907 iso14755buf = ISO_14755_51 | i[1];
908 commit_iso14755 ();
909
910 return;
911 }
912
913 scr_bell ();
914# endif
915 iso14755buf = 0;
916
917 return;
918 }
919 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
920 {
921# if ISO_14755
922 scr_overlay_off ();
923# endif
924 if (iso14755buf & ISO_14755_51)
925 commit_iso14755 ();
926#if ISO_14755
927 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
928 {
929 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
930
931 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
932 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
933 }
934# endif
935 else
936 iso14755buf = 0;
937 }
938#endif
939
940 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
941 return;
942
943#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
944 if (!(ev.state & ControlMask))
945 slip_wheel_ev.stop ();
946 else if (keysym == XK_Control_L || keysym == XK_Control_R)
947 mouse_slip_wheel_speed = 0;
948#endif
949}
920 950
921#if defined (KEYSYM_RESOURCE) 951#if defined (KEYSYM_RESOURCE)
922unsigned int 952unsigned int
923rxvt_term::cmd_write (const char *str, unsigned int count) 953rxvt_term::cmd_write (const char *str, unsigned int count)
924{ 954{
… …
954void 984void
955rxvt_term::flush () 985rxvt_term::flush ()
956{ 986{
957 flush_ev.stop (); 987 flush_ev.stop ();
958 988
959#ifdef TRANSPARENT 989#ifdef HAVE_BG_PIXMAP
960 if (want_full_refresh) 990 if (bgPixmap.check_clearChanged ())
961 { 991 {
962 want_full_refresh = 0; 992// scr_clear (true); This needs to be researched further!
963 scr_clear ();
964 scr_touch (false); 993 scr_touch (false);
965 } 994 }
966#endif 995#endif
967 996
968 if (want_refresh) 997 if (want_refresh)
… …
1013 } 1042 }
1014 1043
1015 display->flush (); 1044 display->flush ();
1016} 1045}
1017 1046
1047/* checks wether a refresh is requested and starts the refresh timer */
1018void 1048void
1019rxvt_term::check_cb (check_watcher &w) 1049rxvt_term::refresh_check ()
1050{
1051 if (want_refresh && !flush_ev.is_active ())
1052 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1053
1054 display->flush ();
1055}
1056
1057void
1058rxvt_term::flush_cb (ev::timer &w, int revents)
1020{ 1059{
1021 make_current (); 1060 make_current ();
1022 1061
1023 display->flush ();
1024
1025 if (want_refresh && !flush_ev.active)
1026 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1027}
1028
1029void
1030rxvt_term::flush_cb (time_watcher &w)
1031{
1032 make_current ();
1033
1034 refresh_limit = 1;
1035 refresh_count = 0; 1062 refresh_count = 0;
1036 flush (); 1063 flush ();
1037} 1064}
1038 1065
1039#ifdef CURSOR_BLINK 1066#ifdef CURSOR_BLINK
1040void 1067void
1041rxvt_term::cursor_blink_cb (time_watcher &w) 1068rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1042{ 1069{
1043 hidden_cursor = !hidden_cursor; 1070 hidden_cursor = !hidden_cursor;
1044 want_refresh = 1; 1071 want_refresh = 1;
1045 1072 refresh_check ();
1046 w.start (w.at + CURSOR_BLINK_INTERVAL);
1047} 1073}
1048#endif 1074#endif
1049 1075
1050#ifdef TEXT_BLINK 1076#ifdef TEXT_BLINK
1051void 1077void
1052rxvt_term::text_blink_cb (time_watcher &w) 1078rxvt_term::text_blink_cb (ev::timer &w, int revents)
1053{ 1079{
1054 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1080 if (scr_refresh_rend (RS_Blink, RS_Blink))
1055 { 1081 {
1056 hidden_text = !hidden_text; 1082 hidden_text = !hidden_text;
1057 want_refresh = 1; 1083 want_refresh = 1;
1058 w.start (w.at + TEXT_BLINK_INTERVAL); 1084 refresh_check ();
1059 } 1085 }
1086 else
1087 w.stop ();
1060} 1088}
1061#endif 1089#endif
1062 1090
1063#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1091#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1064void 1092void
1065rxvt_term::cont_scroll_cb (time_watcher &w) 1093rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1066{ 1094{
1067 if ((scrollbar_isUp() || scrollbar_isDn()) && 1095 if ((scrollbar_isUp () || scrollbar_isDn ())
1068 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1096 && scr_page (scrollbar_isUp () ? UP : DN, 1))
1069 { 1097 {
1070 want_refresh = 1; 1098 want_refresh = 1;
1071 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1099 refresh_check ();
1072 } 1100 }
1101 else
1102 w.stop ();
1073} 1103}
1074#endif 1104#endif
1075 1105
1076#ifdef SELECTION_SCROLLING 1106#ifdef SELECTION_SCROLLING
1077void 1107void
1078rxvt_term::sel_scroll_cb (time_watcher &w) 1108rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1079{ 1109{
1080 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1110 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1081 { 1111 {
1082 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1112 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1083 want_refresh = 1; 1113 want_refresh = 1;
1084 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1114 refresh_check ();
1085 } 1115 }
1116 else
1117 w.stop ();
1086} 1118}
1087#endif 1119#endif
1088 1120
1089#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1121#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1090void 1122void
1091rxvt_term::slip_wheel_cb (time_watcher &w) 1123rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1092{ 1124{
1093 if (mouse_slip_wheel_speed == 0 1125 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1094 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1095 : scr_page (UP, mouse_slip_wheel_speed))
1096 { 1126 {
1097 if (view_start == top_row || view_start == 0)
1098 mouse_slip_wheel_speed = 0;
1099
1100 want_refresh = 1; 1127 want_refresh = 1;
1101 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1128 refresh_check ();
1129 }
1130
1131 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1102 } 1132 {
1133 mouse_slip_wheel_speed = 0;
1134 w.stop ();
1135 }
1103} 1136}
1104#endif 1137#endif
1105 1138
1106#if HAVE_SCHED_YIELD 1139#if LINUX_YIELD_HACK
1107static struct event_handler 1140static struct event_handler
1108{ 1141{
1109 check_watcher cw_yield; 1142 ev::prepare yield_ev;
1110 1143
1111 void yield (check_watcher &w) 1144 void yield_cb (ev::prepare &w, int revents)
1112 { 1145 {
1113 sched_yield (); 1146 // this should really be sched_yield(), but the linux guys thought
1147 // that giving a process calling sched_yield () less cpu time than
1148 // ones with high nice levels is a useful thing to do. It surely is is
1149 // allowed by the sus... as is returning ENOSYS.
1150
1151 struct timespec ts = { 0, 0 };
1152 nanosleep (&ts, 0);
1153
1114 w.stop (); 1154 w.stop ();
1115 } 1155 }
1116 1156
1117 event_handler () 1157 event_handler ()
1118 : cw_yield (this, &event_handler::yield) 1158 : yield_ev (this, &event_handler::yield_cb)
1119 { 1159 {
1120 } 1160 }
1121} event_handler; 1161} event_handler;
1122#endif 1162#endif
1123 1163
… …
1143 cmdbuf_endp += r; 1183 cmdbuf_endp += r;
1144 return true; 1184 return true;
1145 } 1185 }
1146 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1186 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1147 { 1187 {
1148#if HAVE_SCHED_YIELD 1188#if LINUX_YIELD_HACK
1149 if (display->is_local) 1189 if (display->is_local)
1150 event_handler.cw_yield.start (); 1190 event_handler.yield_ev.start ();
1151#endif 1191#endif
1152 } 1192 }
1153 else 1193 else
1154 { 1194 {
1155 pty_ev.stop (); 1195 pty_ev.stop ();
1156 1196
1157 if (!OPTION (Opt_hold)) 1197 if (!option (Opt_hold))
1158 destroy (); 1198 destroy ();
1159 } 1199 }
1160 1200
1161 return false; 1201 return false;
1162} 1202}
1163 1203
1164void 1204void
1165rxvt_term::pty_cb (io_watcher &w, short revents) 1205rxvt_term::pty_cb (ev::io &w, int revents)
1166{ 1206{
1167 make_current (); 1207 make_current ();
1168 1208
1169 if (revents & EVENT_READ) 1209 if (revents & ev::READ)
1170 // loop, but don't allow a single term to monopolize us 1210 // loop, but don't allow a single term to monopolize us
1171 while (pty_fill ()) 1211 while (pty_fill ())
1172 if (cmd_parse ()) 1212 if (cmd_parse ())
1173 break; 1213 break;
1174 1214
1175 if (revents & EVENT_WRITE) 1215 if (revents & ev::WRITE)
1176 pty_write (); 1216 pty_write ();
1217
1218 refresh_check ();
1177} 1219}
1178 1220
1179void 1221void
1180rxvt_term::pointer_unblank () 1222rxvt_term::pointer_unblank ()
1181{ 1223{
1182 XDefineCursor (display->display, vt, TermWin_cursor); 1224 XDefineCursor (dpy, vt, TermWin_cursor);
1183 recolour_cursor (); 1225 recolour_cursor ();
1184 1226
1185#ifdef POINTER_BLANK 1227#ifdef POINTER_BLANK
1186 hidden_pointer = 0; 1228 hidden_pointer = 0;
1187 1229
1188 if (OPTION (Opt_pointerBlank)) 1230 if (option (Opt_pointerBlank))
1189 pointer_ev.start (NOW + pointerBlankDelay); 1231 pointer_ev.start (pointerBlankDelay);
1190#endif 1232#endif
1191} 1233}
1192 1234
1193#ifdef POINTER_BLANK 1235#ifdef POINTER_BLANK
1194void 1236void
1195rxvt_term::pointer_blank () 1237rxvt_term::pointer_blank ()
1196{ 1238{
1197 if (!OPTION (Opt_pointerBlank)) 1239 if (!option (Opt_pointerBlank))
1198 return; 1240 return;
1199 1241
1200 XDefineCursor (display->display, vt, display->blank_cursor); 1242 XDefineCursor (dpy, vt, display->blank_cursor);
1201 XFlush (display->display); 1243 XFlush (dpy);
1202 1244
1203 hidden_pointer = 1; 1245 hidden_pointer = 1;
1204} 1246}
1205 1247
1206void 1248void
1207rxvt_term::pointer_cb (time_watcher &w) 1249rxvt_term::pointer_cb (ev::timer &w, int revents)
1208{ 1250{
1209 make_current (); 1251 make_current ();
1210 1252
1211 pointer_blank (); 1253 pointer_blank ();
1212} 1254}
… …
1215void 1257void
1216rxvt_term::mouse_report (XButtonEvent &ev) 1258rxvt_term::mouse_report (XButtonEvent &ev)
1217{ 1259{
1218 int button_number, key_state = 0; 1260 int button_number, key_state = 0;
1219 int x, y; 1261 int x, y;
1262 int code = 32;
1220 1263
1221 x = ev.x; 1264 x = Pixel2Col (ev.x);
1222 y = ev.y; 1265 y = Pixel2Row (ev.y);
1223 pixel_position (&x, &y); 1266 if (ev.type == MotionNotify)
1267 {
1268 if (x == mouse_row && y == mouse_col)
1269 return;
1270 mouse_row = x;
1271 mouse_col = y;
1272 code += 32;
1273 }
1224 1274
1225 if (MEvent.button == AnyButton) 1275 if (MEvent.button == AnyButton)
1226 button_number = 3; 1276 button_number = 3;
1227 else 1277 else
1228 { 1278 {
… …
1274 x + 1, 1324 x + 1,
1275 y + 1); 1325 y + 1);
1276#endif 1326#endif
1277 1327
1278 tt_printf ("\033[M%c%c%c", 1328 tt_printf ("\033[M%c%c%c",
1279 (32 + button_number + key_state), 1329 (code + button_number + key_state),
1280 (32 + x + 1), 1330 (32 + x + 1),
1281 (32 + y + 1)); 1331 (32 + y + 1));
1282} 1332}
1283
1284#ifdef USING_W11LIB
1285void
1286rxvt_W11_process_x_event (XEvent *ev)
1287{
1288 rxvt_t *r = rxvt_get_r ();
1289
1290 x_cb (*ev);
1291}
1292#endif
1293 1333
1294/*{{{ process an X event */ 1334/*{{{ process an X event */
1295void 1335void
1296rxvt_term::x_cb (XEvent &ev) 1336rxvt_term::x_cb (XEvent &ev)
1297{ 1337{
1298 make_current (); 1338 make_current ();
1299 1339
1300 dDisp; 1340 dLocal (Display *, dpy);
1301 1341
1302 if (ev.xany.window == vt 1342 if (ev.xany.window == vt
1303 && SHOULD_INVOKE (HOOK_X_EVENT) 1343 && SHOULD_INVOKE (HOOK_X_EVENT)
1304 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1344 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1305 return; 1345 return;
… …
1310 unsigned int unused_mask; 1350 unsigned int unused_mask;
1311 1351
1312 switch (ev.type) 1352 switch (ev.type)
1313 { 1353 {
1314 case KeyPress: 1354 case KeyPress:
1315#if ISO_14755 1355 key_press (ev.xkey);
1316 if (!(iso14755buf & ISO_14755_52))
1317#endif
1318 lookup_key (ev.xkey);
1319
1320 break; 1356 break;
1321 1357
1322 case KeyRelease: 1358 case KeyRelease:
1323 { 1359 key_release (ev.xkey);
1324#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1325 KeySym keysym;
1326
1327 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1328#endif
1329
1330#if ENABLE_FRILLS || ISO_14755
1331 // ISO 14755 support
1332 if (iso14755buf)
1333 if (iso14755buf & ISO_14755_52)
1334 {
1335# if ENABLE_OVERLAY
1336 scr_overlay_off ();
1337# endif
1338# if ISO_14755
1339 // iso14755 part 5.2 handling: release time
1340 // first: controls
1341 if ((ev.xkey.state & ControlMask)
1342 && ((keysym >= 0x40 && keysym <= 0x5f)
1343 || (keysym >= 0x61 && keysym <= 0x7f)))
1344 {
1345 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1346 commit_iso14755 ();
1347 goto skip_switch;
1348 }
1349
1350 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1351 if (i[0] == keysym)
1352 {
1353 iso14755buf = ISO_14755_51 | i[1];
1354 commit_iso14755 ();
1355 goto skip_switch;
1356 }
1357
1358 scr_bell ();
1359# endif
1360 iso14755buf = 0;
1361 break;
1362 }
1363 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1364 {
1365# if ENABLE_OVERLAY
1366 scr_overlay_off ();
1367# endif
1368 if (iso14755buf & ISO_14755_51)
1369 commit_iso14755 ();
1370#if ISO_14755
1371 else if (iso14755buf & ISO_14755_STARTED)
1372 {
1373 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1374
1375 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1376 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1377 }
1378# endif
1379 else
1380 iso14755buf = 0;
1381 }
1382#endif
1383
1384 if (ev.xany.window == vt
1385 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1386 break;
1387
1388#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1389 if (!(ev.xkey.state & ControlMask))
1390 slip_wheel_ev.stop ();
1391 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1392 mouse_slip_wheel_speed = 0;
1393#endif
1394 break; 1360 break;
1395 }
1396 1361
1397 case ButtonPress: 1362 case ButtonPress:
1398 button_press (ev.xbutton); 1363 button_press (ev.xbutton);
1399 break; 1364 break;
1400 1365
… …
1415 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END))) 1380 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1416 destroy (); 1381 destroy ();
1417 } 1382 }
1418#if ENABLE_EWMH 1383#if ENABLE_EWMH
1419 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1384 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1420 XSendEvent (disp, ev.xclient.window = display->root, 1385 XSendEvent (dpy, ev.xclient.window = display->root,
1421 False, SubstructureRedirectMask | SubstructureNotifyMask, 1386 False, SubstructureRedirectMask | SubstructureNotifyMask,
1422 &ev); 1387 &ev);
1423#endif 1388#endif
1424 } 1389 }
1425 } 1390 }
… …
1431 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1396 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1432 focus_out (); 1397 focus_out ();
1433 } 1398 }
1434#endif 1399#endif
1435 } 1400 }
1436 break;
1437
1438 case MappingNotify:
1439 XRefreshKeyboardMapping (&ev.xmapping);
1440 break; 1401 break;
1441 1402
1442 /* 1403 /*
1443 * XXX: this is not the _current_ arrangement 1404 * XXX: this is not the _current_ arrangement
1444 * Here's my conclusion: 1405 * Here's my conclusion:
… …
1463 break; 1424 break;
1464 } 1425 }
1465 break; 1426 break;
1466 1427
1467 case FocusIn: 1428 case FocusIn:
1429 if (ev.xfocus.detail != NotifyInferior
1430 && ev.xfocus.detail != NotifyPointer
1431 && ev.xfocus.mode != NotifyGrab)
1468 focus_in (); 1432 focus_in ();
1469 break; 1433 break;
1470 1434
1471 case FocusOut: 1435 case FocusOut:
1436 if (ev.xfocus.detail != NotifyInferior
1437 && ev.xfocus.detail != NotifyPointer
1438 && ev.xfocus.mode != NotifyGrab)
1472 focus_out (); 1439 focus_out ();
1473 break; 1440 break;
1474 1441
1475 case ConfigureNotify: 1442 case ConfigureNotify:
1443 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1444 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1445 szHint.width, szHint.height); */
1476 if (ev.xconfigure.window == parent[0]) 1446 if (ev.xconfigure.window == parent[0])
1477 { 1447 {
1478 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1448 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1479 ; 1449 ;
1480 1450
1481 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1451 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1482 { 1452 {
1483 seen_resize = 1; 1453 seen_resize = 1;
1484 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1454 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1485 } 1455 }
1456 else
1457 {
1458#ifdef HAVE_BG_PIXMAP
1459 if (bgPixmap.window_position_sensitive ())
1460 {
1461 if (mapped)
1462 update_background ();
1463 else
1464 bgPixmap.invalidate ();
1465 }
1466#endif
1467 }
1486 1468
1487 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1469 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1488
1489#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1490 if (OPTION (Opt_transparent))
1491 check_our_parents ();
1492#endif
1493 } 1470 }
1494 break; 1471 break;
1495 1472
1496 case PropertyNotify: 1473 case PropertyNotify:
1497 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1474 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
… …
1513 case SelectionRequest: 1490 case SelectionRequest:
1514 selection_send (ev.xselectionrequest); 1491 selection_send (ev.xselectionrequest);
1515 break; 1492 break;
1516 1493
1517 case MapNotify: 1494 case MapNotify:
1495#ifdef HAVE_BG_PIXMAP
1496 /* This is needed spcifically to fix the case of no window manager or a
1497 * non-reparenting window manager. In those cases we never get first
1498 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1499 * care of multiplicity of ConfigureNotify events arriwing while WM does
1500 * reparenting.
1501 * We should not render background immidiately, as there could be several
1502 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1503 * by scheduling background redraw as soon as we can, but giving a short
1504 * bit of time for ConfigureNotifies to arrive.
1505 * We should render background PRIOR to drawing any text, but AFTER all
1506 * of ConfigureNotifys for the best results.
1507 */
1508 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1509 update_background_ev.start (0.025);
1510#endif
1518 mapped = 1; 1511 mapped = 1;
1519#ifdef TEXT_BLINK 1512#ifdef TEXT_BLINK
1520 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1513 text_blink_ev.start ();
1521#endif 1514#endif
1522 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1515 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1523 break; 1516 break;
1524 1517
1525 case UnmapNotify: 1518 case UnmapNotify:
… …
1527#ifdef TEXT_BLINK 1520#ifdef TEXT_BLINK
1528 text_blink_ev.stop (); 1521 text_blink_ev.stop ();
1529#endif 1522#endif
1530 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1523 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1531 break; 1524 break;
1532
1533#ifdef TRANSPARENT
1534 case ReparentNotify:
1535 rootwin_cb (ev);
1536 break;
1537#endif /* TRANSPARENT */
1538 1525
1539 case GraphicsExpose: 1526 case GraphicsExpose:
1540 case Expose: 1527 case Expose:
1541 if (ev.xany.window == vt) 1528 if (ev.xany.window == vt)
1542 { 1529 {
1543 do 1530 do
1531 {
1544 scr_expose (ev.xexpose.x, ev.xexpose.y, 1532 scr_expose (ev.xexpose.x, ev.xexpose.y,
1545 ev.xexpose.width, ev.xexpose.height, False); 1533 ev.xexpose.width, ev.xexpose.height, False);
1534 }
1546 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1535 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1547 1536
1548 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1537 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1549 1538
1550 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1539 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1540 {
1551 scr_expose (ev.xexpose.x, ev.xexpose.y, 1541 scr_expose (ev.xexpose.x, ev.xexpose.y,
1552 ev.xexpose.width, ev.xexpose.height, False); 1542 ev.xexpose.width, ev.xexpose.height, False);
1543 }
1553 1544
1554 want_refresh = 1; 1545 want_refresh = 1;
1555 } 1546 }
1556 else 1547 else
1557 { 1548 {
1558 XEvent unused_event; 1549 XEvent unused_event;
1559 1550
1560 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1551 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1561 ; 1552 ;
1562 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1553 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1563 ; 1554 ;
1564 1555
1565 if (isScrollbarWindow (ev.xany.window)) 1556 if (scrollBar.state && ev.xany.window == scrollBar.win)
1566 { 1557 {
1567 scrollBar.setIdle (); 1558 scrollBar.setIdle ();
1568 scrollbar_show (0); 1559 scrollbar_show (0);
1569 } 1560 }
1570
1571#ifdef TRANSPARENT
1572 if (am_transparent && ev.xany.window == parent[0])
1573 XClearWindow (disp, ev.xany.window);
1574#endif
1575 } 1561 }
1576 break; 1562 break;
1577 1563
1578 case MotionNotify: 1564 case MotionNotify:
1579#ifdef POINTER_BLANK 1565#ifdef POINTER_BLANK
1580 if (hidden_pointer) 1566 if (hidden_pointer)
1581 pointer_unblank (); 1567 pointer_unblank ();
1582#endif 1568#endif
1569 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1570 || priv_modes & PrivMode_MouseAnyEvent)
1571 mouse_report (ev.xbutton);
1583 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1572 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1584 break; 1573 break;
1585 1574
1586 if (ev.xany.window == vt) 1575 if (ev.xany.window == vt)
1587 { 1576 {
1588 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1577 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1589 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1578 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1590 ; // nop 1579 ; // nop
1591 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1580 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1592 { 1581 {
1593 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1582 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1594 ; 1583 ;
1595 1584
1596 XQueryPointer (disp, vt, 1585 XQueryPointer (dpy, vt,
1597 &unused_root, &unused_child, 1586 &unused_root, &unused_child,
1598 &unused_root_x, &unused_root_y, 1587 &unused_root_x, &unused_root_y,
1599 &ev.xbutton.x, &ev.xbutton.y, 1588 &ev.xbutton.x, &ev.xbutton.y,
1600 &ev.xbutton.state); 1589 &ev.xbutton.state);
1601#ifdef MOUSE_THRESHOLD 1590#ifdef MOUSE_THRESHOLD
… …
1621 int dist; 1610 int dist;
1622 1611
1623 /* don't clobber the current delay if we are 1612 /* don't clobber the current delay if we are
1624 * already in the middle of scrolling. 1613 * already in the middle of scrolling.
1625 */ 1614 */
1626 if (!sel_scroll_ev.active) 1615 if (!sel_scroll_ev.is_active ())
1627 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1616 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1628 1617
1629 /* save the event params so we can highlight 1618 /* save the event params so we can highlight
1630 * the selection in the pending-scroll loop 1619 * the selection in the pending-scroll loop
1631 */ 1620 */
1632 selection_save_x = ev.xbutton.x; 1621 selection_save_x = ev.xbutton.x;
… …
1654 else 1643 else
1655 { 1644 {
1656 /* we are within the text window, so we 1645 /* we are within the text window, so we
1657 * shouldn't be scrolling 1646 * shouldn't be scrolling
1658 */ 1647 */
1659 if (sel_scroll_ev.active)
1660 sel_scroll_ev.stop(); 1648 sel_scroll_ev.stop();
1661 } 1649 }
1662#endif 1650#endif
1663#ifdef MOUSE_THRESHOLD 1651#ifdef MOUSE_THRESHOLD
1664 } 1652 }
1665#endif 1653#endif
1666 } 1654 }
1667 } 1655 }
1668 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1656 else if (scrollbar_isMotion () && ev.xany.window == scrollBar.win)
1669 { 1657 {
1670 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1658 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1671 MotionNotify, &ev)) 1659 MotionNotify, &ev))
1672 ; 1660 ;
1673 1661
1674 XQueryPointer (disp, scrollBar.win, 1662 XQueryPointer (dpy, scrollBar.win,
1675 &unused_root, &unused_child, 1663 &unused_root, &unused_child,
1676 &unused_root_x, &unused_root_y, 1664 &unused_root_x, &unused_root_y,
1677 &ev.xbutton.x, &ev.xbutton.y, 1665 &ev.xbutton.x, &ev.xbutton.y,
1678 &unused_mask); 1666 &unused_mask);
1679 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1667 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1680 scrollbar_size ()); 1668 scrollbar_size ());
1681 want_refresh = 1; 1669 want_refresh = 1;
1682 refresh_limit = 0;
1683 scrollbar_show (1); 1670 scrollbar_show (1);
1684 } 1671 }
1685 break; 1672 break;
1686 } 1673 }
1687 1674
1688skip_switch: ;
1689
1690#if defined(CURSOR_BLINK) 1675#if defined(CURSOR_BLINK)
1691 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1676 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1692 { 1677 {
1693 if (hidden_cursor) 1678 if (hidden_cursor)
1694 { 1679 {
1695 hidden_cursor = 0; 1680 hidden_cursor = 0;
1696 want_refresh = 1; 1681 want_refresh = 1;
1697 } 1682 }
1698 1683
1699 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1684 cursor_blink_ev.again ();
1700 } 1685 }
1701#endif 1686#endif
1702 1687
1703#if defined(POINTER_BLANK) 1688#if defined(POINTER_BLANK)
1704 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1689 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1705 { 1690 {
1706 if (ev.type == MotionNotify 1691 if (ev.type == MotionNotify
1707 || ev.type == ButtonPress 1692 || ev.type == ButtonPress
1708 || ev.type == ButtonRelease) 1693 || ev.type == ButtonRelease)
1709 if (hidden_pointer) 1694 if (hidden_pointer)
… …
1711 1696
1712 if (ev.type == KeyPress && hidden_pointer == 0) 1697 if (ev.type == KeyPress && hidden_pointer == 0)
1713 pointer_blank (); 1698 pointer_blank ();
1714 } 1699 }
1715#endif 1700#endif
1701
1702 refresh_check ();
1716} 1703}
1717 1704
1718void 1705void
1719rxvt_term::focus_in () 1706rxvt_term::focus_in ()
1720{ 1707{
1721 if (!focus) 1708 if (!focus)
1722 { 1709 {
1723 focus = 1; 1710 focus = 1;
1724 want_refresh = 1; 1711 want_refresh = 1;
1725 1712
1726 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1713 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1727 1714
1728#if USE_XIM 1715#if USE_XIM
1729 if (Input_Context != NULL) 1716 if (Input_Context != NULL)
1730 { 1717 {
1731 IMSetStatusPosition (); 1718 IMSetPosition ();
1732 XSetICFocus (Input_Context); 1719 XSetICFocus (Input_Context);
1733 } 1720 }
1734#endif 1721#endif
1735#if CURSOR_BLINK 1722#if CURSOR_BLINK
1736 if (OPTION (Opt_cursorBlink)) 1723 if (option (Opt_cursorBlink))
1737 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1724 cursor_blink_ev.again ();
1738#endif 1725#endif
1739#if OFF_FOCUS_FADING 1726#if OFF_FOCUS_FADING
1740 if (rs[Rs_fade]) 1727 if (rs[Rs_fade])
1741 { 1728 {
1742 pix_colors = pix_colors_focused; 1729 pix_colors = pix_colors_focused;
1743 scr_recolour (); 1730 scr_recolour ();
1744 } 1731 }
1745#endif 1732#endif
1733#if ENABLE_FRILLS
1734 if (option (Opt_urgentOnBell))
1735 {
1736 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1737 {
1738 h->flags &= ~XUrgencyHint;
1739 XSetWMHints (dpy, parent[0], h);
1740 }
1741 }
1742#endif
1746 } 1743 }
1747} 1744}
1748 1745
1749void 1746void
1750rxvt_term::focus_out () 1747rxvt_term::focus_out ()
… …
1758 1755
1759#if ENABLE_FRILLS || ISO_14755 1756#if ENABLE_FRILLS || ISO_14755
1760 if (iso14755buf) 1757 if (iso14755buf)
1761 { 1758 {
1762 iso14755buf = 0; 1759 iso14755buf = 0;
1763# if ENABLE_OVERLAY 1760# if ISO_14755
1764 scr_overlay_off (); 1761 scr_overlay_off ();
1765# endif 1762# endif
1766 } 1763 }
1767#endif 1764#endif
1768#if USE_XIM 1765#if USE_XIM
1769 if (Input_Context != NULL) 1766 if (Input_Context != NULL)
1770 XUnsetICFocus (Input_Context); 1767 XUnsetICFocus (Input_Context);
1771#endif 1768#endif
1772#if CURSOR_BLINK 1769#if CURSOR_BLINK
1773 if (OPTION (Opt_cursorBlink)) 1770 if (option (Opt_cursorBlink))
1774 cursor_blink_ev.stop (); 1771 cursor_blink_ev.stop ();
1772
1775 hidden_cursor = 0; 1773 hidden_cursor = 0;
1776#endif 1774#endif
1777#if OFF_FOCUS_FADING 1775#if OFF_FOCUS_FADING
1778 if (rs[Rs_fade]) 1776 if (rs[Rs_fade])
1779 { 1777 {
… …
1782 } 1780 }
1783#endif 1781#endif
1784 } 1782 }
1785} 1783}
1786 1784
1787#if TRANSPARENT 1785void
1786rxvt_term::update_fade_color (unsigned int idx)
1787{
1788#if OFF_FOCUS_FADING
1789 if (rs[Rs_fade])
1790 {
1791 rgba c;
1792 pix_colors [Color_fade].get (c);
1793 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1794 }
1795#endif
1796}
1797
1798#if ENABLE_TRANSPARENCY || ENABLE_PERL
1788void 1799void
1789rxvt_term::rootwin_cb (XEvent &ev) 1800rxvt_term::rootwin_cb (XEvent &ev)
1790{ 1801{
1791 make_current (); 1802 make_current ();
1792 1803
1804 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1805 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1806 return;
1807
1808# if ENABLE_TRANSPARENCY
1793 switch (ev.type) 1809 switch (ev.type)
1794 { 1810 {
1795 case PropertyNotify: 1811 case PropertyNotify:
1796 /* 1812 /*
1797 * if user used some Esetroot compatible prog to set the root bg, 1813 * if user used some Esetroot compatible prog to set the root bg,
1798 * use the property to determine the pixmap. We use it later on. 1814 * use the property to determine the pixmap. We use it later on.
1799 */ 1815 */
1800 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1816 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1801 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1817 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1802 return; 1818 {
1819 bgPixmap.set_root_pixmap ();
1820 update_background ();
1821 }
1803 1822
1804 /* FALLTHROUGH */
1805 case ReparentNotify:
1806 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1807 want_refresh = want_full_refresh = 1;
1808 break; 1823 break;
1809 } 1824 }
1825# endif
1826
1827 refresh_check ();
1810} 1828}
1811#endif 1829#endif
1812 1830
1813void 1831void
1814rxvt_term::button_press (XButtonEvent &ev) 1832rxvt_term::button_press (XButtonEvent &ev)
… …
1823 /* 1841 /*
1824 * VT window processing of button press 1842 * VT window processing of button press
1825 */ 1843 */
1826 if (ev.window == vt) 1844 if (ev.window == vt)
1827 { 1845 {
1846 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1847 return;
1848
1828#if ISO_14755 1849#if ISO_14755
1829 // 5.4 1850 // 5.4
1830 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1851 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1831 { 1852 {
1832 iso14755_54 (ev.x, ev.y); 1853 iso14755_54 (ev.x, ev.y);
… …
1866 mouse_report (ev); 1887 mouse_report (ev);
1867 } 1888 }
1868#else 1889#else
1869 MEvent.button = ev.button; 1890 MEvent.button = ev.button;
1870 mouse_report (ev); 1891 mouse_report (ev);
1871#endif /* MOUSE_REPORT_DOUBLECLICK */ 1892#endif /* MOUSE_REPORT_DOUBLECLICK */
1872 1893
1873 } 1894 }
1874 else 1895 else
1875 { 1896 {
1876 if (ev.button != MEvent.button) 1897 if (ev.button != MEvent.button)
1877 MEvent.clicks = 0; 1898 MEvent.clicks = 0;
1878 1899
1879 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1880 switch (ev.button) 1900 switch (ev.button)
1881 { 1901 {
1882 case Button1: 1902 case Button1:
1883 /* allow meta + click to select rectangular areas */ 1903 /* allow meta + click to select rectangular areas */
1884 /* should be done in screen.C */ 1904 /* should be done in screen.C */
1885#if ENABLE_FRILLS 1905#if ENABLE_FRILLS
1886 selection.rect = !!(ev.state & ModMetaMask); 1906 selection.rect = !!(ev.state & ModMetaMask);
1887#else 1907#else
1888 selection.rect = false; 1908 selection.rect = false;
1889#endif 1909#endif
1890 1910
1891 /* allow shift+left click to extend selection */ 1911 /* allow shift+left click to extend selection */
1892 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report)) 1912 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1893 { 1913 {
1894 if (MEvent.button == Button1 && clickintime) 1914 if (MEvent.button == Button1 && clickintime)
1895 selection_rotate (ev.x, ev.y); 1915 selection_rotate (ev.x, ev.y);
1896 else 1916 else
1897 selection_extend (ev.x, ev.y, 1); 1917 selection_extend (ev.x, ev.y, 1);
1898 } 1918 }
1899 else 1919 else
1900 { 1920 {
1901 if (MEvent.button == Button1 && clickintime) 1921 if (MEvent.button == Button1 && clickintime)
1902 MEvent.clicks++; 1922 MEvent.clicks++;
1903 else 1923 else
1904 MEvent.clicks = 1; 1924 MEvent.clicks = 1;
1905 1925
1906 selection_click (MEvent.clicks, ev.x, ev.y); 1926 selection_click (MEvent.clicks, ev.x, ev.y);
1907 } 1927 }
1908 1928
1909 MEvent.button = Button1; 1929 MEvent.button = Button1;
1910 break; 1930 break;
1911 1931
1912 case Button3: 1932 case Button3:
1913 if (MEvent.button == Button3 && clickintime) 1933 if (MEvent.button == Button3 && clickintime)
1914 selection_rotate (ev.x, ev.y); 1934 selection_rotate (ev.x, ev.y);
1915 else 1935 else
1916 selection_extend (ev.x, ev.y, 1); 1936 selection_extend (ev.x, ev.y, 1);
1917 1937
1918 MEvent.button = Button3; 1938 MEvent.button = Button3;
1919 break; 1939 break;
1920 } 1940 }
1921 } 1941 }
1922 1942
1923 MEvent.time = ev.time; 1943 MEvent.time = ev.time;
1924 return; 1944 return;
1925 } 1945 }
1926 1946
1927 /* 1947 /*
1928 * Scrollbar window processing of button press 1948 * Scrollbar window processing of button press
1929 */ 1949 */
1930 if (isScrollbarWindow (ev.window)) 1950 if (scrollBar.state && ev.window == scrollBar.win)
1931 { 1951 {
1932 scrollBar.setIdle (); 1952 scrollBar.setIdle ();
1933 /* 1953 /*
1934 * Rxvt-style scrollbar: 1954 * Rxvt-style scrollbar:
1935 * move up if mouse is above slider 1955 * move up if mouse is above slider
… …
1971 tt_printf ("\033[5~"); 1991 tt_printf ("\033[5~");
1972 break; 1992 break;
1973 } 1993 }
1974 } 1994 }
1975 else 1995 else
1976#endif /* NO_SCROLLBAR_REPORT */ 1996#endif /* NO_SCROLLBAR_REPORT */
1977 1997
1978 { 1998 {
1979 char upordown = 0; 1999 char upordown = 0;
1980 2000
1981 if (scrollBar.style == R_SB_NEXT) 2001 if (scrollBar.style == R_SB_NEXT)
1982 { 2002 {
1983 if (scrollbarnext_upButton (ev.y)) 2003 if (scrollbarnext_upButton (ev.y))
1984 upordown = -1; /* up */ 2004 upordown = -1; /* up */
… …
1990 if (scrollbarrxvt_upButton (ev.y)) 2010 if (scrollbarrxvt_upButton (ev.y))
1991 upordown = -1; /* up */ 2011 upordown = -1; /* up */
1992 else if (scrollbarrxvt_dnButton (ev.y)) 2012 else if (scrollbarrxvt_dnButton (ev.y))
1993 upordown = 1; /* down */ 2013 upordown = 1; /* down */
1994 } 2014 }
2015
1995 if (upordown) 2016 if (upordown)
1996 { 2017 {
1997#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2018#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2019 if (!cont_scroll_ev.is_active ())
1998 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2020 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1999#endif 2021#endif
2000 if (scr_page (upordown < 0 ? UP : DN, 1)) 2022 if (scr_page (upordown < 0 ? UP : DN, 1))
2001 { 2023 {
2002 if (upordown < 0) 2024 if (upordown < 0)
2003 scrollBar.setUp (); 2025 scrollBar.setUp ();
… …
2007 } 2029 }
2008 else 2030 else
2009 switch (ev.button) 2031 switch (ev.button)
2010 { 2032 {
2011 case Button2: 2033 case Button2:
2012 switch (scrollbar_align) 2034 switch (scrollBar.align)
2013 { 2035 {
2014 case R_SB_ALIGN_TOP: 2036 case R_SB_ALIGN_TOP:
2015 csrO = 0; 2037 csrO = 0;
2016 break; 2038 break;
2017 case R_SB_ALIGN_CENTRE: 2039 case R_SB_ALIGN_CENTRE:
… …
2029 2051
2030 scrollBar.setMotion (); 2052 scrollBar.setMotion ();
2031 break; 2053 break;
2032 2054
2033 case Button1: 2055 case Button1:
2034 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2056 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2035 csrO = ev.y - scrollBar.top; 2057 csrO = ev.y - scrollBar.top;
2036 /* FALLTHROUGH */ 2058 /* FALLTHROUGH */
2037 2059
2038 case Button3: 2060 case Button3:
2039 if (scrollBar.style != R_SB_XTERM) 2061 if (scrollBar.style != R_SB_XTERM)
… …
2083 scrollBar.setIdle (); 2105 scrollBar.setIdle ();
2084 scrollbar_show (0); 2106 scrollbar_show (0);
2085 } 2107 }
2086 2108
2087#ifdef SELECTION_SCROLLING 2109#ifdef SELECTION_SCROLLING
2088 if (sel_scroll_ev.active)
2089 sel_scroll_ev.stop(); 2110 sel_scroll_ev.stop();
2090#endif 2111#endif
2091 2112
2092 if (ev.window == vt) 2113 if (ev.window == vt)
2093 { 2114 {
2115 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2116 return;
2117
2094#if ISO_14755 2118#if ISO_14755
2095 // 5.4 2119 // 5.4
2096 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2120 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2097 return; 2121 return;
2098#endif 2122#endif
2123
2099 if (reportmode) 2124 if (reportmode)
2100 { 2125 {
2101 /* mouse report from vt window */ 2126 /* mouse report from vt window */
2102 /* don't report release of wheel "buttons" */ 2127 /* don't report release of wheel "buttons" */
2103 if (ev.button >= 4) 2128 if (ev.button >= 4)
… …
2114 mouse_report (ev); 2139 mouse_report (ev);
2115 } 2140 }
2116#else /* MOUSE_REPORT_DOUBLECLICK */ 2141#else /* MOUSE_REPORT_DOUBLECLICK */
2117 MEvent.button = AnyButton; 2142 MEvent.button = AnyButton;
2118 mouse_report (ev); 2143 mouse_report (ev);
2119#endif /* MOUSE_REPORT_DOUBLECLICK */ 2144#endif /* MOUSE_REPORT_DOUBLECLICK */
2120 return; 2145 return;
2121 } 2146 }
2122 2147
2123 /* 2148 /*
2124 * dumb hack to compensate for the failure of click-and-drag 2149 * dumb hack to compensate for the failure of click-and-drag
… …
2127 if (priv_modes & PrivMode_mouse_report 2152 if (priv_modes & PrivMode_mouse_report
2128 && bypass_keystate 2153 && bypass_keystate
2129 && ev.button == Button1 && MEvent.clicks <= 1) 2154 && ev.button == Button1 && MEvent.clicks <= 1)
2130 selection_extend (ev.x, ev.y, 0); 2155 selection_extend (ev.x, ev.y, 0);
2131 2156
2132 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2133 return;
2134
2135 switch (ev.button) 2157 switch (ev.button)
2136 { 2158 {
2137 case Button1: 2159 case Button1:
2138 case Button3: 2160 case Button3:
2139 selection_make (ev.time); 2161 selection_make (ev.time);
2140 break; 2162 break;
2141 2163
2142 case Button2: 2164 case Button2:
2143 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2165 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2144 selection_request (ev.time, ev.state & ShiftMask ? Sel_Clipboard : Sel_Primary); 2166 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2145 break; 2167 break;
2146 2168
2147#ifdef MOUSE_WHEEL 2169#ifdef MOUSE_WHEEL
2148 case Button4: 2170 case Button4:
2149 case Button5: 2171 case Button5:
… …
2153 2175
2154 v = ev.button == Button4 ? UP : DN; 2176 v = ev.button == Button4 ? UP : DN;
2155 2177
2156 if (ev.state & ShiftMask) 2178 if (ev.state & ShiftMask)
2157 i = 1; 2179 i = 1;
2158 else if (OPTION (Opt_mouseWheelScrollPage)) 2180 else if (option (Opt_mouseWheelScrollPage))
2159 i = nrow - 1; 2181 i = nrow - 1;
2160 else 2182 else
2161 i = 5; 2183 i = 5;
2162 2184
2163# ifdef MOUSE_SLIP_WHEELING 2185# ifdef MOUSE_SLIP_WHEELING
… …
2165 { 2187 {
2166 mouse_slip_wheel_speed += v ? -1 : 1; 2188 mouse_slip_wheel_speed += v ? -1 : 1;
2167 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2189 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2168 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2190 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2169 2191
2170 if (slip_wheel_ev.at < NOW) 2192 if (!slip_wheel_ev.is_active ())
2171 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2193 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2172
2173 slip_wheel_ev.start ();
2174 } 2194 }
2175 else 2195 else
2196# endif
2176 { 2197 {
2177# endif
2178 scr_page (v, i); 2198 scr_page (v, i);
2179 scrollbar_show (1); 2199 scrollbar_show (1);
2180# ifdef MOUSE_SLIP_WHEELING
2181 } 2200 }
2182# endif
2183 } 2201 }
2184 break; 2202 break;
2185#endif 2203#endif
2186 } 2204 }
2187 } 2205 }
2188} 2206}
2189
2190#ifdef TRANSPARENT
2191#if TINTING
2192/* taken from aterm-0.4.2 */
2193
2194typedef uint32_t RUINT32T;
2195
2196void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2197{
2198 int sh_r, sh_g, sh_b;
2199 RUINT32T mask_r, mask_g, mask_b;
2200 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2201 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2202 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2203 int i;
2204
2205 Visual *visual = display->visual;
2206
2207 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2208
2209 /* for convenience */
2210 mask_r = visual->red_mask;
2211 mask_g = visual->green_mask;
2212 mask_b = visual->blue_mask;
2213
2214 /* boring lookup table pre-initialization */
2215 switch (srcImage->bits_per_pixel) {
2216 case 15:
2217 if ((mask_r != 0x7c00) ||
2218 (mask_g != 0x03e0) ||
2219 (mask_b != 0x001f))
2220 return;
2221 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2222 lookup_r = lookup;
2223 lookup_g = lookup+32;
2224 lookup_b = lookup+32+32;
2225 sh_r = 10;
2226 sh_g = 5;
2227 sh_b = 0;
2228 break;
2229 case 16:
2230 if ((mask_r != 0xf800) ||
2231 (mask_g != 0x07e0) ||
2232 (mask_b != 0x001f))
2233 return;
2234 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2235 lookup_r = lookup;
2236 lookup_g = lookup+32;
2237 lookup_b = lookup+32+64;
2238 sh_r = 11;
2239 sh_g = 5;
2240 sh_b = 0;
2241 break;
2242 case 24:
2243 if ((mask_r != 0xff0000) ||
2244 (mask_g != 0x00ff00) ||
2245 (mask_b != 0x0000ff))
2246 return;
2247 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2248 lookup_r = lookup;
2249 lookup_g = lookup+256;
2250 lookup_b = lookup+256+256;
2251 sh_r = 16;
2252 sh_g = 8;
2253 sh_b = 0;
2254 break;
2255 case 32:
2256 if ((mask_r != 0xff0000) ||
2257 (mask_g != 0x00ff00) ||
2258 (mask_b != 0x0000ff))
2259 return;
2260 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2261 lookup_r = lookup;
2262 lookup_g = lookup+256;
2263 lookup_b = lookup+256+256;
2264 sh_r = 16;
2265 sh_g = 8;
2266 sh_b = 0;
2267 break;
2268 default:
2269 return; /* we do not support this color depth */
2270 }
2271
2272 /* prepare limits for color transformation (each channel is handled separately) */
2273 if (shade < 0) {
2274 shade = -shade;
2275 if (shade < 0) shade = 0;
2276 if (shade > 100) shade = 100;
2277
2278 lower_lim_r = 65535-rm;
2279 lower_lim_g = 65535-gm;
2280 lower_lim_b = 65535-bm;
2281
2282 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2283 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2284 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2285
2286 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2287 } else {
2288 if (shade < 0) shade = 0;
2289 if (shade > 100) shade = 100;
2290
2291 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2292
2293 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2294 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2295 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2296 }
2297
2298 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2299 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2300 {
2301 unsigned int tmp;
2302
2303 tmp = lower_lim_r;
2304 lower_lim_r = lower_lim_b;
2305 lower_lim_b = tmp;
2306
2307 tmp = upper_lim_r;
2308 upper_lim_r = upper_lim_b;
2309 upper_lim_b = tmp;
2310 }
2311
2312 /* fill our lookup tables */
2313 for (i = 0; i <= mask_r>>sh_r; i++)
2314 {
2315 RUINT32T tmp;
2316 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2317 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2318 lookup_r[i] = (tmp/65535)<<sh_r;
2319 }
2320 for (i = 0; i <= mask_g>>sh_g; i++)
2321 {
2322 RUINT32T tmp;
2323 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2324 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2325 lookup_g[i] = (tmp/65535)<<sh_g;
2326 }
2327 for (i = 0; i <= mask_b>>sh_b; i++)
2328 {
2329 RUINT32T tmp;
2330 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2331 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2332 lookup_b[i] = (tmp/65535)<<sh_b;
2333 }
2334
2335 /* apply table to input image (replacing colors by newly calculated ones) */
2336 switch (srcImage->bits_per_pixel)
2337 {
2338 case 15:
2339 {
2340 unsigned short *p1, *pf, *p, *pl;
2341 p1 = (unsigned short *) srcImage->data;
2342 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2343 while (p1 < pf)
2344 {
2345 p = p1;
2346 pl = p1 + srcImage->width;
2347 for (; p < pl; p++)
2348 {
2349 *p = lookup_r[(*p & 0x7c00)>>10] |
2350 lookup_g[(*p & 0x03e0)>> 5] |
2351 lookup_b[(*p & 0x001f)];
2352 }
2353 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2354 }
2355 break;
2356 }
2357 case 16:
2358 {
2359 unsigned short *p1, *pf, *p, *pl;
2360 p1 = (unsigned short *) srcImage->data;
2361 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2362 while (p1 < pf)
2363 {
2364 p = p1;
2365 pl = p1 + srcImage->width;
2366 for (; p < pl; p++)
2367 {
2368 *p = lookup_r[(*p & 0xf800)>>11] |
2369 lookup_g[(*p & 0x07e0)>> 5] |
2370 lookup_b[(*p & 0x001f)];
2371 }
2372 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2373 }
2374 break;
2375 }
2376 case 24:
2377 {
2378 unsigned char *p1, *pf, *p, *pl;
2379 p1 = (unsigned char *) srcImage->data;
2380 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2381 while (p1 < pf)
2382 {
2383 p = p1;
2384 pl = p1 + srcImage->width * 3;
2385 for (; p < pl; p += 3)
2386 {
2387 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2388 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2389 p[2] = lookup_r[(p[2] & 0x0000ff)];
2390 }
2391 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2392 }
2393 break;
2394 }
2395 case 32:
2396 {
2397 RUINT32T *p1, *pf, *p, *pl;
2398 p1 = (RUINT32T *) srcImage->data;
2399 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2400
2401 while (p1 < pf)
2402 {
2403 p = p1;
2404 pl = p1 + srcImage->width;
2405 for (; p < pl; p++)
2406 {
2407 *p = lookup_r[(*p & 0xff0000)>>16] |
2408 lookup_g[(*p & 0x00ff00)>> 8] |
2409 lookup_b[(*p & 0x0000ff)] |
2410 (*p & ~0xffffff);
2411 }
2412 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2413 }
2414 break;
2415 }
2416 }
2417
2418 free (lookup);
2419}
2420#endif
2421
2422/*
2423 * Check our parents are still who we think they are.
2424 * Do transparency updates if required
2425 */
2426int
2427rxvt_term::check_our_parents ()
2428{
2429 int i, pchanged, aformat, have_pixmap, rootdepth;
2430 unsigned long nitems, bytes_after;
2431 Atom atype;
2432 unsigned char *prop = NULL;
2433 Window root, oldp, *list;
2434 Pixmap rootpixmap = None;
2435 XWindowAttributes wattr, wrootattr;
2436 dDisp;
2437
2438 pchanged = 0;
2439
2440 if (!OPTION (Opt_transparent))
2441 return pchanged; /* Don't try any more */
2442
2443 XGetWindowAttributes (disp, display->root, &wrootattr);
2444 rootdepth = wrootattr.depth;
2445
2446 XGetWindowAttributes (disp, parent[0], &wattr);
2447
2448 if (rootdepth != wattr.depth)
2449 {
2450 if (am_transparent)
2451 {
2452 pchanged = 1;
2453 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2454 am_transparent = am_pixmap_trans = 0;
2455 }
2456
2457 return pchanged; /* Don't try any more */
2458 }
2459
2460 /* Get all X ops out of the queue so that our information is up-to-date. */
2461 XSync (disp, False);
2462
2463 /*
2464 * Make the frame window set by the window manager have
2465 * the root background. Some window managers put multiple nested frame
2466 * windows for each client, so we have to take care about that.
2467 */
2468 i = (xa[XA_XROOTPMAP_ID]
2469 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2470 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2471 &nitems, &bytes_after, &prop) == Success);
2472
2473 if (!i || prop == NULL)
2474 i = (xa[XA_ESETROOT_PMAP_ID]
2475 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2476 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2477 &nitems, &bytes_after, &prop) == Success);
2478
2479 if (!i || prop == NULL
2480#if TINTING
2481 || !rs[Rs_color + Color_tint]
2482#endif
2483 )
2484 have_pixmap = 0;
2485 else
2486 {
2487 have_pixmap = 1;
2488 rootpixmap = *(Pixmap *)prop;
2489 XFree (prop);
2490 }
2491
2492 if (have_pixmap)
2493 {
2494 /*
2495 * Copy display->root pixmap transparency
2496 */
2497 int sx, sy, nx, ny;
2498 unsigned int nw, nh;
2499 Window cr;
2500 XImage *image;
2501 GC gc;
2502 XGCValues gcvalue;
2503
2504 XTranslateCoordinates (disp, parent[0], display->root,
2505 0, 0, &sx, &sy, &cr);
2506 nw = (unsigned int)szHint.width;
2507 nh = (unsigned int)szHint.height;
2508 nx = ny = 0;
2509
2510 if (sx < 0)
2511 {
2512 nw += sx;
2513 nx = -sx;
2514 sx = 0;
2515 }
2516
2517 if (sy < 0)
2518 {
2519 nh += sy;
2520 ny = -sy;
2521 sy = 0;
2522 }
2523
2524 min_it (nw, (unsigned int) (wrootattr.width - sx));
2525 min_it (nh, (unsigned int) (wrootattr.height - sy));
2526
2527 XSync (disp, False);
2528 allowedxerror = -1;
2529 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2530
2531 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2532 /* XXX: may need a delay here? */
2533 allowedxerror = 0;
2534
2535 if (image == NULL)
2536 {
2537 if (am_transparent && am_pixmap_trans)
2538 {
2539 pchanged = 1;
2540 if (pixmap != None)
2541 {
2542 XFreePixmap (disp, pixmap);
2543 pixmap = None;
2544 }
2545 }
2546
2547 am_pixmap_trans = 0;
2548 }
2549 else
2550 {
2551 if (pixmap != None)
2552 XFreePixmap (disp, pixmap);
2553
2554#if TINTING
2555 if (ISSET_PIXCOLOR (Color_tint))
2556 {
2557 unsigned short rm, gm, bm;
2558 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2559
2560 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2561
2562 ShadeXImage (display, image, shade, rm, gm, bm);
2563 }
2564#endif
2565
2566 pixmap = XCreatePixmap (disp, vt,
2567 szHint.width, szHint.height, image->depth);
2568 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2569 XPutImage (disp, pixmap, gc, image, 0, 0,
2570 nx, ny, image->width, image->height);
2571 XFreeGC (disp, gc);
2572 XDestroyImage (image);
2573 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2574 XClearWindow (disp, parent[0]);
2575
2576 if (!am_transparent || !am_pixmap_trans)
2577 pchanged = 1;
2578
2579 am_transparent = am_pixmap_trans = 1;
2580 }
2581 }
2582
2583 if (am_pixmap_trans)
2584 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2585 else
2586 {
2587 unsigned int n;
2588 /*
2589 * InheritPixmap transparency
2590 */
2591 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2592 {
2593 oldp = parent[i];
2594 XQueryTree (disp, parent[i - 1], &root,
2595 &parent[i], &list, &n);
2596 XFree (list);
2597
2598 if (parent[i] == display->root)
2599 {
2600 if (oldp != None)
2601 pchanged = 1;
2602
2603 break;
2604 }
2605
2606 if (oldp != parent[i])
2607 pchanged = 1;
2608 }
2609
2610 n = 0;
2611
2612 if (pchanged)
2613 {
2614 for (; n < (unsigned int)i; n++)
2615 {
2616 XGetWindowAttributes (disp, parent[n], &wattr);
2617 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2618 {
2619 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2620 break;
2621 }
2622 }
2623 }
2624
2625 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2626 {
2627 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2628 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2629 am_transparent = 0;
2630 /* XXX: also turn off Opt_transparent? */
2631 }
2632 else
2633 {
2634 for (n = 0; n < (unsigned int)i; n++)
2635 {
2636 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2637 XClearWindow (disp, parent[n]);
2638 }
2639
2640 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2641 am_transparent = 1;
2642 }
2643
2644 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2645 parent[i] = None;
2646 }
2647
2648 if (scrollBar.win)
2649 {
2650 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2651 scrollBar.setIdle ();
2652 scrollbar_show (0);
2653 }
2654
2655 if (am_transparent)
2656 {
2657 want_refresh = want_full_refresh = 1;
2658 if (am_pixmap_trans)
2659 flush ();
2660 }
2661
2662 return pchanged;
2663}
2664#endif
2665 2207
2666/*}}} */ 2208/*}}} */
2667 2209
2668bool 2210bool
2669rxvt_term::cmd_parse () 2211rxvt_term::cmd_parse ()
… …
2718 if (ch == C0_LF) 2260 if (ch == C0_LF)
2719 nlines++; 2261 nlines++;
2720 2262
2721 refresh_count++; 2263 refresh_count++;
2722 2264
2723 if (!OPTION (Opt_jumpScroll) 2265 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2724 || (refresh_count >= refresh_limit * (nrow - 1)))
2725 { 2266 {
2726 refreshnow = true;
2727 refresh_count = 0; 2267 refresh_count = 0;
2268
2269 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2270 {
2271 refreshnow = true;
2728 ch = NOCHAR; 2272 ch = NOCHAR;
2729 break; 2273 break;
2274 }
2730 } 2275 }
2731 2276
2732 // scr_add_lines only works for nlines <= nrow - 1. 2277 // scr_add_lines only works for nlines <= nrow - 1.
2733 if (nlines >= nrow - 1) 2278 if (nlines >= nrow - 1)
2734 { 2279 {
… …
2762 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2307 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2763 scr_add_lines (buf, str - buf, nlines); 2308 scr_add_lines (buf, str - buf, nlines);
2764 2309
2765 /* 2310 /*
2766 * If there have been a lot of new lines, then update the screen 2311 * If there have been a lot of new lines, then update the screen
2767 * What the heck I'll cheat and only refresh less than every page-full. 2312 * What the heck we'll cheat and only refresh less than every page-full.
2768 * the number of pages between refreshes is refresh_limit, which 2313 * if skipScroll is enabled.
2769 * is incremented here because we must be doing flat-out scrolling.
2770 */ 2314 */
2771 if (refreshnow) 2315 if (refreshnow)
2772 { 2316 {
2773 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2774 refresh_limit++;
2775 else
2776 {
2777 flag = true; 2317 flag = true;
2778 scr_refresh (); 2318 scr_refresh ();
2779 want_refresh = 1; 2319 want_refresh = 1;
2780 }
2781 } 2320 }
2782 2321
2783 } 2322 }
2784 else 2323 else
2785 { 2324 {
… …
2934 { 2473 {
2935 if ((buf[len++] = cmd_getc ()) == 'i') 2474 if ((buf[len++] = cmd_getc ()) == 'i')
2936 break; /* done = 1 */ 2475 break; /* done = 1 */
2937 } 2476 }
2938 } 2477 }
2939 2478
2940 for (i = 0; i < len; i++) 2479 for (i = 0; i < len; i++)
2941 if (putc (buf[i], fd) == EOF) 2480 if (putc (buf[i], fd) == EOF)
2942 { 2481 {
2943 done = 1; 2482 done = 1;
2944 break; 2483 break;
… …
2946 } 2485 }
2947 } 2486 }
2948 2487
2949 pclose_printer (fd); 2488 pclose_printer (fd);
2950} 2489}
2951#endif /* PRINTPIPE */ 2490#endif /* PRINTPIPE */
2952/*}}} */ 2491/*}}} */
2953 2492
2954/* *INDENT-OFF* */ 2493/* *INDENT-OFF* */
2955enum { 2494enum {
2956 C1_40 = 0x40, 2495 C1_40 = 0x40,
… …
3006 process_dcs_seq (); 2545 process_dcs_seq ();
3007 break; 2546 break;
3008 case 0x9b: /* CSI */ 2547 case 0x9b: /* CSI */
3009 process_csi_seq (); 2548 process_csi_seq ();
3010 break; 2549 break;
3011 case 0x9d: /* CSI */ 2550 case 0x9d: /* OSC */
3012 process_osc_seq (); 2551 process_osc_seq ();
3013 break; 2552 break;
3014#endif 2553#endif
3015 } 2554 }
3016} 2555}
… …
3106 scr_charset_set (2, (unsigned int)cmd_getc ()); 2645 scr_charset_set (2, (unsigned int)cmd_getc ());
3107 break; 2646 break;
3108 case '+': 2647 case '+':
3109 scr_charset_set (3, (unsigned int)cmd_getc ()); 2648 scr_charset_set (3, (unsigned int)cmd_getc ());
3110 break; 2649 break;
3111#if ENABLE_FRILLS 2650#if !ENABLE_MINIMAL
3112 case '6': 2651 case '6':
3113 scr_backindex (); 2652 scr_backindex ();
3114 break; 2653 break;
3115#endif 2654#endif
3116 case '7': 2655 case '7':
3117 scr_cursor (SAVE); 2656 scr_cursor (SAVE);
3118 break; 2657 break;
3119 case '8': 2658 case '8':
3120 scr_cursor (RESTORE); 2659 scr_cursor (RESTORE);
3121 break; 2660 break;
3122#if ENABLE_FRILLS 2661#if !ENABLE_MINIMAL
3123 case '9': 2662 case '9':
3124 scr_forwardindex (); 2663 scr_forwardindex ();
3125 break; 2664 break;
3126#endif 2665#endif
3127 case '=': 2666 case '=':
… …
3242rxvt_term::process_csi_seq () 2781rxvt_term::process_csi_seq ()
3243{ 2782{
3244 unicode_t ch, priv, i; 2783 unicode_t ch, priv, i;
3245 unsigned int nargs, p; 2784 unsigned int nargs, p;
3246 int n, ndef; 2785 int n, ndef;
3247 int arg[ESC_ARGS]; 2786 int arg[ESC_ARGS] = { };
3248 2787
3249 for (nargs = ESC_ARGS; nargs > 0;) 2788 nargs = 0;
3250 arg[--nargs] = 0;
3251 2789
3252 priv = 0; 2790 priv = 0;
3253 ch = cmd_getc (); 2791 ch = cmd_getc ();
3254 if (ch >= '<' && ch <= '?') 2792 if (ch >= '<' && ch <= '?')
2793 {
3255 { /* '<' '=' '>' '?' */ 2794 /* '<' '=' '>' '?' */
3256 priv = ch; 2795 priv = ch;
3257 ch = cmd_getc (); 2796 ch = cmd_getc ();
3258 } 2797 }
3259 2798
3260 /* read any numerical arguments */ 2799 /* read any numerical arguments */
… …
3289 ndef = get_byte_array_bit (csi_defaults, i); 2828 ndef = get_byte_array_bit (csi_defaults, i);
3290 for (p = 0; p < nargs; p++) 2829 for (p = 0; p < nargs; p++)
3291 if (arg[p] == -1) 2830 if (arg[p] == -1)
3292 arg[p] = ndef; 2831 arg[p] = ndef;
3293 2832
3294#ifdef DEBUG_CMD
3295 fprintf (stderr, "CSI ");
3296 for (p = 0; p < nargs; p++)
3297 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3298 fprintf (stderr, "%c\n", ch);
3299#endif
3300
3301 /* 2833 /*
3302 * private mode handling 2834 * private mode handling
3303 */ 2835 */
3304 if (priv) 2836 if (priv)
3305 { 2837 {
3306 switch (priv) 2838 switch (priv)
3307 { 2839 {
3308 case '>': 2840 case '>':
3309 if (ch == CSI_DA) /* secondary device attributes */ 2841 if (ch == CSI_DA) /* secondary device attributes */
3310 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 2842 {
2843 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2844 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2845 //
2846 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2847 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2848 // versions.
2849 //
2850 tt_printf ("\033[>%d;95;0c", 'U');
2851 }
3311 break; 2852 break;
2853
3312 case '?': 2854 case '?':
3313 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2855 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3314 process_terminal_mode (ch, priv, nargs, arg); 2856 process_terminal_mode (ch, priv, nargs, arg);
3315 break; 2857 break;
3316 } 2858 }
… …
3441 break; 2983 break;
3442 case 6: /* CPR requested */ 2984 case 6: /* CPR requested */
3443 scr_report_position (); 2985 scr_report_position ();
3444 break; 2986 break;
3445 case 7: /* unofficial extension */ 2987 case 7: /* unofficial extension */
3446 if (OPTION (Opt_insecure)) 2988 if (option (Opt_insecure))
3447 tt_printf ("%-.250s\012", rs[Rs_display_name]); 2989 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3448 break; 2990 break;
3449 case 8: /* unofficial extension */ 2991 case 8: /* unofficial extension */
3450 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2992 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3451 break; 2993 break;
… …
3518 break; 3060 break;
3519 case CSI_75: 3061 case CSI_75:
3520 scr_cursor (RESTORE); 3062 scr_cursor (RESTORE);
3521 break; 3063 break;
3522 3064
3523#if ENABLE_FRILLS 3065#if !ENABLE_MINIMAL
3524 case CSI_74: 3066 case CSI_74:
3525 process_window_ops (arg, nargs); 3067 process_window_ops (arg, nargs);
3526 break; 3068 break;
3527#endif 3069#endif
3528 3070
… …
3535 break; 3077 break;
3536 } 3078 }
3537} 3079}
3538/*}}} */ 3080/*}}} */
3539 3081
3540#if ENABLE_FRILLS 3082#if !ENABLE_MINIMAL
3541/* ARGSUSED */ 3083/* ARGSUSED */
3542void 3084void
3543rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3085rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3544{ 3086{
3545 int x, y; 3087 int x, y;
3546 XWindowAttributes wattr; 3088 XWindowAttributes wattr;
3547 Window wdummy; 3089 Window wdummy;
3548 dDisp; 3090
3091 dLocal (Display *, dpy);
3549 3092
3550 if (nargs == 0) 3093 if (nargs == 0)
3551 return; 3094 return;
3552 3095
3553 switch (args[0]) 3096 switch (args[0])
3554 { 3097 {
3555 /* 3098 /*
3556 * commands 3099 * commands
3557 */ 3100 */
3558 case 1: /* deiconify window */ 3101 case 1: /* deiconify window */
3559 XMapWindow (disp, parent[0]); 3102 XMapWindow (dpy, parent[0]);
3560 break; 3103 break;
3561 case 2: /* iconify window */ 3104 case 2: /* iconify window */
3562 XIconifyWindow (disp, parent[0], display->screen); 3105 XIconifyWindow (dpy, parent[0], display->screen);
3563 break; 3106 break;
3564 case 3: /* set position (pixels) */ 3107 case 3: /* set position (pixels) */
3565 XMoveWindow (disp, parent[0], args[1], args[2]); 3108 XMoveWindow (dpy, parent[0], args[1], args[2]);
3566 break; 3109 break;
3567 case 4: /* set size (pixels) */ 3110 case 4: /* set size (pixels) */
3568 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3111 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3569 break; 3112 break;
3570 case 5: /* raise window */ 3113 case 5: /* raise window */
3571 XRaiseWindow (disp, parent[0]); 3114 XRaiseWindow (dpy, parent[0]);
3572 break; 3115 break;
3573 case 6: /* lower window */ 3116 case 6: /* lower window */
3574 XLowerWindow (disp, parent[0]); 3117 XLowerWindow (dpy, parent[0]);
3575 break; 3118 break;
3576 case 7: /* refresh window */ 3119 case 7: /* refresh window */
3577 scr_touch (true); 3120 scr_touch (true);
3578 break; 3121 break;
3579 case 8: /* set size (chars) */ 3122 case 8: /* set size (chars) */
… …
3586 if (args[0] >= 24) /* set height (chars) */ 3129 if (args[0] >= 24) /* set height (chars) */
3587 set_widthheight ((unsigned int)width, 3130 set_widthheight ((unsigned int)width,
3588 (unsigned int) (args[1] * fheight)); 3131 (unsigned int) (args[1] * fheight));
3589 break; 3132 break;
3590 3133
3591
3592 /* 3134 /*
3593 * reports - some output format copied from XTerm 3135 * reports - some output format copied from XTerm
3594 */ 3136 */
3595 case 11: /* report window state */ 3137 case 11: /* report window state */
3596 XGetWindowAttributes (disp, parent[0], &wattr); 3138 XGetWindowAttributes (dpy, parent[0], &wattr);
3597 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3139 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3598 break; 3140 break;
3599 case 13: /* report window position */ 3141 case 13: /* report window position */
3600 XGetWindowAttributes (disp, parent[0], &wattr); 3142 XGetWindowAttributes (dpy, parent[0], &wattr);
3601 XTranslateCoordinates (disp, parent[0], wattr.root, 3143 XTranslateCoordinates (dpy, parent[0], wattr.root,
3602 -wattr.border_width, -wattr.border_width, 3144 -wattr.border_width, -wattr.border_width,
3603 &x, &y, &wdummy); 3145 &x, &y, &wdummy);
3604 tt_printf ("\033[3;%d;%dt", x, y); 3146 tt_printf ("\033[3;%d;%dt", x, y);
3605 break; 3147 break;
3606 case 14: /* report window size (pixels) */ 3148 case 14: /* report window size (pixels) */
3607 XGetWindowAttributes (disp, parent[0], &wattr); 3149 XGetWindowAttributes (dpy, parent[0], &wattr);
3608 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3150 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3609 break; 3151 break;
3610 case 18: /* report text area size (chars) */ 3152 case 18: /* report text area size (chars) */
3611 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3153 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3612 break; 3154 break;
… …
3614 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3156 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3615 break; 3157 break;
3616 case 20: /* report icon label */ 3158 case 20: /* report icon label */
3617 { 3159 {
3618 char *s; 3160 char *s;
3619 XGetIconName (disp, parent[0], &s); 3161 XGetIconName (dpy, parent[0], &s);
3620 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3162 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3621 XFree (s); 3163 XFree (s);
3622 } 3164 }
3623 break; 3165 break;
3624 case 21: /* report window title */ 3166 case 21: /* report window title */
3625 { 3167 {
3626 char *s; 3168 char *s;
3627 XFetchName (disp, parent[0], &s); 3169 XFetchName (dpy, parent[0], &s);
3628 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3170 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3629 XFree (s); 3171 XFree (s);
3630 } 3172 }
3631 break; 3173 break;
3632 } 3174 }
3633} 3175}
… …
3660 seen_esc = true; 3202 seen_esc = true;
3661 continue; 3203 continue;
3662 } 3204 }
3663 else if (ch == C0_BEL || ch == CHAR_ST) 3205 else if (ch == C0_BEL || ch == CHAR_ST)
3664 break; 3206 break;
3207 else if (ch == C0_SYN)
3208 ch = cmd_get8 ();
3665 else if (ch < 0x20) 3209 else if (ch < 0x20)
3666 return NULL; /* other control character - exit */ 3210 return NULL; /* other control character - exit */
3667 3211
3668 seen_esc = false; 3212 seen_esc = false;
3669 3213
3670 if (n >= STRING_MAX - 1) 3214 if (n >= STRING_MAX - 1)
3671 // stop at some sane length 3215 // stop at some sane length
3672 return NULL; 3216 return NULL;
3673 3217
3674 if (ch == C0_SYN)
3675 string[n++] = cmd_get8 ();
3676 else
3677 string[n++] = ch; 3218 string[n++] = ch;
3678 } 3219 }
3679 3220
3680 string[n++] = '\0'; 3221 string[n++] = '\0';
3681 3222
3682 ends_how = (ch == 0x5c ? C0_ESC : ch); 3223 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3733void 3274void
3734rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3275rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3735{ 3276{
3736 if (str[0] == '?' && !str[1]) 3277 if (str[0] == '?' && !str[1])
3737 { 3278 {
3738 unsigned short r, g, b; 3279 rgba c;
3739 pix_colors_focused[color].get (display, r, g, b); 3280 pix_colors_focused[color].get (c);
3281
3282#if XFT
3283 if (c.a != rgba::MAX_CC)
3284 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3285 else
3286#endif
3740 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3287 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3741 } 3288 }
3742 else 3289 else
3743 set_window_color (color, str); 3290 set_window_color (color, str);
3744} 3291}
3745 3292
… …
3751{ 3298{
3752 int color; 3299 int color;
3753 char *buf, *name; 3300 char *buf, *name;
3754 bool query = str[0] == '?' && !str[1]; 3301 bool query = str[0] == '?' && !str[1];
3755 int saveop = op; 3302 int saveop = op;
3756 dDisp; 3303
3304 dLocal (Display *, dpy);
3757 3305
3758 assert (str != NULL); 3306 assert (str != NULL);
3307
3308 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3309 return;
3310
3759 switch (op) 3311 switch (op)
3760 { 3312 {
3761 case XTerm_name: 3313 case XTerm_name:
3762 set_title (str); 3314 set_title (str);
3763 /* FALLTHROUGH */ 3315 /* FALLTHROUGH */
… …
3777 unsigned long bytes_after; 3329 unsigned long bytes_after;
3778 unsigned char *value = 0; 3330 unsigned char *value = 0;
3779 const char *str = ""; 3331 const char *str = "";
3780 3332
3781 if (prop 3333 if (prop
3782 && XGetWindowProperty (disp, parent[0], 3334 && XGetWindowProperty (dpy, parent[0],
3783 prop, 0, 1<<16, 0, AnyPropertyType, 3335 prop, 0, 1<<16, 0, AnyPropertyType,
3784 &actual_type, &actual_format, 3336 &actual_type, &actual_format,
3785 &nitems, &bytes_after, &value) == Success 3337 &nitems, &bytes_after, &value) == Success
3786 && actual_type != None 3338 && actual_type != None
3787 && actual_format == 8) 3339 && actual_format == 8)
3788 str = (const char *)(value); 3340 str = (const char *)(value);
3789 3341
3790 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3342 tt_printf ("\033]%d;%s%c", op, str, resp);
3791 3343
3792 XFree (value); 3344 XFree (value);
3793 } 3345 }
3794 else 3346 else
3795 { 3347 {
… …
3799 { 3351 {
3800 *eq = 0; 3352 *eq = 0;
3801 set_utf8_property (display->atom (str), eq + 1); 3353 set_utf8_property (display->atom (str), eq + 1);
3802 } 3354 }
3803 else 3355 else
3804 XDeleteProperty (disp, parent[0], 3356 XDeleteProperty (dpy, parent[0],
3805 display->atom (str)); 3357 display->atom (str));
3806 } 3358 }
3807 break; 3359 break;
3808 3360
3809 case XTerm_Color: 3361 case XTerm_Color:
… …
3819 break; 3371 break;
3820 3372
3821 if ((buf = strchr (name, ';')) != NULL) 3373 if ((buf = strchr (name, ';')) != NULL)
3822 *buf++ = '\0'; 3374 *buf++ = '\0';
3823 3375
3824 if (name[0] == '?' && !name[1]) 3376 process_color_seq (op, color, name, resp);
3825 {
3826 unsigned short r, g, b;
3827 pix_colors_focused[color].get (display, r, g, b);
3828 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3829 }
3830 else
3831 set_window_color (color, name);
3832 } 3377 }
3833 break; 3378 break;
3379 case Rxvt_restoreFG:
3834 case XTerm_Color00: 3380 case XTerm_Color00:
3835 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3381 process_color_seq (op, Color_fg, str, resp);
3836 break; 3382 break;
3383 case Rxvt_restoreBG:
3837 case XTerm_Color01: 3384 case XTerm_Color01:
3838 process_color_seq (XTerm_Color01, Color_bg, str, resp); 3385 process_color_seq (op, Color_bg, str, resp);
3839 break; 3386 break;
3840#ifndef NO_CURSORCOLOR 3387#ifndef NO_CURSORCOLOR
3841 case XTerm_Color_cursor: 3388 case XTerm_Color_cursor:
3842 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3389 process_color_seq (op, Color_cursor, str, resp);
3843 break; 3390 break;
3844#endif 3391#endif
3845 case XTerm_Color_pointer_fg: 3392 case XTerm_Color_pointer_fg:
3846 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3393 process_color_seq (op, Color_pointer_fg, str, resp);
3847 break; 3394 break;
3848 case XTerm_Color_pointer_bg: 3395 case XTerm_Color_pointer_bg:
3849 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3396 process_color_seq (op, Color_pointer_bg, str, resp);
3850 break; 3397 break;
3851#ifndef NO_BOLD_UNDERLINE_REVERSE 3398#ifndef NO_BOLD_UNDERLINE_REVERSE
3852 case XTerm_Color_RV: 3399 case XTerm_Color_RV:
3853 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3400 process_color_seq (op, Color_RV, str, resp);
3854 break; 3401 break;
3855 case Rxvt_Color_BD: 3402 case Rxvt_Color_BD:
3856 case URxvt_Color_BD: 3403 case URxvt_Color_BD:
3857 process_color_seq (op, Color_BD, str, resp); 3404 process_color_seq (op, Color_BD, str, resp);
3858 break; 3405 break;
3859 case Rxvt_Color_UL: 3406 case Rxvt_Color_UL:
3860 case URxvt_Color_UL: 3407 case URxvt_Color_UL:
3861 process_color_seq (op, Color_UL, str, resp); 3408 process_color_seq (op, Color_UL, str, resp);
3862 break; 3409 break;
3863 case URxvt_Color_IT: 3410 case URxvt_Color_IT:
3864 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3411 process_color_seq (op, Color_IT, str, resp);
3865 break; 3412 break;
3866#endif 3413#endif
3867#if TRANSPARENT && TINTING 3414#if ENABLE_TRANSPARENCY
3868 case URxvt_Color_tint: 3415 case URxvt_Color_tint:
3869 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3416 process_color_seq (op, Color_tint, str, resp);
3870 check_our_parents (); 3417 {
3871 if (am_transparent) 3418 bool changed = false;
3872 want_full_refresh = want_refresh = 1;
3873 break;
3874#endif
3875 3419
3420 if (ISSET_PIXCOLOR (Color_tint))
3421 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3422 else
3423 changed = bgPixmap.unset_tint ();
3424
3425 if (changed)
3426 update_background ();
3427 }
3428
3429 break;
3430#endif
3431
3432#if BG_IMAGE_FROM_FILE
3876 case Rxvt_Pixmap: 3433 case Rxvt_Pixmap:
3877 { 3434 if (!strcmp (str, "?"))
3878 if (*str != ';')
3879 { 3435 {
3880#if XPM_BACKGROUND 3436 char str[256];
3881 scale_pixmap (""); /* reset to default scaling */ 3437
3882 set_bgPixmap (str); /* change pixmap */ 3438 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3883 scr_touch (true); 3439 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3884#endif 3440 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3441 process_xterm_seq (XTerm_title, str, CHAR_ST);
3885 } 3442 }
3886 3443 else
3444 {
3887 int changed = 0; 3445 int changed = 0;
3888 3446
3889 while ((str = strchr (str, ';')) != NULL) 3447 if (*str != ';')
3890 { 3448 {
3449 /* reset to default scaling :*/
3450 bgPixmap.unset_geometry ();
3451 if (bgPixmap.set_file (str)) /* change pixmap */
3452 changed++;
3453 str = strchr (str, ';');
3454 if (str == NULL)
3455 bgPixmap.set_defaultGeometry ();
3456 }
3457
3458 while (str)
3459 {
3891 str++; 3460 str++;
3892#if XPM_BACKGROUND 3461 if (bgPixmap.set_geometry (str))
3893 changed += scale_pixmap (str); 3462 changed++;
3894#endif 3463 str = strchr (str, ';');
3895 } 3464 }
3896 3465
3897 if (changed) 3466 if (changed)
3898 { 3467 update_background ();
3899#ifdef XPM_BACKGROUND
3900 resize_pixmap ();
3901 scr_touch (true);
3902#endif
3903 } 3468 }
3904 }
3905 break; 3469 break;
3906 3470#endif
3907 case Rxvt_restoreFG:
3908 set_window_color (Color_fg, str);
3909 break;
3910 case Rxvt_restoreBG:
3911 set_window_color (Color_bg, str);
3912 break;
3913 3471
3914 case XTerm_logfile: 3472 case XTerm_logfile:
3915 // TODO, when secure mode? 3473 // TODO, when secure mode?
3916 break; 3474 break;
3917 3475
… …
3935 case URxvt_italicFont: 3493 case URxvt_italicFont:
3936 case URxvt_boldItalicFont: 3494 case URxvt_boldItalicFont:
3937#endif 3495#endif
3938 if (query) 3496 if (query)
3939 tt_printf ("\33]%d;%-.250s%c", saveop, 3497 tt_printf ("\33]%d;%-.250s%c", saveop,
3940 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3498 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3941 ? fontset[op - URxvt_font]->fontdesc : "", 3499 ? fontset[op - URxvt_font]->fontdesc : "",
3942 resp); 3500 resp);
3943 else 3501 else
3944 { 3502 {
3945 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3503 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3948 allocated.push_back ((void *)res); 3506 allocated.push_back ((void *)res);
3949 set_fonts (); 3507 set_fonts ();
3950 } 3508 }
3951 break; 3509 break;
3952 3510
3953#if ENABLE_FRILLS 3511 case URxvt_version:
3512 if (query)
3513 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3514 op,
3515 rs[Rs_name], VERSION[0], VERSION[2],
3516 resp);
3517 break;
3518
3519#if !ENABLE_MINIMAL
3954 case URxvt_locale: 3520 case URxvt_locale:
3955 if (query) 3521 if (query)
3956 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3522 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3957 else 3523 else
3958 { 3524 {
3959 set_locale (str); 3525 set_locale (str);
3960 pty->set_utf8_mode (enc_utf8); 3526 pty->set_utf8_mode (enc_utf8);
3961 init_xlocale (); 3527 init_xlocale ();
… …
3976 break; 3542 break;
3977#endif 3543#endif
3978 3544
3979#if ENABLE_PERL 3545#if ENABLE_PERL
3980 case URxvt_perl: 3546 case URxvt_perl:
3981 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 3547 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3982 ; // no responses yet 3548 ; // no responses yet
3983 break; 3549 break;
3984#endif 3550#endif
3985 } 3551 }
3986} 3552}
… …
4024{ 3590{
4025 unsigned int i, j; 3591 unsigned int i, j;
4026 int state; 3592 int state;
4027 3593
4028 static const struct 3594 static const struct
4029 { 3595 {
4030 const int argval; 3596 const int argval;
4031 const unsigned long bit; 3597 const unsigned long bit;
4032 }
4033
4034 argtopriv[] = { 3598 } argtopriv[] = {
4035 { 1, PrivMode_aplCUR }, 3599 { 1, PrivMode_aplCUR },
4036 { 2, PrivMode_vt52 }, 3600 { 2, PrivMode_vt52 },
4037 { 3, PrivMode_132 }, 3601 { 3, PrivMode_132 },
4038 { 4, PrivMode_smoothScroll }, 3602 { 4, PrivMode_smoothScroll },
4039 { 5, PrivMode_rVideo }, 3603 { 5, PrivMode_rVideo },
… …
4055 { 66, PrivMode_aplKP }, 3619 { 66, PrivMode_aplKP },
4056#ifndef NO_BACKSPACE_KEY 3620#ifndef NO_BACKSPACE_KEY
4057 { 67, PrivMode_BackSpace }, 3621 { 67, PrivMode_BackSpace },
4058#endif 3622#endif
4059 { 1000, PrivMode_MouseX11 }, 3623 { 1000, PrivMode_MouseX11 },
4060 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3624 { 1002, PrivMode_MouseBtnEvent },
4061 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3625 { 1003, PrivMode_MouseAnyEvent },
4062 // 1003 Use All Motion Mouse Tracking. NYI, TODO
4063 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3626 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4064 { 1011, PrivMode_Keypress }, // rxvt extension 3627 { 1011, PrivMode_Keypress }, // rxvt extension
4065 // 1035 enable modifiers for alt, numlock NYI 3628 // 1035 enable modifiers for alt, numlock NYI
4066 // 1036 send ESC for meta keys NYI 3629 // 1036 send ESC for meta keys NYI
4067 // 1037 send DEL for keypad delete NYI 3630 // 1037 send DEL for keypad delete NYI
4068 { 1047, PrivMode_Screen }, 3631 { 1047, PrivMode_Screen },
4069 // 1048 save and restore cursor 3632 // 1048 save and restore cursor
4070 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3633 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
4071 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3634 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3635 { 2004, PrivMode_BracketPaste },
4072 }; 3636 };
4073 3637
4074 if (nargs == 0) 3638 if (nargs == 0)
4075 return; 3639 return;
4076 3640
… …
4102 scr_touch (true); 3666 scr_touch (true);
4103 break; 3667 break;
4104#endif 3668#endif
4105 case 1048: /* alternative cursor save */ 3669 case 1048: /* alternative cursor save */
4106 case 1049: 3670 case 1049:
4107 if (OPTION (Opt_secondaryScreen)) 3671 if (option (Opt_secondaryScreen))
4108 if (mode == 0) 3672 if (mode == 0)
4109 scr_cursor (RESTORE); 3673 scr_cursor (RESTORE);
4110 else if (mode == 1) 3674 else if (mode == 1)
4111 scr_cursor (SAVE); 3675 scr_cursor (SAVE);
4112 break; 3676 break;
… …
4124 */ 3688 */
4125 PrivMode (1, PrivMode_vt52); 3689 PrivMode (1, PrivMode_vt52);
4126 break; 3690 break;
4127 case 3: /* 80/132 */ 3691 case 3: /* 80/132 */
4128 if (priv_modes & PrivMode_132OK) 3692 if (priv_modes & PrivMode_132OK)
3693 {
3694 scr_poweron ();
4129 set_widthheight (((state ? 132 : 80) * fwidth), height); 3695 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight);
3696 }
4130 break; 3697 break;
4131 case 4: /* smooth scrolling */ 3698 case 4: /* smooth scrolling */
4132 set_option (Opt_jumpScroll, !state); 3699 set_option (Opt_jumpScroll, !state);
4133 break; 3700 break;
4134 case 5: /* reverse video */ 3701 case 5: /* reverse video */
… …
4141 scr_autowrap (state); 3708 scr_autowrap (state);
4142 break; 3709 break;
4143 /* case 8: - auto repeat, can't do on a per window basis */ 3710 /* case 8: - auto repeat, can't do on a per window basis */
4144 case 9: /* X10 mouse reporting */ 3711 case 9: /* X10 mouse reporting */
4145 if (state) /* orthogonal */ 3712 if (state) /* orthogonal */
4146 priv_modes &= ~PrivMode_MouseX11; 3713 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4147 break; 3714 break;
4148#ifdef scrollBar_esc 3715#ifdef scrollBar_esc
4149 case scrollBar_esc: 3716 case scrollBar_esc:
4150 if (scrollbar_mapping (state)) 3717 if (scrollbar_mapping (state))
4151 { 3718 {
… …
4164 break; 3731 break;
4165 /* case 66: - application key pad */ 3732 /* case 66: - application key pad */
4166 /* case 67: - backspace key */ 3733 /* case 67: - backspace key */
4167 case 1000: /* X11 mouse reporting */ 3734 case 1000: /* X11 mouse reporting */
4168 if (state) /* orthogonal */ 3735 if (state) /* orthogonal */
4169 priv_modes &= ~PrivMode_MouseX10; 3736 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4170 break; 3737 break;
4171#if 0
4172 case 1001: 3738 case 1002:
4173 break; /* X11 mouse highlighting */ 3739 case 1003:
4174#endif 3740 if (state)
3741 {
3742 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3743 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3744 vt_emask_mouse = PointerMotionMask;
3745 }
3746 else
3747 vt_emask_mouse = NoEventMask;
3748 vt_select_input ();
3749 break;
4175 case 1010: /* scroll to bottom on TTY output inhibit */ 3750 case 1010: /* scroll to bottom on TTY output inhibit */
4176 set_option (Opt_scrollTtyOutput, !state); 3751 set_option (Opt_scrollTtyOutput, !state);
4177 break; 3752 break;
4178 case 1011: /* scroll to bottom on key press */ 3753 case 1011: /* scroll to bottom on key press */
4179 set_option (Opt_scrollTtyKeypress, state); 3754 set_option (Opt_scrollTtyKeypress, state);
4180 break; 3755 break;
4181 case 1047: /* secondary screen w/ clearing last */ 3756 case 1047: /* secondary screen w/ clearing last */
4182 if (OPTION (Opt_secondaryScreen)) 3757 if (option (Opt_secondaryScreen))
4183 if (current_screen != PRIMARY) 3758 if (current_screen != PRIMARY)
4184 scr_erase_screen (2); 3759 scr_erase_screen (2);
4185 scr_change_screen (state); 3760 scr_change_screen (state);
4186 break; 3761 break;
4187 case 1049: /* secondary screen w/ clearing first */ 3762 case 1049: /* secondary screen w/ clearing first */
4188 scr_change_screen (state); 3763 scr_change_screen (state);
4189 if (OPTION (Opt_secondaryScreen)) 3764 if (option (Opt_secondaryScreen))
4190 if (current_screen != PRIMARY) 3765 if (current_screen != PRIMARY)
4191 scr_erase_screen (2); 3766 scr_erase_screen (2);
4192 break; 3767 break;
4193 default: 3768 default:
4194 break; 3769 break;
… …
4322 scr_color (Color_bg, Color_bg); 3897 scr_color (Color_bg, Color_bg);
4323 break; 3898 break;
4324 3899
4325 //case 50: // not variable spacing 3900 //case 50: // not variable spacing
4326 3901
4327#if ENABLE_FRILLS 3902#if !ENABLE_MINIMAL
4328 case 90: 3903 case 90:
4329 case 91: /* set bright fg color */ 3904 case 91: /* set bright fg color */
4330 case 92: 3905 case 92:
4331 case 93: 3906 case 93:
4332 case 94: 3907 case 94:
… …
4356rxvt_term::process_graphics () 3931rxvt_term::process_graphics ()
4357{ 3932{
4358 unicode_t ch, cmd = cmd_getc (); 3933 unicode_t ch, cmd = cmd_getc ();
4359 3934
4360 if (cmd == 'Q') 3935 if (cmd == 'Q')
3936 {
4361 { /* query graphics */ 3937 /* query graphics */
4362 tt_printf ("\033G0\012"); /* no graphics */ 3938 tt_printf ("\033G0\012"); /* no graphics */
4363 return; 3939 return;
4364 } 3940 }
4365 /* swallow other graphics sequences until terminating ':' */ 3941 /* swallow other graphics sequences until terminating ':' */
4366 do 3942 do
… …
4416 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 3992 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4417 3993
4418 memcpy (v_buffer + v_buflen, data, len); 3994 memcpy (v_buffer + v_buflen, data, len);
4419 v_buflen += len; 3995 v_buflen += len;
4420 3996
4421 pty_ev.set (EVENT_READ | EVENT_WRITE); 3997 pty_ev.set (ev::READ | ev::WRITE);
4422} 3998}
4423 3999
4424void rxvt_term::pty_write () 4000void rxvt_term::pty_write ()
4425{ 4001{
4426 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4002 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4431 4007
4432 if (v_buflen == 0) 4008 if (v_buflen == 0)
4433 { 4009 {
4434 free (v_buffer); 4010 free (v_buffer);
4435 v_buffer = 0; 4011 v_buffer = 0;
4436 v_buflen = 0;
4437 4012
4438 pty_ev.set (EVENT_READ); 4013 pty_ev.set (ev::READ);
4439 return; 4014 return;
4440 } 4015 }
4441 4016
4442 memmove (v_buffer, v_buffer + written, v_buflen); 4017 memmove (v_buffer, v_buffer + written, v_buflen);
4443 } 4018 }
4444 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4019 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4445 pty_ev.set (EVENT_READ); 4020 pty_ev.set (ev::READ);
4446} 4021}
4447 4022
4448/*----------------------- end-of-file (C source) -----------------------*/ 4023/*----------------------- end-of-file (C source) -----------------------*/
4449 4024

Diff Legend

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