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.303 by root, Tue Jan 31 21:47:56 2006 UTC vs.
Revision 1.409 by ayin, Sat Feb 16 15:39:20 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.
… …
95 XK_Shift_L, 0x21e7, 96 XK_Shift_L, 0x21e7,
96 XK_Shift_R, 0x21e7, 97 XK_Shift_R, 0x21e7,
97 98
98 XK_Shift_Lock, 0x21eb, 99 XK_Shift_Lock, 0x21eb,
99 XK_ISO_Lock, 0x21eb, 100 XK_ISO_Lock, 0x21eb,
100 XK_ISO_Lock, 0x21eb,
101 XK_Caps_Lock, 0x21ec, 101 XK_Caps_Lock, 0x21ec,
102 XK_Num_Lock, 0x21ed, 102 XK_Num_Lock, 0x21ed,
103 XK_ISO_Level3_Shift, 0x21ee, 103 XK_ISO_Level3_Shift, 0x21ee,
104 XK_ISO_Level3_Lock, 0x21ef, 104 XK_ISO_Level3_Lock, 0x21ef,
105 XK_ISO_Group_Lock, 0x21f0, 105 XK_ISO_Group_Lock, 0x21f0,
… …
199 r & RS_Uline ? " uline" : "", 199 r & RS_Uline ? " uline" : "",
200 r & RS_Careful ? " careful" : ""); 200 r & RS_Careful ? " careful" : "");
201 201
202 int width = wcswidth (fname, wcslen (fname)); 202 int width = wcswidth (fname, wcslen (fname));
203 203
204 max_it (width, 8+5); // for char + hey 204 max_it (width, 8+5); // for char + hex
205 max_it (width, strlen (attr)); 205 max_it (width, strlen (attr));
206 206
207 if (y >= 0) 207 if (y >= 0)
208 { 208 {
209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
… …
221 ch = *chr++; 221 ch = *chr++;
222 222
223 sprintf (buf, "%8x", ch); 223 sprintf (buf, "%8x", ch);
224 scr_overlay_set (0, y, buf); 224 scr_overlay_set (0, y, buf);
225 scr_overlay_set (9, y, '='); 225 scr_overlay_set (9, y, '=');
226# if !UNICODE3 226# if !UNICODE_3
227 if (ch >= 0x10000) 227 if (ch >= 0x10000)
228 ch = 0xfffd; 228 ch = 0xfffd;
229# endif 229# endif
230 scr_overlay_set (11, y, ch, r); 230 scr_overlay_set (11, y, ch, r);
231 231
… …
279 } 279 }
280 280
281 iso14755buf = 0; 281 iso14755buf = 0;
282} 282}
283 283
284int 284static int
285rxvt_term::hex_keyval (XKeyEvent &ev) 285hex_keyval (XKeyEvent &ev)
286{ 286{
287 // check wether this event corresponds to a hex digit 287 // check wether this event corresponds to a hex digit
288 // if the modifiers had not been pressed. 288 // if the modifiers had not been pressed.
289 for (int index = 0; index < 8; index++) 289 for (int index = 0; index < 8; index++)
290 { 290 {
… …
298 298
299 return -1; 299 return -1;
300} 300}
301#endif 301#endif
302 302
303/*{{{ 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
339static inline int
340map_function_key (KeySym keysym)
341{
342 int param = 0;
343
344 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
345 {
346 param = 11 + keysym - XK_F1;
347 if (keysym >= XK_F17)
348 param += 4;
349 else if (keysym >= XK_F15)
350 param += 3;
351 else if (keysym >= XK_F11)
352 param += 2;
353 else if (keysym >= XK_F6)
354 param += 1;
355 }
356 else
357 switch (keysym)
358 {
359 case XK_Find:
360 param = 1;
361 break;
362 case XK_Insert:
363 param = 2;
364 break;
365#ifdef DXK_Remove
366 case DXK_Remove:
367#endif
368 case XK_Execute:
369 param = 3;
370 break;
371 case XK_Select:
372 param = 4;
373 break;
374#ifndef UNSHIFTED_SCROLLKEYS
375 case XK_Prior:
376 param = 5;
377 break;
378 case XK_Next:
379 param = 6;
380 break;
381#endif
382 case XK_Help:
383 param = 28;
384 break;
385 case XK_Menu:
386 param = 29;
387 break;
388 }
389 return param;
390}
391
304void 392void
305rxvt_term::lookup_key (XKeyEvent &ev) 393rxvt_term::key_press (XKeyEvent &ev)
306{ 394{
307 int ctrl, meta, shft, len; 395 int ctrl, meta, shft, len;
308 unsigned int newlen;
309 KeySym keysym; 396 KeySym keysym;
310 int valid_keysym; 397 int valid_keysym;
311 char kbuf[KBUFSZ]; 398 char kbuf[KBUFSZ];
399
400#if ISO_14755
401 if (iso14755buf & ISO_14755_52)
402 return;
403#endif
312 404
313 /* 405 /*
314 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 406 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
315 * escape sequence to toggle the Keypad. 407 * escape sequence to toggle the Keypad.
316 * 408 *
… …
496# if ISO_14755 588# if ISO_14755
497 iso14755_51 (0); 589 iso14755_51 (0);
498# endif 590# endif
499 return; 591 return;
500 } 592 }
593 else if (keysym == XK_BackSpace)
594 {
595 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
596# if ISO_14755
597 iso14755_51 (iso14755buf & ISO_14755_MASK);
598# endif
599 return;
600 }
501 else if ((hv = hex_keyval (ev)) >= 0) 601 else if ((hv = hex_keyval (ev)) >= 0)
502 { 602 {
503 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK) 603 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
504 | hv | ISO_14755_51; 604 | hv | ISO_14755_51;
505# if ISO_14755 605# if ISO_14755
… …
507# endif 607# endif
508 return; 608 return;
509 } 609 }
510 else 610 else
511 { 611 {
512# if ENABLE_OVERLAY 612# if ISO_14755
513 scr_overlay_off (); 613 scr_overlay_off ();
514# endif 614# endif
515 iso14755buf = 0; 615 iso14755buf = 0;
516 } 616 }
517 } 617 }
518 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 618 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
519 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 619 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
520 if (!(iso14755buf & ISO_14755_STARTED)) 620 if (!(iso14755buf & ISO_14755_STARTED))
521 { 621 {
522 iso14755buf |= ISO_14755_STARTED; 622 iso14755buf |= ISO_14755_STARTED;
523# if ENABLE_OVERLAY 623# if ISO_14755
524 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 624 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
525 scr_overlay_set (0, 0, "ISO 14755 mode"); 625 scr_overlay_set (0, 0, "ISO 14755 mode");
526# endif 626# endif
527 } 627 }
528#endif 628#endif
529 629
530#ifdef PRINTPIPE 630#ifdef PRINTPIPE
531 if (keysym == XK_Print) 631 if (keysym == XK_Print)
532 { 632 {
533 scr_printscreen (ctrl | shft); 633 scr_printscreen (ctrl | shft);
534 return; 634 return;
535 } 635 }
536#endif 636#endif
537 637
538 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 638 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
539 { 639 {
540 { 640 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
541 newlen = 1; 641 unsigned int newlen = 1;
542 switch (keysym) 642
643 switch (translate_keypad (keysym, kp))
543 { 644 {
544#ifndef NO_BACKSPACE_KEY 645#ifndef NO_BACKSPACE_KEY
545 case XK_BackSpace: 646 case XK_BackSpace:
546 if (priv_modes & PrivMode_HaveBackSpace) 647 if (priv_modes & PrivMode_HaveBackSpace)
547 { 648 {
548 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace) 649 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
549 ^ !!ctrl) ? '\b' : '\177'; 650 ^ !!ctrl) ? '\b' : '\177';
550 kbuf[1] = '\0'; 651 kbuf[1] = '\0';
551 } 652 }
552 else 653 else
553 strcpy (kbuf, key_backspace); 654 strcpy (kbuf, rs[Rs_backspace_key]);
554 break; 655 break;
555#endif 656#endif
556#ifndef NO_DELETE_KEY 657#ifndef NO_DELETE_KEY
557# ifdef XK_KP_Prior
558 case XK_KP_Delete:
559 /* allow shift to override */
560 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
561 {
562 strcpy (kbuf, "\033On");
563 break;
564 }
565 /* FALLTHROUGH */
566# endif
567 case XK_Delete: 658 case XK_Delete:
568 strcpy (kbuf, key_delete); 659 strcpy (kbuf, rs[Rs_delete_key]);
569 break; 660 break;
570#endif 661#endif
571 case XK_Tab: 662 case XK_Tab:
572 if (shft) 663 if (shft)
573 strcpy (kbuf, "\033[Z"); 664 strcpy (kbuf, "\033[Z");
… …
583#endif 674#endif
584 newlen = 0; 675 newlen = 0;
585 } 676 }
586 break; 677 break;
587 678
588#ifdef XK_KP_Left
589 case XK_KP_Up: /* \033Ox or standard */
590 case XK_KP_Down: /* \033Or or standard */
591 case XK_KP_Right: /* \033Ov or standard */
592 case XK_KP_Left: /* \033Ot or standard */
593 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
594 {
595 strcpy (kbuf, "\033OZ");
596 kbuf[2] = "txvr"[keysym - XK_KP_Left];
597 break;
598 }
599 else
600 /* translate to std. cursor key */
601 keysym = XK_Left + (keysym - XK_KP_Left);
602 /* FALLTHROUGH */
603#endif
604 case XK_Up: /* "\033[A" */ 679 case XK_Up: /* "\033[A" */
605 case XK_Down: /* "\033[B" */ 680 case XK_Down: /* "\033[B" */
606 case XK_Right: /* "\033[C" */ 681 case XK_Right: /* "\033[C" */
607 case XK_Left: /* "\033[D" */ 682 case XK_Left: /* "\033[D" */
608 strcpy (kbuf, "\033[Z"); 683 strcpy (kbuf, "\033[Z");
… …
617 } 692 }
618 else if (priv_modes & PrivMode_aplCUR) 693 else if (priv_modes & PrivMode_aplCUR)
619 kbuf[1] = 'O'; 694 kbuf[1] = 'O';
620 break; 695 break;
621 696
622#ifndef UNSHIFTED_SCROLLKEYS
623# ifdef XK_KP_Prior
624 case XK_KP_Prior:
625 /* allow shift to override */
626 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
627 {
628 strcpy (kbuf, "\033Oy");
629 break;
630 }
631 /* FALLTHROUGH */
632# endif
633 case XK_Prior:
634 strcpy (kbuf, "\033[5~");
635 break;
636# ifdef XK_KP_Next
637 case XK_KP_Next:
638 /* allow shift to override */
639 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
640 {
641 strcpy (kbuf, "\033Os");
642 break;
643 }
644 /* FALLTHROUGH */
645# endif
646 case XK_Next:
647 strcpy (kbuf, "\033[6~");
648 break;
649#endif
650 case XK_KP_Enter: 697 case XK_KP_Enter:
651 /* allow shift to override */ 698 /* allow shift to override */
652 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 699 if (kp)
653 { 700 {
654 strcpy (kbuf, "\033OM"); 701 strcpy (kbuf, "\033OM");
655 break; 702 break;
656 } 703 }
657 704
… …
669 kbuf[0] = '\015'; 716 kbuf[0] = '\015';
670 kbuf[1] = '\0'; 717 kbuf[1] = '\0';
671 } 718 }
672 break; 719 break;
673 720
674#ifdef XK_KP_Begin
675 case XK_KP_Begin:
676 strcpy (kbuf, "\033Ou");
677 break;
678
679#endif
680 case XK_KP_F1: /* "\033OP" */ 721 case XK_KP_F1: /* "\033OP" */
681 case XK_KP_F2: /* "\033OQ" */ 722 case XK_KP_F2: /* "\033OQ" */
682 case XK_KP_F3: /* "\033OR" */ 723 case XK_KP_F3: /* "\033OR" */
683 case XK_KP_F4: /* "\033OS" */ 724 case XK_KP_F4: /* "\033OS" */
684 strcpy (kbuf, "\033OP"); 725 strcpy (kbuf, "\033OP");
… …
700 case XK_KP_6: /* "\033Ov" : "6" */ 741 case XK_KP_6: /* "\033Ov" : "6" */
701 case XK_KP_7: /* "\033Ow" : "7" */ 742 case XK_KP_7: /* "\033Ow" : "7" */
702 case XK_KP_8: /* "\033Ox" : "8" */ 743 case XK_KP_8: /* "\033Ox" : "8" */
703 case XK_KP_9: /* "\033Oy" : "9" */ 744 case XK_KP_9: /* "\033Oy" : "9" */
704 /* allow shift to override */ 745 /* allow shift to override */
705 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 746 if (kp)
706 { 747 {
707 strcpy (kbuf, "\033Oj"); 748 strcpy (kbuf, "\033Oj");
708 kbuf[2] += (keysym - XK_KP_Multiply); 749 kbuf[2] += (keysym - XK_KP_Multiply);
709 } 750 }
710 else 751 else
… …
712 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 753 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
713 kbuf[1] = '\0'; 754 kbuf[1] = '\0';
714 } 755 }
715 break; 756 break;
716 757
717 case XK_Find:
718 strcpy (kbuf, "\033[1~");
719 break;
720
721#ifdef XK_KP_End
722 case XK_KP_Insert:
723 /* allow shift to override */
724 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
725 {
726 strcpy (kbuf, "\033Op");
727 break;
728 }
729 /* FALLTHROUGH */
730#endif
731 case XK_Insert:
732 strcpy (kbuf, "\033[2~");
733 break;
734#ifdef DXK_Remove /* support for DEC remove like key */
735 case DXK_Remove:
736 /* FALLTHROUGH */
737#endif
738 case XK_Execute:
739 strcpy (kbuf, "\033[3~");
740 break;
741 case XK_Select:
742 strcpy (kbuf, "\033[4~");
743 break;
744#ifdef XK_KP_End
745 case XK_KP_End:
746 /* allow shift to override */
747 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
748 {
749 strcpy (kbuf, "\033Oq");
750 break;
751 }
752 /* FALLTHROUGH */
753#endif
754 case XK_End: 758 case XK_End:
755 strcpy (kbuf, KS_END); 759 strcpy (kbuf, KS_END);
756 break; 760 break;
757#ifdef XK_KP_Home
758 case XK_KP_Home:
759 /* allow shift to override */
760 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
761 {
762 strcpy (kbuf, "\033Ow");
763 break;
764 }
765 /* FALLTHROUGH */
766#endif
767 case XK_Home: 761 case XK_Home:
768 strcpy (kbuf, KS_HOME); 762 strcpy (kbuf, KS_HOME);
769 break; 763 break;
770 764
771#define FKEY(n, fkey) \
772 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
773
774 case XK_F1: /* "\033[11~" */
775 case XK_F2: /* "\033[12~" */
776 case XK_F3: /* "\033[13~" */
777 case XK_F4: /* "\033[14~" */
778 case XK_F5: /* "\033[15~" */
779 FKEY (11, XK_F1);
780 break;
781 case XK_F6: /* "\033[17~" */
782 case XK_F7: /* "\033[18~" */
783 case XK_F8: /* "\033[19~" */
784 case XK_F9: /* "\033[20~" */
785 case XK_F10: /* "\033[21~" */
786 FKEY (17, XK_F6);
787 break;
788 case XK_F11: /* "\033[23~" */
789 case XK_F12: /* "\033[24~" */
790 case XK_F13: /* "\033[25~" */
791 case XK_F14: /* "\033[26~" */
792 FKEY (23, XK_F11);
793 break;
794 case XK_F15: /* "\033[28~" */
795 case XK_F16: /* "\033[29~" */
796 FKEY (28, XK_F15);
797 break;
798 case XK_Help: /* "\033[28~" */
799 FKEY (28, XK_Help);
800 break;
801 case XK_Menu: /* "\033[29~" */
802 FKEY (29, XK_Menu);
803 break;
804 case XK_F17: /* "\033[31~" */
805 case XK_F18: /* "\033[32~" */
806 case XK_F19: /* "\033[33~" */
807 case XK_F20: /* "\033[34~" */
808 case XK_F21: /* "\033[35~" */
809 case XK_F22: /* "\033[36~" */
810 case XK_F23: /* "\033[37~" */
811 case XK_F24: /* "\033[38~" */
812 case XK_F25: /* "\033[39~" */
813 case XK_F26: /* "\033[40~" */
814 case XK_F27: /* "\033[41~" */
815 case XK_F28: /* "\033[42~" */
816 case XK_F29: /* "\033[43~" */
817 case XK_F30: /* "\033[44~" */
818 case XK_F31: /* "\033[45~" */
819 case XK_F32: /* "\033[46~" */
820 case XK_F33: /* "\033[47~" */
821 case XK_F34: /* "\033[48~" */
822 case XK_F35: /* "\033[49~" */
823 FKEY (31, XK_F17);
824 break;
825#undef FKEY
826 default: 765 default:
766 {
767 int param = map_function_key (keysym);
768 if (param > 0)
769 sprintf (kbuf,"\033[%d~", param);
770 else
827 newlen = 0; 771 newlen = 0;
772 }
828 break; 773 break;
829 } 774 }
830 775
831 if (newlen) 776 if (newlen)
832 len = strlen (kbuf); 777 len = strlen (kbuf);
833 }
834 778
835 /* 779 /*
836 * Pass meta for all function keys, if 'meta' option set 780 * Pass meta for all function keys, if 'meta' option set
837 */ 781 */
838#ifdef META8_OPTION 782#ifdef META8_OPTION
… …
873 return; 817 return;
874 818
875 if (len <= 0) 819 if (len <= 0)
876 return; /* not mapped */ 820 return; /* not mapped */
877 821
878 if (OPTION (Opt_scrollTtyKeypress)) 822 if (option (Opt_scrollTtyKeypress))
879 if (view_start) 823 if (view_start)
880 { 824 {
881 view_start = 0; 825 view_start = 0;
882 want_refresh = 1; 826 want_refresh = 1;
883 } 827 }
… …
907 tt_write (&ch, 1); 851 tt_write (&ch, 1);
908 } 852 }
909 853
910 tt_write (kbuf, (unsigned int)len); 854 tt_write (kbuf, (unsigned int)len);
911} 855}
912/*}}} */ 856
857void
858rxvt_term::key_release (XKeyEvent &ev)
859{
860#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
861 KeySym keysym;
862
863 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
864#endif
865
866#if ENABLE_FRILLS || ISO_14755
867 // ISO 14755 support
868 if (iso14755buf)
869 if (iso14755buf & ISO_14755_52)
870 {
871# if ISO_14755
872 scr_overlay_off ();
873# endif
874# if ISO_14755
875 // iso14755 part 5.2 handling: release time
876 // first: controls
877 if ((ev.state & ControlMask)
878 && ((keysym >= 0x40 && keysym <= 0x5f)
879 || (keysym >= 0x61 && keysym <= 0x7f)))
880 {
881 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
882 commit_iso14755 ();
883
884 return;
885 }
886
887 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
888 if (i[0] == keysym)
889 {
890 iso14755buf = ISO_14755_51 | i[1];
891 commit_iso14755 ();
892
893 return;
894 }
895
896 scr_bell ();
897# endif
898 iso14755buf = 0;
899
900 return;
901 }
902 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
903 {
904# if ISO_14755
905 scr_overlay_off ();
906# endif
907 if (iso14755buf & ISO_14755_51)
908 commit_iso14755 ();
909#if ISO_14755
910 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
911 {
912 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
913
914 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
915 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
916 }
917# endif
918 else
919 iso14755buf = 0;
920 }
921#endif
922
923 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
924 return;
925
926#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
927 if (!(ev.state & ControlMask))
928 slip_wheel_ev.stop ();
929 else if (keysym == XK_Control_L || keysym == XK_Control_R)
930 mouse_slip_wheel_speed = 0;
931#endif
932}
913 933
914#if defined (KEYSYM_RESOURCE) 934#if defined (KEYSYM_RESOURCE)
915unsigned int 935unsigned int
916rxvt_term::cmd_write (const char *str, unsigned int count) 936rxvt_term::cmd_write (const char *str, unsigned int count)
917{ 937{
… …
947void 967void
948rxvt_term::flush () 968rxvt_term::flush ()
949{ 969{
950 flush_ev.stop (); 970 flush_ev.stop ();
951 971
952#ifdef TRANSPARENT 972#ifdef HAVE_BG_PIXMAP
953 if (want_full_refresh) 973 if (bgPixmap.check_clearChanged ())
954 { 974 {
955 want_full_refresh = 0; 975// scr_clear (true); This needs to be researched further!
956 scr_clear ();
957 scr_touch (false); 976 scr_touch (false);
958 } 977 }
959#endif 978#endif
960 979
961 if (want_refresh) 980 if (want_refresh)
… …
1006 } 1025 }
1007 1026
1008 display->flush (); 1027 display->flush ();
1009} 1028}
1010 1029
1030/* checks wether a refresh is requested and starts the refresh timer */
1011void 1031void
1012rxvt_term::check_cb (check_watcher &w) 1032rxvt_term::refresh_check ()
1033{
1034 if (want_refresh && !flush_ev.is_active ())
1035 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1036
1037 display->flush ();
1038}
1039
1040void
1041rxvt_term::flush_cb (ev::timer &w, int revents)
1013{ 1042{
1014 make_current (); 1043 make_current ();
1015 1044
1016 display->flush ();
1017
1018 if (want_refresh && !flush_ev.active)
1019 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1020}
1021
1022void
1023rxvt_term::flush_cb (time_watcher &w)
1024{
1025 make_current ();
1026
1027 refresh_limit = 1;
1028 refresh_count = 0; 1045 refresh_count = 0;
1029 flush (); 1046 flush ();
1030} 1047}
1031 1048
1032#ifdef CURSOR_BLINK 1049#ifdef CURSOR_BLINK
1033void 1050void
1034rxvt_term::cursor_blink_cb (time_watcher &w) 1051rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1035{ 1052{
1036 hidden_cursor = !hidden_cursor; 1053 hidden_cursor = !hidden_cursor;
1037 want_refresh = 1; 1054 want_refresh = 1;
1038 1055 refresh_check ();
1039 w.start (w.at + CURSOR_BLINK_INTERVAL);
1040} 1056}
1041#endif 1057#endif
1042 1058
1043#ifdef TEXT_BLINK 1059#ifdef TEXT_BLINK
1044void 1060void
1045rxvt_term::text_blink_cb (time_watcher &w) 1061rxvt_term::text_blink_cb (ev::timer &w, int revents)
1046{ 1062{
1047 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1063 if (scr_refresh_rend (RS_Blink, RS_Blink))
1048 { 1064 {
1049 hidden_text = !hidden_text; 1065 hidden_text = !hidden_text;
1050 want_refresh = 1; 1066 want_refresh = 1;
1051 w.start (w.at + TEXT_BLINK_INTERVAL); 1067 refresh_check ();
1052 } 1068 }
1069 else
1070 w.stop ();
1053} 1071}
1054#endif 1072#endif
1055 1073
1056#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1074#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1057void 1075void
1058rxvt_term::cont_scroll_cb (time_watcher &w) 1076rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1059{ 1077{
1060 if ((scrollbar_isUp() || scrollbar_isDn()) && 1078 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1061 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1079 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1062 { 1080 {
1063 want_refresh = 1; 1081 want_refresh = 1;
1064 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1082 refresh_check ();
1065 } 1083 }
1084 else
1085 w.stop ();
1066} 1086}
1067#endif 1087#endif
1068 1088
1069#ifdef SELECTION_SCROLLING 1089#ifdef SELECTION_SCROLLING
1070void 1090void
1071rxvt_term::sel_scroll_cb (time_watcher &w) 1091rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1072{ 1092{
1073 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1093 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1074 { 1094 {
1075 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1095 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1076 want_refresh = 1; 1096 want_refresh = 1;
1077 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1097 refresh_check ();
1078 } 1098 }
1099 else
1100 w.stop ();
1079} 1101}
1080#endif 1102#endif
1081 1103
1082#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1104#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1083void 1105void
1084rxvt_term::slip_wheel_cb (time_watcher &w) 1106rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1085{ 1107{
1086 if (mouse_slip_wheel_speed == 0 1108 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1087 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1088 : scr_page (UP, mouse_slip_wheel_speed))
1089 { 1109 {
1090 if (view_start == top_row || view_start == 0)
1091 mouse_slip_wheel_speed = 0;
1092
1093 want_refresh = 1; 1110 want_refresh = 1;
1094 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1111 refresh_check ();
1112 }
1113
1114 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1115 {
1116 mouse_slip_wheel_speed = 0;
1117 w.stop ();
1095 } 1118 }
1096} 1119}
1097#endif 1120#endif
1098 1121
1099#if LINUX_YIELD_HACK 1122#if LINUX_YIELD_HACK
1100static struct event_handler 1123static struct event_handler
1101{ 1124{
1102 check_watcher yield_ev; 1125 ev::prepare yield_ev;
1103 1126
1104 void yield_cb (check_watcher &w) 1127 void yield_cb (ev::prepare &w, int revents)
1105 { 1128 {
1106 // this should really be sched_yield(), but the linux guys thought 1129 // this should really be sched_yield(), but the linux guys thought
1107 // that giving a process calling sched_yield () less cpu time than 1130 // that giving a process calling sched_yield () less cpu time than
1108 // ones with high nice levels. 1131 // ones with high nice levels is a useful thing to do. It surely is is
1132 // allowed by the sus... as is returning ENOSYS.
1109 1133
1110 struct timespec ts = { 0, 0 }; 1134 struct timespec ts = { 0, 0 };
1111 nanosleep (&ts, 0); 1135 nanosleep (&ts, 0);
1112 1136
1113 w.stop (); 1137 w.stop ();
… …
1151 } 1175 }
1152 else 1176 else
1153 { 1177 {
1154 pty_ev.stop (); 1178 pty_ev.stop ();
1155 1179
1156 if (!OPTION (Opt_hold)) 1180 if (!option (Opt_hold))
1157 destroy (); 1181 destroy ();
1158 } 1182 }
1159 1183
1160 return false; 1184 return false;
1161} 1185}
1162 1186
1163void 1187void
1164rxvt_term::pty_cb (io_watcher &w, short revents) 1188rxvt_term::pty_cb (ev::io &w, int revents)
1165{ 1189{
1166 make_current (); 1190 make_current ();
1167 1191
1168 if (revents & EVENT_READ) 1192 if (revents & ev::READ)
1169 // loop, but don't allow a single term to monopolize us 1193 // loop, but don't allow a single term to monopolize us
1170 while (pty_fill ()) 1194 while (pty_fill ())
1171 if (cmd_parse ()) 1195 if (cmd_parse ())
1172 break; 1196 break;
1173 1197
1174 if (revents & EVENT_WRITE) 1198 if (revents & ev::WRITE)
1175 pty_write (); 1199 pty_write ();
1200
1201 refresh_check ();
1176} 1202}
1177 1203
1178void 1204void
1179rxvt_term::pointer_unblank () 1205rxvt_term::pointer_unblank ()
1180{ 1206{
1181 XDefineCursor (xdisp, vt, TermWin_cursor); 1207 XDefineCursor (dpy, vt, TermWin_cursor);
1182 recolour_cursor (); 1208 recolour_cursor ();
1183 1209
1184#ifdef POINTER_BLANK 1210#ifdef POINTER_BLANK
1185 hidden_pointer = 0; 1211 hidden_pointer = 0;
1186 1212
1187 if (OPTION (Opt_pointerBlank)) 1213 if (option (Opt_pointerBlank))
1188 pointer_ev.start (NOW + pointerBlankDelay); 1214 pointer_ev.start (pointerBlankDelay);
1189#endif 1215#endif
1190} 1216}
1191 1217
1192#ifdef POINTER_BLANK 1218#ifdef POINTER_BLANK
1193void 1219void
1194rxvt_term::pointer_blank () 1220rxvt_term::pointer_blank ()
1195{ 1221{
1196 if (!OPTION (Opt_pointerBlank)) 1222 if (!option (Opt_pointerBlank))
1197 return; 1223 return;
1198 1224
1199 XDefineCursor (xdisp, vt, display->blank_cursor); 1225 XDefineCursor (dpy, vt, display->blank_cursor);
1200 XFlush (xdisp); 1226 XFlush (dpy);
1201 1227
1202 hidden_pointer = 1; 1228 hidden_pointer = 1;
1203} 1229}
1204 1230
1205void 1231void
1206rxvt_term::pointer_cb (time_watcher &w) 1232rxvt_term::pointer_cb (ev::timer &w, int revents)
1207{ 1233{
1208 make_current (); 1234 make_current ();
1209 1235
1210 pointer_blank (); 1236 pointer_blank ();
1211} 1237}
… …
1214void 1240void
1215rxvt_term::mouse_report (XButtonEvent &ev) 1241rxvt_term::mouse_report (XButtonEvent &ev)
1216{ 1242{
1217 int button_number, key_state = 0; 1243 int button_number, key_state = 0;
1218 int x, y; 1244 int x, y;
1245 int code = 32;
1219 1246
1220 x = ev.x; 1247 x = Pixel2Col (ev.x);
1221 y = ev.y; 1248 y = Pixel2Row (ev.y);
1222 pixel_position (&x, &y); 1249 if (ev.type == MotionNotify)
1250 {
1251 if (x == mouse_row && y == mouse_col)
1252 return;
1253 mouse_row = x;
1254 mouse_col = y;
1255 code += 32;
1256 }
1223 1257
1224 if (MEvent.button == AnyButton) 1258 if (MEvent.button == AnyButton)
1225 button_number = 3; 1259 button_number = 3;
1226 else 1260 else
1227 { 1261 {
… …
1273 x + 1, 1307 x + 1,
1274 y + 1); 1308 y + 1);
1275#endif 1309#endif
1276 1310
1277 tt_printf ("\033[M%c%c%c", 1311 tt_printf ("\033[M%c%c%c",
1278 (32 + button_number + key_state), 1312 (code + button_number + key_state),
1279 (32 + x + 1), 1313 (32 + x + 1),
1280 (32 + y + 1)); 1314 (32 + y + 1));
1281} 1315}
1282 1316
1283/*{{{ process an X event */ 1317/*{{{ process an X event */
1284void 1318void
1285rxvt_term::x_cb (XEvent &ev) 1319rxvt_term::x_cb (XEvent &ev)
1286{ 1320{
1287 make_current (); 1321 make_current ();
1288 1322
1289 dLocal (Display *, xdisp); 1323 dLocal (Display *, dpy);
1290 1324
1291 if (ev.xany.window == vt 1325 if (ev.xany.window == vt
1292 && SHOULD_INVOKE (HOOK_X_EVENT) 1326 && SHOULD_INVOKE (HOOK_X_EVENT)
1293 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1327 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1294 return; 1328 return;
… …
1299 unsigned int unused_mask; 1333 unsigned int unused_mask;
1300 1334
1301 switch (ev.type) 1335 switch (ev.type)
1302 { 1336 {
1303 case KeyPress: 1337 case KeyPress:
1304#if ISO_14755 1338 key_press (ev.xkey);
1305 if (!(iso14755buf & ISO_14755_52))
1306#endif
1307 lookup_key (ev.xkey);
1308
1309 break; 1339 break;
1310 1340
1311 case KeyRelease: 1341 case KeyRelease:
1312 { 1342 key_release (ev.xkey);
1313#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1314 KeySym keysym;
1315
1316 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1317#endif
1318
1319#if ENABLE_FRILLS || ISO_14755
1320 // ISO 14755 support
1321 if (iso14755buf)
1322 if (iso14755buf & ISO_14755_52)
1323 {
1324# if ENABLE_OVERLAY
1325 scr_overlay_off ();
1326# endif
1327# if ISO_14755
1328 // iso14755 part 5.2 handling: release time
1329 // first: controls
1330 if ((ev.xkey.state & ControlMask)
1331 && ((keysym >= 0x40 && keysym <= 0x5f)
1332 || (keysym >= 0x61 && keysym <= 0x7f)))
1333 {
1334 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1335 commit_iso14755 ();
1336 goto skip_switch;
1337 }
1338
1339 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1340 if (i[0] == keysym)
1341 {
1342 iso14755buf = ISO_14755_51 | i[1];
1343 commit_iso14755 ();
1344 goto skip_switch;
1345 }
1346
1347 scr_bell ();
1348# endif
1349 iso14755buf = 0;
1350 break;
1351 }
1352 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1353 {
1354# if ENABLE_OVERLAY
1355 scr_overlay_off ();
1356# endif
1357 if (iso14755buf & ISO_14755_51)
1358 commit_iso14755 ();
1359#if ISO_14755
1360 else if (iso14755buf & ISO_14755_STARTED)
1361 {
1362 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1363
1364 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1365 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1366 }
1367# endif
1368 else
1369 iso14755buf = 0;
1370 }
1371#endif
1372
1373 if (ev.xany.window == vt
1374 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1375 break;
1376
1377#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1378 if (!(ev.xkey.state & ControlMask))
1379 slip_wheel_ev.stop ();
1380 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1381 mouse_slip_wheel_speed = 0;
1382#endif
1383 break; 1343 break;
1384 }
1385 1344
1386 case ButtonPress: 1345 case ButtonPress:
1387 button_press (ev.xbutton); 1346 button_press (ev.xbutton);
1388 break; 1347 break;
1389 1348
… …
1404 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END))) 1363 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1405 destroy (); 1364 destroy ();
1406 } 1365 }
1407#if ENABLE_EWMH 1366#if ENABLE_EWMH
1408 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1367 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1409 XSendEvent (xdisp, ev.xclient.window = display->root, 1368 XSendEvent (dpy, ev.xclient.window = display->root,
1410 False, SubstructureRedirectMask | SubstructureNotifyMask, 1369 False, SubstructureRedirectMask | SubstructureNotifyMask,
1411 &ev); 1370 &ev);
1412#endif 1371#endif
1413 } 1372 }
1414 } 1373 }
… …
1420 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1379 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1421 focus_out (); 1380 focus_out ();
1422 } 1381 }
1423#endif 1382#endif
1424 } 1383 }
1425 break;
1426
1427 case MappingNotify:
1428 XRefreshKeyboardMapping (&ev.xmapping);
1429 break; 1384 break;
1430 1385
1431 /* 1386 /*
1432 * XXX: this is not the _current_ arrangement 1387 * XXX: this is not the _current_ arrangement
1433 * Here's my conclusion: 1388 * Here's my conclusion:
… …
1452 break; 1407 break;
1453 } 1408 }
1454 break; 1409 break;
1455 1410
1456 case FocusIn: 1411 case FocusIn:
1412 if (ev.xfocus.detail != NotifyInferior
1413 && ev.xfocus.detail != NotifyPointer
1414 && ev.xfocus.mode != NotifyGrab)
1457 focus_in (); 1415 focus_in ();
1458 break; 1416 break;
1459 1417
1460 case FocusOut: 1418 case FocusOut:
1419 if (ev.xfocus.detail != NotifyInferior
1420 && ev.xfocus.detail != NotifyPointer
1421 && ev.xfocus.mode != NotifyGrab)
1461 focus_out (); 1422 focus_out ();
1462 break; 1423 break;
1463 1424
1464 case ConfigureNotify: 1425 case ConfigureNotify:
1426 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1427 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1428 szHint.width, szHint.height);*/
1465 if (ev.xconfigure.window == parent[0]) 1429 if (ev.xconfigure.window == parent[0])
1466 { 1430 {
1467 while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev)) 1431 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1468 ; 1432 ;
1469 1433
1470 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1434 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1471 { 1435 {
1472 seen_resize = 1; 1436 seen_resize = 1;
1473 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1437 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1474 } 1438 }
1439 else
1440 {
1441#ifdef HAVE_BG_PIXMAP
1442 if (bgPixmap.window_position_sensitive ())
1443 {
1444 if (mapped)
1445 update_background ();
1446 else
1447 bgPixmap.invalidate ();
1448 }
1449#endif
1450 }
1475 1451
1476 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1452 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1477
1478#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1479 if (OPTION (Opt_transparent))
1480 check_our_parents ();
1481#endif
1482 } 1453 }
1483 break; 1454 break;
1484 1455
1485 case PropertyNotify: 1456 case PropertyNotify:
1486 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1457 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
… …
1502 case SelectionRequest: 1473 case SelectionRequest:
1503 selection_send (ev.xselectionrequest); 1474 selection_send (ev.xselectionrequest);
1504 break; 1475 break;
1505 1476
1506 case MapNotify: 1477 case MapNotify:
1478#ifdef HAVE_BG_PIXMAP
1479 /* This is needed spcifically to fix the case of no window manager or a
1480 * non-reparenting window manager. In those cases we never get first
1481 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1482 * care of multiplicity of ConfigureNotify events arriwing while WM does
1483 * reparenting.
1484 * We should not render background immidiately, as there could be several
1485 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1486 * by scheduling background redraw as soon as we can, but giving a short
1487 * bit of time for ConfigureNotifies to arrive.
1488 * We should render background PRIOR to drawing any text, but AFTER all
1489 * of ConfigureNotifys for the best results.
1490 */
1491 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1492 update_background_ev.start (0.025);
1493#endif
1507 mapped = 1; 1494 mapped = 1;
1508#ifdef TEXT_BLINK 1495#ifdef TEXT_BLINK
1509 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1496 text_blink_ev.start ();
1510#endif 1497#endif
1511 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1498 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1512 break; 1499 break;
1513 1500
1514 case UnmapNotify: 1501 case UnmapNotify:
… …
1516#ifdef TEXT_BLINK 1503#ifdef TEXT_BLINK
1517 text_blink_ev.stop (); 1504 text_blink_ev.stop ();
1518#endif 1505#endif
1519 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1506 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1520 break; 1507 break;
1521
1522#ifdef TRANSPARENT
1523 case ReparentNotify:
1524 rootwin_cb (ev);
1525 break;
1526#endif /* TRANSPARENT */
1527 1508
1528 case GraphicsExpose: 1509 case GraphicsExpose:
1529 case Expose: 1510 case Expose:
1530 if (ev.xany.window == vt) 1511 if (ev.xany.window == vt)
1531 { 1512 {
1532 do 1513 do
1514 {
1533 scr_expose (ev.xexpose.x, ev.xexpose.y, 1515 scr_expose (ev.xexpose.x, ev.xexpose.y,
1534 ev.xexpose.width, ev.xexpose.height, False); 1516 ev.xexpose.width, ev.xexpose.height, False);
1517 }
1535 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev)); 1518 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1536 1519
1537 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1520 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1538 1521
1539 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev)) 1522 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1523 {
1540 scr_expose (ev.xexpose.x, ev.xexpose.y, 1524 scr_expose (ev.xexpose.x, ev.xexpose.y,
1541 ev.xexpose.width, ev.xexpose.height, False); 1525 ev.xexpose.width, ev.xexpose.height, False);
1526 }
1542 1527
1543 want_refresh = 1; 1528 want_refresh = 1;
1544 } 1529 }
1545 else 1530 else
1546 { 1531 {
1547 XEvent unused_event; 1532 XEvent unused_event;
1548 1533
1549 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event)) 1534 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1550 ; 1535 ;
1551 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event)) 1536 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1552 ; 1537 ;
1553 1538
1554 if (isScrollbarWindow (ev.xany.window)) 1539 if (scrollBar.state && ev.xany.window == scrollBar.win)
1555 { 1540 {
1556 scrollBar.setIdle (); 1541 scrollBar.state = STATE_IDLE;
1557 scrollbar_show (0); 1542 scrollbar_show (0);
1558 } 1543 }
1559
1560#ifdef TRANSPARENT
1561 if (am_transparent && ev.xany.window == parent[0])
1562 XClearWindow (xdisp, ev.xany.window);
1563#endif
1564 } 1544 }
1565 break; 1545 break;
1566 1546
1567 case MotionNotify: 1547 case MotionNotify:
1568#ifdef POINTER_BLANK 1548#ifdef POINTER_BLANK
1569 if (hidden_pointer) 1549 if (hidden_pointer)
1570 pointer_unblank (); 1550 pointer_unblank ();
1571#endif 1551#endif
1552 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1553 || priv_modes & PrivMode_MouseAnyEvent)
1554 mouse_report (ev.xbutton);
1572 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1555 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1573 break; 1556 break;
1574 1557
1575 if (ev.xany.window == vt) 1558 if (ev.xany.window == vt)
1576 { 1559 {
1577 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1560 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1578 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1561 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1579 ; // nop 1562 ; // nop
1580 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1563 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1581 { 1564 {
1582 while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev)) 1565 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1583 ; 1566 ;
1584 1567
1585 XQueryPointer (xdisp, vt, 1568 XQueryPointer (dpy, vt,
1586 &unused_root, &unused_child, 1569 &unused_root, &unused_child,
1587 &unused_root_x, &unused_root_y, 1570 &unused_root_x, &unused_root_y,
1588 &ev.xbutton.x, &ev.xbutton.y, 1571 &ev.xbutton.x, &ev.xbutton.y,
1589 &ev.xbutton.state); 1572 &ev.xbutton.state);
1590#ifdef MOUSE_THRESHOLD 1573#ifdef MOUSE_THRESHOLD
… …
1610 int dist; 1593 int dist;
1611 1594
1612 /* don't clobber the current delay if we are 1595 /* don't clobber the current delay if we are
1613 * already in the middle of scrolling. 1596 * already in the middle of scrolling.
1614 */ 1597 */
1615 if (!sel_scroll_ev.active) 1598 if (!sel_scroll_ev.is_active ())
1616 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1599 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1617 1600
1618 /* save the event params so we can highlight 1601 /* save the event params so we can highlight
1619 * the selection in the pending-scroll loop 1602 * the selection in the pending-scroll loop
1620 */ 1603 */
1621 selection_save_x = ev.xbutton.x; 1604 selection_save_x = ev.xbutton.x;
… …
1643 else 1626 else
1644 { 1627 {
1645 /* we are within the text window, so we 1628 /* we are within the text window, so we
1646 * shouldn't be scrolling 1629 * shouldn't be scrolling
1647 */ 1630 */
1648 if (sel_scroll_ev.active)
1649 sel_scroll_ev.stop(); 1631 sel_scroll_ev.stop();
1650 } 1632 }
1651#endif 1633#endif
1652#ifdef MOUSE_THRESHOLD 1634#ifdef MOUSE_THRESHOLD
1653 } 1635 }
1654#endif 1636#endif
1655 } 1637 }
1656 } 1638 }
1657 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1639 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1658 { 1640 {
1659 while (XCheckTypedWindowEvent (xdisp, scrollBar.win, 1641 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1660 MotionNotify, &ev)) 1642 MotionNotify, &ev))
1661 ; 1643 ;
1662 1644
1663 XQueryPointer (xdisp, scrollBar.win, 1645 XQueryPointer (dpy, scrollBar.win,
1664 &unused_root, &unused_child, 1646 &unused_root, &unused_child,
1665 &unused_root_x, &unused_root_y, 1647 &unused_root_x, &unused_root_y,
1666 &ev.xbutton.x, &ev.xbutton.y, 1648 &ev.xbutton.x, &ev.xbutton.y,
1667 &unused_mask); 1649 &unused_mask);
1668 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1650 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1669 scrollbar_size ()); 1651 scrollbar_size ());
1670 want_refresh = 1; 1652 want_refresh = 1;
1671 refresh_limit = 0;
1672 scrollbar_show (1); 1653 scrollbar_show (1);
1673 } 1654 }
1674 break; 1655 break;
1675 } 1656 }
1676 1657
1677skip_switch: ;
1678
1679#if defined(CURSOR_BLINK) 1658#if defined(CURSOR_BLINK)
1680 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1659 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1681 { 1660 {
1682 if (hidden_cursor) 1661 if (hidden_cursor)
1683 { 1662 {
1684 hidden_cursor = 0; 1663 hidden_cursor = 0;
1685 want_refresh = 1; 1664 want_refresh = 1;
1686 } 1665 }
1687 1666
1688 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1667 cursor_blink_ev.again ();
1689 } 1668 }
1690#endif 1669#endif
1691 1670
1692#if defined(POINTER_BLANK) 1671#if defined(POINTER_BLANK)
1693 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1672 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1694 { 1673 {
1695 if (ev.type == MotionNotify 1674 if (ev.type == MotionNotify
1696 || ev.type == ButtonPress 1675 || ev.type == ButtonPress
1697 || ev.type == ButtonRelease) 1676 || ev.type == ButtonRelease)
1698 if (hidden_pointer) 1677 if (hidden_pointer)
… …
1700 1679
1701 if (ev.type == KeyPress && hidden_pointer == 0) 1680 if (ev.type == KeyPress && hidden_pointer == 0)
1702 pointer_blank (); 1681 pointer_blank ();
1703 } 1682 }
1704#endif 1683#endif
1684
1685 refresh_check ();
1705} 1686}
1706 1687
1707void 1688void
1708rxvt_term::focus_in () 1689rxvt_term::focus_in ()
1709{ 1690{
1710 if (!focus) 1691 if (!focus)
1711 { 1692 {
1712 focus = 1; 1693 focus = 1;
1713 want_refresh = 1; 1694 want_refresh = 1;
1714 1695
1715 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1696 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1716 1697
1717#if USE_XIM 1698#if USE_XIM
1718 if (Input_Context != NULL) 1699 if (Input_Context != NULL)
1719 { 1700 {
1720 IMSetStatusPosition (); 1701 IMSetPosition ();
1721 XSetICFocus (Input_Context); 1702 XSetICFocus (Input_Context);
1722 } 1703 }
1723#endif 1704#endif
1724#if CURSOR_BLINK 1705#if CURSOR_BLINK
1725 if (OPTION (Opt_cursorBlink)) 1706 if (option (Opt_cursorBlink))
1726 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1707 cursor_blink_ev.again ();
1727#endif 1708#endif
1728#if OFF_FOCUS_FADING 1709#if OFF_FOCUS_FADING
1729 if (rs[Rs_fade]) 1710 if (rs[Rs_fade])
1730 { 1711 {
1731 pix_colors = pix_colors_focused; 1712 pix_colors = pix_colors_focused;
1732 scr_recolour (); 1713 scr_recolour ();
1733 } 1714 }
1734#endif 1715#endif
1716#if ENABLE_FRILLS
1717 if (option (Opt_urgentOnBell))
1718 {
1719 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1720 {
1721 h->flags &= ~XUrgencyHint;
1722 XSetWMHints (dpy, parent[0], h);
1723 }
1724 }
1725#endif
1735 } 1726 }
1736} 1727}
1737 1728
1738void 1729void
1739rxvt_term::focus_out () 1730rxvt_term::focus_out ()
… …
1747 1738
1748#if ENABLE_FRILLS || ISO_14755 1739#if ENABLE_FRILLS || ISO_14755
1749 if (iso14755buf) 1740 if (iso14755buf)
1750 { 1741 {
1751 iso14755buf = 0; 1742 iso14755buf = 0;
1752# if ENABLE_OVERLAY 1743# if ISO_14755
1753 scr_overlay_off (); 1744 scr_overlay_off ();
1754# endif 1745# endif
1755 } 1746 }
1756#endif 1747#endif
1757#if USE_XIM 1748#if USE_XIM
1758 if (Input_Context != NULL) 1749 if (Input_Context != NULL)
1759 XUnsetICFocus (Input_Context); 1750 XUnsetICFocus (Input_Context);
1760#endif 1751#endif
1761#if CURSOR_BLINK 1752#if CURSOR_BLINK
1762 if (OPTION (Opt_cursorBlink)) 1753 if (option (Opt_cursorBlink))
1763 cursor_blink_ev.stop (); 1754 cursor_blink_ev.stop ();
1755
1764 hidden_cursor = 0; 1756 hidden_cursor = 0;
1765#endif 1757#endif
1766#if OFF_FOCUS_FADING 1758#if OFF_FOCUS_FADING
1767 if (rs[Rs_fade]) 1759 if (rs[Rs_fade])
1768 { 1760 {
… …
1771 } 1763 }
1772#endif 1764#endif
1773 } 1765 }
1774} 1766}
1775 1767
1776#if TRANSPARENT 1768void
1769rxvt_term::update_fade_color (unsigned int idx)
1770{
1771#if OFF_FOCUS_FADING
1772 if (rs[Rs_fade])
1773 {
1774 rgba c;
1775 pix_colors [Color_fade].get (c);
1776 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1777 }
1778#endif
1779}
1780
1781#if ENABLE_TRANSPARENCY || ENABLE_PERL
1777void 1782void
1778rxvt_term::rootwin_cb (XEvent &ev) 1783rxvt_term::rootwin_cb (XEvent &ev)
1779{ 1784{
1780 make_current (); 1785 make_current ();
1781 1786
1787 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1788 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1789 return;
1790
1791# if ENABLE_TRANSPARENCY
1782 switch (ev.type) 1792 switch (ev.type)
1783 { 1793 {
1784 case PropertyNotify: 1794 case PropertyNotify:
1785 /* 1795 /*
1786 * if user used some Esetroot compatible prog to set the root bg, 1796 * if user used some Esetroot compatible prog to set the root bg,
1787 * use the property to determine the pixmap. We use it later on. 1797 * use the property to determine the pixmap. We use it later on.
1788 */ 1798 */
1789 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1799 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1790 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1800 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1791 return; 1801 {
1802 bgPixmap.set_root_pixmap ();
1803 update_background ();
1804 }
1792 1805
1793 /* FALLTHROUGH */
1794 case ReparentNotify:
1795 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1796 want_refresh = want_full_refresh = 1;
1797 break; 1806 break;
1798 } 1807 }
1808# endif
1809
1810 refresh_check ();
1799} 1811}
1800#endif 1812#endif
1801 1813
1802void 1814void
1803rxvt_term::button_press (XButtonEvent &ev) 1815rxvt_term::button_press (XButtonEvent &ev)
… …
1858 mouse_report (ev); 1870 mouse_report (ev);
1859 } 1871 }
1860#else 1872#else
1861 MEvent.button = ev.button; 1873 MEvent.button = ev.button;
1862 mouse_report (ev); 1874 mouse_report (ev);
1863#endif /* MOUSE_REPORT_DOUBLECLICK */ 1875#endif /* MOUSE_REPORT_DOUBLECLICK */
1864 1876
1865 } 1877 }
1866 else 1878 else
1867 { 1879 {
1868 if (ev.button != MEvent.button) 1880 if (ev.button != MEvent.button)
… …
1916 } 1928 }
1917 1929
1918 /* 1930 /*
1919 * Scrollbar window processing of button press 1931 * Scrollbar window processing of button press
1920 */ 1932 */
1921 if (isScrollbarWindow (ev.window)) 1933 if (scrollBar.state && ev.window == scrollBar.win)
1922 { 1934 {
1923 scrollBar.setIdle (); 1935 page_dirn direction = NO_DIR;
1936
1937 if (scrollBar.upButton (ev.y))
1938 direction = UP; /* up */
1939 else if (scrollBar.dnButton (ev.y))
1940 direction = DN; /* down */
1941
1942 scrollBar.state = STATE_IDLE;
1924 /* 1943 /*
1925 * Rxvt-style scrollbar: 1944 * Rxvt-style scrollbar:
1926 * move up if mouse is above slider 1945 * move up if mouse is above slider
1927 * move dn if mouse is below slider 1946 * move dn if mouse is below slider
1928 * 1947 *
… …
1937 /* 1956 /*
1938 * Mouse report disabled scrollbar: 1957 * Mouse report disabled scrollbar:
1939 * arrow buttons - send up/down 1958 * arrow buttons - send up/down
1940 * click on scrollbar - send pageup/down 1959 * click on scrollbar - send pageup/down
1941 */ 1960 */
1942 if ((scrollBar.style == R_SB_NEXT 1961 if (direction == UP)
1943 && scrollbarnext_upButton (ev.y))
1944 || (scrollBar.style == R_SB_RXVT
1945 && scrollbarrxvt_upButton (ev.y)))
1946 tt_printf ("\033[A"); 1962 tt_printf ("\033[A");
1947 else if ((scrollBar.style == R_SB_NEXT 1963 else if (direction == DN)
1948 && scrollbarnext_dnButton (ev.y))
1949 || (scrollBar.style == R_SB_RXVT
1950 && scrollbarrxvt_dnButton (ev.y)))
1951 tt_printf ("\033[B"); 1964 tt_printf ("\033[B");
1952 else 1965 else
1953 switch (ev.button) 1966 switch (ev.button)
1954 { 1967 {
1955 case Button2: 1968 case Button2:
… …
1962 tt_printf ("\033[5~"); 1975 tt_printf ("\033[5~");
1963 break; 1976 break;
1964 } 1977 }
1965 } 1978 }
1966 else 1979 else
1967#endif /* NO_SCROLLBAR_REPORT */ 1980#endif /* NO_SCROLLBAR_REPORT */
1968
1969 {
1970 char upordown = 0;
1971
1972 if (scrollBar.style == R_SB_NEXT)
1973 { 1981 {
1974 if (scrollbarnext_upButton (ev.y)) 1982 if (direction != NO_DIR)
1975 upordown = -1; /* up */
1976 else if (scrollbarnext_dnButton (ev.y))
1977 upordown = 1; /* down */
1978 }
1979 else if (scrollBar.style == R_SB_RXVT)
1980 {
1981 if (scrollbarrxvt_upButton (ev.y))
1982 upordown = -1; /* up */
1983 else if (scrollbarrxvt_dnButton (ev.y))
1984 upordown = 1; /* down */
1985 }
1986 if (upordown)
1987 { 1983 {
1988#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1984#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1985 if (!cont_scroll_ev.is_active ())
1989 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1986 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1990#endif 1987#endif
1991 if (scr_page (upordown < 0 ? UP : DN, 1)) 1988 if (scr_page (direction, 1))
1992 { 1989 {
1993 if (upordown < 0) 1990 if (direction == UP)
1994 scrollBar.setUp (); 1991 scrollBar.state = STATE_UP;
1995 else 1992 else
1996 scrollBar.setDn (); 1993 scrollBar.state = STATE_DOWN;
1997 } 1994 }
1998 } 1995 }
1999 else 1996 else
2000 switch (ev.button) 1997 switch (ev.button)
2001 { 1998 {
2002 case Button2: 1999 case Button2:
2003 switch (scrollbar_align) 2000 switch (scrollBar.align)
2004 { 2001 {
2005 case R_SB_ALIGN_TOP: 2002 case R_SB_ALIGN_TOP:
2006 csrO = 0; 2003 csrO = 0;
2007 break; 2004 break;
2008 case R_SB_ALIGN_CENTRE: 2005 case R_SB_ALIGN_CENTRE:
… …
2016 if (scrollBar.style == R_SB_XTERM 2013 if (scrollBar.style == R_SB_XTERM
2017 || scrollbar_above_slider (ev.y) 2014 || scrollbar_above_slider (ev.y)
2018 || scrollbar_below_slider (ev.y)) 2015 || scrollbar_below_slider (ev.y))
2019 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2016 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
2020 2017
2021 scrollBar.setMotion (); 2018 scrollBar.state = STATE_MOTION;
2022 break; 2019 break;
2023 2020
2024 case Button1: 2021 case Button1:
2025 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2022 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2026 csrO = ev.y - scrollBar.top; 2023 csrO = ev.y - scrollBar.top;
2027 /* FALLTHROUGH */ 2024 /* FALLTHROUGH */
2028 2025
2029 case Button3: 2026 case Button3:
2030 if (scrollBar.style != R_SB_XTERM) 2027 if (scrollBar.style != R_SB_XTERM)
… …
2040 scr_page (DN, nrow - 1); 2037 scr_page (DN, nrow - 1);
2041# else 2038# else
2042 scr_page (DN, nrow / 4); 2039 scr_page (DN, nrow / 4);
2043# endif 2040# endif
2044 else 2041 else
2045 scrollBar.setMotion (); 2042 scrollBar.state = STATE_MOTION;
2046 } 2043 }
2047 else 2044 else
2048 { 2045 {
2049 scr_page ((ev.button == Button1 ? DN : UP), 2046 scr_page ((ev.button == Button1 ? DN : UP),
2050 (nrow 2047 (nrow
… …
2067 2064
2068 csrO = 0; /* reset csr Offset */ 2065 csrO = 0; /* reset csr Offset */
2069 if (!bypass_keystate) 2066 if (!bypass_keystate)
2070 reportmode = !! (priv_modes & PrivMode_mouse_report); 2067 reportmode = !! (priv_modes & PrivMode_mouse_report);
2071 2068
2072 if (scrollbar_isUpDn ()) 2069 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2073 { 2070 {
2074 scrollBar.setIdle (); 2071 scrollBar.state = STATE_IDLE;
2075 scrollbar_show (0); 2072 scrollbar_show (0);
2076 } 2073 }
2077 2074
2078#ifdef SELECTION_SCROLLING 2075#ifdef SELECTION_SCROLLING
2079 if (sel_scroll_ev.active)
2080 sel_scroll_ev.stop(); 2076 sel_scroll_ev.stop();
2081#endif 2077#endif
2082 2078
2083 if (ev.window == vt) 2079 if (ev.window == vt)
2084 { 2080 {
2085 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2081 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
… …
2109 mouse_report (ev); 2105 mouse_report (ev);
2110 } 2106 }
2111#else /* MOUSE_REPORT_DOUBLECLICK */ 2107#else /* MOUSE_REPORT_DOUBLECLICK */
2112 MEvent.button = AnyButton; 2108 MEvent.button = AnyButton;
2113 mouse_report (ev); 2109 mouse_report (ev);
2114#endif /* MOUSE_REPORT_DOUBLECLICK */ 2110#endif /* MOUSE_REPORT_DOUBLECLICK */
2115 return; 2111 return;
2116 } 2112 }
2117 2113
2118 /* 2114 /*
2119 * dumb hack to compensate for the failure of click-and-drag 2115 * dumb hack to compensate for the failure of click-and-drag
… …
2131 selection_make (ev.time); 2127 selection_make (ev.time);
2132 break; 2128 break;
2133 2129
2134 case Button2: 2130 case Button2:
2135 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2131 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2136 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary); 2132 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2137 break; 2133 break;
2138 2134
2139#ifdef MOUSE_WHEEL 2135#ifdef MOUSE_WHEEL
2140 case Button4: 2136 case Button4:
2141 case Button5: 2137 case Button5:
… …
2145 2141
2146 v = ev.button == Button4 ? UP : DN; 2142 v = ev.button == Button4 ? UP : DN;
2147 2143
2148 if (ev.state & ShiftMask) 2144 if (ev.state & ShiftMask)
2149 i = 1; 2145 i = 1;
2150 else if (OPTION (Opt_mouseWheelScrollPage)) 2146 else if (option (Opt_mouseWheelScrollPage))
2151 i = nrow - 1; 2147 i = nrow - 1;
2152 else 2148 else
2153 i = 5; 2149 i = 5;
2154 2150
2155# ifdef MOUSE_SLIP_WHEELING 2151# ifdef MOUSE_SLIP_WHEELING
… …
2157 { 2153 {
2158 mouse_slip_wheel_speed += v ? -1 : 1; 2154 mouse_slip_wheel_speed += v ? -1 : 1;
2159 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2155 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2160 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2156 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2161 2157
2162 if (slip_wheel_ev.at < NOW) 2158 if (!slip_wheel_ev.is_active ())
2163 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2159 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2164
2165 slip_wheel_ev.start ();
2166 } 2160 }
2167 else 2161 else
2162# endif
2168 { 2163 {
2169# endif
2170 scr_page (v, i); 2164 scr_page (v, i);
2171 scrollbar_show (1); 2165 scrollbar_show (1);
2172# ifdef MOUSE_SLIP_WHEELING
2173 } 2166 }
2174# endif
2175 } 2167 }
2176 break; 2168 break;
2177#endif 2169#endif
2178 } 2170 }
2179 } 2171 }
2180} 2172}
2181
2182#ifdef TRANSPARENT
2183#if TINTING
2184/* taken from aterm-0.4.2 */
2185
2186typedef uint32_t RUINT32T;
2187
2188void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2189{
2190 int sh_r, sh_g, sh_b;
2191 RUINT32T mask_r, mask_g, mask_b;
2192 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2193 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2194 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2195 int i;
2196
2197 Visual *visual = term->visual;
2198
2199 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2200
2201 /* for convenience */
2202 mask_r = visual->red_mask;
2203 mask_g = visual->green_mask;
2204 mask_b = visual->blue_mask;
2205
2206 /* boring lookup table pre-initialization */
2207 switch (srcImage->bits_per_pixel) {
2208 case 15:
2209 if ((mask_r != 0x7c00) ||
2210 (mask_g != 0x03e0) ||
2211 (mask_b != 0x001f))
2212 return;
2213 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2214 lookup_r = lookup;
2215 lookup_g = lookup+32;
2216 lookup_b = lookup+32+32;
2217 sh_r = 10;
2218 sh_g = 5;
2219 sh_b = 0;
2220 break;
2221 case 16:
2222 if ((mask_r != 0xf800) ||
2223 (mask_g != 0x07e0) ||
2224 (mask_b != 0x001f))
2225 return;
2226 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2227 lookup_r = lookup;
2228 lookup_g = lookup+32;
2229 lookup_b = lookup+32+64;
2230 sh_r = 11;
2231 sh_g = 5;
2232 sh_b = 0;
2233 break;
2234 case 24:
2235 if ((mask_r != 0xff0000) ||
2236 (mask_g != 0x00ff00) ||
2237 (mask_b != 0x0000ff))
2238 return;
2239 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2240 lookup_r = lookup;
2241 lookup_g = lookup+256;
2242 lookup_b = lookup+256+256;
2243 sh_r = 16;
2244 sh_g = 8;
2245 sh_b = 0;
2246 break;
2247 case 32:
2248 if ((mask_r != 0xff0000) ||
2249 (mask_g != 0x00ff00) ||
2250 (mask_b != 0x0000ff))
2251 return;
2252 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2253 lookup_r = lookup;
2254 lookup_g = lookup+256;
2255 lookup_b = lookup+256+256;
2256 sh_r = 16;
2257 sh_g = 8;
2258 sh_b = 0;
2259 break;
2260 default:
2261 return; /* we do not support this color depth */
2262 }
2263
2264 /* prepare limits for color transformation (each channel is handled separately) */
2265 if (shade < 0) {
2266 shade = -shade;
2267 if (shade < 0) shade = 0;
2268 if (shade > 100) shade = 100;
2269
2270 lower_lim_r = 65535-rm;
2271 lower_lim_g = 65535-gm;
2272 lower_lim_b = 65535-bm;
2273
2274 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2275 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2276 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2277
2278 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2279 } else {
2280 if (shade < 0) shade = 0;
2281 if (shade > 100) shade = 100;
2282
2283 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2284
2285 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2286 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2287 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2288 }
2289
2290 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2291 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2292 {
2293 unsigned int tmp;
2294
2295 tmp = lower_lim_r;
2296 lower_lim_r = lower_lim_b;
2297 lower_lim_b = tmp;
2298
2299 tmp = upper_lim_r;
2300 upper_lim_r = upper_lim_b;
2301 upper_lim_b = tmp;
2302 }
2303
2304 /* fill our lookup tables */
2305 for (i = 0; i <= mask_r>>sh_r; i++)
2306 {
2307 RUINT32T tmp;
2308 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2309 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2310 lookup_r[i] = (tmp/65535)<<sh_r;
2311 }
2312 for (i = 0; i <= mask_g>>sh_g; i++)
2313 {
2314 RUINT32T tmp;
2315 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2316 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2317 lookup_g[i] = (tmp/65535)<<sh_g;
2318 }
2319 for (i = 0; i <= mask_b>>sh_b; i++)
2320 {
2321 RUINT32T tmp;
2322 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2323 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2324 lookup_b[i] = (tmp/65535)<<sh_b;
2325 }
2326
2327 /* apply table to input image (replacing colors by newly calculated ones) */
2328 switch (srcImage->bits_per_pixel)
2329 {
2330 case 15:
2331 {
2332 unsigned short *p1, *pf, *p, *pl;
2333 p1 = (unsigned short *) srcImage->data;
2334 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2335 while (p1 < pf)
2336 {
2337 p = p1;
2338 pl = p1 + srcImage->width;
2339 for (; p < pl; p++)
2340 {
2341 *p = lookup_r[(*p & 0x7c00)>>10] |
2342 lookup_g[(*p & 0x03e0)>> 5] |
2343 lookup_b[(*p & 0x001f)];
2344 }
2345 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2346 }
2347 break;
2348 }
2349 case 16:
2350 {
2351 unsigned short *p1, *pf, *p, *pl;
2352 p1 = (unsigned short *) srcImage->data;
2353 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2354 while (p1 < pf)
2355 {
2356 p = p1;
2357 pl = p1 + srcImage->width;
2358 for (; p < pl; p++)
2359 {
2360 *p = lookup_r[(*p & 0xf800)>>11] |
2361 lookup_g[(*p & 0x07e0)>> 5] |
2362 lookup_b[(*p & 0x001f)];
2363 }
2364 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2365 }
2366 break;
2367 }
2368 case 24:
2369 {
2370 unsigned char *p1, *pf, *p, *pl;
2371 p1 = (unsigned char *) srcImage->data;
2372 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2373 while (p1 < pf)
2374 {
2375 p = p1;
2376 pl = p1 + srcImage->width * 3;
2377 for (; p < pl; p += 3)
2378 {
2379 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2380 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2381 p[2] = lookup_r[(p[2] & 0x0000ff)];
2382 }
2383 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2384 }
2385 break;
2386 }
2387 case 32:
2388 {
2389 RUINT32T *p1, *pf, *p, *pl;
2390 p1 = (RUINT32T *) srcImage->data;
2391 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2392
2393 while (p1 < pf)
2394 {
2395 p = p1;
2396 pl = p1 + srcImage->width;
2397 for (; p < pl; p++)
2398 {
2399 *p = lookup_r[(*p & 0xff0000)>>16] |
2400 lookup_g[(*p & 0x00ff00)>> 8] |
2401 lookup_b[(*p & 0x0000ff)] |
2402 (*p & ~0xffffff);
2403 }
2404 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2405 }
2406 break;
2407 }
2408 }
2409
2410 free (lookup);
2411}
2412#endif
2413
2414/*
2415 * Check our parents are still who we think they are.
2416 * Do transparency updates if required
2417 */
2418int
2419rxvt_term::check_our_parents ()
2420{
2421 int i, pchanged, aformat, have_pixmap, rootdepth;
2422 unsigned long nitems, bytes_after;
2423 Atom atype;
2424 unsigned char *prop = NULL;
2425 Window root, oldp, *list;
2426 Pixmap rootpixmap = None;
2427 XWindowAttributes wattr, wrootattr;
2428
2429 pchanged = 0;
2430
2431 if (!OPTION (Opt_transparent))
2432 return pchanged; /* Don't try any more */
2433
2434 XGetWindowAttributes (xdisp, display->root, &wrootattr);
2435 rootdepth = wrootattr.depth;
2436
2437 XGetWindowAttributes (xdisp, parent[0], &wattr);
2438
2439 if (rootdepth != wattr.depth)
2440 {
2441 if (am_transparent)
2442 {
2443 pchanged = 1;
2444 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2445 am_transparent = am_pixmap_trans = 0;
2446 }
2447
2448 return pchanged; /* Don't try any more */
2449 }
2450
2451 /* Get all X ops out of the queue so that our information is up-to-date. */
2452 XSync (xdisp, False);
2453
2454 /*
2455 * Make the frame window set by the window manager have
2456 * the root background. Some window managers put multiple nested frame
2457 * windows for each client, so we have to take care about that.
2458 */
2459 i = (xa[XA_XROOTPMAP_ID]
2460 && XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
2461 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2462 &nitems, &bytes_after, &prop) == Success);
2463
2464 if (!i || prop == NULL)
2465 i = (xa[XA_ESETROOT_PMAP_ID]
2466 && XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
2467 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2468 &nitems, &bytes_after, &prop) == Success);
2469
2470 if (!i || prop == NULL
2471#if TINTING
2472 || !ISSET_PIXCOLOR (Color_tint)
2473#endif
2474 )
2475 have_pixmap = 0;
2476 else
2477 {
2478 have_pixmap = 1;
2479 rootpixmap = *(Pixmap *)prop;
2480 XFree (prop);
2481 }
2482
2483 if (have_pixmap)
2484 {
2485 /*
2486 * Copy display->root pixmap transparency
2487 */
2488 int sx, sy, nx, ny;
2489 unsigned int nw, nh;
2490 Window cr;
2491 XImage *image;
2492 GC gc;
2493 XGCValues gcvalue;
2494
2495 XTranslateCoordinates (xdisp, parent[0], display->root,
2496 0, 0, &sx, &sy, &cr);
2497 nw = (unsigned int)szHint.width;
2498 nh = (unsigned int)szHint.height;
2499 nx = ny = 0;
2500
2501 if (sx < 0)
2502 {
2503 nw += sx;
2504 nx = -sx;
2505 sx = 0;
2506 }
2507
2508 if (sy < 0)
2509 {
2510 nh += sy;
2511 ny = -sy;
2512 sy = 0;
2513 }
2514
2515 min_it (nw, (unsigned int) (wrootattr.width - sx));
2516 min_it (nh, (unsigned int) (wrootattr.height - sy));
2517
2518 XSync (xdisp, False);
2519 allowedxerror = -1;
2520 image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2521
2522 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2523 /* XXX: may need a delay here? */
2524 allowedxerror = 0;
2525
2526 if (image == NULL)
2527 {
2528 if (am_transparent && am_pixmap_trans)
2529 {
2530 pchanged = 1;
2531 if (pixmap != None)
2532 {
2533 XFreePixmap (xdisp, pixmap);
2534 pixmap = None;
2535 }
2536 }
2537
2538 am_pixmap_trans = 0;
2539 }
2540 else
2541 {
2542 if (pixmap != None)
2543 XFreePixmap (xdisp, pixmap);
2544
2545#if TINTING
2546 if (ISSET_PIXCOLOR (Color_tint))
2547 {
2548 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2549
2550 rgba c;
2551 pix_colors_focused [Color_tint].get (c);
2552
2553 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2554 }
2555#endif
2556
2557 pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2558 gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2559 XPutImage (xdisp, pixmap, gc, image, 0, 0,
2560 nx, ny, image->width, image->height);
2561 XFreeGC (xdisp, gc);
2562 XDestroyImage (image);
2563 XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
2564 XClearWindow (xdisp, parent[0]);
2565
2566 if (!am_transparent || !am_pixmap_trans)
2567 pchanged = 1;
2568
2569 am_transparent = am_pixmap_trans = 1;
2570 }
2571 }
2572
2573 if (am_pixmap_trans)
2574 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2575 else
2576 {
2577 unsigned int n;
2578 /*
2579 * InheritPixmap transparency
2580 */
2581 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2582 {
2583 oldp = parent[i];
2584 XQueryTree (xdisp, parent[i - 1], &root, &parent[i], &list, &n);
2585 XFree (list);
2586
2587 if (parent[i] == display->root)
2588 {
2589 if (oldp != None)
2590 pchanged = 1;
2591
2592 break;
2593 }
2594
2595 if (oldp != parent[i])
2596 pchanged = 1;
2597 }
2598
2599 n = 0;
2600
2601 if (pchanged)
2602 for (; n < (unsigned int)i; n++)
2603 {
2604 XGetWindowAttributes (xdisp, parent[n], &wattr);
2605
2606 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2607 {
2608 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2609 break;
2610 }
2611 }
2612
2613 if (n > (sizeof (parent) / sizeof (parent[0])))
2614 {
2615 XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2616 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2617 am_transparent = 0;
2618 /* XXX: also turn off Opt_transparent? */
2619 }
2620 else
2621 {
2622 for (n = 0; n < (unsigned int)i; n++)
2623 {
2624 XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
2625 XClearWindow (xdisp, parent[n]);
2626 }
2627
2628 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2629 am_transparent = 1;
2630 }
2631
2632 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2633 parent[i] = None;
2634 }
2635
2636 if (scrollBar.win)
2637 {
2638 XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);
2639 scrollBar.setIdle ();
2640 scrollbar_show (0);
2641 }
2642
2643 if (am_transparent)
2644 {
2645 want_refresh = want_full_refresh = 1;
2646 if (am_pixmap_trans)
2647 flush ();
2648 }
2649
2650 return pchanged;
2651}
2652#endif
2653 2173
2654/*}}} */ 2174/*}}} */
2655 2175
2656bool 2176bool
2657rxvt_term::cmd_parse () 2177rxvt_term::cmd_parse ()
… …
2706 if (ch == C0_LF) 2226 if (ch == C0_LF)
2707 nlines++; 2227 nlines++;
2708 2228
2709 refresh_count++; 2229 refresh_count++;
2710 2230
2711 if (!OPTION (Opt_jumpScroll) 2231 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2712 || (refresh_count >= refresh_limit * (nrow - 1)))
2713 { 2232 {
2714 refreshnow = true;
2715 refresh_count = 0; 2233 refresh_count = 0;
2234
2235 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2236 {
2237 refreshnow = true;
2716 ch = NOCHAR; 2238 ch = NOCHAR;
2717 break; 2239 break;
2240 }
2718 } 2241 }
2719 2242
2720 // scr_add_lines only works for nlines <= nrow - 1. 2243 // scr_add_lines only works for nlines <= nrow - 1.
2721 if (nlines >= nrow - 1) 2244 if (nlines >= nrow - 1)
2722 { 2245 {
… …
2750 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2273 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2751 scr_add_lines (buf, str - buf, nlines); 2274 scr_add_lines (buf, str - buf, nlines);
2752 2275
2753 /* 2276 /*
2754 * If there have been a lot of new lines, then update the screen 2277 * If there have been a lot of new lines, then update the screen
2755 * What the heck I'll cheat and only refresh less than every page-full. 2278 * What the heck we'll cheat and only refresh less than every page-full.
2756 * the number of pages between refreshes is refresh_limit, which 2279 * if skipScroll is enabled.
2757 * is incremented here because we must be doing flat-out scrolling.
2758 */ 2280 */
2759 if (refreshnow) 2281 if (refreshnow)
2760 { 2282 {
2761 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2762 refresh_limit++;
2763 else
2764 {
2765 flag = true; 2283 flag = true;
2766 scr_refresh (); 2284 scr_refresh ();
2767 want_refresh = 1; 2285 want_refresh = 1;
2768 }
2769 } 2286 }
2770 2287
2771 } 2288 }
2772 else 2289 else
2773 { 2290 {
… …
2922 { 2439 {
2923 if ((buf[len++] = cmd_getc ()) == 'i') 2440 if ((buf[len++] = cmd_getc ()) == 'i')
2924 break; /* done = 1 */ 2441 break; /* done = 1 */
2925 } 2442 }
2926 } 2443 }
2927 2444
2928 for (i = 0; i < len; i++) 2445 for (i = 0; i < len; i++)
2929 if (putc (buf[i], fd) == EOF) 2446 if (putc (buf[i], fd) == EOF)
2930 { 2447 {
2931 done = 1; 2448 done = 1;
2932 break; 2449 break;
… …
2934 } 2451 }
2935 } 2452 }
2936 2453
2937 pclose_printer (fd); 2454 pclose_printer (fd);
2938} 2455}
2939#endif /* PRINTPIPE */ 2456#endif /* PRINTPIPE */
2940/*}}} */ 2457/*}}} */
2941 2458
2942/* *INDENT-OFF* */ 2459/* *INDENT-OFF* */
2943enum { 2460enum {
2944 C1_40 = 0x40, 2461 C1_40 = 0x40,
… …
2994 process_dcs_seq (); 2511 process_dcs_seq ();
2995 break; 2512 break;
2996 case 0x9b: /* CSI */ 2513 case 0x9b: /* CSI */
2997 process_csi_seq (); 2514 process_csi_seq ();
2998 break; 2515 break;
2999 case 0x9d: /* CSI */ 2516 case 0x9d: /* OSC */
3000 process_osc_seq (); 2517 process_osc_seq ();
3001 break; 2518 break;
3002#endif 2519#endif
3003 } 2520 }
3004} 2521}
… …
3230rxvt_term::process_csi_seq () 2747rxvt_term::process_csi_seq ()
3231{ 2748{
3232 unicode_t ch, priv, i; 2749 unicode_t ch, priv, i;
3233 unsigned int nargs, p; 2750 unsigned int nargs, p;
3234 int n, ndef; 2751 int n, ndef;
3235 int arg[ESC_ARGS]; 2752 int arg[ESC_ARGS] = { };
3236 2753
3237 for (nargs = ESC_ARGS; nargs > 0;) 2754 nargs = 0;
3238 arg[--nargs] = 0;
3239 2755
3240 priv = 0; 2756 priv = 0;
3241 ch = cmd_getc (); 2757 ch = cmd_getc ();
3242 if (ch >= '<' && ch <= '?') 2758 if (ch >= '<' && ch <= '?')
2759 {
3243 { /* '<' '=' '>' '?' */ 2760 /* '<' '=' '>' '?' */
3244 priv = ch; 2761 priv = ch;
3245 ch = cmd_getc (); 2762 ch = cmd_getc ();
3246 } 2763 }
3247 2764
3248 /* read any numerical arguments */ 2765 /* read any numerical arguments */
… …
3287 switch (priv) 2804 switch (priv)
3288 { 2805 {
3289 case '>': 2806 case '>':
3290 if (ch == CSI_DA) /* secondary device attributes */ 2807 if (ch == CSI_DA) /* secondary device attributes */
3291 { 2808 {
3292 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt, 2809 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
3293 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2810 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3294 // 2811 //
3295 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2812 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3296 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2813 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
3297 // that we do not support xterm mouse reporting (should be 95 when we do). 2814 // versions.
3298 // 2815 //
3299 tt_printf ("\033[>%d;94;0c", 'U'); 2816 tt_printf ("\033[>%d;95;0c", 'U');
3300 } 2817 }
3301 break; 2818 break;
2819
3302 case '?': 2820 case '?':
3303 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2821 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3304 process_terminal_mode (ch, priv, nargs, arg); 2822 process_terminal_mode (ch, priv, nargs, arg);
3305 break; 2823 break;
3306 } 2824 }
… …
3431 break; 2949 break;
3432 case 6: /* CPR requested */ 2950 case 6: /* CPR requested */
3433 scr_report_position (); 2951 scr_report_position ();
3434 break; 2952 break;
3435 case 7: /* unofficial extension */ 2953 case 7: /* unofficial extension */
3436 if (OPTION (Opt_insecure)) 2954 if (option (Opt_insecure))
3437 tt_printf ("%-.250s\012", rs[Rs_display_name]); 2955 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3438 break; 2956 break;
3439 case 8: /* unofficial extension */ 2957 case 8: /* unofficial extension */
3440 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2958 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3441 break; 2959 break;
… …
3534{ 3052{
3535 int x, y; 3053 int x, y;
3536 XWindowAttributes wattr; 3054 XWindowAttributes wattr;
3537 Window wdummy; 3055 Window wdummy;
3538 3056
3539 dLocal (Display *, xdisp); 3057 dLocal (Display *, dpy);
3540 3058
3541 if (nargs == 0) 3059 if (nargs == 0)
3542 return; 3060 return;
3543 3061
3544 switch (args[0]) 3062 switch (args[0])
3545 { 3063 {
3546 /* 3064 /*
3547 * commands 3065 * commands
3548 */ 3066 */
3549 case 1: /* deiconify window */ 3067 case 1: /* deiconify window */
3550 XMapWindow (xdisp, parent[0]); 3068 XMapWindow (dpy, parent[0]);
3551 break; 3069 break;
3552 case 2: /* iconify window */ 3070 case 2: /* iconify window */
3553 XIconifyWindow (xdisp, parent[0], display->screen); 3071 XIconifyWindow (dpy, parent[0], display->screen);
3554 break; 3072 break;
3555 case 3: /* set position (pixels) */ 3073 case 3: /* set position (pixels) */
3556 XMoveWindow (xdisp, parent[0], args[1], args[2]); 3074 XMoveWindow (dpy, parent[0], args[1], args[2]);
3557 break; 3075 break;
3558 case 4: /* set size (pixels) */ 3076 case 4: /* set size (pixels) */
3559 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3077 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3560 break; 3078 break;
3561 case 5: /* raise window */ 3079 case 5: /* raise window */
3562 XRaiseWindow (xdisp, parent[0]); 3080 XRaiseWindow (dpy, parent[0]);
3563 break; 3081 break;
3564 case 6: /* lower window */ 3082 case 6: /* lower window */
3565 XLowerWindow (xdisp, parent[0]); 3083 XLowerWindow (dpy, parent[0]);
3566 break; 3084 break;
3567 case 7: /* refresh window */ 3085 case 7: /* refresh window */
3568 scr_touch (true); 3086 scr_touch (true);
3569 break; 3087 break;
3570 case 8: /* set size (chars) */ 3088 case 8: /* set size (chars) */
… …
3581 3099
3582 /* 3100 /*
3583 * reports - some output format copied from XTerm 3101 * reports - some output format copied from XTerm
3584 */ 3102 */
3585 case 11: /* report window state */ 3103 case 11: /* report window state */
3586 XGetWindowAttributes (xdisp, parent[0], &wattr); 3104 XGetWindowAttributes (dpy, parent[0], &wattr);
3587 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3105 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3588 break; 3106 break;
3589 case 13: /* report window position */ 3107 case 13: /* report window position */
3590 XGetWindowAttributes (xdisp, parent[0], &wattr); 3108 XGetWindowAttributes (dpy, parent[0], &wattr);
3591 XTranslateCoordinates (xdisp, parent[0], wattr.root, 3109 XTranslateCoordinates (dpy, parent[0], wattr.root,
3592 -wattr.border_width, -wattr.border_width, 3110 -wattr.border_width, -wattr.border_width,
3593 &x, &y, &wdummy); 3111 &x, &y, &wdummy);
3594 tt_printf ("\033[3;%d;%dt", x, y); 3112 tt_printf ("\033[3;%d;%dt", x, y);
3595 break; 3113 break;
3596 case 14: /* report window size (pixels) */ 3114 case 14: /* report window size (pixels) */
3597 XGetWindowAttributes (xdisp, parent[0], &wattr); 3115 XGetWindowAttributes (dpy, parent[0], &wattr);
3598 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3116 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3599 break; 3117 break;
3600 case 18: /* report text area size (chars) */ 3118 case 18: /* report text area size (chars) */
3601 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3119 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3602 break; 3120 break;
… …
3604 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3122 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3605 break; 3123 break;
3606 case 20: /* report icon label */ 3124 case 20: /* report icon label */
3607 { 3125 {
3608 char *s; 3126 char *s;
3609 XGetIconName (xdisp, parent[0], &s); 3127 XGetIconName (dpy, parent[0], &s);
3610 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3128 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3611 XFree (s); 3129 XFree (s);
3612 } 3130 }
3613 break; 3131 break;
3614 case 21: /* report window title */ 3132 case 21: /* report window title */
3615 { 3133 {
3616 char *s; 3134 char *s;
3617 XFetchName (xdisp, parent[0], &s); 3135 XFetchName (dpy, parent[0], &s);
3618 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3136 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3619 XFree (s); 3137 XFree (s);
3620 } 3138 }
3621 break; 3139 break;
3622 } 3140 }
3623} 3141}
… …
3650 seen_esc = true; 3168 seen_esc = true;
3651 continue; 3169 continue;
3652 } 3170 }
3653 else if (ch == C0_BEL || ch == CHAR_ST) 3171 else if (ch == C0_BEL || ch == CHAR_ST)
3654 break; 3172 break;
3173 else if (ch == C0_SYN)
3174 ch = cmd_get8 ();
3655 else if (ch < 0x20) 3175 else if (ch < 0x20)
3656 return NULL; /* other control character - exit */ 3176 return NULL; /* other control character - exit */
3657 3177
3658 seen_esc = false; 3178 seen_esc = false;
3659 3179
3660 if (n >= STRING_MAX - 1) 3180 if (n >= STRING_MAX - 1)
3661 // stop at some sane length 3181 // stop at some sane length
3662 return NULL; 3182 return NULL;
3663 3183
3664 if (ch == C0_SYN)
3665 string[n++] = cmd_get8 ();
3666 else
3667 string[n++] = ch; 3184 string[n++] = ch;
3668 } 3185 }
3669 3186
3670 string[n++] = '\0'; 3187 string[n++] = '\0';
3671 3188
3672 ends_how = (ch == 0x5c ? C0_ESC : ch); 3189 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3748 int color; 3265 int color;
3749 char *buf, *name; 3266 char *buf, *name;
3750 bool query = str[0] == '?' && !str[1]; 3267 bool query = str[0] == '?' && !str[1];
3751 int saveop = op; 3268 int saveop = op;
3752 3269
3753 dLocal (Display *, xdisp); 3270 dLocal (Display *, dpy);
3754 3271
3755 assert (str != NULL); 3272 assert (str != NULL);
3273
3274 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3275 return;
3276
3756 switch (op) 3277 switch (op)
3757 { 3278 {
3758 case XTerm_name: 3279 case XTerm_name:
3759 set_title (str); 3280 set_title (str);
3760 /* FALLTHROUGH */ 3281 /* FALLTHROUGH */
… …
3774 unsigned long bytes_after; 3295 unsigned long bytes_after;
3775 unsigned char *value = 0; 3296 unsigned char *value = 0;
3776 const char *str = ""; 3297 const char *str = "";
3777 3298
3778 if (prop 3299 if (prop
3779 && XGetWindowProperty (xdisp, parent[0], 3300 && XGetWindowProperty (dpy, parent[0],
3780 prop, 0, 1<<16, 0, AnyPropertyType, 3301 prop, 0, 1<<16, 0, AnyPropertyType,
3781 &actual_type, &actual_format, 3302 &actual_type, &actual_format,
3782 &nitems, &bytes_after, &value) == Success 3303 &nitems, &bytes_after, &value) == Success
3783 && actual_type != None 3304 && actual_type != None
3784 && actual_format == 8) 3305 && actual_format == 8)
… …
3796 { 3317 {
3797 *eq = 0; 3318 *eq = 0;
3798 set_utf8_property (display->atom (str), eq + 1); 3319 set_utf8_property (display->atom (str), eq + 1);
3799 } 3320 }
3800 else 3321 else
3801 XDeleteProperty (xdisp, parent[0], 3322 XDeleteProperty (dpy, parent[0],
3802 display->atom (str)); 3323 display->atom (str));
3803 } 3324 }
3804 break; 3325 break;
3805 3326
3806 case XTerm_Color: 3327 case XTerm_Color:
… …
3819 *buf++ = '\0'; 3340 *buf++ = '\0';
3820 3341
3821 process_color_seq (op, color, name, resp); 3342 process_color_seq (op, color, name, resp);
3822 } 3343 }
3823 break; 3344 break;
3345 case Rxvt_restoreFG:
3824 case XTerm_Color00: 3346 case XTerm_Color00:
3825 process_color_seq (op, Color_fg, str, resp); 3347 process_color_seq (op, Color_fg, str, resp);
3826 break; 3348 break;
3349 case Rxvt_restoreBG:
3827 case XTerm_Color01: 3350 case XTerm_Color01:
3828 process_color_seq (op, Color_bg, str, resp); 3351 process_color_seq (op, Color_bg, str, resp);
3829 break; 3352 break;
3830#ifndef NO_CURSORCOLOR 3353#ifndef NO_CURSORCOLOR
3831 case XTerm_Color_cursor: 3354 case XTerm_Color_cursor:
… …
3852 break; 3375 break;
3853 case URxvt_Color_IT: 3376 case URxvt_Color_IT:
3854 process_color_seq (op, Color_IT, str, resp); 3377 process_color_seq (op, Color_IT, str, resp);
3855 break; 3378 break;
3856#endif 3379#endif
3857#if TRANSPARENT && TINTING 3380#if ENABLE_TRANSPARENCY
3858 case URxvt_Color_tint: 3381 case URxvt_Color_tint:
3859 process_color_seq (op, Color_tint, str, resp); 3382 process_color_seq (op, Color_tint, str, resp);
3383 {
3384 bool changed = false;
3860 3385
3861 check_our_parents (); 3386 if (ISSET_PIXCOLOR (Color_tint))
3387 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3388 else
3389 changed = bgPixmap.unset_tint ();
3862 3390
3863 if (am_transparent) 3391 if (changed)
3864 want_full_refresh = want_refresh = 1; 3392 update_background ();
3393 }
3865 3394
3866 break; 3395 break;
3867#endif 3396#endif
3868 3397
3398#if BG_IMAGE_FROM_FILE
3869 case Rxvt_Pixmap: 3399 case Rxvt_Pixmap:
3870 { 3400 if (!strcmp (str, "?"))
3871 if (*str != ';')
3872 { 3401 {
3873#if XPM_BACKGROUND 3402 char str[256];
3874 scale_pixmap (""); /* reset to default scaling */ 3403
3875 set_bgPixmap (str); /* change pixmap */ 3404 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3876 scr_touch (true); 3405 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3877#endif 3406 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3407 process_xterm_seq (XTerm_title, str, CHAR_ST);
3878 } 3408 }
3879 3409 else
3410 {
3880 int changed = 0; 3411 int changed = 0;
3881 3412
3882 while ((str = strchr (str, ';')) != NULL) 3413 if (*str != ';')
3883 { 3414 {
3415 /* reset to default scaling :*/
3416 bgPixmap.unset_geometry ();
3417 if (bgPixmap.set_file (str)) /* change pixmap */
3418 changed++;
3419 str = strchr (str, ';');
3420 if (str == NULL)
3421 bgPixmap.set_defaultGeometry ();
3422 }
3423
3424 while (str)
3425 {
3884 str++; 3426 str++;
3885#if XPM_BACKGROUND 3427 if (bgPixmap.set_geometry (str))
3886 changed += scale_pixmap (str); 3428 changed++;
3887#endif 3429 str = strchr (str, ';');
3888 } 3430 }
3889 3431
3890 if (changed) 3432 if (changed)
3891 { 3433 update_background ();
3892#ifdef XPM_BACKGROUND
3893 resize_pixmap ();
3894 scr_touch (true);
3895#endif
3896 } 3434 }
3897 }
3898 break; 3435 break;
3899 3436#endif
3900 case Rxvt_restoreFG:
3901 set_window_color (Color_fg, str);
3902 break;
3903 case Rxvt_restoreBG:
3904 set_window_color (Color_bg, str);
3905 break;
3906 3437
3907 case XTerm_logfile: 3438 case XTerm_logfile:
3908 // TODO, when secure mode? 3439 // TODO, when secure mode?
3909 break; 3440 break;
3910 3441
… …
3928 case URxvt_italicFont: 3459 case URxvt_italicFont:
3929 case URxvt_boldItalicFont: 3460 case URxvt_boldItalicFont:
3930#endif 3461#endif
3931 if (query) 3462 if (query)
3932 tt_printf ("\33]%d;%-.250s%c", saveop, 3463 tt_printf ("\33]%d;%-.250s%c", saveop,
3933 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3464 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3934 ? fontset[op - URxvt_font]->fontdesc : "", 3465 ? fontset[op - URxvt_font]->fontdesc : "",
3935 resp); 3466 resp);
3936 else 3467 else
3937 { 3468 {
3938 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3469 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3952 break; 3483 break;
3953 3484
3954#if !ENABLE_MINIMAL 3485#if !ENABLE_MINIMAL
3955 case URxvt_locale: 3486 case URxvt_locale:
3956 if (query) 3487 if (query)
3957 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp); 3488 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3958 else 3489 else
3959 { 3490 {
3960 set_locale (str); 3491 set_locale (str);
3961 pty->set_utf8_mode (enc_utf8); 3492 pty->set_utf8_mode (enc_utf8);
3962 init_xlocale (); 3493 init_xlocale ();
… …
3977 break; 3508 break;
3978#endif 3509#endif
3979 3510
3980#if ENABLE_PERL 3511#if ENABLE_PERL
3981 case URxvt_perl: 3512 case URxvt_perl:
3982 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 3513 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3983 ; // no responses yet 3514 ; // no responses yet
3984 break; 3515 break;
3985#endif 3516#endif
3986 } 3517 }
3987} 3518}
… …
4025{ 3556{
4026 unsigned int i, j; 3557 unsigned int i, j;
4027 int state; 3558 int state;
4028 3559
4029 static const struct 3560 static const struct
4030 { 3561 {
4031 const int argval; 3562 const int argval;
4032 const unsigned long bit; 3563 const unsigned long bit;
4033 }
4034
4035 argtopriv[] = { 3564 } argtopriv[] = {
4036 { 1, PrivMode_aplCUR }, 3565 { 1, PrivMode_aplCUR },
4037 { 2, PrivMode_vt52 }, 3566 { 2, PrivMode_vt52 },
4038 { 3, PrivMode_132 }, 3567 { 3, PrivMode_132 },
4039 { 4, PrivMode_smoothScroll }, 3568 { 4, PrivMode_smoothScroll },
4040 { 5, PrivMode_rVideo }, 3569 { 5, PrivMode_rVideo },
… …
4056 { 66, PrivMode_aplKP }, 3585 { 66, PrivMode_aplKP },
4057#ifndef NO_BACKSPACE_KEY 3586#ifndef NO_BACKSPACE_KEY
4058 { 67, PrivMode_BackSpace }, 3587 { 67, PrivMode_BackSpace },
4059#endif 3588#endif
4060 { 1000, PrivMode_MouseX11 }, 3589 { 1000, PrivMode_MouseX11 },
4061 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3590 { 1002, PrivMode_MouseBtnEvent },
4062 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3591 { 1003, PrivMode_MouseAnyEvent },
4063 // 1003 Use All Motion Mouse Tracking. NYI, TODO
4064 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3592 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4065 { 1011, PrivMode_Keypress }, // rxvt extension 3593 { 1011, PrivMode_Keypress }, // rxvt extension
4066 // 1035 enable modifiers for alt, numlock NYI 3594 // 1035 enable modifiers for alt, numlock NYI
4067 // 1036 send ESC for meta keys NYI 3595 // 1036 send ESC for meta keys NYI
4068 // 1037 send DEL for keypad delete NYI 3596 // 1037 send DEL for keypad delete NYI
4069 { 1047, PrivMode_Screen }, 3597 { 1047, PrivMode_Screen },
4070 // 1048 save and restore cursor 3598 // 1048 save and restore cursor
4071 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3599 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
4072 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3600 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3601 { 2004, PrivMode_BracketPaste },
4073 }; 3602 };
4074 3603
4075 if (nargs == 0) 3604 if (nargs == 0)
4076 return; 3605 return;
4077 3606
… …
4103 scr_touch (true); 3632 scr_touch (true);
4104 break; 3633 break;
4105#endif 3634#endif
4106 case 1048: /* alternative cursor save */ 3635 case 1048: /* alternative cursor save */
4107 case 1049: 3636 case 1049:
4108 if (OPTION (Opt_secondaryScreen)) 3637 if (option (Opt_secondaryScreen))
4109 if (mode == 0) 3638 if (mode == 0)
4110 scr_cursor (RESTORE); 3639 scr_cursor (RESTORE);
4111 else if (mode == 1) 3640 else if (mode == 1)
4112 scr_cursor (SAVE); 3641 scr_cursor (SAVE);
4113 break; 3642 break;
… …
4125 */ 3654 */
4126 PrivMode (1, PrivMode_vt52); 3655 PrivMode (1, PrivMode_vt52);
4127 break; 3656 break;
4128 case 3: /* 80/132 */ 3657 case 3: /* 80/132 */
4129 if (priv_modes & PrivMode_132OK) 3658 if (priv_modes & PrivMode_132OK)
3659 {
3660 scr_poweron ();
4130 set_widthheight (((state ? 132 : 80) * fwidth), height); 3661 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight);
3662 }
4131 break; 3663 break;
4132 case 4: /* smooth scrolling */ 3664 case 4: /* smooth scrolling */
4133 set_option (Opt_jumpScroll, !state); 3665 set_option (Opt_jumpScroll, !state);
4134 break; 3666 break;
4135 case 5: /* reverse video */ 3667 case 5: /* reverse video */
… …
4142 scr_autowrap (state); 3674 scr_autowrap (state);
4143 break; 3675 break;
4144 /* case 8: - auto repeat, can't do on a per window basis */ 3676 /* case 8: - auto repeat, can't do on a per window basis */
4145 case 9: /* X10 mouse reporting */ 3677 case 9: /* X10 mouse reporting */
4146 if (state) /* orthogonal */ 3678 if (state) /* orthogonal */
4147 priv_modes &= ~PrivMode_MouseX11; 3679 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4148 break; 3680 break;
4149#ifdef scrollBar_esc 3681#ifdef scrollBar_esc
4150 case scrollBar_esc: 3682 case scrollBar_esc:
4151 if (scrollbar_mapping (state)) 3683 if (scrollbar_mapping (state))
4152 { 3684 {
… …
4165 break; 3697 break;
4166 /* case 66: - application key pad */ 3698 /* case 66: - application key pad */
4167 /* case 67: - backspace key */ 3699 /* case 67: - backspace key */
4168 case 1000: /* X11 mouse reporting */ 3700 case 1000: /* X11 mouse reporting */
4169 if (state) /* orthogonal */ 3701 if (state) /* orthogonal */
4170 priv_modes &= ~PrivMode_MouseX10; 3702 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4171 break; 3703 break;
4172#if 0
4173 case 1001: 3704 case 1002:
4174 break; /* X11 mouse highlighting */ 3705 case 1003:
4175#endif 3706 if (state)
3707 {
3708 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3709 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3710 vt_emask_mouse = PointerMotionMask;
3711 }
3712 else
3713 vt_emask_mouse = NoEventMask;
3714 vt_select_input ();
3715 break;
4176 case 1010: /* scroll to bottom on TTY output inhibit */ 3716 case 1010: /* scroll to bottom on TTY output inhibit */
4177 set_option (Opt_scrollTtyOutput, !state); 3717 set_option (Opt_scrollTtyOutput, !state);
4178 break; 3718 break;
4179 case 1011: /* scroll to bottom on key press */ 3719 case 1011: /* scroll to bottom on key press */
4180 set_option (Opt_scrollTtyKeypress, state); 3720 set_option (Opt_scrollTtyKeypress, state);
4181 break; 3721 break;
4182 case 1047: /* secondary screen w/ clearing last */ 3722 case 1047: /* secondary screen w/ clearing last */
4183 if (OPTION (Opt_secondaryScreen)) 3723 if (option (Opt_secondaryScreen))
4184 if (current_screen != PRIMARY) 3724 if (current_screen != PRIMARY)
4185 scr_erase_screen (2); 3725 scr_erase_screen (2);
4186 scr_change_screen (state); 3726 scr_change_screen (state);
4187 break; 3727 break;
4188 case 1049: /* secondary screen w/ clearing first */ 3728 case 1049: /* secondary screen w/ clearing first */
4189 scr_change_screen (state); 3729 scr_change_screen (state);
4190 if (OPTION (Opt_secondaryScreen)) 3730 if (option (Opt_secondaryScreen))
4191 if (current_screen != PRIMARY) 3731 if (current_screen != PRIMARY)
4192 scr_erase_screen (2); 3732 scr_erase_screen (2);
4193 break; 3733 break;
4194 default: 3734 default:
4195 break; 3735 break;
… …
4357rxvt_term::process_graphics () 3897rxvt_term::process_graphics ()
4358{ 3898{
4359 unicode_t ch, cmd = cmd_getc (); 3899 unicode_t ch, cmd = cmd_getc ();
4360 3900
4361 if (cmd == 'Q') 3901 if (cmd == 'Q')
3902 {
4362 { /* query graphics */ 3903 /* query graphics */
4363 tt_printf ("\033G0\012"); /* no graphics */ 3904 tt_printf ("\033G0\012"); /* no graphics */
4364 return; 3905 return;
4365 } 3906 }
4366 /* swallow other graphics sequences until terminating ':' */ 3907 /* swallow other graphics sequences until terminating ':' */
4367 do 3908 do
… …
4417 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 3958 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4418 3959
4419 memcpy (v_buffer + v_buflen, data, len); 3960 memcpy (v_buffer + v_buflen, data, len);
4420 v_buflen += len; 3961 v_buflen += len;
4421 3962
4422 pty_ev.set (EVENT_READ | EVENT_WRITE); 3963 pty_ev.set (ev::READ | ev::WRITE);
4423} 3964}
4424 3965
4425void rxvt_term::pty_write () 3966void rxvt_term::pty_write ()
4426{ 3967{
4427 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 3968 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4432 3973
4433 if (v_buflen == 0) 3974 if (v_buflen == 0)
4434 { 3975 {
4435 free (v_buffer); 3976 free (v_buffer);
4436 v_buffer = 0; 3977 v_buffer = 0;
4437 v_buflen = 0;
4438 3978
4439 pty_ev.set (EVENT_READ); 3979 pty_ev.set (ev::READ);
4440 return; 3980 return;
4441 } 3981 }
4442 3982
4443 memmove (v_buffer, v_buffer + written, v_buflen); 3983 memmove (v_buffer, v_buffer + written, v_buflen);
4444 } 3984 }
4445 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 3985 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4446 pty_ev.set (EVENT_READ); 3986 pty_ev.set (ev::READ);
4447} 3987}
4448 3988
4449/*----------------------- end-of-file (C source) -----------------------*/ 3989/*----------------------- end-of-file (C source) -----------------------*/
4450 3990

Diff Legend

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