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.287 by root, Sat Jan 28 20:08:05 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 int valid_keysym; 344 int valid_keysym;
305 char kbuf[KBUFSZ]; 345 char kbuf[KBUFSZ];
346
347#if ISO_14755
348 if (iso14755buf & ISO_14755_52)
349 return;
350#endif
306 351
307 /* 352 /*
308 * 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
309 * escape sequence to toggle the Keypad. 354 * escape sequence to toggle the Keypad.
310 * 355 *
… …
490# if ISO_14755 535# if ISO_14755
491 iso14755_51 (0); 536 iso14755_51 (0);
492# endif 537# endif
493 return; 538 return;
494 } 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 }
495 else if ((hv = hex_keyval (ev)) >= 0) 548 else if ((hv = hex_keyval (ev)) >= 0)
496 { 549 {
497 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK) 550 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
498 | hv | ISO_14755_51; 551 | hv | ISO_14755_51;
499# if ISO_14755 552# if ISO_14755
… …
501# endif 554# endif
502 return; 555 return;
503 } 556 }
504 else 557 else
505 { 558 {
506# if ENABLE_OVERLAY 559# if ISO_14755
507 scr_overlay_off (); 560 scr_overlay_off ();
508# endif 561# endif
509 iso14755buf = 0; 562 iso14755buf = 0;
510 } 563 }
511 } 564 }
512 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 565 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
513 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 566 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
514 if (!(iso14755buf & ISO_14755_STARTED)) 567 if (!(iso14755buf & ISO_14755_STARTED))
515 { 568 {
516 iso14755buf |= ISO_14755_STARTED; 569 iso14755buf |= ISO_14755_STARTED;
517# if ENABLE_OVERLAY 570# if ISO_14755
518 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 571 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
519 scr_overlay_set (0, 0, "ISO 14755 mode"); 572 scr_overlay_set (0, 0, "ISO 14755 mode");
520# endif 573# endif
521 } 574 }
522#endif 575#endif
523 576
524#ifdef PRINTPIPE 577#ifdef PRINTPIPE
525 if (keysym == XK_Print) 578 if (keysym == XK_Print)
526 { 579 {
527 scr_printscreen (ctrl | shft); 580 scr_printscreen (ctrl | shft);
528 return; 581 return;
529 } 582 }
530#endif 583#endif
531 584
532 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 585 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
533 { 586 {
534 { 587 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
535 newlen = 1; 588 unsigned int newlen = 1;
536 switch (keysym) 589
590 switch (translate_keypad (keysym, kp))
537 { 591 {
538#ifndef NO_BACKSPACE_KEY 592#ifndef NO_BACKSPACE_KEY
539 case XK_BackSpace: 593 case XK_BackSpace:
540 if (priv_modes & PrivMode_HaveBackSpace) 594 if (priv_modes & PrivMode_HaveBackSpace)
541 { 595 {
542 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace) 596 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
543 ^ !!ctrl) ? '\b' : '\177'; 597 ^ !!ctrl) ? '\b' : '\177';
544 kbuf[1] = '\0'; 598 kbuf[1] = '\0';
545 } 599 }
546 else 600 else
547 strcpy (kbuf, key_backspace); 601 strcpy (kbuf, rs[Rs_backspace_key]);
548 break; 602 break;
549#endif 603#endif
550#ifndef NO_DELETE_KEY 604#ifndef NO_DELETE_KEY
551# ifdef XK_KP_Prior
552 case XK_KP_Delete:
553 /* allow shift to override */
554 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
555 {
556 strcpy (kbuf, "\033On");
557 break;
558 }
559 /* FALLTHROUGH */
560# endif
561 case XK_Delete: 605 case XK_Delete:
562 strcpy (kbuf, key_delete); 606 strcpy (kbuf, rs[Rs_delete_key]);
563 break; 607 break;
564#endif 608#endif
565 case XK_Tab: 609 case XK_Tab:
566 if (shft) 610 if (shft)
567 strcpy (kbuf, "\033[Z"); 611 strcpy (kbuf, "\033[Z");
… …
577#endif 621#endif
578 newlen = 0; 622 newlen = 0;
579 } 623 }
580 break; 624 break;
581 625
582#ifdef XK_KP_Left
583 case XK_KP_Up: /* \033Ox or standard */
584 case XK_KP_Down: /* \033Or or standard */
585 case XK_KP_Right: /* \033Ov or standard */
586 case XK_KP_Left: /* \033Ot or standard */
587 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
588 {
589 strcpy (kbuf, "\033OZ");
590 kbuf[2] = "txvr"[keysym - XK_KP_Left];
591 break;
592 }
593 else
594 /* translate to std. cursor key */
595 keysym = XK_Left + (keysym - XK_KP_Left);
596 /* FALLTHROUGH */
597#endif
598 case XK_Up: /* "\033[A" */ 626 case XK_Up: /* "\033[A" */
599 case XK_Down: /* "\033[B" */ 627 case XK_Down: /* "\033[B" */
600 case XK_Right: /* "\033[C" */ 628 case XK_Right: /* "\033[C" */
601 case XK_Left: /* "\033[D" */ 629 case XK_Left: /* "\033[D" */
602 strcpy (kbuf, "\033[Z"); 630 strcpy (kbuf, "\033[Z");
… …
612 else if (priv_modes & PrivMode_aplCUR) 640 else if (priv_modes & PrivMode_aplCUR)
613 kbuf[1] = 'O'; 641 kbuf[1] = 'O';
614 break; 642 break;
615 643
616#ifndef UNSHIFTED_SCROLLKEYS 644#ifndef UNSHIFTED_SCROLLKEYS
617# ifdef XK_KP_Prior
618 case XK_KP_Prior:
619 /* allow shift to override */
620 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
621 {
622 strcpy (kbuf, "\033Oy");
623 break;
624 }
625 /* FALLTHROUGH */
626# endif
627 case XK_Prior: 645 case XK_Prior:
628 strcpy (kbuf, "\033[5~"); 646 strcpy (kbuf, "\033[5~");
629 break; 647 break;
630# ifdef XK_KP_Next
631 case XK_KP_Next:
632 /* allow shift to override */
633 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
634 {
635 strcpy (kbuf, "\033Os");
636 break;
637 }
638 /* FALLTHROUGH */
639# endif
640 case XK_Next: 648 case XK_Next:
641 strcpy (kbuf, "\033[6~"); 649 strcpy (kbuf, "\033[6~");
642 break; 650 break;
643#endif 651#endif
644 case XK_KP_Enter: 652 case XK_KP_Enter:
645 /* allow shift to override */ 653 /* allow shift to override */
646 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 654 if (kp)
647 { 655 {
648 strcpy (kbuf, "\033OM"); 656 strcpy (kbuf, "\033OM");
649 break; 657 break;
650 } 658 }
651 659
… …
663 kbuf[0] = '\015'; 671 kbuf[0] = '\015';
664 kbuf[1] = '\0'; 672 kbuf[1] = '\0';
665 } 673 }
666 break; 674 break;
667 675
668#ifdef XK_KP_Begin
669 case XK_KP_Begin:
670 strcpy (kbuf, "\033Ou");
671 break;
672
673#endif
674 case XK_KP_F1: /* "\033OP" */ 676 case XK_KP_F1: /* "\033OP" */
675 case XK_KP_F2: /* "\033OQ" */ 677 case XK_KP_F2: /* "\033OQ" */
676 case XK_KP_F3: /* "\033OR" */ 678 case XK_KP_F3: /* "\033OR" */
677 case XK_KP_F4: /* "\033OS" */ 679 case XK_KP_F4: /* "\033OS" */
678 strcpy (kbuf, "\033OP"); 680 strcpy (kbuf, "\033OP");
… …
694 case XK_KP_6: /* "\033Ov" : "6" */ 696 case XK_KP_6: /* "\033Ov" : "6" */
695 case XK_KP_7: /* "\033Ow" : "7" */ 697 case XK_KP_7: /* "\033Ow" : "7" */
696 case XK_KP_8: /* "\033Ox" : "8" */ 698 case XK_KP_8: /* "\033Ox" : "8" */
697 case XK_KP_9: /* "\033Oy" : "9" */ 699 case XK_KP_9: /* "\033Oy" : "9" */
698 /* allow shift to override */ 700 /* allow shift to override */
699 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 701 if (kp)
700 { 702 {
701 strcpy (kbuf, "\033Oj"); 703 strcpy (kbuf, "\033Oj");
702 kbuf[2] += (keysym - XK_KP_Multiply); 704 kbuf[2] += (keysym - XK_KP_Multiply);
703 } 705 }
704 else 706 else
… …
710 712
711 case XK_Find: 713 case XK_Find:
712 strcpy (kbuf, "\033[1~"); 714 strcpy (kbuf, "\033[1~");
713 break; 715 break;
714 716
715#ifdef XK_KP_End
716 case XK_KP_Insert:
717 /* allow shift to override */
718 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
719 {
720 strcpy (kbuf, "\033Op");
721 break;
722 }
723 /* FALLTHROUGH */
724#endif
725 case XK_Insert: 717 case XK_Insert:
726 strcpy (kbuf, "\033[2~"); 718 strcpy (kbuf, "\033[2~");
727 break; 719 break;
728#ifdef DXK_Remove /* support for DEC remove like key */ 720#ifdef DXK_Remove /* support for DEC remove like key */
729 case DXK_Remove: 721 case DXK_Remove:
… …
733 strcpy (kbuf, "\033[3~"); 725 strcpy (kbuf, "\033[3~");
734 break; 726 break;
735 case XK_Select: 727 case XK_Select:
736 strcpy (kbuf, "\033[4~"); 728 strcpy (kbuf, "\033[4~");
737 break; 729 break;
738#ifdef XK_KP_End
739 case XK_KP_End:
740 /* allow shift to override */
741 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
742 {
743 strcpy (kbuf, "\033Oq");
744 break;
745 }
746 /* FALLTHROUGH */
747#endif
748 case XK_End: 730 case XK_End:
749 strcpy (kbuf, KS_END); 731 strcpy (kbuf, KS_END);
750 break; 732 break;
751#ifdef XK_KP_Home
752 case XK_KP_Home:
753 /* allow shift to override */
754 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
755 {
756 strcpy (kbuf, "\033Ow");
757 break;
758 }
759 /* FALLTHROUGH */
760#endif
761 case XK_Home: 733 case XK_Home:
762 strcpy (kbuf, KS_HOME); 734 strcpy (kbuf, KS_HOME);
763 break; 735 break;
764 736
765#define FKEY(n, fkey) \ 737#define FKEY(n, fkey) \
… …
822 break; 794 break;
823 } 795 }
824 796
825 if (newlen) 797 if (newlen)
826 len = strlen (kbuf); 798 len = strlen (kbuf);
827 }
828 799
829 /* 800 /*
830 * Pass meta for all function keys, if 'meta' option set 801 * Pass meta for all function keys, if 'meta' option set
831 */ 802 */
832#ifdef META8_OPTION 803#ifdef META8_OPTION
… …
867 return; 838 return;
868 839
869 if (len <= 0) 840 if (len <= 0)
870 return; /* not mapped */ 841 return; /* not mapped */
871 842
872 if (OPTION (Opt_scrollTtyKeypress)) 843 if (option (Opt_scrollTtyKeypress))
873 if (view_start) 844 if (view_start)
874 { 845 {
875 view_start = 0; 846 view_start = 0;
876 want_refresh = 1; 847 want_refresh = 1;
877 } 848 }
… …
901 tt_write (&ch, 1); 872 tt_write (&ch, 1);
902 } 873 }
903 874
904 tt_write (kbuf, (unsigned int)len); 875 tt_write (kbuf, (unsigned int)len);
905} 876}
906/*}}} */ 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}
907 954
908#if defined (KEYSYM_RESOURCE) 955#if defined (KEYSYM_RESOURCE)
909unsigned int 956unsigned int
910rxvt_term::cmd_write (const char *str, unsigned int count) 957rxvt_term::cmd_write (const char *str, unsigned int count)
911{ 958{
… …
941void 988void
942rxvt_term::flush () 989rxvt_term::flush ()
943{ 990{
944 flush_ev.stop (); 991 flush_ev.stop ();
945 992
946#ifdef TRANSPARENT 993#ifdef HAVE_BG_PIXMAP
947 if (want_full_refresh) 994 if (bgPixmap.check_clearChanged ())
948 { 995 {
949 want_full_refresh = 0; 996// scr_clear (true); This needs to be researched further!
950 scr_clear ();
951 scr_touch (false); 997 scr_touch (false);
952 } 998 }
953#endif 999#endif
954 1000
955 if (want_refresh) 1001 if (want_refresh)
… …
1000 } 1046 }
1001 1047
1002 display->flush (); 1048 display->flush ();
1003} 1049}
1004 1050
1051/* checks wether a refresh is requested and starts the refresh timer */
1005void 1052void
1006rxvt_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)
1007{ 1063{
1008 make_current (); 1064 make_current ();
1009 1065
1010 display->flush ();
1011
1012 if (want_refresh && !flush_ev.active)
1013 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1014}
1015
1016void
1017rxvt_term::flush_cb (time_watcher &w)
1018{
1019 make_current ();
1020
1021 refresh_limit = 1;
1022 refresh_count = 0; 1066 refresh_count = 0;
1023 flush (); 1067 flush ();
1024} 1068}
1025 1069
1026#ifdef CURSOR_BLINK 1070#ifdef CURSOR_BLINK
1027void 1071void
1028rxvt_term::cursor_blink_cb (time_watcher &w) 1072rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1029{ 1073{
1030 hidden_cursor = !hidden_cursor; 1074 hidden_cursor = !hidden_cursor;
1031 want_refresh = 1; 1075 want_refresh = 1;
1032 1076 refresh_check ();
1033 w.start (w.at + CURSOR_BLINK_INTERVAL);
1034} 1077}
1035#endif 1078#endif
1036 1079
1037#ifdef TEXT_BLINK 1080#ifdef TEXT_BLINK
1038void 1081void
1039rxvt_term::text_blink_cb (time_watcher &w) 1082rxvt_term::text_blink_cb (ev::timer &w, int revents)
1040{ 1083{
1041 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1084 if (scr_refresh_rend (RS_Blink, RS_Blink))
1042 { 1085 {
1043 hidden_text = !hidden_text; 1086 hidden_text = !hidden_text;
1044 want_refresh = 1; 1087 want_refresh = 1;
1045 w.start (w.at + TEXT_BLINK_INTERVAL); 1088 refresh_check ();
1046 } 1089 }
1090 else
1091 w.stop ();
1047} 1092}
1048#endif 1093#endif
1049 1094
1050#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1095#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1051void 1096void
1052rxvt_term::cont_scroll_cb (time_watcher &w) 1097rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1053{ 1098{
1054 if ((scrollbar_isUp() || scrollbar_isDn()) && 1099 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1055 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1100 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1056 { 1101 {
1057 want_refresh = 1; 1102 want_refresh = 1;
1058 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1103 refresh_check ();
1059 } 1104 }
1105 else
1106 w.stop ();
1060} 1107}
1061#endif 1108#endif
1062 1109
1063#ifdef SELECTION_SCROLLING 1110#ifdef SELECTION_SCROLLING
1064void 1111void
1065rxvt_term::sel_scroll_cb (time_watcher &w) 1112rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1066{ 1113{
1067 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1114 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1068 { 1115 {
1069 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1116 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1070 want_refresh = 1; 1117 want_refresh = 1;
1071 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1118 refresh_check ();
1072 } 1119 }
1120 else
1121 w.stop ();
1073} 1122}
1074#endif 1123#endif
1075 1124
1076#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1125#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1077void 1126void
1078rxvt_term::slip_wheel_cb (time_watcher &w) 1127rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1079{ 1128{
1080 if (mouse_slip_wheel_speed == 0 1129 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1081 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1082 : scr_page (UP, mouse_slip_wheel_speed))
1083 { 1130 {
1084 if (view_start == top_row || view_start == 0)
1085 mouse_slip_wheel_speed = 0;
1086
1087 want_refresh = 1; 1131 want_refresh = 1;
1088 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)
1089 } 1136 {
1137 mouse_slip_wheel_speed = 0;
1138 w.stop ();
1139 }
1090} 1140}
1091#endif 1141#endif
1092 1142
1093#if HAVE_SCHED_YIELD 1143#if LINUX_YIELD_HACK
1094static struct event_handler 1144static struct event_handler
1095{ 1145{
1096 check_watcher cw_yield; 1146 ev::prepare yield_ev;
1097 1147
1098 void yield (check_watcher &w) 1148 void yield_cb (ev::prepare &w, int revents)
1099 { 1149 {
1100 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
1101 w.stop (); 1158 w.stop ();
1102 } 1159 }
1103 1160
1104 event_handler () 1161 event_handler ()
1105 : cw_yield (this, &event_handler::yield) 1162 : yield_ev (this, &event_handler::yield_cb)
1106 { 1163 {
1107 } 1164 }
1108} event_handler; 1165} event_handler;
1109#endif 1166#endif
1110 1167
… …
1130 cmdbuf_endp += r; 1187 cmdbuf_endp += r;
1131 return true; 1188 return true;
1132 } 1189 }
1133 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1190 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1134 { 1191 {
1135#if HAVE_SCHED_YIELD 1192#if LINUX_YIELD_HACK
1136 if (display->is_local) 1193 if (display->is_local)
1137 event_handler.cw_yield.start (); 1194 event_handler.yield_ev.start ();
1138#endif 1195#endif
1139 } 1196 }
1140 else 1197 else
1141 { 1198 {
1142 pty_ev.stop (); 1199 pty_ev.stop ();
1143 1200
1144 if (!OPTION (Opt_hold)) 1201 if (!option (Opt_hold))
1145 destroy (); 1202 destroy ();
1146 } 1203 }
1147 1204
1148 return false; 1205 return false;
1149} 1206}
1150 1207
1151void 1208void
1152rxvt_term::pty_cb (io_watcher &w, short revents) 1209rxvt_term::pty_cb (ev::io &w, int revents)
1153{ 1210{
1154 make_current (); 1211 make_current ();
1155 1212
1156 if (revents & EVENT_READ) 1213 if (revents & ev::READ)
1157 // loop, but don't allow a single term to monopolize us 1214 // loop, but don't allow a single term to monopolize us
1158 while (pty_fill ()) 1215 while (pty_fill ())
1159 if (cmd_parse ()) 1216 if (cmd_parse ())
1160 break; 1217 break;
1161 1218
1162 if (revents & EVENT_WRITE) 1219 if (revents & ev::WRITE)
1163 pty_write (); 1220 pty_write ();
1221
1222 refresh_check ();
1164} 1223}
1165 1224
1166void 1225void
1167rxvt_term::pointer_unblank () 1226rxvt_term::pointer_unblank ()
1168{ 1227{
1169 XDefineCursor (xdisp, vt, TermWin_cursor); 1228 XDefineCursor (dpy, vt, TermWin_cursor);
1170 recolour_cursor (); 1229 recolour_cursor ();
1171 1230
1172#ifdef POINTER_BLANK 1231#ifdef POINTER_BLANK
1173 hidden_pointer = 0; 1232 hidden_pointer = 0;
1174 1233
1175 if (OPTION (Opt_pointerBlank)) 1234 if (option (Opt_pointerBlank))
1176 pointer_ev.start (NOW + pointerBlankDelay); 1235 pointer_ev.start (pointerBlankDelay);
1177#endif 1236#endif
1178} 1237}
1179 1238
1180#ifdef POINTER_BLANK 1239#ifdef POINTER_BLANK
1181void 1240void
1182rxvt_term::pointer_blank () 1241rxvt_term::pointer_blank ()
1183{ 1242{
1184 if (!OPTION (Opt_pointerBlank)) 1243 if (!option (Opt_pointerBlank))
1185 return; 1244 return;
1186 1245
1187 XDefineCursor (xdisp, vt, display->blank_cursor); 1246 XDefineCursor (dpy, vt, display->blank_cursor);
1188 XFlush (xdisp); 1247 XFlush (dpy);
1189 1248
1190 hidden_pointer = 1; 1249 hidden_pointer = 1;
1191} 1250}
1192 1251
1193void 1252void
1194rxvt_term::pointer_cb (time_watcher &w) 1253rxvt_term::pointer_cb (ev::timer &w, int revents)
1195{ 1254{
1196 make_current (); 1255 make_current ();
1197 1256
1198 pointer_blank (); 1257 pointer_blank ();
1199} 1258}
… …
1202void 1261void
1203rxvt_term::mouse_report (XButtonEvent &ev) 1262rxvt_term::mouse_report (XButtonEvent &ev)
1204{ 1263{
1205 int button_number, key_state = 0; 1264 int button_number, key_state = 0;
1206 int x, y; 1265 int x, y;
1266 int code = 32;
1207 1267
1208 x = ev.x; 1268 x = Pixel2Col (ev.x);
1209 y = ev.y; 1269 y = Pixel2Row (ev.y);
1210 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 }
1211 1278
1212 if (MEvent.button == AnyButton) 1279 if (MEvent.button == AnyButton)
1213 button_number = 3; 1280 button_number = 3;
1214 else 1281 else
1215 { 1282 {
… …
1261 x + 1, 1328 x + 1,
1262 y + 1); 1329 y + 1);
1263#endif 1330#endif
1264 1331
1265 tt_printf ("\033[M%c%c%c", 1332 tt_printf ("\033[M%c%c%c",
1266 (32 + button_number + key_state), 1333 (code + button_number + key_state),
1267 (32 + x + 1), 1334 (32 + x + 1),
1268 (32 + y + 1)); 1335 (32 + y + 1));
1269} 1336}
1270 1337
1271/*{{{ process an X event */ 1338/*{{{ process an X event */
1272void 1339void
1273rxvt_term::x_cb (XEvent &ev) 1340rxvt_term::x_cb (XEvent &ev)
1274{ 1341{
1275 make_current (); 1342 make_current ();
1276 1343
1277 dLocal (Display *, xdisp); 1344 dLocal (Display *, dpy);
1278 1345
1279 if (ev.xany.window == vt 1346 if (ev.xany.window == vt
1280 && SHOULD_INVOKE (HOOK_X_EVENT) 1347 && SHOULD_INVOKE (HOOK_X_EVENT)
1281 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1348 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1282 return; 1349 return;
… …
1287 unsigned int unused_mask; 1354 unsigned int unused_mask;
1288 1355
1289 switch (ev.type) 1356 switch (ev.type)
1290 { 1357 {
1291 case KeyPress: 1358 case KeyPress:
1292#if ISO_14755 1359 key_press (ev.xkey);
1293 if (!(iso14755buf & ISO_14755_52))
1294#endif
1295 lookup_key (ev.xkey);
1296
1297 break; 1360 break;
1298 1361
1299 case KeyRelease: 1362 case KeyRelease:
1300 { 1363 key_release (ev.xkey);
1301#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1302 KeySym keysym;
1303
1304 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1305#endif
1306
1307#if ENABLE_FRILLS || ISO_14755
1308 // ISO 14755 support
1309 if (iso14755buf)
1310 if (iso14755buf & ISO_14755_52)
1311 {
1312# if ENABLE_OVERLAY
1313 scr_overlay_off ();
1314# endif
1315# if ISO_14755
1316 // iso14755 part 5.2 handling: release time
1317 // first: controls
1318 if ((ev.xkey.state & ControlMask)
1319 && ((keysym >= 0x40 && keysym <= 0x5f)
1320 || (keysym >= 0x61 && keysym <= 0x7f)))
1321 {
1322 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1323 commit_iso14755 ();
1324 goto skip_switch;
1325 }
1326
1327 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1328 if (i[0] == keysym)
1329 {
1330 iso14755buf = ISO_14755_51 | i[1];
1331 commit_iso14755 ();
1332 goto skip_switch;
1333 }
1334
1335 scr_bell ();
1336# endif
1337 iso14755buf = 0;
1338 break;
1339 }
1340 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1341 {
1342# if ENABLE_OVERLAY
1343 scr_overlay_off ();
1344# endif
1345 if (iso14755buf & ISO_14755_51)
1346 commit_iso14755 ();
1347#if ISO_14755
1348 else if (iso14755buf & ISO_14755_STARTED)
1349 {
1350 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1351
1352 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1353 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1354 }
1355# endif
1356 else
1357 iso14755buf = 0;
1358 }
1359#endif
1360
1361 if (ev.xany.window == vt
1362 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1363 break;
1364
1365#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1366 if (!(ev.xkey.state & ControlMask))
1367 slip_wheel_ev.stop ();
1368 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1369 mouse_slip_wheel_speed = 0;
1370#endif
1371 break; 1364 break;
1372 }
1373 1365
1374 case ButtonPress: 1366 case ButtonPress:
1375 button_press (ev.xbutton); 1367 button_press (ev.xbutton);
1376 break; 1368 break;
1377 1369
… …
1392 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)))
1393 destroy (); 1385 destroy ();
1394 } 1386 }
1395#if ENABLE_EWMH 1387#if ENABLE_EWMH
1396 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])
1397 XSendEvent (xdisp, ev.xclient.window = display->root, 1389 XSendEvent (dpy, ev.xclient.window = display->root,
1398 False, SubstructureRedirectMask | SubstructureNotifyMask, 1390 False, SubstructureRedirectMask | SubstructureNotifyMask,
1399 &ev); 1391 &ev);
1400#endif 1392#endif
1401 } 1393 }
1402 } 1394 }
… …
1408 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1400 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1409 focus_out (); 1401 focus_out ();
1410 } 1402 }
1411#endif 1403#endif
1412 } 1404 }
1413 break;
1414
1415 case MappingNotify:
1416 XRefreshKeyboardMapping (&ev.xmapping);
1417 break; 1405 break;
1418 1406
1419 /* 1407 /*
1420 * XXX: this is not the _current_ arrangement 1408 * XXX: this is not the _current_ arrangement
1421 * Here's my conclusion: 1409 * Here's my conclusion:
… …
1440 break; 1428 break;
1441 } 1429 }
1442 break; 1430 break;
1443 1431
1444 case FocusIn: 1432 case FocusIn:
1433 if (ev.xfocus.detail != NotifyInferior
1434 && ev.xfocus.detail != NotifyPointer
1435 && ev.xfocus.mode != NotifyGrab)
1445 focus_in (); 1436 focus_in ();
1446 break; 1437 break;
1447 1438
1448 case FocusOut: 1439 case FocusOut:
1440 if (ev.xfocus.detail != NotifyInferior
1441 && ev.xfocus.detail != NotifyPointer
1442 && ev.xfocus.mode != NotifyGrab)
1449 focus_out (); 1443 focus_out ();
1450 break; 1444 break;
1451 1445
1452 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);*/
1453 if (ev.xconfigure.window == parent[0]) 1450 if (ev.xconfigure.window == parent[0])
1454 { 1451 {
1455 while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev)) 1452 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1456 ; 1453 ;
1457 1454
1458 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1455 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1459 { 1456 {
1460 seen_resize = 1; 1457 seen_resize = 1;
1461 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1458 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1462 } 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 }
1463 1472
1464 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1473 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1465
1466#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1467 if (OPTION (Opt_transparent))
1468 check_our_parents ();
1469#endif
1470 } 1474 }
1471 break; 1475 break;
1472 1476
1473 case PropertyNotify: 1477 case PropertyNotify:
1474 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)))
… …
1490 case SelectionRequest: 1494 case SelectionRequest:
1491 selection_send (ev.xselectionrequest); 1495 selection_send (ev.xselectionrequest);
1492 break; 1496 break;
1493 1497
1494 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
1495 mapped = 1; 1515 mapped = 1;
1496#ifdef TEXT_BLINK 1516#ifdef TEXT_BLINK
1497 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1517 text_blink_ev.start ();
1498#endif 1518#endif
1499 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1519 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1500 break; 1520 break;
1501 1521
1502 case UnmapNotify: 1522 case UnmapNotify:
… …
1504#ifdef TEXT_BLINK 1524#ifdef TEXT_BLINK
1505 text_blink_ev.stop (); 1525 text_blink_ev.stop ();
1506#endif 1526#endif
1507 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1527 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1508 break; 1528 break;
1509
1510#ifdef TRANSPARENT
1511 case ReparentNotify:
1512 rootwin_cb (ev);
1513 break;
1514#endif /* TRANSPARENT */
1515 1529
1516 case GraphicsExpose: 1530 case GraphicsExpose:
1517 case Expose: 1531 case Expose:
1518 if (ev.xany.window == vt) 1532 if (ev.xany.window == vt)
1519 { 1533 {
1520 do 1534 do
1535 {
1521 scr_expose (ev.xexpose.x, ev.xexpose.y, 1536 scr_expose (ev.xexpose.x, ev.xexpose.y,
1522 ev.xexpose.width, ev.xexpose.height, False); 1537 ev.xexpose.width, ev.xexpose.height, False);
1538 }
1523 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev)); 1539 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1524 1540
1525 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1541 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1526 1542
1527 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev)) 1543 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1544 {
1528 scr_expose (ev.xexpose.x, ev.xexpose.y, 1545 scr_expose (ev.xexpose.x, ev.xexpose.y,
1529 ev.xexpose.width, ev.xexpose.height, False); 1546 ev.xexpose.width, ev.xexpose.height, False);
1547 }
1530 1548
1531 want_refresh = 1; 1549 want_refresh = 1;
1532 } 1550 }
1533 else 1551 else
1534 { 1552 {
1535 XEvent unused_event; 1553 XEvent unused_event;
1536 1554
1537 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event)) 1555 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1538 ; 1556 ;
1539 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event)) 1557 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1540 ; 1558 ;
1541 1559
1542 if (isScrollbarWindow (ev.xany.window)) 1560 if (scrollBar.state && ev.xany.window == scrollBar.win)
1543 { 1561 {
1544 scrollBar.setIdle (); 1562 scrollBar.state = STATE_IDLE;
1545 scrollbar_show (0); 1563 scrollbar_show (0);
1546 } 1564 }
1547
1548#ifdef TRANSPARENT
1549 if (am_transparent && ev.xany.window == parent[0])
1550 XClearWindow (xdisp, ev.xany.window);
1551#endif
1552 } 1565 }
1553 break; 1566 break;
1554 1567
1555 case MotionNotify: 1568 case MotionNotify:
1556#ifdef POINTER_BLANK 1569#ifdef POINTER_BLANK
1557 if (hidden_pointer) 1570 if (hidden_pointer)
1558 pointer_unblank (); 1571 pointer_unblank ();
1559#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);
1560 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1576 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1561 break; 1577 break;
1562 1578
1563 if (ev.xany.window == vt) 1579 if (ev.xany.window == vt)
1564 { 1580 {
1565 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1581 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1566 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1582 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1567 ; // nop 1583 ; // nop
1568 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1584 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1569 { 1585 {
1570 while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev)) 1586 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1571 ; 1587 ;
1572 1588
1573 XQueryPointer (xdisp, vt, 1589 XQueryPointer (dpy, vt,
1574 &unused_root, &unused_child, 1590 &unused_root, &unused_child,
1575 &unused_root_x, &unused_root_y, 1591 &unused_root_x, &unused_root_y,
1576 &ev.xbutton.x, &ev.xbutton.y, 1592 &ev.xbutton.x, &ev.xbutton.y,
1577 &ev.xbutton.state); 1593 &ev.xbutton.state);
1578#ifdef MOUSE_THRESHOLD 1594#ifdef MOUSE_THRESHOLD
… …
1598 int dist; 1614 int dist;
1599 1615
1600 /* don't clobber the current delay if we are 1616 /* don't clobber the current delay if we are
1601 * already in the middle of scrolling. 1617 * already in the middle of scrolling.
1602 */ 1618 */
1603 if (!sel_scroll_ev.active) 1619 if (!sel_scroll_ev.is_active ())
1604 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1620 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1605 1621
1606 /* save the event params so we can highlight 1622 /* save the event params so we can highlight
1607 * the selection in the pending-scroll loop 1623 * the selection in the pending-scroll loop
1608 */ 1624 */
1609 selection_save_x = ev.xbutton.x; 1625 selection_save_x = ev.xbutton.x;
… …
1631 else 1647 else
1632 { 1648 {
1633 /* we are within the text window, so we 1649 /* we are within the text window, so we
1634 * shouldn't be scrolling 1650 * shouldn't be scrolling
1635 */ 1651 */
1636 if (sel_scroll_ev.active)
1637 sel_scroll_ev.stop(); 1652 sel_scroll_ev.stop();
1638 } 1653 }
1639#endif 1654#endif
1640#ifdef MOUSE_THRESHOLD 1655#ifdef MOUSE_THRESHOLD
1641 } 1656 }
1642#endif 1657#endif
1643 } 1658 }
1644 } 1659 }
1645 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1660 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1646 { 1661 {
1647 while (XCheckTypedWindowEvent (xdisp, scrollBar.win, 1662 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1648 MotionNotify, &ev)) 1663 MotionNotify, &ev))
1649 ; 1664 ;
1650 1665
1651 XQueryPointer (xdisp, scrollBar.win, 1666 XQueryPointer (dpy, scrollBar.win,
1652 &unused_root, &unused_child, 1667 &unused_root, &unused_child,
1653 &unused_root_x, &unused_root_y, 1668 &unused_root_x, &unused_root_y,
1654 &ev.xbutton.x, &ev.xbutton.y, 1669 &ev.xbutton.x, &ev.xbutton.y,
1655 &unused_mask); 1670 &unused_mask);
1656 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1671 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1657 scrollbar_size ()); 1672 scrollbar_size ());
1658 want_refresh = 1; 1673 want_refresh = 1;
1659 refresh_limit = 0;
1660 scrollbar_show (1); 1674 scrollbar_show (1);
1661 } 1675 }
1662 break; 1676 break;
1663 } 1677 }
1664 1678
1665skip_switch: ;
1666
1667#if defined(CURSOR_BLINK) 1679#if defined(CURSOR_BLINK)
1668 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1680 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1669 { 1681 {
1670 if (hidden_cursor) 1682 if (hidden_cursor)
1671 { 1683 {
1672 hidden_cursor = 0; 1684 hidden_cursor = 0;
1673 want_refresh = 1; 1685 want_refresh = 1;
1674 } 1686 }
1675 1687
1676 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1688 cursor_blink_ev.again ();
1677 } 1689 }
1678#endif 1690#endif
1679 1691
1680#if defined(POINTER_BLANK) 1692#if defined(POINTER_BLANK)
1681 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1693 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1682 { 1694 {
1683 if (ev.type == MotionNotify 1695 if (ev.type == MotionNotify
1684 || ev.type == ButtonPress 1696 || ev.type == ButtonPress
1685 || ev.type == ButtonRelease) 1697 || ev.type == ButtonRelease)
1686 if (hidden_pointer) 1698 if (hidden_pointer)
… …
1688 1700
1689 if (ev.type == KeyPress && hidden_pointer == 0) 1701 if (ev.type == KeyPress && hidden_pointer == 0)
1690 pointer_blank (); 1702 pointer_blank ();
1691 } 1703 }
1692#endif 1704#endif
1705
1706 refresh_check ();
1693} 1707}
1694 1708
1695void 1709void
1696rxvt_term::focus_in () 1710rxvt_term::focus_in ()
1697{ 1711{
1698 if (!focus) 1712 if (!focus)
1699 { 1713 {
1700 focus = 1; 1714 focus = 1;
1701 want_refresh = 1; 1715 want_refresh = 1;
1702 1716
1703 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1717 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1704 1718
1705#if USE_XIM 1719#if USE_XIM
1706 if (Input_Context != NULL) 1720 if (Input_Context != NULL)
1707 { 1721 {
1708 IMSetStatusPosition (); 1722 IMSetPosition ();
1709 XSetICFocus (Input_Context); 1723 XSetICFocus (Input_Context);
1710 } 1724 }
1711#endif 1725#endif
1712#if CURSOR_BLINK 1726#if CURSOR_BLINK
1713 if (OPTION (Opt_cursorBlink)) 1727 if (option (Opt_cursorBlink))
1714 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1728 cursor_blink_ev.again ();
1715#endif 1729#endif
1716#if OFF_FOCUS_FADING 1730#if OFF_FOCUS_FADING
1717 if (rs[Rs_fade]) 1731 if (rs[Rs_fade])
1718 { 1732 {
1719 pix_colors = pix_colors_focused; 1733 pix_colors = pix_colors_focused;
1720 scr_recolour (); 1734 scr_recolour ();
1721 } 1735 }
1722#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
1723 } 1747 }
1724} 1748}
1725 1749
1726void 1750void
1727rxvt_term::focus_out () 1751rxvt_term::focus_out ()
… …
1735 1759
1736#if ENABLE_FRILLS || ISO_14755 1760#if ENABLE_FRILLS || ISO_14755
1737 if (iso14755buf) 1761 if (iso14755buf)
1738 { 1762 {
1739 iso14755buf = 0; 1763 iso14755buf = 0;
1740# if ENABLE_OVERLAY 1764# if ISO_14755
1741 scr_overlay_off (); 1765 scr_overlay_off ();
1742# endif 1766# endif
1743 } 1767 }
1744#endif 1768#endif
1745#if USE_XIM 1769#if USE_XIM
1746 if (Input_Context != NULL) 1770 if (Input_Context != NULL)
1747 XUnsetICFocus (Input_Context); 1771 XUnsetICFocus (Input_Context);
1748#endif 1772#endif
1749#if CURSOR_BLINK 1773#if CURSOR_BLINK
1750 if (OPTION (Opt_cursorBlink)) 1774 if (option (Opt_cursorBlink))
1751 cursor_blink_ev.stop (); 1775 cursor_blink_ev.stop ();
1776
1752 hidden_cursor = 0; 1777 hidden_cursor = 0;
1753#endif 1778#endif
1754#if OFF_FOCUS_FADING 1779#if OFF_FOCUS_FADING
1755 if (rs[Rs_fade]) 1780 if (rs[Rs_fade])
1756 { 1781 {
… …
1759 } 1784 }
1760#endif 1785#endif
1761 } 1786 }
1762} 1787}
1763 1788
1764#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
1765void 1803void
1766rxvt_term::rootwin_cb (XEvent &ev) 1804rxvt_term::rootwin_cb (XEvent &ev)
1767{ 1805{
1768 make_current (); 1806 make_current ();
1769 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
1770 switch (ev.type) 1813 switch (ev.type)
1771 { 1814 {
1772 case PropertyNotify: 1815 case PropertyNotify:
1773 /* 1816 /*
1774 * 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,
1775 * 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.
1776 */ 1819 */
1777 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1820 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1778 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1821 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1779 return; 1822 {
1823 bgPixmap.set_root_pixmap ();
1824 update_background ();
1825 }
1780 1826
1781 /* FALLTHROUGH */
1782 case ReparentNotify:
1783 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1784 want_refresh = want_full_refresh = 1;
1785 break; 1827 break;
1786 } 1828 }
1829# endif
1830
1831 refresh_check ();
1787} 1832}
1788#endif 1833#endif
1789 1834
1790void 1835void
1791rxvt_term::button_press (XButtonEvent &ev) 1836rxvt_term::button_press (XButtonEvent &ev)
… …
1846 mouse_report (ev); 1891 mouse_report (ev);
1847 } 1892 }
1848#else 1893#else
1849 MEvent.button = ev.button; 1894 MEvent.button = ev.button;
1850 mouse_report (ev); 1895 mouse_report (ev);
1851#endif /* MOUSE_REPORT_DOUBLECLICK */ 1896#endif /* MOUSE_REPORT_DOUBLECLICK */
1852 1897
1853 } 1898 }
1854 else 1899 else
1855 { 1900 {
1856 if (ev.button != MEvent.button) 1901 if (ev.button != MEvent.button)
… …
1904 } 1949 }
1905 1950
1906 /* 1951 /*
1907 * Scrollbar window processing of button press 1952 * Scrollbar window processing of button press
1908 */ 1953 */
1909 if (isScrollbarWindow (ev.window)) 1954 if (scrollBar.state && ev.window == scrollBar.win)
1910 { 1955 {
1911 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;
1912 /* 1964 /*
1913 * Rxvt-style scrollbar: 1965 * Rxvt-style scrollbar:
1914 * move up if mouse is above slider 1966 * move up if mouse is above slider
1915 * move dn if mouse is below slider 1967 * move dn if mouse is below slider
1916 * 1968 *
… …
1925 /* 1977 /*
1926 * Mouse report disabled scrollbar: 1978 * Mouse report disabled scrollbar:
1927 * arrow buttons - send up/down 1979 * arrow buttons - send up/down
1928 * click on scrollbar - send pageup/down 1980 * click on scrollbar - send pageup/down
1929 */ 1981 */
1930 if ((scrollBar.style == R_SB_NEXT 1982 if (direction == UP)
1931 && scrollbarnext_upButton (ev.y))
1932 || (scrollBar.style == R_SB_RXVT
1933 && scrollbarrxvt_upButton (ev.y)))
1934 tt_printf ("\033[A"); 1983 tt_printf ("\033[A");
1935 else if ((scrollBar.style == R_SB_NEXT 1984 else if (direction == DN)
1936 && scrollbarnext_dnButton (ev.y))
1937 || (scrollBar.style == R_SB_RXVT
1938 && scrollbarrxvt_dnButton (ev.y)))
1939 tt_printf ("\033[B"); 1985 tt_printf ("\033[B");
1940 else 1986 else
1941 switch (ev.button) 1987 switch (ev.button)
1942 { 1988 {
1943 case Button2: 1989 case Button2:
… …
1950 tt_printf ("\033[5~"); 1996 tt_printf ("\033[5~");
1951 break; 1997 break;
1952 } 1998 }
1953 } 1999 }
1954 else 2000 else
1955#endif /* NO_SCROLLBAR_REPORT */ 2001#endif /* NO_SCROLLBAR_REPORT */
1956
1957 {
1958 char upordown = 0;
1959
1960 if (scrollBar.style == R_SB_NEXT)
1961 { 2002 {
1962 if (scrollbarnext_upButton (ev.y)) 2003 if (direction != NO_DIR)
1963 upordown = -1; /* up */
1964 else if (scrollbarnext_dnButton (ev.y))
1965 upordown = 1; /* down */
1966 }
1967 else if (scrollBar.style == R_SB_RXVT)
1968 {
1969 if (scrollbarrxvt_upButton (ev.y))
1970 upordown = -1; /* up */
1971 else if (scrollbarrxvt_dnButton (ev.y))
1972 upordown = 1; /* down */
1973 }
1974 if (upordown)
1975 { 2004 {
1976#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2005#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2006 if (!cont_scroll_ev.is_active ())
1977 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2007 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1978#endif 2008#endif
1979 if (scr_page (upordown < 0 ? UP : DN, 1)) 2009 if (scr_page (direction, 1))
1980 { 2010 {
1981 if (upordown < 0) 2011 if (direction == UP)
1982 scrollBar.setUp (); 2012 scrollBar.state = STATE_UP;
1983 else 2013 else
1984 scrollBar.setDn (); 2014 scrollBar.state = STATE_DOWN;
1985 } 2015 }
1986 } 2016 }
1987 else 2017 else
1988 switch (ev.button) 2018 switch (ev.button)
1989 { 2019 {
1990 case Button2: 2020 case Button2:
1991 switch (scrollbar_align) 2021 switch (scrollBar.align)
1992 { 2022 {
1993 case R_SB_ALIGN_TOP: 2023 case R_SB_ALIGN_TOP:
1994 csrO = 0; 2024 csrO = 0;
1995 break; 2025 break;
1996 case R_SB_ALIGN_CENTRE: 2026 case R_SB_ALIGN_CENTRE:
… …
2004 if (scrollBar.style == R_SB_XTERM 2034 if (scrollBar.style == R_SB_XTERM
2005 || scrollbar_above_slider (ev.y) 2035 || scrollbar_above_slider (ev.y)
2006 || scrollbar_below_slider (ev.y)) 2036 || scrollbar_below_slider (ev.y))
2007 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2037 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
2008 2038
2009 scrollBar.setMotion (); 2039 scrollBar.state = STATE_MOTION;
2010 break; 2040 break;
2011 2041
2012 case Button1: 2042 case Button1:
2013 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2043 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2014 csrO = ev.y - scrollBar.top; 2044 csrO = ev.y - scrollBar.top;
2015 /* FALLTHROUGH */ 2045 /* FALLTHROUGH */
2016 2046
2017 case Button3: 2047 case Button3:
2018 if (scrollBar.style != R_SB_XTERM) 2048 if (scrollBar.style != R_SB_XTERM)
… …
2028 scr_page (DN, nrow - 1); 2058 scr_page (DN, nrow - 1);
2029# else 2059# else
2030 scr_page (DN, nrow / 4); 2060 scr_page (DN, nrow / 4);
2031# endif 2061# endif
2032 else 2062 else
2033 scrollBar.setMotion (); 2063 scrollBar.state = STATE_MOTION;
2034 } 2064 }
2035 else 2065 else
2036 { 2066 {
2037 scr_page ((ev.button == Button1 ? DN : UP), 2067 scr_page ((ev.button == Button1 ? DN : UP),
2038 (nrow 2068 (nrow
… …
2055 2085
2056 csrO = 0; /* reset csr Offset */ 2086 csrO = 0; /* reset csr Offset */
2057 if (!bypass_keystate) 2087 if (!bypass_keystate)
2058 reportmode = !! (priv_modes & PrivMode_mouse_report); 2088 reportmode = !! (priv_modes & PrivMode_mouse_report);
2059 2089
2060 if (scrollbar_isUpDn ()) 2090 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2061 { 2091 {
2062 scrollBar.setIdle (); 2092 scrollBar.state = STATE_IDLE;
2063 scrollbar_show (0); 2093 scrollbar_show (0);
2064 } 2094 }
2065 2095
2066#ifdef SELECTION_SCROLLING 2096#ifdef SELECTION_SCROLLING
2067 if (sel_scroll_ev.active)
2068 sel_scroll_ev.stop(); 2097 sel_scroll_ev.stop();
2069#endif 2098#endif
2070 2099
2071 if (ev.window == vt) 2100 if (ev.window == vt)
2072 { 2101 {
2073 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)))
… …
2097 mouse_report (ev); 2126 mouse_report (ev);
2098 } 2127 }
2099#else /* MOUSE_REPORT_DOUBLECLICK */ 2128#else /* MOUSE_REPORT_DOUBLECLICK */
2100 MEvent.button = AnyButton; 2129 MEvent.button = AnyButton;
2101 mouse_report (ev); 2130 mouse_report (ev);
2102#endif /* MOUSE_REPORT_DOUBLECLICK */ 2131#endif /* MOUSE_REPORT_DOUBLECLICK */
2103 return; 2132 return;
2104 } 2133 }
2105 2134
2106 /* 2135 /*
2107 * dumb hack to compensate for the failure of click-and-drag 2136 * dumb hack to compensate for the failure of click-and-drag
… …
2119 selection_make (ev.time); 2148 selection_make (ev.time);
2120 break; 2149 break;
2121 2150
2122 case Button2: 2151 case Button2:
2123 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?
2124 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary); 2153 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2125 break; 2154 break;
2126 2155
2127#ifdef MOUSE_WHEEL 2156#ifdef MOUSE_WHEEL
2128 case Button4: 2157 case Button4:
2129 case Button5: 2158 case Button5:
… …
2133 2162
2134 v = ev.button == Button4 ? UP : DN; 2163 v = ev.button == Button4 ? UP : DN;
2135 2164
2136 if (ev.state & ShiftMask) 2165 if (ev.state & ShiftMask)
2137 i = 1; 2166 i = 1;
2138 else if (OPTION (Opt_mouseWheelScrollPage)) 2167 else if (option (Opt_mouseWheelScrollPage))
2139 i = nrow - 1; 2168 i = nrow - 1;
2140 else 2169 else
2141 i = 5; 2170 i = 5;
2142 2171
2143# ifdef MOUSE_SLIP_WHEELING 2172# ifdef MOUSE_SLIP_WHEELING
… …
2145 { 2174 {
2146 mouse_slip_wheel_speed += v ? -1 : 1; 2175 mouse_slip_wheel_speed += v ? -1 : 1;
2147 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2176 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2148 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2177 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2149 2178
2150 if (slip_wheel_ev.at < NOW) 2179 if (!slip_wheel_ev.is_active ())
2151 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2180 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2152
2153 slip_wheel_ev.start ();
2154 } 2181 }
2155 else 2182 else
2183# endif
2156 { 2184 {
2157# endif
2158 scr_page (v, i); 2185 scr_page (v, i);
2159 scrollbar_show (1); 2186 scrollbar_show (1);
2160# ifdef MOUSE_SLIP_WHEELING
2161 } 2187 }
2162# endif
2163 } 2188 }
2164 break; 2189 break;
2165#endif 2190#endif
2166 } 2191 }
2167 } 2192 }
2168} 2193}
2169
2170#ifdef TRANSPARENT
2171#if TINTING
2172/* taken from aterm-0.4.2 */
2173
2174typedef uint32_t RUINT32T;
2175
2176void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2177{
2178 int sh_r, sh_g, sh_b;
2179 RUINT32T mask_r, mask_g, mask_b;
2180 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2181 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2182 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2183 int i;
2184
2185 Visual *visual = term->visual;
2186
2187 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2188
2189 /* for convenience */
2190 mask_r = visual->red_mask;
2191 mask_g = visual->green_mask;
2192 mask_b = visual->blue_mask;
2193
2194 /* boring lookup table pre-initialization */
2195 switch (srcImage->bits_per_pixel) {
2196 case 15:
2197 if ((mask_r != 0x7c00) ||
2198 (mask_g != 0x03e0) ||
2199 (mask_b != 0x001f))
2200 return;
2201 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2202 lookup_r = lookup;
2203 lookup_g = lookup+32;
2204 lookup_b = lookup+32+32;
2205 sh_r = 10;
2206 sh_g = 5;
2207 sh_b = 0;
2208 break;
2209 case 16:
2210 if ((mask_r != 0xf800) ||
2211 (mask_g != 0x07e0) ||
2212 (mask_b != 0x001f))
2213 return;
2214 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2215 lookup_r = lookup;
2216 lookup_g = lookup+32;
2217 lookup_b = lookup+32+64;
2218 sh_r = 11;
2219 sh_g = 5;
2220 sh_b = 0;
2221 break;
2222 case 24:
2223 if ((mask_r != 0xff0000) ||
2224 (mask_g != 0x00ff00) ||
2225 (mask_b != 0x0000ff))
2226 return;
2227 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2228 lookup_r = lookup;
2229 lookup_g = lookup+256;
2230 lookup_b = lookup+256+256;
2231 sh_r = 16;
2232 sh_g = 8;
2233 sh_b = 0;
2234 break;
2235 case 32:
2236 if ((mask_r != 0xff0000) ||
2237 (mask_g != 0x00ff00) ||
2238 (mask_b != 0x0000ff))
2239 return;
2240 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2241 lookup_r = lookup;
2242 lookup_g = lookup+256;
2243 lookup_b = lookup+256+256;
2244 sh_r = 16;
2245 sh_g = 8;
2246 sh_b = 0;
2247 break;
2248 default:
2249 return; /* we do not support this color depth */
2250 }
2251
2252 /* prepare limits for color transformation (each channel is handled separately) */
2253 if (shade < 0) {
2254 shade = -shade;
2255 if (shade < 0) shade = 0;
2256 if (shade > 100) shade = 100;
2257
2258 lower_lim_r = 65535-rm;
2259 lower_lim_g = 65535-gm;
2260 lower_lim_b = 65535-bm;
2261
2262 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2263 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2264 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2265
2266 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2267 } else {
2268 if (shade < 0) shade = 0;
2269 if (shade > 100) shade = 100;
2270
2271 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2272
2273 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2274 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2275 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2276 }
2277
2278 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2279 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2280 {
2281 unsigned int tmp;
2282
2283 tmp = lower_lim_r;
2284 lower_lim_r = lower_lim_b;
2285 lower_lim_b = tmp;
2286
2287 tmp = upper_lim_r;
2288 upper_lim_r = upper_lim_b;
2289 upper_lim_b = tmp;
2290 }
2291
2292 /* fill our lookup tables */
2293 for (i = 0; i <= mask_r>>sh_r; i++)
2294 {
2295 RUINT32T tmp;
2296 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2297 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2298 lookup_r[i] = (tmp/65535)<<sh_r;
2299 }
2300 for (i = 0; i <= mask_g>>sh_g; i++)
2301 {
2302 RUINT32T tmp;
2303 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2304 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2305 lookup_g[i] = (tmp/65535)<<sh_g;
2306 }
2307 for (i = 0; i <= mask_b>>sh_b; i++)
2308 {
2309 RUINT32T tmp;
2310 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2311 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2312 lookup_b[i] = (tmp/65535)<<sh_b;
2313 }
2314
2315 /* apply table to input image (replacing colors by newly calculated ones) */
2316 switch (srcImage->bits_per_pixel)
2317 {
2318 case 15:
2319 {
2320 unsigned short *p1, *pf, *p, *pl;
2321 p1 = (unsigned short *) srcImage->data;
2322 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2323 while (p1 < pf)
2324 {
2325 p = p1;
2326 pl = p1 + srcImage->width;
2327 for (; p < pl; p++)
2328 {
2329 *p = lookup_r[(*p & 0x7c00)>>10] |
2330 lookup_g[(*p & 0x03e0)>> 5] |
2331 lookup_b[(*p & 0x001f)];
2332 }
2333 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2334 }
2335 break;
2336 }
2337 case 16:
2338 {
2339 unsigned short *p1, *pf, *p, *pl;
2340 p1 = (unsigned short *) srcImage->data;
2341 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2342 while (p1 < pf)
2343 {
2344 p = p1;
2345 pl = p1 + srcImage->width;
2346 for (; p < pl; p++)
2347 {
2348 *p = lookup_r[(*p & 0xf800)>>11] |
2349 lookup_g[(*p & 0x07e0)>> 5] |
2350 lookup_b[(*p & 0x001f)];
2351 }
2352 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2353 }
2354 break;
2355 }
2356 case 24:
2357 {
2358 unsigned char *p1, *pf, *p, *pl;
2359 p1 = (unsigned char *) srcImage->data;
2360 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2361 while (p1 < pf)
2362 {
2363 p = p1;
2364 pl = p1 + srcImage->width * 3;
2365 for (; p < pl; p += 3)
2366 {
2367 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2368 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2369 p[2] = lookup_r[(p[2] & 0x0000ff)];
2370 }
2371 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2372 }
2373 break;
2374 }
2375 case 32:
2376 {
2377 RUINT32T *p1, *pf, *p, *pl;
2378 p1 = (RUINT32T *) srcImage->data;
2379 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2380
2381 while (p1 < pf)
2382 {
2383 p = p1;
2384 pl = p1 + srcImage->width;
2385 for (; p < pl; p++)
2386 {
2387 *p = lookup_r[(*p & 0xff0000)>>16] |
2388 lookup_g[(*p & 0x00ff00)>> 8] |
2389 lookup_b[(*p & 0x0000ff)] |
2390 (*p & ~0xffffff);
2391 }
2392 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2393 }
2394 break;
2395 }
2396 }
2397
2398 free (lookup);
2399}
2400#endif
2401
2402/*
2403 * Check our parents are still who we think they are.
2404 * Do transparency updates if required
2405 */
2406int
2407rxvt_term::check_our_parents ()
2408{
2409 int i, pchanged, aformat, have_pixmap, rootdepth;
2410 unsigned long nitems, bytes_after;
2411 Atom atype;
2412 unsigned char *prop = NULL;
2413 Window root, oldp, *list;
2414 Pixmap rootpixmap = None;
2415 XWindowAttributes wattr, wrootattr;
2416
2417 pchanged = 0;
2418
2419 if (!OPTION (Opt_transparent))
2420 return pchanged; /* Don't try any more */
2421
2422 XGetWindowAttributes (xdisp, display->root, &wrootattr);
2423 rootdepth = wrootattr.depth;
2424
2425 XGetWindowAttributes (xdisp, parent[0], &wattr);
2426
2427 if (rootdepth != wattr.depth)
2428 {
2429 if (am_transparent)
2430 {
2431 pchanged = 1;
2432 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2433 am_transparent = am_pixmap_trans = 0;
2434 }
2435
2436 return pchanged; /* Don't try any more */
2437 }
2438
2439 /* Get all X ops out of the queue so that our information is up-to-date. */
2440 XSync (xdisp, False);
2441
2442 /*
2443 * Make the frame window set by the window manager have
2444 * the root background. Some window managers put multiple nested frame
2445 * windows for each client, so we have to take care about that.
2446 */
2447 i = (xa[XA_XROOTPMAP_ID]
2448 && XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
2449 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2450 &nitems, &bytes_after, &prop) == Success);
2451
2452 if (!i || prop == NULL)
2453 i = (xa[XA_ESETROOT_PMAP_ID]
2454 && XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
2455 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2456 &nitems, &bytes_after, &prop) == Success);
2457
2458 if (!i || prop == NULL
2459#if TINTING
2460 || !rs[Rs_color + Color_tint]
2461#endif
2462 )
2463 have_pixmap = 0;
2464 else
2465 {
2466 have_pixmap = 1;
2467 rootpixmap = *(Pixmap *)prop;
2468 XFree (prop);
2469 }
2470
2471 if (have_pixmap)
2472 {
2473 /*
2474 * Copy display->root pixmap transparency
2475 */
2476 int sx, sy, nx, ny;
2477 unsigned int nw, nh;
2478 Window cr;
2479 XImage *image;
2480 GC gc;
2481 XGCValues gcvalue;
2482
2483 XTranslateCoordinates (xdisp, parent[0], display->root,
2484 0, 0, &sx, &sy, &cr);
2485 nw = (unsigned int)szHint.width;
2486 nh = (unsigned int)szHint.height;
2487 nx = ny = 0;
2488
2489 if (sx < 0)
2490 {
2491 nw += sx;
2492 nx = -sx;
2493 sx = 0;
2494 }
2495
2496 if (sy < 0)
2497 {
2498 nh += sy;
2499 ny = -sy;
2500 sy = 0;
2501 }
2502
2503 min_it (nw, (unsigned int) (wrootattr.width - sx));
2504 min_it (nh, (unsigned int) (wrootattr.height - sy));
2505
2506 XSync (xdisp, False);
2507 allowedxerror = -1;
2508 image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2509
2510 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2511 /* XXX: may need a delay here? */
2512 allowedxerror = 0;
2513
2514 if (image == NULL)
2515 {
2516 if (am_transparent && am_pixmap_trans)
2517 {
2518 pchanged = 1;
2519 if (pixmap != None)
2520 {
2521 XFreePixmap (xdisp, pixmap);
2522 pixmap = None;
2523 }
2524 }
2525
2526 am_pixmap_trans = 0;
2527 }
2528 else
2529 {
2530 if (pixmap != None)
2531 XFreePixmap (xdisp, pixmap);
2532
2533#if TINTING
2534 if (ISSET_PIXCOLOR (Color_tint))
2535 {
2536 unsigned short rm, gm, bm;
2537 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2538
2539 pix_colors_focused[Color_tint].get (this, rm, gm, bm);
2540
2541 ShadeXImage (this, image, shade, rm, gm, bm);
2542 }
2543#endif
2544
2545 pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2546 gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2547 XPutImage (xdisp, pixmap, gc, image, 0, 0,
2548 nx, ny, image->width, image->height);
2549 XFreeGC (xdisp, gc);
2550 XDestroyImage (image);
2551 XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
2552 XClearWindow (xdisp, parent[0]);
2553
2554 if (!am_transparent || !am_pixmap_trans)
2555 pchanged = 1;
2556
2557 am_transparent = am_pixmap_trans = 1;
2558 }
2559 }
2560
2561 if (am_pixmap_trans)
2562 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2563 else
2564 {
2565 unsigned int n;
2566 /*
2567 * InheritPixmap transparency
2568 */
2569 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2570 {
2571 oldp = parent[i];
2572 XQueryTree (xdisp, parent[i - 1], &root,
2573 &parent[i], &list, &n);
2574 XFree (list);
2575
2576 if (parent[i] == display->root)
2577 {
2578 if (oldp != None)
2579 pchanged = 1;
2580
2581 break;
2582 }
2583
2584 if (oldp != parent[i])
2585 pchanged = 1;
2586 }
2587
2588 n = 0;
2589
2590 if (pchanged)
2591 {
2592 for (; n < (unsigned int)i; n++)
2593 {
2594 XGetWindowAttributes (xdisp, parent[n], &wattr);
2595 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2596 {
2597 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2598 break;
2599 }
2600 }
2601 }
2602
2603 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2604 {
2605 XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2606 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2607 am_transparent = 0;
2608 /* XXX: also turn off Opt_transparent? */
2609 }
2610 else
2611 {
2612 for (n = 0; n < (unsigned int)i; n++)
2613 {
2614 XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
2615 XClearWindow (xdisp, parent[n]);
2616 }
2617
2618 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2619 am_transparent = 1;
2620 }
2621
2622 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2623 parent[i] = None;
2624 }
2625
2626 if (scrollBar.win)
2627 {
2628 XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);
2629 scrollBar.setIdle ();
2630 scrollbar_show (0);
2631 }
2632
2633 if (am_transparent)
2634 {
2635 want_refresh = want_full_refresh = 1;
2636 if (am_pixmap_trans)
2637 flush ();
2638 }
2639
2640 return pchanged;
2641}
2642#endif
2643 2194
2644/*}}} */ 2195/*}}} */
2645 2196
2646bool 2197bool
2647rxvt_term::cmd_parse () 2198rxvt_term::cmd_parse ()
… …
2696 if (ch == C0_LF) 2247 if (ch == C0_LF)
2697 nlines++; 2248 nlines++;
2698 2249
2699 refresh_count++; 2250 refresh_count++;
2700 2251
2701 if (!OPTION (Opt_jumpScroll) 2252 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2702 || (refresh_count >= refresh_limit * (nrow - 1)))
2703 { 2253 {
2704 refreshnow = true;
2705 refresh_count = 0; 2254 refresh_count = 0;
2255
2256 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2257 {
2258 refreshnow = true;
2706 ch = NOCHAR; 2259 ch = NOCHAR;
2707 break; 2260 break;
2261 }
2708 } 2262 }
2709 2263
2710 // scr_add_lines only works for nlines <= nrow - 1. 2264 // scr_add_lines only works for nlines <= nrow - 1.
2711 if (nlines >= nrow - 1) 2265 if (nlines >= nrow - 1)
2712 { 2266 {
… …
2740 && 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))))
2741 scr_add_lines (buf, str - buf, nlines); 2295 scr_add_lines (buf, str - buf, nlines);
2742 2296
2743 /* 2297 /*
2744 * 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
2745 * 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.
2746 * the number of pages between refreshes is refresh_limit, which 2300 * if skipScroll is enabled.
2747 * is incremented here because we must be doing flat-out scrolling.
2748 */ 2301 */
2749 if (refreshnow) 2302 if (refreshnow)
2750 { 2303 {
2751 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2752 refresh_limit++;
2753 else
2754 {
2755 flag = true; 2304 flag = true;
2756 scr_refresh (); 2305 scr_refresh ();
2757 want_refresh = 1; 2306 want_refresh = 1;
2758 }
2759 } 2307 }
2760 2308
2761 } 2309 }
2762 else 2310 else
2763 { 2311 {
… …
2912 { 2460 {
2913 if ((buf[len++] = cmd_getc ()) == 'i') 2461 if ((buf[len++] = cmd_getc ()) == 'i')
2914 break; /* done = 1 */ 2462 break; /* done = 1 */
2915 } 2463 }
2916 } 2464 }
2917 2465
2918 for (i = 0; i < len; i++) 2466 for (i = 0; i < len; i++)
2919 if (putc (buf[i], fd) == EOF) 2467 if (putc (buf[i], fd) == EOF)
2920 { 2468 {
2921 done = 1; 2469 done = 1;
2922 break; 2470 break;
… …
2924 } 2472 }
2925 } 2473 }
2926 2474
2927 pclose_printer (fd); 2475 pclose_printer (fd);
2928} 2476}
2929#endif /* PRINTPIPE */ 2477#endif /* PRINTPIPE */
2930/*}}} */ 2478/*}}} */
2931 2479
2932/* *INDENT-OFF* */ 2480/* *INDENT-OFF* */
2933enum { 2481enum {
2934 C1_40 = 0x40, 2482 C1_40 = 0x40,
… …
2984 process_dcs_seq (); 2532 process_dcs_seq ();
2985 break; 2533 break;
2986 case 0x9b: /* CSI */ 2534 case 0x9b: /* CSI */
2987 process_csi_seq (); 2535 process_csi_seq ();
2988 break; 2536 break;
2989 case 0x9d: /* CSI */ 2537 case 0x9d: /* OSC */
2990 process_osc_seq (); 2538 process_osc_seq ();
2991 break; 2539 break;
2992#endif 2540#endif
2993 } 2541 }
2994} 2542}
… …
3084 scr_charset_set (2, (unsigned int)cmd_getc ()); 2632 scr_charset_set (2, (unsigned int)cmd_getc ());
3085 break; 2633 break;
3086 case '+': 2634 case '+':
3087 scr_charset_set (3, (unsigned int)cmd_getc ()); 2635 scr_charset_set (3, (unsigned int)cmd_getc ());
3088 break; 2636 break;
3089#if ENABLE_FRILLS 2637#if !ENABLE_MINIMAL
3090 case '6': 2638 case '6':
3091 scr_backindex (); 2639 scr_backindex ();
3092 break; 2640 break;
3093#endif 2641#endif
3094 case '7': 2642 case '7':
3095 scr_cursor (SAVE); 2643 scr_cursor (SAVE);
3096 break; 2644 break;
3097 case '8': 2645 case '8':
3098 scr_cursor (RESTORE); 2646 scr_cursor (RESTORE);
3099 break; 2647 break;
3100#if ENABLE_FRILLS 2648#if !ENABLE_MINIMAL
3101 case '9': 2649 case '9':
3102 scr_forwardindex (); 2650 scr_forwardindex ();
3103 break; 2651 break;
3104#endif 2652#endif
3105 case '=': 2653 case '=':
… …
3220rxvt_term::process_csi_seq () 2768rxvt_term::process_csi_seq ()
3221{ 2769{
3222 unicode_t ch, priv, i; 2770 unicode_t ch, priv, i;
3223 unsigned int nargs, p; 2771 unsigned int nargs, p;
3224 int n, ndef; 2772 int n, ndef;
3225 int arg[ESC_ARGS]; 2773 int arg[ESC_ARGS] = { };
3226 2774
3227 for (nargs = ESC_ARGS; nargs > 0;) 2775 nargs = 0;
3228 arg[--nargs] = 0;
3229 2776
3230 priv = 0; 2777 priv = 0;
3231 ch = cmd_getc (); 2778 ch = cmd_getc ();
3232 if (ch >= '<' && ch <= '?') 2779 if (ch >= '<' && ch <= '?')
2780 {
3233 { /* '<' '=' '>' '?' */ 2781 /* '<' '=' '>' '?' */
3234 priv = ch; 2782 priv = ch;
3235 ch = cmd_getc (); 2783 ch = cmd_getc ();
3236 } 2784 }
3237 2785
3238 /* read any numerical arguments */ 2786 /* read any numerical arguments */
… …
3277 switch (priv) 2825 switch (priv)
3278 { 2826 {
3279 case '>': 2827 case '>':
3280 if (ch == CSI_DA) /* secondary device attributes */ 2828 if (ch == CSI_DA) /* secondary device attributes */
3281 { 2829 {
3282 // 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,
3283 // '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).
3284 // 2832 //
3285 // 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
3286 // 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
3287 // that we do not support xterm mouse reporting (should be 95 when we do). 2835 // versions.
3288 // 2836 //
3289 tt_printf ("\033[>%c%c85;94;0c", VERSION[0], VERSION[2]); 2837 tt_printf ("\033[>%d;95;0c", 'U');
3290 } 2838 }
3291 break; 2839 break;
2840
3292 case '?': 2841 case '?':
3293 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2842 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3294 process_terminal_mode (ch, priv, nargs, arg); 2843 process_terminal_mode (ch, priv, nargs, arg);
3295 break; 2844 break;
3296 } 2845 }
… …
3421 break; 2970 break;
3422 case 6: /* CPR requested */ 2971 case 6: /* CPR requested */
3423 scr_report_position (); 2972 scr_report_position ();
3424 break; 2973 break;
3425 case 7: /* unofficial extension */ 2974 case 7: /* unofficial extension */
3426 if (OPTION (Opt_insecure)) 2975 if (option (Opt_insecure))
3427 tt_printf ("%-.250s\012", rs[Rs_display_name]); 2976 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3428 break; 2977 break;
3429 case 8: /* unofficial extension */ 2978 case 8: /* unofficial extension */
3430 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2979 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3431 break; 2980 break;
… …
3498 break; 3047 break;
3499 case CSI_75: 3048 case CSI_75:
3500 scr_cursor (RESTORE); 3049 scr_cursor (RESTORE);
3501 break; 3050 break;
3502 3051
3503#if ENABLE_FRILLS 3052#if !ENABLE_MINIMAL
3504 case CSI_74: 3053 case CSI_74:
3505 process_window_ops (arg, nargs); 3054 process_window_ops (arg, nargs);
3506 break; 3055 break;
3507#endif 3056#endif
3508 3057
… …
3515 break; 3064 break;
3516 } 3065 }
3517} 3066}
3518/*}}} */ 3067/*}}} */
3519 3068
3520#if ENABLE_FRILLS 3069#if !ENABLE_MINIMAL
3521/* ARGSUSED */ 3070/* ARGSUSED */
3522void 3071void
3523rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3072rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3524{ 3073{
3525 int x, y; 3074 int x, y;
3526 XWindowAttributes wattr; 3075 XWindowAttributes wattr;
3527 Window wdummy; 3076 Window wdummy;
3528 3077
3529 dLocal (Display *, xdisp); 3078 dLocal (Display *, dpy);
3530 3079
3531 if (nargs == 0) 3080 if (nargs == 0)
3532 return; 3081 return;
3533 3082
3534 switch (args[0]) 3083 switch (args[0])
3535 { 3084 {
3536 /* 3085 /*
3537 * commands 3086 * commands
3538 */ 3087 */
3539 case 1: /* deiconify window */ 3088 case 1: /* deiconify window */
3540 XMapWindow (xdisp, parent[0]); 3089 XMapWindow (dpy, parent[0]);
3541 break; 3090 break;
3542 case 2: /* iconify window */ 3091 case 2: /* iconify window */
3543 XIconifyWindow (xdisp, parent[0], display->screen); 3092 XIconifyWindow (dpy, parent[0], display->screen);
3544 break; 3093 break;
3545 case 3: /* set position (pixels) */ 3094 case 3: /* set position (pixels) */
3546 XMoveWindow (xdisp, parent[0], args[1], args[2]); 3095 XMoveWindow (dpy, parent[0], args[1], args[2]);
3547 break; 3096 break;
3548 case 4: /* set size (pixels) */ 3097 case 4: /* set size (pixels) */
3549 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3098 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3550 break; 3099 break;
3551 case 5: /* raise window */ 3100 case 5: /* raise window */
3552 XRaiseWindow (xdisp, parent[0]); 3101 XRaiseWindow (dpy, parent[0]);
3553 break; 3102 break;
3554 case 6: /* lower window */ 3103 case 6: /* lower window */
3555 XLowerWindow (xdisp, parent[0]); 3104 XLowerWindow (dpy, parent[0]);
3556 break; 3105 break;
3557 case 7: /* refresh window */ 3106 case 7: /* refresh window */
3558 scr_touch (true); 3107 scr_touch (true);
3559 break; 3108 break;
3560 case 8: /* set size (chars) */ 3109 case 8: /* set size (chars) */
… …
3567 if (args[0] >= 24) /* set height (chars) */ 3116 if (args[0] >= 24) /* set height (chars) */
3568 set_widthheight ((unsigned int)width, 3117 set_widthheight ((unsigned int)width,
3569 (unsigned int) (args[1] * fheight)); 3118 (unsigned int) (args[1] * fheight));
3570 break; 3119 break;
3571 3120
3572
3573 /* 3121 /*
3574 * reports - some output format copied from XTerm 3122 * reports - some output format copied from XTerm
3575 */ 3123 */
3576 case 11: /* report window state */ 3124 case 11: /* report window state */
3577 XGetWindowAttributes (xdisp, parent[0], &wattr); 3125 XGetWindowAttributes (dpy, parent[0], &wattr);
3578 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3126 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3579 break; 3127 break;
3580 case 13: /* report window position */ 3128 case 13: /* report window position */
3581 XGetWindowAttributes (xdisp, parent[0], &wattr); 3129 XGetWindowAttributes (dpy, parent[0], &wattr);
3582 XTranslateCoordinates (xdisp, parent[0], wattr.root, 3130 XTranslateCoordinates (dpy, parent[0], wattr.root,
3583 -wattr.border_width, -wattr.border_width, 3131 -wattr.border_width, -wattr.border_width,
3584 &x, &y, &wdummy); 3132 &x, &y, &wdummy);
3585 tt_printf ("\033[3;%d;%dt", x, y); 3133 tt_printf ("\033[3;%d;%dt", x, y);
3586 break; 3134 break;
3587 case 14: /* report window size (pixels) */ 3135 case 14: /* report window size (pixels) */
3588 XGetWindowAttributes (xdisp, parent[0], &wattr); 3136 XGetWindowAttributes (dpy, parent[0], &wattr);
3589 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3137 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3590 break; 3138 break;
3591 case 18: /* report text area size (chars) */ 3139 case 18: /* report text area size (chars) */
3592 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3140 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3593 break; 3141 break;
… …
3595 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3143 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3596 break; 3144 break;
3597 case 20: /* report icon label */ 3145 case 20: /* report icon label */
3598 { 3146 {
3599 char *s; 3147 char *s;
3600 XGetIconName (xdisp, parent[0], &s); 3148 XGetIconName (dpy, parent[0], &s);
3601 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 */
3602 XFree (s); 3150 XFree (s);
3603 } 3151 }
3604 break; 3152 break;
3605 case 21: /* report window title */ 3153 case 21: /* report window title */
3606 { 3154 {
3607 char *s; 3155 char *s;
3608 XFetchName (xdisp, parent[0], &s); 3156 XFetchName (dpy, parent[0], &s);
3609 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 */
3610 XFree (s); 3158 XFree (s);
3611 } 3159 }
3612 break; 3160 break;
3613 } 3161 }
3614} 3162}
… …
3641 seen_esc = true; 3189 seen_esc = true;
3642 continue; 3190 continue;
3643 } 3191 }
3644 else if (ch == C0_BEL || ch == CHAR_ST) 3192 else if (ch == C0_BEL || ch == CHAR_ST)
3645 break; 3193 break;
3194 else if (ch == C0_SYN)
3195 ch = cmd_get8 ();
3646 else if (ch < 0x20) 3196 else if (ch < 0x20)
3647 return NULL; /* other control character - exit */ 3197 return NULL; /* other control character - exit */
3648 3198
3649 seen_esc = false; 3199 seen_esc = false;
3650 3200
3651 if (n >= STRING_MAX - 1) 3201 if (n >= STRING_MAX - 1)
3652 // stop at some sane length 3202 // stop at some sane length
3653 return NULL; 3203 return NULL;
3654 3204
3655 if (ch == C0_SYN)
3656 string[n++] = cmd_get8 ();
3657 else
3658 string[n++] = ch; 3205 string[n++] = ch;
3659 } 3206 }
3660 3207
3661 string[n++] = '\0'; 3208 string[n++] = '\0';
3662 3209
3663 ends_how = (ch == 0x5c ? C0_ESC : ch); 3210 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3714void 3261void
3715rxvt_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)
3716{ 3263{
3717 if (str[0] == '?' && !str[1]) 3264 if (str[0] == '?' && !str[1])
3718 { 3265 {
3719 unsigned short r, g, b; 3266 rgba c;
3720 pix_colors_focused[color].get (this, 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
3721 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);
3722 } 3275 }
3723 else 3276 else
3724 set_window_color (color, str); 3277 set_window_color (color, str);
3725} 3278}
3726 3279
… …
3733 int color; 3286 int color;
3734 char *buf, *name; 3287 char *buf, *name;
3735 bool query = str[0] == '?' && !str[1]; 3288 bool query = str[0] == '?' && !str[1];
3736 int saveop = op; 3289 int saveop = op;
3737 3290
3738 dLocal (Display *, xdisp); 3291 dLocal (Display *, dpy);
3739 3292
3740 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
3741 switch (op) 3298 switch (op)
3742 { 3299 {
3743 case XTerm_name: 3300 case XTerm_name:
3744 set_title (str); 3301 set_title (str);
3745 /* FALLTHROUGH */ 3302 /* FALLTHROUGH */
… …
3759 unsigned long bytes_after; 3316 unsigned long bytes_after;
3760 unsigned char *value = 0; 3317 unsigned char *value = 0;
3761 const char *str = ""; 3318 const char *str = "";
3762 3319
3763 if (prop 3320 if (prop
3764 && XGetWindowProperty (xdisp, parent[0], 3321 && XGetWindowProperty (dpy, parent[0],
3765 prop, 0, 1<<16, 0, AnyPropertyType, 3322 prop, 0, 1<<16, 0, AnyPropertyType,
3766 &actual_type, &actual_format, 3323 &actual_type, &actual_format,
3767 &nitems, &bytes_after, &value) == Success 3324 &nitems, &bytes_after, &value) == Success
3768 && actual_type != None 3325 && actual_type != None
3769 && actual_format == 8) 3326 && actual_format == 8)
3770 str = (const char *)(value); 3327 str = (const char *)(value);
3771 3328
3772 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3329 tt_printf ("\033]%d;%s%c", op, str, resp);
3773 3330
3774 XFree (value); 3331 XFree (value);
3775 } 3332 }
3776 else 3333 else
3777 { 3334 {
… …
3781 { 3338 {
3782 *eq = 0; 3339 *eq = 0;
3783 set_utf8_property (display->atom (str), eq + 1); 3340 set_utf8_property (display->atom (str), eq + 1);
3784 } 3341 }
3785 else 3342 else
3786 XDeleteProperty (xdisp, parent[0], 3343 XDeleteProperty (dpy, parent[0],
3787 display->atom (str)); 3344 display->atom (str));
3788 } 3345 }
3789 break; 3346 break;
3790 3347
3791 case XTerm_Color: 3348 case XTerm_Color:
… …
3801 break; 3358 break;
3802 3359
3803 if ((buf = strchr (name, ';')) != NULL) 3360 if ((buf = strchr (name, ';')) != NULL)
3804 *buf++ = '\0'; 3361 *buf++ = '\0';
3805 3362
3806 if (name[0] == '?' && !name[1]) 3363 process_color_seq (op, color, name, resp);
3807 {
3808 unsigned short r, g, b;
3809 pix_colors_focused[color].get (this, r, g, b);
3810 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3811 }
3812 else
3813 set_window_color (color, name);
3814 } 3364 }
3815 break; 3365 break;
3366 case Rxvt_restoreFG:
3816 case XTerm_Color00: 3367 case XTerm_Color00:
3817 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3368 process_color_seq (op, Color_fg, str, resp);
3818 break; 3369 break;
3370 case Rxvt_restoreBG:
3819 case XTerm_Color01: 3371 case XTerm_Color01:
3820 process_color_seq (XTerm_Color01, Color_bg, str, resp); 3372 process_color_seq (op, Color_bg, str, resp);
3821 break; 3373 break;
3822#ifndef NO_CURSORCOLOR 3374#ifndef NO_CURSORCOLOR
3823 case XTerm_Color_cursor: 3375 case XTerm_Color_cursor:
3824 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3376 process_color_seq (op, Color_cursor, str, resp);
3825 break; 3377 break;
3826#endif 3378#endif
3827 case XTerm_Color_pointer_fg: 3379 case XTerm_Color_pointer_fg:
3828 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3380 process_color_seq (op, Color_pointer_fg, str, resp);
3829 break; 3381 break;
3830 case XTerm_Color_pointer_bg: 3382 case XTerm_Color_pointer_bg:
3831 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3383 process_color_seq (op, Color_pointer_bg, str, resp);
3832 break; 3384 break;
3833#ifndef NO_BOLD_UNDERLINE_REVERSE 3385#ifndef NO_BOLD_UNDERLINE_REVERSE
3834 case XTerm_Color_RV: 3386 case XTerm_Color_RV:
3835 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3387 process_color_seq (op, Color_RV, str, resp);
3836 break; 3388 break;
3837 case Rxvt_Color_BD: 3389 case Rxvt_Color_BD:
3838 case URxvt_Color_BD: 3390 case URxvt_Color_BD:
3839 process_color_seq (op, Color_BD, str, resp); 3391 process_color_seq (op, Color_BD, str, resp);
3840 break; 3392 break;
3841 case Rxvt_Color_UL: 3393 case Rxvt_Color_UL:
3842 case URxvt_Color_UL: 3394 case URxvt_Color_UL:
3843 process_color_seq (op, Color_UL, str, resp); 3395 process_color_seq (op, Color_UL, str, resp);
3844 break; 3396 break;
3845 case URxvt_Color_IT: 3397 case URxvt_Color_IT:
3846 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3398 process_color_seq (op, Color_IT, str, resp);
3847 break; 3399 break;
3848#endif 3400#endif
3849#if TRANSPARENT && TINTING 3401#if ENABLE_TRANSPARENCY
3850 case URxvt_Color_tint: 3402 case URxvt_Color_tint:
3851 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3403 process_color_seq (op, Color_tint, str, resp);
3852 check_our_parents (); 3404 {
3853 if (am_transparent) 3405 bool changed = false;
3854 want_full_refresh = want_refresh = 1;
3855 break;
3856#endif
3857 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
3858 case Rxvt_Pixmap: 3420 case Rxvt_Pixmap:
3859 { 3421 if (!strcmp (str, "?"))
3860 if (*str != ';')
3861 { 3422 {
3862#if XPM_BACKGROUND 3423 char str[256];
3863 scale_pixmap (""); /* reset to default scaling */ 3424
3864 set_bgPixmap (str); /* change pixmap */ 3425 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3865 scr_touch (true); 3426 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3866#endif 3427 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3428 process_xterm_seq (XTerm_title, str, CHAR_ST);
3867 } 3429 }
3868 3430 else
3431 {
3869 int changed = 0; 3432 int changed = 0;
3870 3433
3871 while ((str = strchr (str, ';')) != NULL) 3434 if (*str != ';')
3872 { 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 {
3873 str++; 3447 str++;
3874#if XPM_BACKGROUND 3448 if (bgPixmap.set_geometry (str))
3875 changed += scale_pixmap (str); 3449 changed++;
3876#endif 3450 str = strchr (str, ';');
3877 } 3451 }
3878 3452
3879 if (changed) 3453 if (changed)
3880 { 3454 update_background ();
3881#ifdef XPM_BACKGROUND
3882 resize_pixmap ();
3883 scr_touch (true);
3884#endif
3885 } 3455 }
3886 }
3887 break; 3456 break;
3888 3457#endif
3889 case Rxvt_restoreFG:
3890 set_window_color (Color_fg, str);
3891 break;
3892 case Rxvt_restoreBG:
3893 set_window_color (Color_bg, str);
3894 break;
3895 3458
3896 case XTerm_logfile: 3459 case XTerm_logfile:
3897 // TODO, when secure mode? 3460 // TODO, when secure mode?
3898 break; 3461 break;
3899 3462
… …
3917 case URxvt_italicFont: 3480 case URxvt_italicFont:
3918 case URxvt_boldItalicFont: 3481 case URxvt_boldItalicFont:
3919#endif 3482#endif
3920 if (query) 3483 if (query)
3921 tt_printf ("\33]%d;%-.250s%c", saveop, 3484 tt_printf ("\33]%d;%-.250s%c", saveop,
3922 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3485 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3923 ? fontset[op - URxvt_font]->fontdesc : "", 3486 ? fontset[op - URxvt_font]->fontdesc : "",
3924 resp); 3487 resp);
3925 else 3488 else
3926 { 3489 {
3927 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3490 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3930 allocated.push_back ((void *)res); 3493 allocated.push_back ((void *)res);
3931 set_fonts (); 3494 set_fonts ();
3932 } 3495 }
3933 break; 3496 break;
3934 3497
3935#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
3936 case URxvt_locale: 3507 case URxvt_locale:
3937 if (query) 3508 if (query)
3938 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);
3939 else 3510 else
3940 { 3511 {
3941 set_locale (str); 3512 set_locale (str);
3942 pty->set_utf8_mode (enc_utf8); 3513 pty->set_utf8_mode (enc_utf8);
3943 init_xlocale (); 3514 init_xlocale ();
… …
3958 break; 3529 break;
3959#endif 3530#endif
3960 3531
3961#if ENABLE_PERL 3532#if ENABLE_PERL
3962 case URxvt_perl: 3533 case URxvt_perl:
3963 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)))
3964 ; // no responses yet 3535 ; // no responses yet
3965 break; 3536 break;
3966#endif 3537#endif
3967 } 3538 }
3968} 3539}
… …
4006{ 3577{
4007 unsigned int i, j; 3578 unsigned int i, j;
4008 int state; 3579 int state;
4009 3580
4010 static const struct 3581 static const struct
4011 { 3582 {
4012 const int argval; 3583 const int argval;
4013 const unsigned long bit; 3584 const unsigned long bit;
4014 }
4015
4016 argtopriv[] = { 3585 } argtopriv[] = {
4017 { 1, PrivMode_aplCUR }, 3586 { 1, PrivMode_aplCUR },
4018 { 2, PrivMode_vt52 }, 3587 { 2, PrivMode_vt52 },
4019 { 3, PrivMode_132 }, 3588 { 3, PrivMode_132 },
4020 { 4, PrivMode_smoothScroll }, 3589 { 4, PrivMode_smoothScroll },
4021 { 5, PrivMode_rVideo }, 3590 { 5, PrivMode_rVideo },
… …
4037 { 66, PrivMode_aplKP }, 3606 { 66, PrivMode_aplKP },
4038#ifndef NO_BACKSPACE_KEY 3607#ifndef NO_BACKSPACE_KEY
4039 { 67, PrivMode_BackSpace }, 3608 { 67, PrivMode_BackSpace },
4040#endif 3609#endif
4041 { 1000, PrivMode_MouseX11 }, 3610 { 1000, PrivMode_MouseX11 },
4042 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3611 { 1002, PrivMode_MouseBtnEvent },
4043 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3612 { 1003, PrivMode_MouseAnyEvent },
4044 // 1003 Use All Motion Mouse Tracking. NYI, TODO
4045 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3613 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4046 { 1011, PrivMode_Keypress }, // rxvt extension 3614 { 1011, PrivMode_Keypress }, // rxvt extension
4047 // 1035 enable modifiers for alt, numlock NYI 3615 // 1035 enable modifiers for alt, numlock NYI
4048 // 1036 send ESC for meta keys NYI 3616 // 1036 send ESC for meta keys NYI
4049 // 1037 send DEL for keypad delete NYI 3617 // 1037 send DEL for keypad delete NYI
4050 { 1047, PrivMode_Screen }, 3618 { 1047, PrivMode_Screen },
4051 // 1048 save and restore cursor 3619 // 1048 save and restore cursor
4052 { 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 */
4053 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3621 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3622 { 2004, PrivMode_BracketPaste },
4054 }; 3623 };
4055 3624
4056 if (nargs == 0) 3625 if (nargs == 0)
4057 return; 3626 return;
4058 3627
… …
4084 scr_touch (true); 3653 scr_touch (true);
4085 break; 3654 break;
4086#endif 3655#endif
4087 case 1048: /* alternative cursor save */ 3656 case 1048: /* alternative cursor save */
4088 case 1049: 3657 case 1049:
4089 if (OPTION (Opt_secondaryScreen)) 3658 if (option (Opt_secondaryScreen))
4090 if (mode == 0) 3659 if (mode == 0)
4091 scr_cursor (RESTORE); 3660 scr_cursor (RESTORE);
4092 else if (mode == 1) 3661 else if (mode == 1)
4093 scr_cursor (SAVE); 3662 scr_cursor (SAVE);
4094 break; 3663 break;
… …
4106 */ 3675 */
4107 PrivMode (1, PrivMode_vt52); 3676 PrivMode (1, PrivMode_vt52);
4108 break; 3677 break;
4109 case 3: /* 80/132 */ 3678 case 3: /* 80/132 */
4110 if (priv_modes & PrivMode_132OK) 3679 if (priv_modes & PrivMode_132OK)
3680 {
3681 scr_poweron ();
4111 set_widthheight (((state ? 132 : 80) * fwidth), height); 3682 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight);
3683 }
4112 break; 3684 break;
4113 case 4: /* smooth scrolling */ 3685 case 4: /* smooth scrolling */
4114 set_option (Opt_jumpScroll, !state); 3686 set_option (Opt_jumpScroll, !state);
4115 break; 3687 break;
4116 case 5: /* reverse video */ 3688 case 5: /* reverse video */
… …
4123 scr_autowrap (state); 3695 scr_autowrap (state);
4124 break; 3696 break;
4125 /* 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 */
4126 case 9: /* X10 mouse reporting */ 3698 case 9: /* X10 mouse reporting */
4127 if (state) /* orthogonal */ 3699 if (state) /* orthogonal */
4128 priv_modes &= ~PrivMode_MouseX11; 3700 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4129 break; 3701 break;
4130#ifdef scrollBar_esc 3702#ifdef scrollBar_esc
4131 case scrollBar_esc: 3703 case scrollBar_esc:
4132 if (scrollbar_mapping (state)) 3704 if (scrollbar_mapping (state))
4133 { 3705 {
… …
4146 break; 3718 break;
4147 /* case 66: - application key pad */ 3719 /* case 66: - application key pad */
4148 /* case 67: - backspace key */ 3720 /* case 67: - backspace key */
4149 case 1000: /* X11 mouse reporting */ 3721 case 1000: /* X11 mouse reporting */
4150 if (state) /* orthogonal */ 3722 if (state) /* orthogonal */
4151 priv_modes &= ~PrivMode_MouseX10; 3723 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4152 break; 3724 break;
4153#if 0
4154 case 1001: 3725 case 1002:
4155 break; /* X11 mouse highlighting */ 3726 case 1003:
4156#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;
4157 case 1010: /* scroll to bottom on TTY output inhibit */ 3737 case 1010: /* scroll to bottom on TTY output inhibit */
4158 set_option (Opt_scrollTtyOutput, !state); 3738 set_option (Opt_scrollTtyOutput, !state);
4159 break; 3739 break;
4160 case 1011: /* scroll to bottom on key press */ 3740 case 1011: /* scroll to bottom on key press */
4161 set_option (Opt_scrollTtyKeypress, state); 3741 set_option (Opt_scrollTtyKeypress, state);
4162 break; 3742 break;
4163 case 1047: /* secondary screen w/ clearing last */ 3743 case 1047: /* secondary screen w/ clearing last */
4164 if (OPTION (Opt_secondaryScreen)) 3744 if (option (Opt_secondaryScreen))
4165 if (current_screen != PRIMARY) 3745 if (current_screen != PRIMARY)
4166 scr_erase_screen (2); 3746 scr_erase_screen (2);
4167 scr_change_screen (state); 3747 scr_change_screen (state);
4168 break; 3748 break;
4169 case 1049: /* secondary screen w/ clearing first */ 3749 case 1049: /* secondary screen w/ clearing first */
4170 scr_change_screen (state); 3750 scr_change_screen (state);
4171 if (OPTION (Opt_secondaryScreen)) 3751 if (option (Opt_secondaryScreen))
4172 if (current_screen != PRIMARY) 3752 if (current_screen != PRIMARY)
4173 scr_erase_screen (2); 3753 scr_erase_screen (2);
4174 break; 3754 break;
4175 default: 3755 default:
4176 break; 3756 break;
… …
4304 scr_color (Color_bg, Color_bg); 3884 scr_color (Color_bg, Color_bg);
4305 break; 3885 break;
4306 3886
4307 //case 50: // not variable spacing 3887 //case 50: // not variable spacing
4308 3888
4309#if ENABLE_FRILLS 3889#if !ENABLE_MINIMAL
4310 case 90: 3890 case 90:
4311 case 91: /* set bright fg color */ 3891 case 91: /* set bright fg color */
4312 case 92: 3892 case 92:
4313 case 93: 3893 case 93:
4314 case 94: 3894 case 94:
… …
4338rxvt_term::process_graphics () 3918rxvt_term::process_graphics ()
4339{ 3919{
4340 unicode_t ch, cmd = cmd_getc (); 3920 unicode_t ch, cmd = cmd_getc ();
4341 3921
4342 if (cmd == 'Q') 3922 if (cmd == 'Q')
3923 {
4343 { /* query graphics */ 3924 /* query graphics */
4344 tt_printf ("\033G0\012"); /* no graphics */ 3925 tt_printf ("\033G0\012"); /* no graphics */
4345 return; 3926 return;
4346 } 3927 }
4347 /* swallow other graphics sequences until terminating ':' */ 3928 /* swallow other graphics sequences until terminating ':' */
4348 do 3929 do
… …
4398 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 3979 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4399 3980
4400 memcpy (v_buffer + v_buflen, data, len); 3981 memcpy (v_buffer + v_buflen, data, len);
4401 v_buflen += len; 3982 v_buflen += len;
4402 3983
4403 pty_ev.set (EVENT_READ | EVENT_WRITE); 3984 pty_ev.set (ev::READ | ev::WRITE);
4404} 3985}
4405 3986
4406void rxvt_term::pty_write () 3987void rxvt_term::pty_write ()
4407{ 3988{
4408 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));
… …
4413 3994
4414 if (v_buflen == 0) 3995 if (v_buflen == 0)
4415 { 3996 {
4416 free (v_buffer); 3997 free (v_buffer);
4417 v_buffer = 0; 3998 v_buffer = 0;
4418 v_buflen = 0;
4419 3999
4420 pty_ev.set (EVENT_READ); 4000 pty_ev.set (ev::READ);
4421 return; 4001 return;
4422 } 4002 }
4423 4003
4424 memmove (v_buffer, v_buffer + written, v_buflen); 4004 memmove (v_buffer, v_buffer + written, v_buflen);
4425 } 4005 }
4426 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4006 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4427 pty_ev.set (EVENT_READ); 4007 pty_ev.set (ev::READ);
4428} 4008}
4429 4009
4430/*----------------------- end-of-file (C source) -----------------------*/ 4010/*----------------------- end-of-file (C source) -----------------------*/
4431 4011

Diff Legend

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