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.282 by root, Tue Jan 24 18:57:33 2006 UTC vs.
Revision 1.408 by ayin, Sat Feb 16 13:36:10 2008 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: command.C 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
31 * 32 *
32 * This program is free software; you can redistribute it and/or modify 33 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 34 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 36 * (at your option) any later version.
… …
49#include "rxvt.h" 50#include "rxvt.h"
50#include "rxvtperl.h" 51#include "rxvtperl.h"
51#include "version.h" 52#include "version.h"
52#include "command.h" 53#include "command.h"
53 54
54#if HAVE_SCHED_YIELD
55#undef HAVE_SCHED_YIELD // disabled for the time being
56//# include <sched.h>
57#endif
58
59#ifdef KEYSYM_RESOURCE 55#ifdef KEYSYM_RESOURCE
60# include "keyboard.h" 56# include "keyboard.h"
61#endif 57#endif
62 58
63#include <csignal> 59#include <csignal>
60
61#if LINUX_YIELD_HACK
62# include <ctime>
63#endif
64 64
65/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
66 66
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
68 68
… …
96 XK_Shift_L, 0x21e7, 96 XK_Shift_L, 0x21e7,
97 XK_Shift_R, 0x21e7, 97 XK_Shift_R, 0x21e7,
98 98
99 XK_Shift_Lock, 0x21eb, 99 XK_Shift_Lock, 0x21eb,
100 XK_ISO_Lock, 0x21eb, 100 XK_ISO_Lock, 0x21eb,
101 XK_ISO_Lock, 0x21eb,
102 XK_Caps_Lock, 0x21ec, 101 XK_Caps_Lock, 0x21ec,
103 XK_Num_Lock, 0x21ed, 102 XK_Num_Lock, 0x21ed,
104 XK_ISO_Level3_Shift, 0x21ee, 103 XK_ISO_Level3_Shift, 0x21ee,
105 XK_ISO_Level3_Lock, 0x21ef, 104 XK_ISO_Level3_Lock, 0x21ef,
106 XK_ISO_Group_Lock, 0x21f0, 105 XK_ISO_Group_Lock, 0x21f0,
… …
200 r & RS_Uline ? " uline" : "", 199 r & RS_Uline ? " uline" : "",
201 r & RS_Careful ? " careful" : ""); 200 r & RS_Careful ? " careful" : "");
202 201
203 int width = wcswidth (fname, wcslen (fname)); 202 int width = wcswidth (fname, wcslen (fname));
204 203
205 max_it (width, 8+5); // for char + hey 204 max_it (width, 8+5); // for char + hex
206 max_it (width, strlen (attr)); 205 max_it (width, strlen (attr));
207 206
208 if (y >= 0) 207 if (y >= 0)
209 { 208 {
210 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
… …
222 ch = *chr++; 221 ch = *chr++;
223 222
224 sprintf (buf, "%8x", ch); 223 sprintf (buf, "%8x", ch);
225 scr_overlay_set (0, y, buf); 224 scr_overlay_set (0, y, buf);
226 scr_overlay_set (9, y, '='); 225 scr_overlay_set (9, y, '=');
227# if !UNICODE3 226# if !UNICODE_3
228 if (ch >= 0x10000) 227 if (ch >= 0x10000)
229 ch = 0xfffd; 228 ch = 0xfffd;
230# endif 229# endif
231 scr_overlay_set (11, y, ch, r); 230 scr_overlay_set (11, y, ch, r);
231
232 if (WCWIDTH (ch) >= 2)
232 scr_overlay_set (12, y, NOCHAR, r); 233 scr_overlay_set (12, y, NOCHAR, r);
233 } 234 }
234 235
236// {
237// char buf[4+4+3+1];
238// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
239// scr_overlay_set (0, 0, buf);
240// }
235 scr_overlay_set (0, len , attr); 241 scr_overlay_set (0, len , attr);
236 scr_overlay_set (0, len + 1, fname); 242 scr_overlay_set (0, len + 1, fname);
237 243
238 free (fname); 244 free (fname);
239 245
… …
273 } 279 }
274 280
275 iso14755buf = 0; 281 iso14755buf = 0;
276} 282}
277 283
278int 284static int
279rxvt_term::hex_keyval (XKeyEvent &ev) 285hex_keyval (XKeyEvent &ev)
280{ 286{
281 // check wether this event corresponds to a hex digit 287 // check wether this event corresponds to a hex digit
282 // if the modifiers had not been pressed. 288 // if the modifiers had not been pressed.
283 for (int index = 0; index < 8; index++) 289 for (int index = 0; index < 8; index++)
284 { 290 {
… …
292 298
293 return -1; 299 return -1;
294} 300}
295#endif 301#endif
296 302
297/*{{{ Convert the keypress event into a string */ 303static inline KeySym
304translate_keypad (KeySym keysym, bool kp)
305{
306#ifdef XK_KP_Home
307 static const KeySym keypadtrans[] = {
308 XK_KP_7, // XK_KP_Home
309 XK_KP_4, // XK_KP_Left
310 XK_KP_8, // XK_KP_Up
311 XK_KP_6, // XK_KP_Right
312 XK_KP_2, // XK_KP_Down
313# ifndef UNSHIFTED_SCROLLKEYS
314 XK_KP_9, // XK_KP_Prior
315 XK_KP_3, // XK_KP_Next
316# else
317 XK_Prior,
318 XK_Next,
319# endif
320 XK_KP_1, // XK_KP_End
321 XK_KP_5, // XK_KP_Begin
322 };
323
324 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
325 {
326 unsigned int index = keysym - XK_KP_Home;
327 keysym = kp ? keypadtrans[index] : XK_Home + index;
328 }
329 else if (keysym == XK_KP_Insert)
330 keysym = kp ? XK_KP_0 : XK_Insert;
331# ifndef NO_DELETE_KEY
332 else if (keysym == XK_KP_Delete)
333 keysym = kp ? XK_KP_Decimal : XK_Delete;
334# endif
335#endif
336 return keysym;
337}
338
298void 339void
299rxvt_term::lookup_key (XKeyEvent &ev) 340rxvt_term::key_press (XKeyEvent &ev)
300{ 341{
301 int ctrl, meta, shft, len; 342 int ctrl, meta, shft, len;
302 unsigned int newlen;
303 KeySym keysym; 343 KeySym keysym;
304#ifdef DEBUG_CMD
305 static int debug_key = 1; /* accessible by a debugger only */
306#endif
307 int valid_keysym; 344 int valid_keysym;
308 char kbuf[KBUFSZ]; 345 char kbuf[KBUFSZ];
346
347#if ISO_14755
348 if (iso14755buf & ISO_14755_52)
349 return;
350#endif
309 351
310 /* 352 /*
311 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 353 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
312 * escape sequence to toggle the Keypad. 354 * escape sequence to toggle the Keypad.
313 * 355 *
… …
493# if ISO_14755 535# if ISO_14755
494 iso14755_51 (0); 536 iso14755_51 (0);
495# endif 537# endif
496 return; 538 return;
497 } 539 }
540 else if (keysym == XK_BackSpace)
541 {
542 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
543# if ISO_14755
544 iso14755_51 (iso14755buf & ISO_14755_MASK);
545# endif
546 return;
547 }
498 else if ((hv = hex_keyval (ev)) >= 0) 548 else if ((hv = hex_keyval (ev)) >= 0)
499 { 549 {
500 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK) 550 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
501 | hv | ISO_14755_51; 551 | hv | ISO_14755_51;
502# if ISO_14755 552# if ISO_14755
… …
504# endif 554# endif
505 return; 555 return;
506 } 556 }
507 else 557 else
508 { 558 {
509# if ENABLE_OVERLAY 559# if ISO_14755
510 scr_overlay_off (); 560 scr_overlay_off ();
511# endif 561# endif
512 iso14755buf = 0; 562 iso14755buf = 0;
513 } 563 }
514 } 564 }
515 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 565 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
516 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 566 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
517 if (!(iso14755buf & ISO_14755_STARTED)) 567 if (!(iso14755buf & ISO_14755_STARTED))
518 { 568 {
519 iso14755buf |= ISO_14755_STARTED; 569 iso14755buf |= ISO_14755_STARTED;
520# if ENABLE_OVERLAY 570# if ISO_14755
521 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 571 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
522 scr_overlay_set (0, 0, "ISO 14755 mode"); 572 scr_overlay_set (0, 0, "ISO 14755 mode");
523# endif 573# endif
524 } 574 }
525#endif 575#endif
526 576
527#ifdef PRINTPIPE 577#ifdef PRINTPIPE
528 if (keysym == XK_Print) 578 if (keysym == XK_Print)
529 { 579 {
530 scr_printscreen (ctrl | shft); 580 scr_printscreen (ctrl | shft);
531 return; 581 return;
532 } 582 }
533#endif 583#endif
534 584
535 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 585 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
536 { 586 {
537 { 587 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
538 newlen = 1; 588 unsigned int newlen = 1;
539 switch (keysym) 589
590 switch (translate_keypad (keysym, kp))
540 { 591 {
541#ifndef NO_BACKSPACE_KEY 592#ifndef NO_BACKSPACE_KEY
542 case XK_BackSpace: 593 case XK_BackSpace:
543 if (priv_modes & PrivMode_HaveBackSpace) 594 if (priv_modes & PrivMode_HaveBackSpace)
544 { 595 {
545 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace) 596 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
546 ^ !!ctrl) ? '\b' : '\177'; 597 ^ !!ctrl) ? '\b' : '\177';
547 kbuf[1] = '\0'; 598 kbuf[1] = '\0';
548 } 599 }
549 else 600 else
550 strcpy (kbuf, key_backspace); 601 strcpy (kbuf, rs[Rs_backspace_key]);
551 break; 602 break;
552#endif 603#endif
553#ifndef NO_DELETE_KEY 604#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: 605 case XK_Delete:
565 strcpy (kbuf, key_delete); 606 strcpy (kbuf, rs[Rs_delete_key]);
566 break; 607 break;
567#endif 608#endif
568 case XK_Tab: 609 case XK_Tab:
569 if (shft) 610 if (shft)
570 strcpy (kbuf, "\033[Z"); 611 strcpy (kbuf, "\033[Z");
… …
580#endif 621#endif
581 newlen = 0; 622 newlen = 0;
582 } 623 }
583 break; 624 break;
584 625
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" */ 626 case XK_Up: /* "\033[A" */
602 case XK_Down: /* "\033[B" */ 627 case XK_Down: /* "\033[B" */
603 case XK_Right: /* "\033[C" */ 628 case XK_Right: /* "\033[C" */
604 case XK_Left: /* "\033[D" */ 629 case XK_Left: /* "\033[D" */
605 strcpy (kbuf, "\033[Z"); 630 strcpy (kbuf, "\033[Z");
… …
615 else if (priv_modes & PrivMode_aplCUR) 640 else if (priv_modes & PrivMode_aplCUR)
616 kbuf[1] = 'O'; 641 kbuf[1] = 'O';
617 break; 642 break;
618 643
619#ifndef UNSHIFTED_SCROLLKEYS 644#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: 645 case XK_Prior:
631 strcpy (kbuf, "\033[5~"); 646 strcpy (kbuf, "\033[5~");
632 break; 647 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: 648 case XK_Next:
644 strcpy (kbuf, "\033[6~"); 649 strcpy (kbuf, "\033[6~");
645 break; 650 break;
646#endif 651#endif
647 case XK_KP_Enter: 652 case XK_KP_Enter:
648 /* allow shift to override */ 653 /* allow shift to override */
649 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 654 if (kp)
650 { 655 {
651 strcpy (kbuf, "\033OM"); 656 strcpy (kbuf, "\033OM");
652 break; 657 break;
653 } 658 }
654 659
… …
666 kbuf[0] = '\015'; 671 kbuf[0] = '\015';
667 kbuf[1] = '\0'; 672 kbuf[1] = '\0';
668 } 673 }
669 break; 674 break;
670 675
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" */ 676 case XK_KP_F1: /* "\033OP" */
678 case XK_KP_F2: /* "\033OQ" */ 677 case XK_KP_F2: /* "\033OQ" */
679 case XK_KP_F3: /* "\033OR" */ 678 case XK_KP_F3: /* "\033OR" */
680 case XK_KP_F4: /* "\033OS" */ 679 case XK_KP_F4: /* "\033OS" */
681 strcpy (kbuf, "\033OP"); 680 strcpy (kbuf, "\033OP");
… …
697 case XK_KP_6: /* "\033Ov" : "6" */ 696 case XK_KP_6: /* "\033Ov" : "6" */
698 case XK_KP_7: /* "\033Ow" : "7" */ 697 case XK_KP_7: /* "\033Ow" : "7" */
699 case XK_KP_8: /* "\033Ox" : "8" */ 698 case XK_KP_8: /* "\033Ox" : "8" */
700 case XK_KP_9: /* "\033Oy" : "9" */ 699 case XK_KP_9: /* "\033Oy" : "9" */
701 /* allow shift to override */ 700 /* allow shift to override */
702 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 701 if (kp)
703 { 702 {
704 strcpy (kbuf, "\033Oj"); 703 strcpy (kbuf, "\033Oj");
705 kbuf[2] += (keysym - XK_KP_Multiply); 704 kbuf[2] += (keysym - XK_KP_Multiply);
706 } 705 }
707 else 706 else
… …
713 712
714 case XK_Find: 713 case XK_Find:
715 strcpy (kbuf, "\033[1~"); 714 strcpy (kbuf, "\033[1~");
716 break; 715 break;
717 716
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: 717 case XK_Insert:
729 strcpy (kbuf, "\033[2~"); 718 strcpy (kbuf, "\033[2~");
730 break; 719 break;
731#ifdef DXK_Remove /* support for DEC remove like key */ 720#ifdef DXK_Remove /* support for DEC remove like key */
732 case DXK_Remove: 721 case DXK_Remove:
… …
736 strcpy (kbuf, "\033[3~"); 725 strcpy (kbuf, "\033[3~");
737 break; 726 break;
738 case XK_Select: 727 case XK_Select:
739 strcpy (kbuf, "\033[4~"); 728 strcpy (kbuf, "\033[4~");
740 break; 729 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: 730 case XK_End:
752 strcpy (kbuf, KS_END); 731 strcpy (kbuf, KS_END);
753 break; 732 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: 733 case XK_Home:
765 strcpy (kbuf, KS_HOME); 734 strcpy (kbuf, KS_HOME);
766 break; 735 break;
767 736
768#define FKEY(n, fkey) \ 737#define FKEY(n, fkey) \
… …
825 break; 794 break;
826 } 795 }
827 796
828 if (newlen) 797 if (newlen)
829 len = strlen (kbuf); 798 len = strlen (kbuf);
830 }
831 799
832 /* 800 /*
833 * Pass meta for all function keys, if 'meta' option set 801 * Pass meta for all function keys, if 'meta' option set
834 */ 802 */
835#ifdef META8_OPTION 803#ifdef META8_OPTION
… …
870 return; 838 return;
871 839
872 if (len <= 0) 840 if (len <= 0)
873 return; /* not mapped */ 841 return; /* not mapped */
874 842
875 if (OPTION (Opt_scrollTtyKeypress)) 843 if (option (Opt_scrollTtyKeypress))
876 if (view_start) 844 if (view_start)
877 { 845 {
878 view_start = 0; 846 view_start = 0;
879 want_refresh = 1; 847 want_refresh = 1;
880 } 848 }
… …
902 { 870 {
903 const char ch = C0_ESC; 871 const char ch = C0_ESC;
904 tt_write (&ch, 1); 872 tt_write (&ch, 1);
905 } 873 }
906 874
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); 875 tt_write (kbuf, (unsigned int)len);
918} 876}
919/*}}} */ 877
878void
879rxvt_term::key_release (XKeyEvent &ev)
880{
881#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
882 KeySym keysym;
883
884 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
885#endif
886
887#if ENABLE_FRILLS || ISO_14755
888 // ISO 14755 support
889 if (iso14755buf)
890 if (iso14755buf & ISO_14755_52)
891 {
892# if ISO_14755
893 scr_overlay_off ();
894# endif
895# if ISO_14755
896 // iso14755 part 5.2 handling: release time
897 // first: controls
898 if ((ev.state & ControlMask)
899 && ((keysym >= 0x40 && keysym <= 0x5f)
900 || (keysym >= 0x61 && keysym <= 0x7f)))
901 {
902 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
903 commit_iso14755 ();
904
905 return;
906 }
907
908 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
909 if (i[0] == keysym)
910 {
911 iso14755buf = ISO_14755_51 | i[1];
912 commit_iso14755 ();
913
914 return;
915 }
916
917 scr_bell ();
918# endif
919 iso14755buf = 0;
920
921 return;
922 }
923 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
924 {
925# if ISO_14755
926 scr_overlay_off ();
927# endif
928 if (iso14755buf & ISO_14755_51)
929 commit_iso14755 ();
930#if ISO_14755
931 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
932 {
933 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
934
935 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
936 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
937 }
938# endif
939 else
940 iso14755buf = 0;
941 }
942#endif
943
944 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
945 return;
946
947#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
948 if (!(ev.state & ControlMask))
949 slip_wheel_ev.stop ();
950 else if (keysym == XK_Control_L || keysym == XK_Control_R)
951 mouse_slip_wheel_speed = 0;
952#endif
953}
920 954
921#if defined (KEYSYM_RESOURCE) 955#if defined (KEYSYM_RESOURCE)
922unsigned int 956unsigned int
923rxvt_term::cmd_write (const char *str, unsigned int count) 957rxvt_term::cmd_write (const char *str, unsigned int count)
924{ 958{
… …
954void 988void
955rxvt_term::flush () 989rxvt_term::flush ()
956{ 990{
957 flush_ev.stop (); 991 flush_ev.stop ();
958 992
959#ifdef TRANSPARENT 993#ifdef HAVE_BG_PIXMAP
960 if (want_full_refresh) 994 if (bgPixmap.check_clearChanged ())
961 { 995 {
962 want_full_refresh = 0; 996// scr_clear (true); This needs to be researched further!
963 scr_clear ();
964 scr_touch (false); 997 scr_touch (false);
965 } 998 }
966#endif 999#endif
967 1000
968 if (want_refresh) 1001 if (want_refresh)
… …
1013 } 1046 }
1014 1047
1015 display->flush (); 1048 display->flush ();
1016} 1049}
1017 1050
1051/* checks wether a refresh is requested and starts the refresh timer */
1018void 1052void
1019rxvt_term::check_cb (check_watcher &w) 1053rxvt_term::refresh_check ()
1054{
1055 if (want_refresh && !flush_ev.is_active ())
1056 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1057
1058 display->flush ();
1059}
1060
1061void
1062rxvt_term::flush_cb (ev::timer &w, int revents)
1020{ 1063{
1021 make_current (); 1064 make_current ();
1022 1065
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; 1066 refresh_count = 0;
1036 flush (); 1067 flush ();
1037} 1068}
1038 1069
1039#ifdef CURSOR_BLINK 1070#ifdef CURSOR_BLINK
1040void 1071void
1041rxvt_term::cursor_blink_cb (time_watcher &w) 1072rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1042{ 1073{
1043 hidden_cursor = !hidden_cursor; 1074 hidden_cursor = !hidden_cursor;
1044 want_refresh = 1; 1075 want_refresh = 1;
1045 1076 refresh_check ();
1046 w.start (w.at + CURSOR_BLINK_INTERVAL);
1047} 1077}
1048#endif 1078#endif
1049 1079
1050#ifdef TEXT_BLINK 1080#ifdef TEXT_BLINK
1051void 1081void
1052rxvt_term::text_blink_cb (time_watcher &w) 1082rxvt_term::text_blink_cb (ev::timer &w, int revents)
1053{ 1083{
1054 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1084 if (scr_refresh_rend (RS_Blink, RS_Blink))
1055 { 1085 {
1056 hidden_text = !hidden_text; 1086 hidden_text = !hidden_text;
1057 want_refresh = 1; 1087 want_refresh = 1;
1058 w.start (w.at + TEXT_BLINK_INTERVAL); 1088 refresh_check ();
1059 } 1089 }
1090 else
1091 w.stop ();
1060} 1092}
1061#endif 1093#endif
1062 1094
1063#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1095#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1064void 1096void
1065rxvt_term::cont_scroll_cb (time_watcher &w) 1097rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1066{ 1098{
1067 if ((scrollbar_isUp() || scrollbar_isDn()) && 1099 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1068 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1100 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1069 { 1101 {
1070 want_refresh = 1; 1102 want_refresh = 1;
1071 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1103 refresh_check ();
1072 } 1104 }
1105 else
1106 w.stop ();
1073} 1107}
1074#endif 1108#endif
1075 1109
1076#ifdef SELECTION_SCROLLING 1110#ifdef SELECTION_SCROLLING
1077void 1111void
1078rxvt_term::sel_scroll_cb (time_watcher &w) 1112rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1079{ 1113{
1080 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1114 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1081 { 1115 {
1082 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1116 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1083 want_refresh = 1; 1117 want_refresh = 1;
1084 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1118 refresh_check ();
1085 } 1119 }
1120 else
1121 w.stop ();
1086} 1122}
1087#endif 1123#endif
1088 1124
1089#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1125#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1090void 1126void
1091rxvt_term::slip_wheel_cb (time_watcher &w) 1127rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1092{ 1128{
1093 if (mouse_slip_wheel_speed == 0 1129 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 { 1130 {
1097 if (view_start == top_row || view_start == 0)
1098 mouse_slip_wheel_speed = 0;
1099
1100 want_refresh = 1; 1131 want_refresh = 1;
1101 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1132 refresh_check ();
1133 }
1134
1135 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1102 } 1136 {
1137 mouse_slip_wheel_speed = 0;
1138 w.stop ();
1139 }
1103} 1140}
1104#endif 1141#endif
1105 1142
1106#if HAVE_SCHED_YIELD 1143#if LINUX_YIELD_HACK
1107static struct event_handler 1144static struct event_handler
1108{ 1145{
1109 check_watcher cw_yield; 1146 ev::prepare yield_ev;
1110 1147
1111 void yield (check_watcher &w) 1148 void yield_cb (ev::prepare &w, int revents)
1112 { 1149 {
1113 sched_yield (); 1150 // this should really be sched_yield(), but the linux guys thought
1151 // that giving a process calling sched_yield () less cpu time than
1152 // ones with high nice levels is a useful thing to do. It surely is is
1153 // allowed by the sus... as is returning ENOSYS.
1154
1155 struct timespec ts = { 0, 0 };
1156 nanosleep (&ts, 0);
1157
1114 w.stop (); 1158 w.stop ();
1115 } 1159 }
1116 1160
1117 event_handler () 1161 event_handler ()
1118 : cw_yield (this, &event_handler::yield) 1162 : yield_ev (this, &event_handler::yield_cb)
1119 { 1163 {
1120 } 1164 }
1121} event_handler; 1165} event_handler;
1122#endif 1166#endif
1123 1167
… …
1143 cmdbuf_endp += r; 1187 cmdbuf_endp += r;
1144 return true; 1188 return true;
1145 } 1189 }
1146 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1190 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1147 { 1191 {
1148#if HAVE_SCHED_YIELD 1192#if LINUX_YIELD_HACK
1149 if (display->is_local) 1193 if (display->is_local)
1150 event_handler.cw_yield.start (); 1194 event_handler.yield_ev.start ();
1151#endif 1195#endif
1152 } 1196 }
1153 else 1197 else
1154 { 1198 {
1155 pty_ev.stop (); 1199 pty_ev.stop ();
1156 1200
1157 if (!OPTION (Opt_hold)) 1201 if (!option (Opt_hold))
1158 destroy (); 1202 destroy ();
1159 } 1203 }
1160 1204
1161 return false; 1205 return false;
1162} 1206}
1163 1207
1164void 1208void
1165rxvt_term::pty_cb (io_watcher &w, short revents) 1209rxvt_term::pty_cb (ev::io &w, int revents)
1166{ 1210{
1167 make_current (); 1211 make_current ();
1168 1212
1169 if (revents & EVENT_READ) 1213 if (revents & ev::READ)
1170 // loop, but don't allow a single term to monopolize us 1214 // loop, but don't allow a single term to monopolize us
1171 while (pty_fill ()) 1215 while (pty_fill ())
1172 if (cmd_parse ()) 1216 if (cmd_parse ())
1173 break; 1217 break;
1174 1218
1175 if (revents & EVENT_WRITE) 1219 if (revents & ev::WRITE)
1176 pty_write (); 1220 pty_write ();
1221
1222 refresh_check ();
1177} 1223}
1178 1224
1179void 1225void
1180rxvt_term::pointer_unblank () 1226rxvt_term::pointer_unblank ()
1181{ 1227{
1182 XDefineCursor (display->display, vt, TermWin_cursor); 1228 XDefineCursor (dpy, vt, TermWin_cursor);
1183 recolour_cursor (); 1229 recolour_cursor ();
1184 1230
1185#ifdef POINTER_BLANK 1231#ifdef POINTER_BLANK
1186 hidden_pointer = 0; 1232 hidden_pointer = 0;
1187 1233
1188 if (OPTION (Opt_pointerBlank)) 1234 if (option (Opt_pointerBlank))
1189 pointer_ev.start (NOW + pointerBlankDelay); 1235 pointer_ev.start (pointerBlankDelay);
1190#endif 1236#endif
1191} 1237}
1192 1238
1193#ifdef POINTER_BLANK 1239#ifdef POINTER_BLANK
1194void 1240void
1195rxvt_term::pointer_blank () 1241rxvt_term::pointer_blank ()
1196{ 1242{
1197 if (!OPTION (Opt_pointerBlank)) 1243 if (!option (Opt_pointerBlank))
1198 return; 1244 return;
1199 1245
1200 XDefineCursor (display->display, vt, display->blank_cursor); 1246 XDefineCursor (dpy, vt, display->blank_cursor);
1201 XFlush (display->display); 1247 XFlush (dpy);
1202 1248
1203 hidden_pointer = 1; 1249 hidden_pointer = 1;
1204} 1250}
1205 1251
1206void 1252void
1207rxvt_term::pointer_cb (time_watcher &w) 1253rxvt_term::pointer_cb (ev::timer &w, int revents)
1208{ 1254{
1209 make_current (); 1255 make_current ();
1210 1256
1211 pointer_blank (); 1257 pointer_blank ();
1212} 1258}
… …
1215void 1261void
1216rxvt_term::mouse_report (XButtonEvent &ev) 1262rxvt_term::mouse_report (XButtonEvent &ev)
1217{ 1263{
1218 int button_number, key_state = 0; 1264 int button_number, key_state = 0;
1219 int x, y; 1265 int x, y;
1266 int code = 32;
1220 1267
1221 x = ev.x; 1268 x = Pixel2Col (ev.x);
1222 y = ev.y; 1269 y = Pixel2Row (ev.y);
1223 pixel_position (&x, &y); 1270 if (ev.type == MotionNotify)
1271 {
1272 if (x == mouse_row && y == mouse_col)
1273 return;
1274 mouse_row = x;
1275 mouse_col = y;
1276 code += 32;
1277 }
1224 1278
1225 if (MEvent.button == AnyButton) 1279 if (MEvent.button == AnyButton)
1226 button_number = 3; 1280 button_number = 3;
1227 else 1281 else
1228 { 1282 {
… …
1274 x + 1, 1328 x + 1,
1275 y + 1); 1329 y + 1);
1276#endif 1330#endif
1277 1331
1278 tt_printf ("\033[M%c%c%c", 1332 tt_printf ("\033[M%c%c%c",
1279 (32 + button_number + key_state), 1333 (code + button_number + key_state),
1280 (32 + x + 1), 1334 (32 + x + 1),
1281 (32 + y + 1)); 1335 (32 + y + 1));
1282} 1336}
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 1337
1294/*{{{ process an X event */ 1338/*{{{ process an X event */
1295void 1339void
1296rxvt_term::x_cb (XEvent &ev) 1340rxvt_term::x_cb (XEvent &ev)
1297{ 1341{
1298 make_current (); 1342 make_current ();
1299 1343
1300 dDisp; 1344 dLocal (Display *, dpy);
1301 1345
1302 if (ev.xany.window == vt 1346 if (ev.xany.window == vt
1303 && SHOULD_INVOKE (HOOK_X_EVENT) 1347 && SHOULD_INVOKE (HOOK_X_EVENT)
1304 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1348 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1305 return; 1349 return;
… …
1310 unsigned int unused_mask; 1354 unsigned int unused_mask;
1311 1355
1312 switch (ev.type) 1356 switch (ev.type)
1313 { 1357 {
1314 case KeyPress: 1358 case KeyPress:
1315#if ISO_14755 1359 key_press (ev.xkey);
1316 if (!(iso14755buf & ISO_14755_52))
1317#endif
1318 lookup_key (ev.xkey);
1319
1320 break; 1360 break;
1321 1361
1322 case KeyRelease: 1362 case KeyRelease:
1323 { 1363 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; 1364 break;
1395 }
1396 1365
1397 case ButtonPress: 1366 case ButtonPress:
1398 button_press (ev.xbutton); 1367 button_press (ev.xbutton);
1399 break; 1368 break;
1400 1369
… …
1415 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END))) 1384 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1416 destroy (); 1385 destroy ();
1417 } 1386 }
1418#if ENABLE_EWMH 1387#if ENABLE_EWMH
1419 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1388 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1420 XSendEvent (disp, ev.xclient.window = display->root, 1389 XSendEvent (dpy, ev.xclient.window = display->root,
1421 False, SubstructureRedirectMask | SubstructureNotifyMask, 1390 False, SubstructureRedirectMask | SubstructureNotifyMask,
1422 &ev); 1391 &ev);
1423#endif 1392#endif
1424 } 1393 }
1425 } 1394 }
… …
1431 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1400 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1432 focus_out (); 1401 focus_out ();
1433 } 1402 }
1434#endif 1403#endif
1435 } 1404 }
1436 break;
1437
1438 case MappingNotify:
1439 XRefreshKeyboardMapping (&ev.xmapping);
1440 break; 1405 break;
1441 1406
1442 /* 1407 /*
1443 * XXX: this is not the _current_ arrangement 1408 * XXX: this is not the _current_ arrangement
1444 * Here's my conclusion: 1409 * Here's my conclusion:
… …
1463 break; 1428 break;
1464 } 1429 }
1465 break; 1430 break;
1466 1431
1467 case FocusIn: 1432 case FocusIn:
1433 if (ev.xfocus.detail != NotifyInferior
1434 && ev.xfocus.detail != NotifyPointer
1435 && ev.xfocus.mode != NotifyGrab)
1468 focus_in (); 1436 focus_in ();
1469 break; 1437 break;
1470 1438
1471 case FocusOut: 1439 case FocusOut:
1440 if (ev.xfocus.detail != NotifyInferior
1441 && ev.xfocus.detail != NotifyPointer
1442 && ev.xfocus.mode != NotifyGrab)
1472 focus_out (); 1443 focus_out ();
1473 break; 1444 break;
1474 1445
1475 case ConfigureNotify: 1446 case ConfigureNotify:
1447 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1448 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1449 szHint.width, szHint.height);*/
1476 if (ev.xconfigure.window == parent[0]) 1450 if (ev.xconfigure.window == parent[0])
1477 { 1451 {
1478 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1452 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1479 ; 1453 ;
1480 1454
1481 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1455 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1482 { 1456 {
1483 seen_resize = 1; 1457 seen_resize = 1;
1484 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1458 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1485 } 1459 }
1460 else
1461 {
1462#ifdef HAVE_BG_PIXMAP
1463 if (bgPixmap.window_position_sensitive ())
1464 {
1465 if (mapped)
1466 update_background ();
1467 else
1468 bgPixmap.invalidate ();
1469 }
1470#endif
1471 }
1486 1472
1487 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1473 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 } 1474 }
1494 break; 1475 break;
1495 1476
1496 case PropertyNotify: 1477 case PropertyNotify:
1497 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1478 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
… …
1513 case SelectionRequest: 1494 case SelectionRequest:
1514 selection_send (ev.xselectionrequest); 1495 selection_send (ev.xselectionrequest);
1515 break; 1496 break;
1516 1497
1517 case MapNotify: 1498 case MapNotify:
1499#ifdef HAVE_BG_PIXMAP
1500 /* This is needed spcifically to fix the case of no window manager or a
1501 * non-reparenting window manager. In those cases we never get first
1502 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1503 * care of multiplicity of ConfigureNotify events arriwing while WM does
1504 * reparenting.
1505 * We should not render background immidiately, as there could be several
1506 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1507 * by scheduling background redraw as soon as we can, but giving a short
1508 * bit of time for ConfigureNotifies to arrive.
1509 * We should render background PRIOR to drawing any text, but AFTER all
1510 * of ConfigureNotifys for the best results.
1511 */
1512 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1513 update_background_ev.start (0.025);
1514#endif
1518 mapped = 1; 1515 mapped = 1;
1519#ifdef TEXT_BLINK 1516#ifdef TEXT_BLINK
1520 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1517 text_blink_ev.start ();
1521#endif 1518#endif
1522 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1519 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1523 break; 1520 break;
1524 1521
1525 case UnmapNotify: 1522 case UnmapNotify:
… …
1527#ifdef TEXT_BLINK 1524#ifdef TEXT_BLINK
1528 text_blink_ev.stop (); 1525 text_blink_ev.stop ();
1529#endif 1526#endif
1530 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1527 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1531 break; 1528 break;
1532
1533#ifdef TRANSPARENT
1534 case ReparentNotify:
1535 rootwin_cb (ev);
1536 break;
1537#endif /* TRANSPARENT */
1538 1529
1539 case GraphicsExpose: 1530 case GraphicsExpose:
1540 case Expose: 1531 case Expose:
1541 if (ev.xany.window == vt) 1532 if (ev.xany.window == vt)
1542 { 1533 {
1543 do 1534 do
1535 {
1544 scr_expose (ev.xexpose.x, ev.xexpose.y, 1536 scr_expose (ev.xexpose.x, ev.xexpose.y,
1545 ev.xexpose.width, ev.xexpose.height, False); 1537 ev.xexpose.width, ev.xexpose.height, False);
1538 }
1546 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1539 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1547 1540
1548 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1541 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1549 1542
1550 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1543 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1544 {
1551 scr_expose (ev.xexpose.x, ev.xexpose.y, 1545 scr_expose (ev.xexpose.x, ev.xexpose.y,
1552 ev.xexpose.width, ev.xexpose.height, False); 1546 ev.xexpose.width, ev.xexpose.height, False);
1547 }
1553 1548
1554 want_refresh = 1; 1549 want_refresh = 1;
1555 } 1550 }
1556 else 1551 else
1557 { 1552 {
1558 XEvent unused_event; 1553 XEvent unused_event;
1559 1554
1560 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1555 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1561 ; 1556 ;
1562 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1557 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1563 ; 1558 ;
1564 1559
1565 if (isScrollbarWindow (ev.xany.window)) 1560 if (scrollBar.state && ev.xany.window == scrollBar.win)
1566 { 1561 {
1567 scrollBar.setIdle (); 1562 scrollBar.state = STATE_IDLE;
1568 scrollbar_show (0); 1563 scrollbar_show (0);
1569 } 1564 }
1570
1571#ifdef TRANSPARENT
1572 if (am_transparent && ev.xany.window == parent[0])
1573 XClearWindow (disp, ev.xany.window);
1574#endif
1575 } 1565 }
1576 break; 1566 break;
1577 1567
1578 case MotionNotify: 1568 case MotionNotify:
1579#ifdef POINTER_BLANK 1569#ifdef POINTER_BLANK
1580 if (hidden_pointer) 1570 if (hidden_pointer)
1581 pointer_unblank (); 1571 pointer_unblank ();
1582#endif 1572#endif
1573 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1574 || priv_modes & PrivMode_MouseAnyEvent)
1575 mouse_report (ev.xbutton);
1583 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1576 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1584 break; 1577 break;
1585 1578
1586 if (ev.xany.window == vt) 1579 if (ev.xany.window == vt)
1587 { 1580 {
1588 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1581 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1589 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1582 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1590 ; // nop 1583 ; // nop
1591 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1584 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1592 { 1585 {
1593 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1586 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1594 ; 1587 ;
1595 1588
1596 XQueryPointer (disp, vt, 1589 XQueryPointer (dpy, vt,
1597 &unused_root, &unused_child, 1590 &unused_root, &unused_child,
1598 &unused_root_x, &unused_root_y, 1591 &unused_root_x, &unused_root_y,
1599 &ev.xbutton.x, &ev.xbutton.y, 1592 &ev.xbutton.x, &ev.xbutton.y,
1600 &ev.xbutton.state); 1593 &ev.xbutton.state);
1601#ifdef MOUSE_THRESHOLD 1594#ifdef MOUSE_THRESHOLD
… …
1621 int dist; 1614 int dist;
1622 1615
1623 /* don't clobber the current delay if we are 1616 /* don't clobber the current delay if we are
1624 * already in the middle of scrolling. 1617 * already in the middle of scrolling.
1625 */ 1618 */
1626 if (!sel_scroll_ev.active) 1619 if (!sel_scroll_ev.is_active ())
1627 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1620 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1628 1621
1629 /* save the event params so we can highlight 1622 /* save the event params so we can highlight
1630 * the selection in the pending-scroll loop 1623 * the selection in the pending-scroll loop
1631 */ 1624 */
1632 selection_save_x = ev.xbutton.x; 1625 selection_save_x = ev.xbutton.x;
… …
1654 else 1647 else
1655 { 1648 {
1656 /* we are within the text window, so we 1649 /* we are within the text window, so we
1657 * shouldn't be scrolling 1650 * shouldn't be scrolling
1658 */ 1651 */
1659 if (sel_scroll_ev.active)
1660 sel_scroll_ev.stop(); 1652 sel_scroll_ev.stop();
1661 } 1653 }
1662#endif 1654#endif
1663#ifdef MOUSE_THRESHOLD 1655#ifdef MOUSE_THRESHOLD
1664 } 1656 }
1665#endif 1657#endif
1666 } 1658 }
1667 } 1659 }
1668 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1660 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1669 { 1661 {
1670 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1662 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1671 MotionNotify, &ev)) 1663 MotionNotify, &ev))
1672 ; 1664 ;
1673 1665
1674 XQueryPointer (disp, scrollBar.win, 1666 XQueryPointer (dpy, scrollBar.win,
1675 &unused_root, &unused_child, 1667 &unused_root, &unused_child,
1676 &unused_root_x, &unused_root_y, 1668 &unused_root_x, &unused_root_y,
1677 &ev.xbutton.x, &ev.xbutton.y, 1669 &ev.xbutton.x, &ev.xbutton.y,
1678 &unused_mask); 1670 &unused_mask);
1679 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1671 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1680 scrollbar_size ()); 1672 scrollbar_size ());
1681 want_refresh = 1; 1673 want_refresh = 1;
1682 refresh_limit = 0;
1683 scrollbar_show (1); 1674 scrollbar_show (1);
1684 } 1675 }
1685 break; 1676 break;
1686 } 1677 }
1687 1678
1688skip_switch: ;
1689
1690#if defined(CURSOR_BLINK) 1679#if defined(CURSOR_BLINK)
1691 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1680 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1692 { 1681 {
1693 if (hidden_cursor) 1682 if (hidden_cursor)
1694 { 1683 {
1695 hidden_cursor = 0; 1684 hidden_cursor = 0;
1696 want_refresh = 1; 1685 want_refresh = 1;
1697 } 1686 }
1698 1687
1699 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1688 cursor_blink_ev.again ();
1700 } 1689 }
1701#endif 1690#endif
1702 1691
1703#if defined(POINTER_BLANK) 1692#if defined(POINTER_BLANK)
1704 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1693 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1705 { 1694 {
1706 if (ev.type == MotionNotify 1695 if (ev.type == MotionNotify
1707 || ev.type == ButtonPress 1696 || ev.type == ButtonPress
1708 || ev.type == ButtonRelease) 1697 || ev.type == ButtonRelease)
1709 if (hidden_pointer) 1698 if (hidden_pointer)
… …
1711 1700
1712 if (ev.type == KeyPress && hidden_pointer == 0) 1701 if (ev.type == KeyPress && hidden_pointer == 0)
1713 pointer_blank (); 1702 pointer_blank ();
1714 } 1703 }
1715#endif 1704#endif
1705
1706 refresh_check ();
1716} 1707}
1717 1708
1718void 1709void
1719rxvt_term::focus_in () 1710rxvt_term::focus_in ()
1720{ 1711{
1721 if (!focus) 1712 if (!focus)
1722 { 1713 {
1723 focus = 1; 1714 focus = 1;
1724 want_refresh = 1; 1715 want_refresh = 1;
1725 1716
1726 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1717 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1727 1718
1728#if USE_XIM 1719#if USE_XIM
1729 if (Input_Context != NULL) 1720 if (Input_Context != NULL)
1730 { 1721 {
1731 IMSetStatusPosition (); 1722 IMSetPosition ();
1732 XSetICFocus (Input_Context); 1723 XSetICFocus (Input_Context);
1733 } 1724 }
1734#endif 1725#endif
1735#if CURSOR_BLINK 1726#if CURSOR_BLINK
1736 if (OPTION (Opt_cursorBlink)) 1727 if (option (Opt_cursorBlink))
1737 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1728 cursor_blink_ev.again ();
1738#endif 1729#endif
1739#if OFF_FOCUS_FADING 1730#if OFF_FOCUS_FADING
1740 if (rs[Rs_fade]) 1731 if (rs[Rs_fade])
1741 { 1732 {
1742 pix_colors = pix_colors_focused; 1733 pix_colors = pix_colors_focused;
1743 scr_recolour (); 1734 scr_recolour ();
1744 } 1735 }
1745#endif 1736#endif
1737#if ENABLE_FRILLS
1738 if (option (Opt_urgentOnBell))
1739 {
1740 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1741 {
1742 h->flags &= ~XUrgencyHint;
1743 XSetWMHints (dpy, parent[0], h);
1744 }
1745 }
1746#endif
1746 } 1747 }
1747} 1748}
1748 1749
1749void 1750void
1750rxvt_term::focus_out () 1751rxvt_term::focus_out ()
… …
1758 1759
1759#if ENABLE_FRILLS || ISO_14755 1760#if ENABLE_FRILLS || ISO_14755
1760 if (iso14755buf) 1761 if (iso14755buf)
1761 { 1762 {
1762 iso14755buf = 0; 1763 iso14755buf = 0;
1763# if ENABLE_OVERLAY 1764# if ISO_14755
1764 scr_overlay_off (); 1765 scr_overlay_off ();
1765# endif 1766# endif
1766 } 1767 }
1767#endif 1768#endif
1768#if USE_XIM 1769#if USE_XIM
1769 if (Input_Context != NULL) 1770 if (Input_Context != NULL)
1770 XUnsetICFocus (Input_Context); 1771 XUnsetICFocus (Input_Context);
1771#endif 1772#endif
1772#if CURSOR_BLINK 1773#if CURSOR_BLINK
1773 if (OPTION (Opt_cursorBlink)) 1774 if (option (Opt_cursorBlink))
1774 cursor_blink_ev.stop (); 1775 cursor_blink_ev.stop ();
1776
1775 hidden_cursor = 0; 1777 hidden_cursor = 0;
1776#endif 1778#endif
1777#if OFF_FOCUS_FADING 1779#if OFF_FOCUS_FADING
1778 if (rs[Rs_fade]) 1780 if (rs[Rs_fade])
1779 { 1781 {
… …
1782 } 1784 }
1783#endif 1785#endif
1784 } 1786 }
1785} 1787}
1786 1788
1787#if TRANSPARENT 1789void
1790rxvt_term::update_fade_color (unsigned int idx)
1791{
1792#if OFF_FOCUS_FADING
1793 if (rs[Rs_fade])
1794 {
1795 rgba c;
1796 pix_colors [Color_fade].get (c);
1797 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1798 }
1799#endif
1800}
1801
1802#if ENABLE_TRANSPARENCY || ENABLE_PERL
1788void 1803void
1789rxvt_term::rootwin_cb (XEvent &ev) 1804rxvt_term::rootwin_cb (XEvent &ev)
1790{ 1805{
1791 make_current (); 1806 make_current ();
1792 1807
1808 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1809 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1810 return;
1811
1812# if ENABLE_TRANSPARENCY
1793 switch (ev.type) 1813 switch (ev.type)
1794 { 1814 {
1795 case PropertyNotify: 1815 case PropertyNotify:
1796 /* 1816 /*
1797 * if user used some Esetroot compatible prog to set the root bg, 1817 * 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. 1818 * use the property to determine the pixmap. We use it later on.
1799 */ 1819 */
1800 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1820 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1801 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1821 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1802 return; 1822 {
1823 bgPixmap.set_root_pixmap ();
1824 update_background ();
1825 }
1803 1826
1804 /* FALLTHROUGH */
1805 case ReparentNotify:
1806 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1807 want_refresh = want_full_refresh = 1;
1808 break; 1827 break;
1809 } 1828 }
1829# endif
1830
1831 refresh_check ();
1810} 1832}
1811#endif 1833#endif
1812 1834
1813void 1835void
1814rxvt_term::button_press (XButtonEvent &ev) 1836rxvt_term::button_press (XButtonEvent &ev)
… …
1869 mouse_report (ev); 1891 mouse_report (ev);
1870 } 1892 }
1871#else 1893#else
1872 MEvent.button = ev.button; 1894 MEvent.button = ev.button;
1873 mouse_report (ev); 1895 mouse_report (ev);
1874#endif /* MOUSE_REPORT_DOUBLECLICK */ 1896#endif /* MOUSE_REPORT_DOUBLECLICK */
1875 1897
1876 } 1898 }
1877 else 1899 else
1878 { 1900 {
1879 if (ev.button != MEvent.button) 1901 if (ev.button != MEvent.button)
… …
1927 } 1949 }
1928 1950
1929 /* 1951 /*
1930 * Scrollbar window processing of button press 1952 * Scrollbar window processing of button press
1931 */ 1953 */
1932 if (isScrollbarWindow (ev.window)) 1954 if (scrollBar.state && ev.window == scrollBar.win)
1933 { 1955 {
1934 scrollBar.setIdle (); 1956 page_dirn direction = NO_DIR;
1957
1958 if (scrollBar.upButton (ev.y))
1959 direction = UP; /* up */
1960 else if (scrollBar.dnButton (ev.y))
1961 direction = DN; /* down */
1962
1963 scrollBar.state = STATE_IDLE;
1935 /* 1964 /*
1936 * Rxvt-style scrollbar: 1965 * Rxvt-style scrollbar:
1937 * move up if mouse is above slider 1966 * move up if mouse is above slider
1938 * move dn if mouse is below slider 1967 * move dn if mouse is below slider
1939 * 1968 *
… …
1948 /* 1977 /*
1949 * Mouse report disabled scrollbar: 1978 * Mouse report disabled scrollbar:
1950 * arrow buttons - send up/down 1979 * arrow buttons - send up/down
1951 * click on scrollbar - send pageup/down 1980 * click on scrollbar - send pageup/down
1952 */ 1981 */
1953 if ((scrollBar.style == R_SB_NEXT 1982 if (direction == UP)
1954 && scrollbarnext_upButton (ev.y))
1955 || (scrollBar.style == R_SB_RXVT
1956 && scrollbarrxvt_upButton (ev.y)))
1957 tt_printf ("\033[A"); 1983 tt_printf ("\033[A");
1958 else if ((scrollBar.style == R_SB_NEXT 1984 else if (direction == DN)
1959 && scrollbarnext_dnButton (ev.y))
1960 || (scrollBar.style == R_SB_RXVT
1961 && scrollbarrxvt_dnButton (ev.y)))
1962 tt_printf ("\033[B"); 1985 tt_printf ("\033[B");
1963 else 1986 else
1964 switch (ev.button) 1987 switch (ev.button)
1965 { 1988 {
1966 case Button2: 1989 case Button2:
… …
1973 tt_printf ("\033[5~"); 1996 tt_printf ("\033[5~");
1974 break; 1997 break;
1975 } 1998 }
1976 } 1999 }
1977 else 2000 else
1978#endif /* NO_SCROLLBAR_REPORT */ 2001#endif /* NO_SCROLLBAR_REPORT */
1979
1980 {
1981 char upordown = 0;
1982
1983 if (scrollBar.style == R_SB_NEXT)
1984 { 2002 {
1985 if (scrollbarnext_upButton (ev.y)) 2003 if (direction != NO_DIR)
1986 upordown = -1; /* up */
1987 else if (scrollbarnext_dnButton (ev.y))
1988 upordown = 1; /* down */
1989 }
1990 else if (scrollBar.style == R_SB_RXVT)
1991 {
1992 if (scrollbarrxvt_upButton (ev.y))
1993 upordown = -1; /* up */
1994 else if (scrollbarrxvt_dnButton (ev.y))
1995 upordown = 1; /* down */
1996 }
1997 if (upordown)
1998 { 2004 {
1999#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2005#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2006 if (!cont_scroll_ev.is_active ())
2000 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2007 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2001#endif 2008#endif
2002 if (scr_page (upordown < 0 ? UP : DN, 1)) 2009 if (scr_page (direction, 1))
2003 { 2010 {
2004 if (upordown < 0) 2011 if (direction == UP)
2005 scrollBar.setUp (); 2012 scrollBar.state = STATE_UP;
2006 else 2013 else
2007 scrollBar.setDn (); 2014 scrollBar.state = STATE_DOWN;
2008 } 2015 }
2009 } 2016 }
2010 else 2017 else
2011 switch (ev.button) 2018 switch (ev.button)
2012 { 2019 {
2013 case Button2: 2020 case Button2:
2014 switch (scrollbar_align) 2021 switch (scrollBar.align)
2015 { 2022 {
2016 case R_SB_ALIGN_TOP: 2023 case R_SB_ALIGN_TOP:
2017 csrO = 0; 2024 csrO = 0;
2018 break; 2025 break;
2019 case R_SB_ALIGN_CENTRE: 2026 case R_SB_ALIGN_CENTRE:
… …
2027 if (scrollBar.style == R_SB_XTERM 2034 if (scrollBar.style == R_SB_XTERM
2028 || scrollbar_above_slider (ev.y) 2035 || scrollbar_above_slider (ev.y)
2029 || scrollbar_below_slider (ev.y)) 2036 || scrollbar_below_slider (ev.y))
2030 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2037 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
2031 2038
2032 scrollBar.setMotion (); 2039 scrollBar.state = STATE_MOTION;
2033 break; 2040 break;
2034 2041
2035 case Button1: 2042 case Button1:
2036 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2043 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2037 csrO = ev.y - scrollBar.top; 2044 csrO = ev.y - scrollBar.top;
2038 /* FALLTHROUGH */ 2045 /* FALLTHROUGH */
2039 2046
2040 case Button3: 2047 case Button3:
2041 if (scrollBar.style != R_SB_XTERM) 2048 if (scrollBar.style != R_SB_XTERM)
… …
2051 scr_page (DN, nrow - 1); 2058 scr_page (DN, nrow - 1);
2052# else 2059# else
2053 scr_page (DN, nrow / 4); 2060 scr_page (DN, nrow / 4);
2054# endif 2061# endif
2055 else 2062 else
2056 scrollBar.setMotion (); 2063 scrollBar.state = STATE_MOTION;
2057 } 2064 }
2058 else 2065 else
2059 { 2066 {
2060 scr_page ((ev.button == Button1 ? DN : UP), 2067 scr_page ((ev.button == Button1 ? DN : UP),
2061 (nrow 2068 (nrow
… …
2078 2085
2079 csrO = 0; /* reset csr Offset */ 2086 csrO = 0; /* reset csr Offset */
2080 if (!bypass_keystate) 2087 if (!bypass_keystate)
2081 reportmode = !! (priv_modes & PrivMode_mouse_report); 2088 reportmode = !! (priv_modes & PrivMode_mouse_report);
2082 2089
2083 if (scrollbar_isUpDn ()) 2090 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2084 { 2091 {
2085 scrollBar.setIdle (); 2092 scrollBar.state = STATE_IDLE;
2086 scrollbar_show (0); 2093 scrollbar_show (0);
2087 } 2094 }
2088 2095
2089#ifdef SELECTION_SCROLLING 2096#ifdef SELECTION_SCROLLING
2090 if (sel_scroll_ev.active)
2091 sel_scroll_ev.stop(); 2097 sel_scroll_ev.stop();
2092#endif 2098#endif
2093 2099
2094 if (ev.window == vt) 2100 if (ev.window == vt)
2095 { 2101 {
2096 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2102 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
… …
2120 mouse_report (ev); 2126 mouse_report (ev);
2121 } 2127 }
2122#else /* MOUSE_REPORT_DOUBLECLICK */ 2128#else /* MOUSE_REPORT_DOUBLECLICK */
2123 MEvent.button = AnyButton; 2129 MEvent.button = AnyButton;
2124 mouse_report (ev); 2130 mouse_report (ev);
2125#endif /* MOUSE_REPORT_DOUBLECLICK */ 2131#endif /* MOUSE_REPORT_DOUBLECLICK */
2126 return; 2132 return;
2127 } 2133 }
2128 2134
2129 /* 2135 /*
2130 * dumb hack to compensate for the failure of click-and-drag 2136 * dumb hack to compensate for the failure of click-and-drag
… …
2142 selection_make (ev.time); 2148 selection_make (ev.time);
2143 break; 2149 break;
2144 2150
2145 case Button2: 2151 case Button2:
2146 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2152 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2147 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary); 2153 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2148 break; 2154 break;
2149 2155
2150#ifdef MOUSE_WHEEL 2156#ifdef MOUSE_WHEEL
2151 case Button4: 2157 case Button4:
2152 case Button5: 2158 case Button5:
… …
2156 2162
2157 v = ev.button == Button4 ? UP : DN; 2163 v = ev.button == Button4 ? UP : DN;
2158 2164
2159 if (ev.state & ShiftMask) 2165 if (ev.state & ShiftMask)
2160 i = 1; 2166 i = 1;
2161 else if (OPTION (Opt_mouseWheelScrollPage)) 2167 else if (option (Opt_mouseWheelScrollPage))
2162 i = nrow - 1; 2168 i = nrow - 1;
2163 else 2169 else
2164 i = 5; 2170 i = 5;
2165 2171
2166# ifdef MOUSE_SLIP_WHEELING 2172# ifdef MOUSE_SLIP_WHEELING
… …
2168 { 2174 {
2169 mouse_slip_wheel_speed += v ? -1 : 1; 2175 mouse_slip_wheel_speed += v ? -1 : 1;
2170 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2176 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2171 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2177 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2172 2178
2173 if (slip_wheel_ev.at < NOW) 2179 if (!slip_wheel_ev.is_active ())
2174 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2180 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2175
2176 slip_wheel_ev.start ();
2177 } 2181 }
2178 else 2182 else
2183# endif
2179 { 2184 {
2180# endif
2181 scr_page (v, i); 2185 scr_page (v, i);
2182 scrollbar_show (1); 2186 scrollbar_show (1);
2183# ifdef MOUSE_SLIP_WHEELING
2184 } 2187 }
2185# endif
2186 } 2188 }
2187 break; 2189 break;
2188#endif 2190#endif
2189 } 2191 }
2190 } 2192 }
2191} 2193}
2192
2193#ifdef TRANSPARENT
2194#if TINTING
2195/* taken from aterm-0.4.2 */
2196
2197typedef uint32_t RUINT32T;
2198
2199void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2200{
2201 int sh_r, sh_g, sh_b;
2202 RUINT32T mask_r, mask_g, mask_b;
2203 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2204 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2205 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2206 int i;
2207
2208 Visual *visual = display->visual;
2209
2210 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2211
2212 /* for convenience */
2213 mask_r = visual->red_mask;
2214 mask_g = visual->green_mask;
2215 mask_b = visual->blue_mask;
2216
2217 /* boring lookup table pre-initialization */
2218 switch (srcImage->bits_per_pixel) {
2219 case 15:
2220 if ((mask_r != 0x7c00) ||
2221 (mask_g != 0x03e0) ||
2222 (mask_b != 0x001f))
2223 return;
2224 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2225 lookup_r = lookup;
2226 lookup_g = lookup+32;
2227 lookup_b = lookup+32+32;
2228 sh_r = 10;
2229 sh_g = 5;
2230 sh_b = 0;
2231 break;
2232 case 16:
2233 if ((mask_r != 0xf800) ||
2234 (mask_g != 0x07e0) ||
2235 (mask_b != 0x001f))
2236 return;
2237 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2238 lookup_r = lookup;
2239 lookup_g = lookup+32;
2240 lookup_b = lookup+32+64;
2241 sh_r = 11;
2242 sh_g = 5;
2243 sh_b = 0;
2244 break;
2245 case 24:
2246 if ((mask_r != 0xff0000) ||
2247 (mask_g != 0x00ff00) ||
2248 (mask_b != 0x0000ff))
2249 return;
2250 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2251 lookup_r = lookup;
2252 lookup_g = lookup+256;
2253 lookup_b = lookup+256+256;
2254 sh_r = 16;
2255 sh_g = 8;
2256 sh_b = 0;
2257 break;
2258 case 32:
2259 if ((mask_r != 0xff0000) ||
2260 (mask_g != 0x00ff00) ||
2261 (mask_b != 0x0000ff))
2262 return;
2263 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2264 lookup_r = lookup;
2265 lookup_g = lookup+256;
2266 lookup_b = lookup+256+256;
2267 sh_r = 16;
2268 sh_g = 8;
2269 sh_b = 0;
2270 break;
2271 default:
2272 return; /* we do not support this color depth */
2273 }
2274
2275 /* prepare limits for color transformation (each channel is handled separately) */
2276 if (shade < 0) {
2277 shade = -shade;
2278 if (shade < 0) shade = 0;
2279 if (shade > 100) shade = 100;
2280
2281 lower_lim_r = 65535-rm;
2282 lower_lim_g = 65535-gm;
2283 lower_lim_b = 65535-bm;
2284
2285 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2286 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2287 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2288
2289 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2290 } else {
2291 if (shade < 0) shade = 0;
2292 if (shade > 100) shade = 100;
2293
2294 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2295
2296 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2297 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2298 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2299 }
2300
2301 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2302 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2303 {
2304 unsigned int tmp;
2305
2306 tmp = lower_lim_r;
2307 lower_lim_r = lower_lim_b;
2308 lower_lim_b = tmp;
2309
2310 tmp = upper_lim_r;
2311 upper_lim_r = upper_lim_b;
2312 upper_lim_b = tmp;
2313 }
2314
2315 /* fill our lookup tables */
2316 for (i = 0; i <= mask_r>>sh_r; i++)
2317 {
2318 RUINT32T tmp;
2319 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2320 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2321 lookup_r[i] = (tmp/65535)<<sh_r;
2322 }
2323 for (i = 0; i <= mask_g>>sh_g; i++)
2324 {
2325 RUINT32T tmp;
2326 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2327 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2328 lookup_g[i] = (tmp/65535)<<sh_g;
2329 }
2330 for (i = 0; i <= mask_b>>sh_b; i++)
2331 {
2332 RUINT32T tmp;
2333 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2334 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2335 lookup_b[i] = (tmp/65535)<<sh_b;
2336 }
2337
2338 /* apply table to input image (replacing colors by newly calculated ones) */
2339 switch (srcImage->bits_per_pixel)
2340 {
2341 case 15:
2342 {
2343 unsigned short *p1, *pf, *p, *pl;
2344 p1 = (unsigned short *) srcImage->data;
2345 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2346 while (p1 < pf)
2347 {
2348 p = p1;
2349 pl = p1 + srcImage->width;
2350 for (; p < pl; p++)
2351 {
2352 *p = lookup_r[(*p & 0x7c00)>>10] |
2353 lookup_g[(*p & 0x03e0)>> 5] |
2354 lookup_b[(*p & 0x001f)];
2355 }
2356 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2357 }
2358 break;
2359 }
2360 case 16:
2361 {
2362 unsigned short *p1, *pf, *p, *pl;
2363 p1 = (unsigned short *) srcImage->data;
2364 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2365 while (p1 < pf)
2366 {
2367 p = p1;
2368 pl = p1 + srcImage->width;
2369 for (; p < pl; p++)
2370 {
2371 *p = lookup_r[(*p & 0xf800)>>11] |
2372 lookup_g[(*p & 0x07e0)>> 5] |
2373 lookup_b[(*p & 0x001f)];
2374 }
2375 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2376 }
2377 break;
2378 }
2379 case 24:
2380 {
2381 unsigned char *p1, *pf, *p, *pl;
2382 p1 = (unsigned char *) srcImage->data;
2383 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2384 while (p1 < pf)
2385 {
2386 p = p1;
2387 pl = p1 + srcImage->width * 3;
2388 for (; p < pl; p += 3)
2389 {
2390 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2391 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2392 p[2] = lookup_r[(p[2] & 0x0000ff)];
2393 }
2394 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2395 }
2396 break;
2397 }
2398 case 32:
2399 {
2400 RUINT32T *p1, *pf, *p, *pl;
2401 p1 = (RUINT32T *) srcImage->data;
2402 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2403
2404 while (p1 < pf)
2405 {
2406 p = p1;
2407 pl = p1 + srcImage->width;
2408 for (; p < pl; p++)
2409 {
2410 *p = lookup_r[(*p & 0xff0000)>>16] |
2411 lookup_g[(*p & 0x00ff00)>> 8] |
2412 lookup_b[(*p & 0x0000ff)] |
2413 (*p & ~0xffffff);
2414 }
2415 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2416 }
2417 break;
2418 }
2419 }
2420
2421 free (lookup);
2422}
2423#endif
2424
2425/*
2426 * Check our parents are still who we think they are.
2427 * Do transparency updates if required
2428 */
2429int
2430rxvt_term::check_our_parents ()
2431{
2432 int i, pchanged, aformat, have_pixmap, rootdepth;
2433 unsigned long nitems, bytes_after;
2434 Atom atype;
2435 unsigned char *prop = NULL;
2436 Window root, oldp, *list;
2437 Pixmap rootpixmap = None;
2438 XWindowAttributes wattr, wrootattr;
2439 dDisp;
2440
2441 pchanged = 0;
2442
2443 if (!OPTION (Opt_transparent))
2444 return pchanged; /* Don't try any more */
2445
2446 XGetWindowAttributes (disp, display->root, &wrootattr);
2447 rootdepth = wrootattr.depth;
2448
2449 XGetWindowAttributes (disp, parent[0], &wattr);
2450
2451 if (rootdepth != wattr.depth)
2452 {
2453 if (am_transparent)
2454 {
2455 pchanged = 1;
2456 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2457 am_transparent = am_pixmap_trans = 0;
2458 }
2459
2460 return pchanged; /* Don't try any more */
2461 }
2462
2463 /* Get all X ops out of the queue so that our information is up-to-date. */
2464 XSync (disp, False);
2465
2466 /*
2467 * Make the frame window set by the window manager have
2468 * the root background. Some window managers put multiple nested frame
2469 * windows for each client, so we have to take care about that.
2470 */
2471 i = (xa[XA_XROOTPMAP_ID]
2472 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2473 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2474 &nitems, &bytes_after, &prop) == Success);
2475
2476 if (!i || prop == NULL)
2477 i = (xa[XA_ESETROOT_PMAP_ID]
2478 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2479 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2480 &nitems, &bytes_after, &prop) == Success);
2481
2482 if (!i || prop == NULL
2483#if TINTING
2484 || !rs[Rs_color + Color_tint]
2485#endif
2486 )
2487 have_pixmap = 0;
2488 else
2489 {
2490 have_pixmap = 1;
2491 rootpixmap = *(Pixmap *)prop;
2492 XFree (prop);
2493 }
2494
2495 if (have_pixmap)
2496 {
2497 /*
2498 * Copy display->root pixmap transparency
2499 */
2500 int sx, sy, nx, ny;
2501 unsigned int nw, nh;
2502 Window cr;
2503 XImage *image;
2504 GC gc;
2505 XGCValues gcvalue;
2506
2507 XTranslateCoordinates (disp, parent[0], display->root,
2508 0, 0, &sx, &sy, &cr);
2509 nw = (unsigned int)szHint.width;
2510 nh = (unsigned int)szHint.height;
2511 nx = ny = 0;
2512
2513 if (sx < 0)
2514 {
2515 nw += sx;
2516 nx = -sx;
2517 sx = 0;
2518 }
2519
2520 if (sy < 0)
2521 {
2522 nh += sy;
2523 ny = -sy;
2524 sy = 0;
2525 }
2526
2527 min_it (nw, (unsigned int) (wrootattr.width - sx));
2528 min_it (nh, (unsigned int) (wrootattr.height - sy));
2529
2530 XSync (disp, False);
2531 allowedxerror = -1;
2532 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2533
2534 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2535 /* XXX: may need a delay here? */
2536 allowedxerror = 0;
2537
2538 if (image == NULL)
2539 {
2540 if (am_transparent && am_pixmap_trans)
2541 {
2542 pchanged = 1;
2543 if (pixmap != None)
2544 {
2545 XFreePixmap (disp, pixmap);
2546 pixmap = None;
2547 }
2548 }
2549
2550 am_pixmap_trans = 0;
2551 }
2552 else
2553 {
2554 if (pixmap != None)
2555 XFreePixmap (disp, pixmap);
2556
2557#if TINTING
2558 if (ISSET_PIXCOLOR (Color_tint))
2559 {
2560 unsigned short rm, gm, bm;
2561 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2562
2563 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2564
2565 ShadeXImage (display, image, shade, rm, gm, bm);
2566 }
2567#endif
2568
2569 pixmap = XCreatePixmap (disp, vt,
2570 szHint.width, szHint.height, image->depth);
2571 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2572 XPutImage (disp, pixmap, gc, image, 0, 0,
2573 nx, ny, image->width, image->height);
2574 XFreeGC (disp, gc);
2575 XDestroyImage (image);
2576 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2577 XClearWindow (disp, parent[0]);
2578
2579 if (!am_transparent || !am_pixmap_trans)
2580 pchanged = 1;
2581
2582 am_transparent = am_pixmap_trans = 1;
2583 }
2584 }
2585
2586 if (am_pixmap_trans)
2587 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2588 else
2589 {
2590 unsigned int n;
2591 /*
2592 * InheritPixmap transparency
2593 */
2594 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2595 {
2596 oldp = parent[i];
2597 XQueryTree (disp, parent[i - 1], &root,
2598 &parent[i], &list, &n);
2599 XFree (list);
2600
2601 if (parent[i] == display->root)
2602 {
2603 if (oldp != None)
2604 pchanged = 1;
2605
2606 break;
2607 }
2608
2609 if (oldp != parent[i])
2610 pchanged = 1;
2611 }
2612
2613 n = 0;
2614
2615 if (pchanged)
2616 {
2617 for (; n < (unsigned int)i; n++)
2618 {
2619 XGetWindowAttributes (disp, parent[n], &wattr);
2620 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2621 {
2622 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2623 break;
2624 }
2625 }
2626 }
2627
2628 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2629 {
2630 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2631 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2632 am_transparent = 0;
2633 /* XXX: also turn off Opt_transparent? */
2634 }
2635 else
2636 {
2637 for (n = 0; n < (unsigned int)i; n++)
2638 {
2639 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2640 XClearWindow (disp, parent[n]);
2641 }
2642
2643 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2644 am_transparent = 1;
2645 }
2646
2647 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2648 parent[i] = None;
2649 }
2650
2651 if (scrollBar.win)
2652 {
2653 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2654 scrollBar.setIdle ();
2655 scrollbar_show (0);
2656 }
2657
2658 if (am_transparent)
2659 {
2660 want_refresh = want_full_refresh = 1;
2661 if (am_pixmap_trans)
2662 flush ();
2663 }
2664
2665 return pchanged;
2666}
2667#endif
2668 2194
2669/*}}} */ 2195/*}}} */
2670 2196
2671bool 2197bool
2672rxvt_term::cmd_parse () 2198rxvt_term::cmd_parse ()
… …
2721 if (ch == C0_LF) 2247 if (ch == C0_LF)
2722 nlines++; 2248 nlines++;
2723 2249
2724 refresh_count++; 2250 refresh_count++;
2725 2251
2726 if (!OPTION (Opt_jumpScroll) 2252 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2727 || (refresh_count >= refresh_limit * (nrow - 1)))
2728 { 2253 {
2729 refreshnow = true;
2730 refresh_count = 0; 2254 refresh_count = 0;
2255
2256 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2257 {
2258 refreshnow = true;
2731 ch = NOCHAR; 2259 ch = NOCHAR;
2732 break; 2260 break;
2261 }
2733 } 2262 }
2734 2263
2735 // scr_add_lines only works for nlines <= nrow - 1. 2264 // scr_add_lines only works for nlines <= nrow - 1.
2736 if (nlines >= nrow - 1) 2265 if (nlines >= nrow - 1)
2737 { 2266 {
… …
2765 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2294 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2766 scr_add_lines (buf, str - buf, nlines); 2295 scr_add_lines (buf, str - buf, nlines);
2767 2296
2768 /* 2297 /*
2769 * If there have been a lot of new lines, then update the screen 2298 * If there have been a lot of new lines, then update the screen
2770 * What the heck I'll cheat and only refresh less than every page-full. 2299 * What the heck we'll cheat and only refresh less than every page-full.
2771 * the number of pages between refreshes is refresh_limit, which 2300 * if skipScroll is enabled.
2772 * is incremented here because we must be doing flat-out scrolling.
2773 */ 2301 */
2774 if (refreshnow) 2302 if (refreshnow)
2775 { 2303 {
2776 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2777 refresh_limit++;
2778 else
2779 {
2780 flag = true; 2304 flag = true;
2781 scr_refresh (); 2305 scr_refresh ();
2782 want_refresh = 1; 2306 want_refresh = 1;
2783 }
2784 } 2307 }
2785 2308
2786 } 2309 }
2787 else 2310 else
2788 { 2311 {
… …
2937 { 2460 {
2938 if ((buf[len++] = cmd_getc ()) == 'i') 2461 if ((buf[len++] = cmd_getc ()) == 'i')
2939 break; /* done = 1 */ 2462 break; /* done = 1 */
2940 } 2463 }
2941 } 2464 }
2942 2465
2943 for (i = 0; i < len; i++) 2466 for (i = 0; i < len; i++)
2944 if (putc (buf[i], fd) == EOF) 2467 if (putc (buf[i], fd) == EOF)
2945 { 2468 {
2946 done = 1; 2469 done = 1;
2947 break; 2470 break;
… …
2949 } 2472 }
2950 } 2473 }
2951 2474
2952 pclose_printer (fd); 2475 pclose_printer (fd);
2953} 2476}
2954#endif /* PRINTPIPE */ 2477#endif /* PRINTPIPE */
2955/*}}} */ 2478/*}}} */
2956 2479
2957/* *INDENT-OFF* */ 2480/* *INDENT-OFF* */
2958enum { 2481enum {
2959 C1_40 = 0x40, 2482 C1_40 = 0x40,
… …
3009 process_dcs_seq (); 2532 process_dcs_seq ();
3010 break; 2533 break;
3011 case 0x9b: /* CSI */ 2534 case 0x9b: /* CSI */
3012 process_csi_seq (); 2535 process_csi_seq ();
3013 break; 2536 break;
3014 case 0x9d: /* CSI */ 2537 case 0x9d: /* OSC */
3015 process_osc_seq (); 2538 process_osc_seq ();
3016 break; 2539 break;
3017#endif 2540#endif
3018 } 2541 }
3019} 2542}
… …
3109 scr_charset_set (2, (unsigned int)cmd_getc ()); 2632 scr_charset_set (2, (unsigned int)cmd_getc ());
3110 break; 2633 break;
3111 case '+': 2634 case '+':
3112 scr_charset_set (3, (unsigned int)cmd_getc ()); 2635 scr_charset_set (3, (unsigned int)cmd_getc ());
3113 break; 2636 break;
3114#if ENABLE_FRILLS 2637#if !ENABLE_MINIMAL
3115 case '6': 2638 case '6':
3116 scr_backindex (); 2639 scr_backindex ();
3117 break; 2640 break;
3118#endif 2641#endif
3119 case '7': 2642 case '7':
3120 scr_cursor (SAVE); 2643 scr_cursor (SAVE);
3121 break; 2644 break;
3122 case '8': 2645 case '8':
3123 scr_cursor (RESTORE); 2646 scr_cursor (RESTORE);
3124 break; 2647 break;
3125#if ENABLE_FRILLS 2648#if !ENABLE_MINIMAL
3126 case '9': 2649 case '9':
3127 scr_forwardindex (); 2650 scr_forwardindex ();
3128 break; 2651 break;
3129#endif 2652#endif
3130 case '=': 2653 case '=':
… …
3245rxvt_term::process_csi_seq () 2768rxvt_term::process_csi_seq ()
3246{ 2769{
3247 unicode_t ch, priv, i; 2770 unicode_t ch, priv, i;
3248 unsigned int nargs, p; 2771 unsigned int nargs, p;
3249 int n, ndef; 2772 int n, ndef;
3250 int arg[ESC_ARGS]; 2773 int arg[ESC_ARGS] = { };
3251 2774
3252 for (nargs = ESC_ARGS; nargs > 0;) 2775 nargs = 0;
3253 arg[--nargs] = 0;
3254 2776
3255 priv = 0; 2777 priv = 0;
3256 ch = cmd_getc (); 2778 ch = cmd_getc ();
3257 if (ch >= '<' && ch <= '?') 2779 if (ch >= '<' && ch <= '?')
2780 {
3258 { /* '<' '=' '>' '?' */ 2781 /* '<' '=' '>' '?' */
3259 priv = ch; 2782 priv = ch;
3260 ch = cmd_getc (); 2783 ch = cmd_getc ();
3261 } 2784 }
3262 2785
3263 /* read any numerical arguments */ 2786 /* read any numerical arguments */
… …
3292 ndef = get_byte_array_bit (csi_defaults, i); 2815 ndef = get_byte_array_bit (csi_defaults, i);
3293 for (p = 0; p < nargs; p++) 2816 for (p = 0; p < nargs; p++)
3294 if (arg[p] == -1) 2817 if (arg[p] == -1)
3295 arg[p] = ndef; 2818 arg[p] = ndef;
3296 2819
3297#ifdef DEBUG_CMD
3298 fprintf (stderr, "CSI ");
3299 for (p = 0; p < nargs; p++)
3300 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3301 fprintf (stderr, "%c\n", ch);
3302#endif
3303
3304 /* 2820 /*
3305 * private mode handling 2821 * private mode handling
3306 */ 2822 */
3307 if (priv) 2823 if (priv)
3308 { 2824 {
3309 switch (priv) 2825 switch (priv)
3310 { 2826 {
3311 case '>': 2827 case '>':
3312 if (ch == CSI_DA) /* secondary device attributes */ 2828 if (ch == CSI_DA) /* secondary device attributes */
3313 { 2829 {
3314 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt, 2830 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
3315 // 'U' for rxvt-unicode <= 7.2, and Mm85 (e.g. 7385 for 7.3) for later versions. 2831 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3316 // 2832 //
3317 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2833 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3318 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2834 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
3319 // that we do not support xterm mouse reporting (should be 95 when we do). 2835 // versions.
3320 // 2836 //
3321 tt_printf ("\033[>%c%c85;94;0c", VERSION[0], VERSION[1]); 2837 tt_printf ("\033[>%d;95;0c", 'U');
3322 } 2838 }
3323 break; 2839 break;
2840
3324 case '?': 2841 case '?':
3325 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2842 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3326 process_terminal_mode (ch, priv, nargs, arg); 2843 process_terminal_mode (ch, priv, nargs, arg);
3327 break; 2844 break;
3328 } 2845 }
… …
3453 break; 2970 break;
3454 case 6: /* CPR requested */ 2971 case 6: /* CPR requested */
3455 scr_report_position (); 2972 scr_report_position ();
3456 break; 2973 break;
3457 case 7: /* unofficial extension */ 2974 case 7: /* unofficial extension */
3458 if (OPTION (Opt_insecure)) 2975 if (option (Opt_insecure))
3459 tt_printf ("%-.250s\012", rs[Rs_display_name]); 2976 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3460 break; 2977 break;
3461 case 8: /* unofficial extension */ 2978 case 8: /* unofficial extension */
3462 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2979 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3463 break; 2980 break;
… …
3530 break; 3047 break;
3531 case CSI_75: 3048 case CSI_75:
3532 scr_cursor (RESTORE); 3049 scr_cursor (RESTORE);
3533 break; 3050 break;
3534 3051
3535#if ENABLE_FRILLS 3052#if !ENABLE_MINIMAL
3536 case CSI_74: 3053 case CSI_74:
3537 process_window_ops (arg, nargs); 3054 process_window_ops (arg, nargs);
3538 break; 3055 break;
3539#endif 3056#endif
3540 3057
… …
3547 break; 3064 break;
3548 } 3065 }
3549} 3066}
3550/*}}} */ 3067/*}}} */
3551 3068
3552#if ENABLE_FRILLS 3069#if !ENABLE_MINIMAL
3553/* ARGSUSED */ 3070/* ARGSUSED */
3554void 3071void
3555rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3072rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3556{ 3073{
3557 int x, y; 3074 int x, y;
3558 XWindowAttributes wattr; 3075 XWindowAttributes wattr;
3559 Window wdummy; 3076 Window wdummy;
3560 dDisp; 3077
3078 dLocal (Display *, dpy);
3561 3079
3562 if (nargs == 0) 3080 if (nargs == 0)
3563 return; 3081 return;
3564 3082
3565 switch (args[0]) 3083 switch (args[0])
3566 { 3084 {
3567 /* 3085 /*
3568 * commands 3086 * commands
3569 */ 3087 */
3570 case 1: /* deiconify window */ 3088 case 1: /* deiconify window */
3571 XMapWindow (disp, parent[0]); 3089 XMapWindow (dpy, parent[0]);
3572 break; 3090 break;
3573 case 2: /* iconify window */ 3091 case 2: /* iconify window */
3574 XIconifyWindow (disp, parent[0], display->screen); 3092 XIconifyWindow (dpy, parent[0], display->screen);
3575 break; 3093 break;
3576 case 3: /* set position (pixels) */ 3094 case 3: /* set position (pixels) */
3577 XMoveWindow (disp, parent[0], args[1], args[2]); 3095 XMoveWindow (dpy, parent[0], args[1], args[2]);
3578 break; 3096 break;
3579 case 4: /* set size (pixels) */ 3097 case 4: /* set size (pixels) */
3580 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3098 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3581 break; 3099 break;
3582 case 5: /* raise window */ 3100 case 5: /* raise window */
3583 XRaiseWindow (disp, parent[0]); 3101 XRaiseWindow (dpy, parent[0]);
3584 break; 3102 break;
3585 case 6: /* lower window */ 3103 case 6: /* lower window */
3586 XLowerWindow (disp, parent[0]); 3104 XLowerWindow (dpy, parent[0]);
3587 break; 3105 break;
3588 case 7: /* refresh window */ 3106 case 7: /* refresh window */
3589 scr_touch (true); 3107 scr_touch (true);
3590 break; 3108 break;
3591 case 8: /* set size (chars) */ 3109 case 8: /* set size (chars) */
… …
3598 if (args[0] >= 24) /* set height (chars) */ 3116 if (args[0] >= 24) /* set height (chars) */
3599 set_widthheight ((unsigned int)width, 3117 set_widthheight ((unsigned int)width,
3600 (unsigned int) (args[1] * fheight)); 3118 (unsigned int) (args[1] * fheight));
3601 break; 3119 break;
3602 3120
3603
3604 /* 3121 /*
3605 * reports - some output format copied from XTerm 3122 * reports - some output format copied from XTerm
3606 */ 3123 */
3607 case 11: /* report window state */ 3124 case 11: /* report window state */
3608 XGetWindowAttributes (disp, parent[0], &wattr); 3125 XGetWindowAttributes (dpy, parent[0], &wattr);
3609 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3126 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3610 break; 3127 break;
3611 case 13: /* report window position */ 3128 case 13: /* report window position */
3612 XGetWindowAttributes (disp, parent[0], &wattr); 3129 XGetWindowAttributes (dpy, parent[0], &wattr);
3613 XTranslateCoordinates (disp, parent[0], wattr.root, 3130 XTranslateCoordinates (dpy, parent[0], wattr.root,
3614 -wattr.border_width, -wattr.border_width, 3131 -wattr.border_width, -wattr.border_width,
3615 &x, &y, &wdummy); 3132 &x, &y, &wdummy);
3616 tt_printf ("\033[3;%d;%dt", x, y); 3133 tt_printf ("\033[3;%d;%dt", x, y);
3617 break; 3134 break;
3618 case 14: /* report window size (pixels) */ 3135 case 14: /* report window size (pixels) */
3619 XGetWindowAttributes (disp, parent[0], &wattr); 3136 XGetWindowAttributes (dpy, parent[0], &wattr);
3620 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3137 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3621 break; 3138 break;
3622 case 18: /* report text area size (chars) */ 3139 case 18: /* report text area size (chars) */
3623 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3140 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3624 break; 3141 break;
… …
3626 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3143 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3627 break; 3144 break;
3628 case 20: /* report icon label */ 3145 case 20: /* report icon label */
3629 { 3146 {
3630 char *s; 3147 char *s;
3631 XGetIconName (disp, parent[0], &s); 3148 XGetIconName (dpy, parent[0], &s);
3632 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3149 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3633 XFree (s); 3150 XFree (s);
3634 } 3151 }
3635 break; 3152 break;
3636 case 21: /* report window title */ 3153 case 21: /* report window title */
3637 { 3154 {
3638 char *s; 3155 char *s;
3639 XFetchName (disp, parent[0], &s); 3156 XFetchName (dpy, parent[0], &s);
3640 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3157 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3641 XFree (s); 3158 XFree (s);
3642 } 3159 }
3643 break; 3160 break;
3644 } 3161 }
3645} 3162}
… …
3672 seen_esc = true; 3189 seen_esc = true;
3673 continue; 3190 continue;
3674 } 3191 }
3675 else if (ch == C0_BEL || ch == CHAR_ST) 3192 else if (ch == C0_BEL || ch == CHAR_ST)
3676 break; 3193 break;
3194 else if (ch == C0_SYN)
3195 ch = cmd_get8 ();
3677 else if (ch < 0x20) 3196 else if (ch < 0x20)
3678 return NULL; /* other control character - exit */ 3197 return NULL; /* other control character - exit */
3679 3198
3680 seen_esc = false; 3199 seen_esc = false;
3681 3200
3682 if (n >= STRING_MAX - 1) 3201 if (n >= STRING_MAX - 1)
3683 // stop at some sane length 3202 // stop at some sane length
3684 return NULL; 3203 return NULL;
3685 3204
3686 if (ch == C0_SYN)
3687 string[n++] = cmd_get8 ();
3688 else
3689 string[n++] = ch; 3205 string[n++] = ch;
3690 } 3206 }
3691 3207
3692 string[n++] = '\0'; 3208 string[n++] = '\0';
3693 3209
3694 ends_how = (ch == 0x5c ? C0_ESC : ch); 3210 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3745void 3261void
3746rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3262rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3747{ 3263{
3748 if (str[0] == '?' && !str[1]) 3264 if (str[0] == '?' && !str[1])
3749 { 3265 {
3750 unsigned short r, g, b; 3266 rgba c;
3751 pix_colors_focused[color].get (display, r, g, b); 3267 pix_colors_focused[color].get (c);
3268
3269#if XFT
3270 if (c.a != rgba::MAX_CC)
3271 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3272 else
3273#endif
3752 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3274 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3753 } 3275 }
3754 else 3276 else
3755 set_window_color (color, str); 3277 set_window_color (color, str);
3756} 3278}
3757 3279
… …
3763{ 3285{
3764 int color; 3286 int color;
3765 char *buf, *name; 3287 char *buf, *name;
3766 bool query = str[0] == '?' && !str[1]; 3288 bool query = str[0] == '?' && !str[1];
3767 int saveop = op; 3289 int saveop = op;
3768 dDisp; 3290
3291 dLocal (Display *, dpy);
3769 3292
3770 assert (str != NULL); 3293 assert (str != NULL);
3294
3295 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3296 return;
3297
3771 switch (op) 3298 switch (op)
3772 { 3299 {
3773 case XTerm_name: 3300 case XTerm_name:
3774 set_title (str); 3301 set_title (str);
3775 /* FALLTHROUGH */ 3302 /* FALLTHROUGH */
… …
3789 unsigned long bytes_after; 3316 unsigned long bytes_after;
3790 unsigned char *value = 0; 3317 unsigned char *value = 0;
3791 const char *str = ""; 3318 const char *str = "";
3792 3319
3793 if (prop 3320 if (prop
3794 && XGetWindowProperty (disp, parent[0], 3321 && XGetWindowProperty (dpy, parent[0],
3795 prop, 0, 1<<16, 0, AnyPropertyType, 3322 prop, 0, 1<<16, 0, AnyPropertyType,
3796 &actual_type, &actual_format, 3323 &actual_type, &actual_format,
3797 &nitems, &bytes_after, &value) == Success 3324 &nitems, &bytes_after, &value) == Success
3798 && actual_type != None 3325 && actual_type != None
3799 && actual_format == 8) 3326 && actual_format == 8)
3800 str = (const char *)(value); 3327 str = (const char *)(value);
3801 3328
3802 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3329 tt_printf ("\033]%d;%s%c", op, str, resp);
3803 3330
3804 XFree (value); 3331 XFree (value);
3805 } 3332 }
3806 else 3333 else
3807 { 3334 {
… …
3811 { 3338 {
3812 *eq = 0; 3339 *eq = 0;
3813 set_utf8_property (display->atom (str), eq + 1); 3340 set_utf8_property (display->atom (str), eq + 1);
3814 } 3341 }
3815 else 3342 else
3816 XDeleteProperty (disp, parent[0], 3343 XDeleteProperty (dpy, parent[0],
3817 display->atom (str)); 3344 display->atom (str));
3818 } 3345 }
3819 break; 3346 break;
3820 3347
3821 case XTerm_Color: 3348 case XTerm_Color:
… …
3831 break; 3358 break;
3832 3359
3833 if ((buf = strchr (name, ';')) != NULL) 3360 if ((buf = strchr (name, ';')) != NULL)
3834 *buf++ = '\0'; 3361 *buf++ = '\0';
3835 3362
3836 if (name[0] == '?' && !name[1]) 3363 process_color_seq (op, color, name, resp);
3837 {
3838 unsigned short r, g, b;
3839 pix_colors_focused[color].get (display, r, g, b);
3840 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3841 }
3842 else
3843 set_window_color (color, name);
3844 } 3364 }
3845 break; 3365 break;
3366 case Rxvt_restoreFG:
3846 case XTerm_Color00: 3367 case XTerm_Color00:
3847 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3368 process_color_seq (op, Color_fg, str, resp);
3848 break; 3369 break;
3370 case Rxvt_restoreBG:
3849 case XTerm_Color01: 3371 case XTerm_Color01:
3850 process_color_seq (XTerm_Color01, Color_bg, str, resp); 3372 process_color_seq (op, Color_bg, str, resp);
3851 break; 3373 break;
3852#ifndef NO_CURSORCOLOR 3374#ifndef NO_CURSORCOLOR
3853 case XTerm_Color_cursor: 3375 case XTerm_Color_cursor:
3854 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3376 process_color_seq (op, Color_cursor, str, resp);
3855 break; 3377 break;
3856#endif 3378#endif
3857 case XTerm_Color_pointer_fg: 3379 case XTerm_Color_pointer_fg:
3858 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3380 process_color_seq (op, Color_pointer_fg, str, resp);
3859 break; 3381 break;
3860 case XTerm_Color_pointer_bg: 3382 case XTerm_Color_pointer_bg:
3861 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3383 process_color_seq (op, Color_pointer_bg, str, resp);
3862 break; 3384 break;
3863#ifndef NO_BOLD_UNDERLINE_REVERSE 3385#ifndef NO_BOLD_UNDERLINE_REVERSE
3864 case XTerm_Color_RV: 3386 case XTerm_Color_RV:
3865 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3387 process_color_seq (op, Color_RV, str, resp);
3866 break; 3388 break;
3867 case Rxvt_Color_BD: 3389 case Rxvt_Color_BD:
3868 case URxvt_Color_BD: 3390 case URxvt_Color_BD:
3869 process_color_seq (op, Color_BD, str, resp); 3391 process_color_seq (op, Color_BD, str, resp);
3870 break; 3392 break;
3871 case Rxvt_Color_UL: 3393 case Rxvt_Color_UL:
3872 case URxvt_Color_UL: 3394 case URxvt_Color_UL:
3873 process_color_seq (op, Color_UL, str, resp); 3395 process_color_seq (op, Color_UL, str, resp);
3874 break; 3396 break;
3875 case URxvt_Color_IT: 3397 case URxvt_Color_IT:
3876 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3398 process_color_seq (op, Color_IT, str, resp);
3877 break; 3399 break;
3878#endif 3400#endif
3879#if TRANSPARENT && TINTING 3401#if ENABLE_TRANSPARENCY
3880 case URxvt_Color_tint: 3402 case URxvt_Color_tint:
3881 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3403 process_color_seq (op, Color_tint, str, resp);
3882 check_our_parents (); 3404 {
3883 if (am_transparent) 3405 bool changed = false;
3884 want_full_refresh = want_refresh = 1;
3885 break;
3886#endif
3887 3406
3407 if (ISSET_PIXCOLOR (Color_tint))
3408 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3409 else
3410 changed = bgPixmap.unset_tint ();
3411
3412 if (changed)
3413 update_background ();
3414 }
3415
3416 break;
3417#endif
3418
3419#if BG_IMAGE_FROM_FILE
3888 case Rxvt_Pixmap: 3420 case Rxvt_Pixmap:
3889 { 3421 if (!strcmp (str, "?"))
3890 if (*str != ';')
3891 { 3422 {
3892#if XPM_BACKGROUND 3423 char str[256];
3893 scale_pixmap (""); /* reset to default scaling */ 3424
3894 set_bgPixmap (str); /* change pixmap */ 3425 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3895 scr_touch (true); 3426 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3896#endif 3427 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3428 process_xterm_seq (XTerm_title, str, CHAR_ST);
3897 } 3429 }
3898 3430 else
3431 {
3899 int changed = 0; 3432 int changed = 0;
3900 3433
3901 while ((str = strchr (str, ';')) != NULL) 3434 if (*str != ';')
3902 { 3435 {
3436 /* reset to default scaling :*/
3437 bgPixmap.unset_geometry ();
3438 if (bgPixmap.set_file (str)) /* change pixmap */
3439 changed++;
3440 str = strchr (str, ';');
3441 if (str == NULL)
3442 bgPixmap.set_defaultGeometry ();
3443 }
3444
3445 while (str)
3446 {
3903 str++; 3447 str++;
3904#if XPM_BACKGROUND 3448 if (bgPixmap.set_geometry (str))
3905 changed += scale_pixmap (str); 3449 changed++;
3906#endif 3450 str = strchr (str, ';');
3907 } 3451 }
3908 3452
3909 if (changed) 3453 if (changed)
3910 { 3454 update_background ();
3911#ifdef XPM_BACKGROUND
3912 resize_pixmap ();
3913 scr_touch (true);
3914#endif
3915 } 3455 }
3916 }
3917 break; 3456 break;
3918 3457#endif
3919 case Rxvt_restoreFG:
3920 set_window_color (Color_fg, str);
3921 break;
3922 case Rxvt_restoreBG:
3923 set_window_color (Color_bg, str);
3924 break;
3925 3458
3926 case XTerm_logfile: 3459 case XTerm_logfile:
3927 // TODO, when secure mode? 3460 // TODO, when secure mode?
3928 break; 3461 break;
3929 3462
… …
3947 case URxvt_italicFont: 3480 case URxvt_italicFont:
3948 case URxvt_boldItalicFont: 3481 case URxvt_boldItalicFont:
3949#endif 3482#endif
3950 if (query) 3483 if (query)
3951 tt_printf ("\33]%d;%-.250s%c", saveop, 3484 tt_printf ("\33]%d;%-.250s%c", saveop,
3952 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3485 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3953 ? fontset[op - URxvt_font]->fontdesc : "", 3486 ? fontset[op - URxvt_font]->fontdesc : "",
3954 resp); 3487 resp);
3955 else 3488 else
3956 { 3489 {
3957 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3490 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3960 allocated.push_back ((void *)res); 3493 allocated.push_back ((void *)res);
3961 set_fonts (); 3494 set_fonts ();
3962 } 3495 }
3963 break; 3496 break;
3964 3497
3965#if ENABLE_FRILLS 3498 case URxvt_version:
3499 if (query)
3500 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3501 op,
3502 rs[Rs_name], VERSION[0], VERSION[2],
3503 resp);
3504 break;
3505
3506#if !ENABLE_MINIMAL
3966 case URxvt_locale: 3507 case URxvt_locale:
3967 if (query) 3508 if (query)
3968 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3509 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3969 else 3510 else
3970 { 3511 {
3971 set_locale (str); 3512 set_locale (str);
3972 pty->set_utf8_mode (enc_utf8); 3513 pty->set_utf8_mode (enc_utf8);
3973 init_xlocale (); 3514 init_xlocale ();
… …
3988 break; 3529 break;
3989#endif 3530#endif
3990 3531
3991#if ENABLE_PERL 3532#if ENABLE_PERL
3992 case URxvt_perl: 3533 case URxvt_perl:
3993 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 3534 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3994 ; // no responses yet 3535 ; // no responses yet
3995 break; 3536 break;
3996#endif 3537#endif
3997 } 3538 }
3998} 3539}
… …
4036{ 3577{
4037 unsigned int i, j; 3578 unsigned int i, j;
4038 int state; 3579 int state;
4039 3580
4040 static const struct 3581 static const struct
4041 { 3582 {
4042 const int argval; 3583 const int argval;
4043 const unsigned long bit; 3584 const unsigned long bit;
4044 }
4045
4046 argtopriv[] = { 3585 } argtopriv[] = {
4047 { 1, PrivMode_aplCUR }, 3586 { 1, PrivMode_aplCUR },
4048 { 2, PrivMode_vt52 }, 3587 { 2, PrivMode_vt52 },
4049 { 3, PrivMode_132 }, 3588 { 3, PrivMode_132 },
4050 { 4, PrivMode_smoothScroll }, 3589 { 4, PrivMode_smoothScroll },
4051 { 5, PrivMode_rVideo }, 3590 { 5, PrivMode_rVideo },
… …
4067 { 66, PrivMode_aplKP }, 3606 { 66, PrivMode_aplKP },
4068#ifndef NO_BACKSPACE_KEY 3607#ifndef NO_BACKSPACE_KEY
4069 { 67, PrivMode_BackSpace }, 3608 { 67, PrivMode_BackSpace },
4070#endif 3609#endif
4071 { 1000, PrivMode_MouseX11 }, 3610 { 1000, PrivMode_MouseX11 },
4072 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3611 { 1002, PrivMode_MouseBtnEvent },
4073 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3612 { 1003, PrivMode_MouseAnyEvent },
4074 // 1003 Use All Motion Mouse Tracking. NYI, TODO
4075 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3613 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4076 { 1011, PrivMode_Keypress }, // rxvt extension 3614 { 1011, PrivMode_Keypress }, // rxvt extension
4077 // 1035 enable modifiers for alt, numlock NYI 3615 // 1035 enable modifiers for alt, numlock NYI
4078 // 1036 send ESC for meta keys NYI 3616 // 1036 send ESC for meta keys NYI
4079 // 1037 send DEL for keypad delete NYI 3617 // 1037 send DEL for keypad delete NYI
4080 { 1047, PrivMode_Screen }, 3618 { 1047, PrivMode_Screen },
4081 // 1048 save and restore cursor 3619 // 1048 save and restore cursor
4082 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3620 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
4083 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3621 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3622 { 2004, PrivMode_BracketPaste },
4084 }; 3623 };
4085 3624
4086 if (nargs == 0) 3625 if (nargs == 0)
4087 return; 3626 return;
4088 3627
… …
4114 scr_touch (true); 3653 scr_touch (true);
4115 break; 3654 break;
4116#endif 3655#endif
4117 case 1048: /* alternative cursor save */ 3656 case 1048: /* alternative cursor save */
4118 case 1049: 3657 case 1049:
4119 if (OPTION (Opt_secondaryScreen)) 3658 if (option (Opt_secondaryScreen))
4120 if (mode == 0) 3659 if (mode == 0)
4121 scr_cursor (RESTORE); 3660 scr_cursor (RESTORE);
4122 else if (mode == 1) 3661 else if (mode == 1)
4123 scr_cursor (SAVE); 3662 scr_cursor (SAVE);
4124 break; 3663 break;
… …
4136 */ 3675 */
4137 PrivMode (1, PrivMode_vt52); 3676 PrivMode (1, PrivMode_vt52);
4138 break; 3677 break;
4139 case 3: /* 80/132 */ 3678 case 3: /* 80/132 */
4140 if (priv_modes & PrivMode_132OK) 3679 if (priv_modes & PrivMode_132OK)
3680 {
3681 scr_poweron ();
4141 set_widthheight (((state ? 132 : 80) * fwidth), height); 3682 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight);
3683 }
4142 break; 3684 break;
4143 case 4: /* smooth scrolling */ 3685 case 4: /* smooth scrolling */
4144 set_option (Opt_jumpScroll, !state); 3686 set_option (Opt_jumpScroll, !state);
4145 break; 3687 break;
4146 case 5: /* reverse video */ 3688 case 5: /* reverse video */
… …
4153 scr_autowrap (state); 3695 scr_autowrap (state);
4154 break; 3696 break;
4155 /* case 8: - auto repeat, can't do on a per window basis */ 3697 /* case 8: - auto repeat, can't do on a per window basis */
4156 case 9: /* X10 mouse reporting */ 3698 case 9: /* X10 mouse reporting */
4157 if (state) /* orthogonal */ 3699 if (state) /* orthogonal */
4158 priv_modes &= ~PrivMode_MouseX11; 3700 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4159 break; 3701 break;
4160#ifdef scrollBar_esc 3702#ifdef scrollBar_esc
4161 case scrollBar_esc: 3703 case scrollBar_esc:
4162 if (scrollbar_mapping (state)) 3704 if (scrollbar_mapping (state))
4163 { 3705 {
… …
4176 break; 3718 break;
4177 /* case 66: - application key pad */ 3719 /* case 66: - application key pad */
4178 /* case 67: - backspace key */ 3720 /* case 67: - backspace key */
4179 case 1000: /* X11 mouse reporting */ 3721 case 1000: /* X11 mouse reporting */
4180 if (state) /* orthogonal */ 3722 if (state) /* orthogonal */
4181 priv_modes &= ~PrivMode_MouseX10; 3723 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4182 break; 3724 break;
4183#if 0
4184 case 1001: 3725 case 1002:
4185 break; /* X11 mouse highlighting */ 3726 case 1003:
4186#endif 3727 if (state)
3728 {
3729 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3730 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3731 vt_emask_mouse = PointerMotionMask;
3732 }
3733 else
3734 vt_emask_mouse = NoEventMask;
3735 vt_select_input ();
3736 break;
4187 case 1010: /* scroll to bottom on TTY output inhibit */ 3737 case 1010: /* scroll to bottom on TTY output inhibit */
4188 set_option (Opt_scrollTtyOutput, !state); 3738 set_option (Opt_scrollTtyOutput, !state);
4189 break; 3739 break;
4190 case 1011: /* scroll to bottom on key press */ 3740 case 1011: /* scroll to bottom on key press */
4191 set_option (Opt_scrollTtyKeypress, state); 3741 set_option (Opt_scrollTtyKeypress, state);
4192 break; 3742 break;
4193 case 1047: /* secondary screen w/ clearing last */ 3743 case 1047: /* secondary screen w/ clearing last */
4194 if (OPTION (Opt_secondaryScreen)) 3744 if (option (Opt_secondaryScreen))
4195 if (current_screen != PRIMARY) 3745 if (current_screen != PRIMARY)
4196 scr_erase_screen (2); 3746 scr_erase_screen (2);
4197 scr_change_screen (state); 3747 scr_change_screen (state);
4198 break; 3748 break;
4199 case 1049: /* secondary screen w/ clearing first */ 3749 case 1049: /* secondary screen w/ clearing first */
4200 scr_change_screen (state); 3750 scr_change_screen (state);
4201 if (OPTION (Opt_secondaryScreen)) 3751 if (option (Opt_secondaryScreen))
4202 if (current_screen != PRIMARY) 3752 if (current_screen != PRIMARY)
4203 scr_erase_screen (2); 3753 scr_erase_screen (2);
4204 break; 3754 break;
4205 default: 3755 default:
4206 break; 3756 break;
… …
4334 scr_color (Color_bg, Color_bg); 3884 scr_color (Color_bg, Color_bg);
4335 break; 3885 break;
4336 3886
4337 //case 50: // not variable spacing 3887 //case 50: // not variable spacing
4338 3888
4339#if ENABLE_FRILLS 3889#if !ENABLE_MINIMAL
4340 case 90: 3890 case 90:
4341 case 91: /* set bright fg color */ 3891 case 91: /* set bright fg color */
4342 case 92: 3892 case 92:
4343 case 93: 3893 case 93:
4344 case 94: 3894 case 94:
… …
4368rxvt_term::process_graphics () 3918rxvt_term::process_graphics ()
4369{ 3919{
4370 unicode_t ch, cmd = cmd_getc (); 3920 unicode_t ch, cmd = cmd_getc ();
4371 3921
4372 if (cmd == 'Q') 3922 if (cmd == 'Q')
3923 {
4373 { /* query graphics */ 3924 /* query graphics */
4374 tt_printf ("\033G0\012"); /* no graphics */ 3925 tt_printf ("\033G0\012"); /* no graphics */
4375 return; 3926 return;
4376 } 3927 }
4377 /* swallow other graphics sequences until terminating ':' */ 3928 /* swallow other graphics sequences until terminating ':' */
4378 do 3929 do
… …
4428 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 3979 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4429 3980
4430 memcpy (v_buffer + v_buflen, data, len); 3981 memcpy (v_buffer + v_buflen, data, len);
4431 v_buflen += len; 3982 v_buflen += len;
4432 3983
4433 pty_ev.set (EVENT_READ | EVENT_WRITE); 3984 pty_ev.set (ev::READ | ev::WRITE);
4434} 3985}
4435 3986
4436void rxvt_term::pty_write () 3987void rxvt_term::pty_write ()
4437{ 3988{
4438 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 3989 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4443 3994
4444 if (v_buflen == 0) 3995 if (v_buflen == 0)
4445 { 3996 {
4446 free (v_buffer); 3997 free (v_buffer);
4447 v_buffer = 0; 3998 v_buffer = 0;
4448 v_buflen = 0;
4449 3999
4450 pty_ev.set (EVENT_READ); 4000 pty_ev.set (ev::READ);
4451 return; 4001 return;
4452 } 4002 }
4453 4003
4454 memmove (v_buffer, v_buffer + written, v_buflen); 4004 memmove (v_buffer, v_buffer + written, v_buflen);
4455 } 4005 }
4456 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4006 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4457 pty_ev.set (EVENT_READ); 4007 pty_ev.set (ev::READ);
4458} 4008}
4459 4009
4460/*----------------------- end-of-file (C source) -----------------------*/ 4010/*----------------------- end-of-file (C source) -----------------------*/
4461 4011

Diff Legend

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