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.309 by root, Mon Feb 20 22:42:00 2006 UTC vs.
Revision 1.409 by ayin, Sat Feb 16 15:39:20 2008 UTC

… …
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
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
303void 392void
304rxvt_term::key_press (XKeyEvent &ev) 393rxvt_term::key_press (XKeyEvent &ev)
305{ 394{
306 int ctrl, meta, shft, len; 395 int ctrl, meta, shft, len;
307 unsigned int newlen;
308 KeySym keysym; 396 KeySym keysym;
309 int valid_keysym; 397 int valid_keysym;
310 char kbuf[KBUFSZ]; 398 char kbuf[KBUFSZ];
311 399
312#if ISO_14755 400#if ISO_14755
… …
500# if ISO_14755 588# if ISO_14755
501 iso14755_51 (0); 589 iso14755_51 (0);
502# endif 590# endif
503 return; 591 return;
504 } 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 }
505 else if ((hv = hex_keyval (ev)) >= 0) 601 else if ((hv = hex_keyval (ev)) >= 0)
506 { 602 {
507 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK) 603 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
508 | hv | ISO_14755_51; 604 | hv | ISO_14755_51;
509# if ISO_14755 605# if ISO_14755
… …
511# endif 607# endif
512 return; 608 return;
513 } 609 }
514 else 610 else
515 { 611 {
516# if ENABLE_OVERLAY 612# if ISO_14755
517 scr_overlay_off (); 613 scr_overlay_off ();
518# endif 614# endif
519 iso14755buf = 0; 615 iso14755buf = 0;
520 } 616 }
521 } 617 }
522 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 618 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
523 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 619 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
524 if (!(iso14755buf & ISO_14755_STARTED)) 620 if (!(iso14755buf & ISO_14755_STARTED))
525 { 621 {
526 iso14755buf |= ISO_14755_STARTED; 622 iso14755buf |= ISO_14755_STARTED;
527# if ENABLE_OVERLAY 623# if ISO_14755
528 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 624 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
529 scr_overlay_set (0, 0, "ISO 14755 mode"); 625 scr_overlay_set (0, 0, "ISO 14755 mode");
530# endif 626# endif
531 } 627 }
532#endif 628#endif
533 629
534#ifdef PRINTPIPE 630#ifdef PRINTPIPE
535 if (keysym == XK_Print) 631 if (keysym == XK_Print)
536 { 632 {
537 scr_printscreen (ctrl | shft); 633 scr_printscreen (ctrl | shft);
538 return; 634 return;
539 } 635 }
540#endif 636#endif
541 637
542 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 638 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
543 { 639 {
544 { 640 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
545 newlen = 1; 641 unsigned int newlen = 1;
546 switch (keysym) 642
643 switch (translate_keypad (keysym, kp))
547 { 644 {
548#ifndef NO_BACKSPACE_KEY 645#ifndef NO_BACKSPACE_KEY
549 case XK_BackSpace: 646 case XK_BackSpace:
550 if (priv_modes & PrivMode_HaveBackSpace) 647 if (priv_modes & PrivMode_HaveBackSpace)
551 { 648 {
552 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace) 649 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
553 ^ !!ctrl) ? '\b' : '\177'; 650 ^ !!ctrl) ? '\b' : '\177';
554 kbuf[1] = '\0'; 651 kbuf[1] = '\0';
555 } 652 }
556 else 653 else
557 strcpy (kbuf, key_backspace); 654 strcpy (kbuf, rs[Rs_backspace_key]);
558 break; 655 break;
559#endif 656#endif
560#ifndef NO_DELETE_KEY 657#ifndef NO_DELETE_KEY
561# ifdef XK_KP_Prior
562 case XK_KP_Delete:
563 /* allow shift to override */
564 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
565 {
566 strcpy (kbuf, "\033On");
567 break;
568 }
569 /* FALLTHROUGH */
570# endif
571 case XK_Delete: 658 case XK_Delete:
572 strcpy (kbuf, key_delete); 659 strcpy (kbuf, rs[Rs_delete_key]);
573 break; 660 break;
574#endif 661#endif
575 case XK_Tab: 662 case XK_Tab:
576 if (shft) 663 if (shft)
577 strcpy (kbuf, "\033[Z"); 664 strcpy (kbuf, "\033[Z");
… …
587#endif 674#endif
588 newlen = 0; 675 newlen = 0;
589 } 676 }
590 break; 677 break;
591 678
592#ifdef XK_KP_Left
593 case XK_KP_Up: /* \033Ox or standard */
594 case XK_KP_Down: /* \033Or or standard */
595 case XK_KP_Right: /* \033Ov or standard */
596 case XK_KP_Left: /* \033Ot or standard */
597 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
598 {
599 strcpy (kbuf, "\033OZ");
600 kbuf[2] = "txvr"[keysym - XK_KP_Left];
601 break;
602 }
603 else
604 /* translate to std. cursor key */
605 keysym = XK_Left + (keysym - XK_KP_Left);
606 /* FALLTHROUGH */
607#endif
608 case XK_Up: /* "\033[A" */ 679 case XK_Up: /* "\033[A" */
609 case XK_Down: /* "\033[B" */ 680 case XK_Down: /* "\033[B" */
610 case XK_Right: /* "\033[C" */ 681 case XK_Right: /* "\033[C" */
611 case XK_Left: /* "\033[D" */ 682 case XK_Left: /* "\033[D" */
612 strcpy (kbuf, "\033[Z"); 683 strcpy (kbuf, "\033[Z");
… …
621 } 692 }
622 else if (priv_modes & PrivMode_aplCUR) 693 else if (priv_modes & PrivMode_aplCUR)
623 kbuf[1] = 'O'; 694 kbuf[1] = 'O';
624 break; 695 break;
625 696
626#ifndef UNSHIFTED_SCROLLKEYS
627# ifdef XK_KP_Prior
628 case XK_KP_Prior:
629 /* allow shift to override */
630 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
631 {
632 strcpy (kbuf, "\033Oy");
633 break;
634 }
635 /* FALLTHROUGH */
636# endif
637 case XK_Prior:
638 strcpy (kbuf, "\033[5~");
639 break;
640# ifdef XK_KP_Next
641 case XK_KP_Next:
642 /* allow shift to override */
643 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
644 {
645 strcpy (kbuf, "\033Os");
646 break;
647 }
648 /* FALLTHROUGH */
649# endif
650 case XK_Next:
651 strcpy (kbuf, "\033[6~");
652 break;
653#endif
654 case XK_KP_Enter: 697 case XK_KP_Enter:
655 /* allow shift to override */ 698 /* allow shift to override */
656 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 699 if (kp)
657 { 700 {
658 strcpy (kbuf, "\033OM"); 701 strcpy (kbuf, "\033OM");
659 break; 702 break;
660 } 703 }
661 704
… …
673 kbuf[0] = '\015'; 716 kbuf[0] = '\015';
674 kbuf[1] = '\0'; 717 kbuf[1] = '\0';
675 } 718 }
676 break; 719 break;
677 720
678#ifdef XK_KP_Begin
679 case XK_KP_Begin:
680 strcpy (kbuf, "\033Ou");
681 break;
682
683#endif
684 case XK_KP_F1: /* "\033OP" */ 721 case XK_KP_F1: /* "\033OP" */
685 case XK_KP_F2: /* "\033OQ" */ 722 case XK_KP_F2: /* "\033OQ" */
686 case XK_KP_F3: /* "\033OR" */ 723 case XK_KP_F3: /* "\033OR" */
687 case XK_KP_F4: /* "\033OS" */ 724 case XK_KP_F4: /* "\033OS" */
688 strcpy (kbuf, "\033OP"); 725 strcpy (kbuf, "\033OP");
… …
704 case XK_KP_6: /* "\033Ov" : "6" */ 741 case XK_KP_6: /* "\033Ov" : "6" */
705 case XK_KP_7: /* "\033Ow" : "7" */ 742 case XK_KP_7: /* "\033Ow" : "7" */
706 case XK_KP_8: /* "\033Ox" : "8" */ 743 case XK_KP_8: /* "\033Ox" : "8" */
707 case XK_KP_9: /* "\033Oy" : "9" */ 744 case XK_KP_9: /* "\033Oy" : "9" */
708 /* allow shift to override */ 745 /* allow shift to override */
709 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 746 if (kp)
710 { 747 {
711 strcpy (kbuf, "\033Oj"); 748 strcpy (kbuf, "\033Oj");
712 kbuf[2] += (keysym - XK_KP_Multiply); 749 kbuf[2] += (keysym - XK_KP_Multiply);
713 } 750 }
714 else 751 else
… …
716 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 753 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
717 kbuf[1] = '\0'; 754 kbuf[1] = '\0';
718 } 755 }
719 break; 756 break;
720 757
721 case XK_Find:
722 strcpy (kbuf, "\033[1~");
723 break;
724
725#ifdef XK_KP_End
726 case XK_KP_Insert:
727 /* allow shift to override */
728 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
729 {
730 strcpy (kbuf, "\033Op");
731 break;
732 }
733 /* FALLTHROUGH */
734#endif
735 case XK_Insert:
736 strcpy (kbuf, "\033[2~");
737 break;
738#ifdef DXK_Remove /* support for DEC remove like key */
739 case DXK_Remove:
740 /* FALLTHROUGH */
741#endif
742 case XK_Execute:
743 strcpy (kbuf, "\033[3~");
744 break;
745 case XK_Select:
746 strcpy (kbuf, "\033[4~");
747 break;
748#ifdef XK_KP_End
749 case XK_KP_End:
750 /* allow shift to override */
751 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
752 {
753 strcpy (kbuf, "\033Oq");
754 break;
755 }
756 /* FALLTHROUGH */
757#endif
758 case XK_End: 758 case XK_End:
759 strcpy (kbuf, KS_END); 759 strcpy (kbuf, KS_END);
760 break; 760 break;
761#ifdef XK_KP_Home
762 case XK_KP_Home:
763 /* allow shift to override */
764 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
765 {
766 strcpy (kbuf, "\033Ow");
767 break;
768 }
769 /* FALLTHROUGH */
770#endif
771 case XK_Home: 761 case XK_Home:
772 strcpy (kbuf, KS_HOME); 762 strcpy (kbuf, KS_HOME);
773 break; 763 break;
774 764
775#define FKEY(n, fkey) \
776 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
777
778 case XK_F1: /* "\033[11~" */
779 case XK_F2: /* "\033[12~" */
780 case XK_F3: /* "\033[13~" */
781 case XK_F4: /* "\033[14~" */
782 case XK_F5: /* "\033[15~" */
783 FKEY (11, XK_F1);
784 break;
785 case XK_F6: /* "\033[17~" */
786 case XK_F7: /* "\033[18~" */
787 case XK_F8: /* "\033[19~" */
788 case XK_F9: /* "\033[20~" */
789 case XK_F10: /* "\033[21~" */
790 FKEY (17, XK_F6);
791 break;
792 case XK_F11: /* "\033[23~" */
793 case XK_F12: /* "\033[24~" */
794 case XK_F13: /* "\033[25~" */
795 case XK_F14: /* "\033[26~" */
796 FKEY (23, XK_F11);
797 break;
798 case XK_F15: /* "\033[28~" */
799 case XK_F16: /* "\033[29~" */
800 FKEY (28, XK_F15);
801 break;
802 case XK_Help: /* "\033[28~" */
803 FKEY (28, XK_Help);
804 break;
805 case XK_Menu: /* "\033[29~" */
806 FKEY (29, XK_Menu);
807 break;
808 case XK_F17: /* "\033[31~" */
809 case XK_F18: /* "\033[32~" */
810 case XK_F19: /* "\033[33~" */
811 case XK_F20: /* "\033[34~" */
812 case XK_F21: /* "\033[35~" */
813 case XK_F22: /* "\033[36~" */
814 case XK_F23: /* "\033[37~" */
815 case XK_F24: /* "\033[38~" */
816 case XK_F25: /* "\033[39~" */
817 case XK_F26: /* "\033[40~" */
818 case XK_F27: /* "\033[41~" */
819 case XK_F28: /* "\033[42~" */
820 case XK_F29: /* "\033[43~" */
821 case XK_F30: /* "\033[44~" */
822 case XK_F31: /* "\033[45~" */
823 case XK_F32: /* "\033[46~" */
824 case XK_F33: /* "\033[47~" */
825 case XK_F34: /* "\033[48~" */
826 case XK_F35: /* "\033[49~" */
827 FKEY (31, XK_F17);
828 break;
829#undef FKEY
830 default: 765 default:
766 {
767 int param = map_function_key (keysym);
768 if (param > 0)
769 sprintf (kbuf,"\033[%d~", param);
770 else
831 newlen = 0; 771 newlen = 0;
772 }
832 break; 773 break;
833 } 774 }
834 775
835 if (newlen) 776 if (newlen)
836 len = strlen (kbuf); 777 len = strlen (kbuf);
837 }
838 778
839 /* 779 /*
840 * Pass meta for all function keys, if 'meta' option set 780 * Pass meta for all function keys, if 'meta' option set
841 */ 781 */
842#ifdef META8_OPTION 782#ifdef META8_OPTION
… …
877 return; 817 return;
878 818
879 if (len <= 0) 819 if (len <= 0)
880 return; /* not mapped */ 820 return; /* not mapped */
881 821
882 if (OPTION (Opt_scrollTtyKeypress)) 822 if (option (Opt_scrollTtyKeypress))
883 if (view_start) 823 if (view_start)
884 { 824 {
885 view_start = 0; 825 view_start = 0;
886 want_refresh = 1; 826 want_refresh = 1;
887 } 827 }
… …
926#if ENABLE_FRILLS || ISO_14755 866#if ENABLE_FRILLS || ISO_14755
927 // ISO 14755 support 867 // ISO 14755 support
928 if (iso14755buf) 868 if (iso14755buf)
929 if (iso14755buf & ISO_14755_52) 869 if (iso14755buf & ISO_14755_52)
930 { 870 {
931# if ENABLE_OVERLAY 871# if ISO_14755
932 scr_overlay_off (); 872 scr_overlay_off ();
933# endif 873# endif
934# if ISO_14755 874# if ISO_14755
935 // iso14755 part 5.2 handling: release time 875 // iso14755 part 5.2 handling: release time
936 // first: controls 876 // first: controls
… …
959 899
960 return; 900 return;
961 } 901 }
962 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask)) 902 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
963 { 903 {
964# if ENABLE_OVERLAY 904# if ISO_14755
965 scr_overlay_off (); 905 scr_overlay_off ();
966# endif 906# endif
967 if (iso14755buf & ISO_14755_51) 907 if (iso14755buf & ISO_14755_51)
968 commit_iso14755 (); 908 commit_iso14755 ();
969#if ISO_14755 909#if ISO_14755
970 else if (iso14755buf & ISO_14755_STARTED) 910 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
971 { 911 {
972 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair 912 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
973 913
974 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1); 914 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
975 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE"); 915 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
… …
1027void 967void
1028rxvt_term::flush () 968rxvt_term::flush ()
1029{ 969{
1030 flush_ev.stop (); 970 flush_ev.stop ();
1031 971
1032#ifdef TRANSPARENT 972#ifdef HAVE_BG_PIXMAP
1033 if (want_full_refresh) 973 if (bgPixmap.check_clearChanged ())
1034 { 974 {
1035 want_full_refresh = 0; 975// scr_clear (true); This needs to be researched further!
1036 scr_clear ();
1037 scr_touch (false); 976 scr_touch (false);
1038 } 977 }
1039#endif 978#endif
1040 979
1041 if (want_refresh) 980 if (want_refresh)
… …
1086 } 1025 }
1087 1026
1088 display->flush (); 1027 display->flush ();
1089} 1028}
1090 1029
1030/* checks wether a refresh is requested and starts the refresh timer */
1091void 1031void
1092rxvt_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)
1093{ 1042{
1094 make_current (); 1043 make_current ();
1095 1044
1096 display->flush ();
1097
1098 if (want_refresh && !flush_ev.active)
1099 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1100}
1101
1102void
1103rxvt_term::flush_cb (time_watcher &w)
1104{
1105 make_current ();
1106
1107 refresh_limit = 1;
1108 refresh_count = 0; 1045 refresh_count = 0;
1109 flush (); 1046 flush ();
1110} 1047}
1111 1048
1112#ifdef CURSOR_BLINK 1049#ifdef CURSOR_BLINK
1113void 1050void
1114rxvt_term::cursor_blink_cb (time_watcher &w) 1051rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1115{ 1052{
1116 hidden_cursor = !hidden_cursor; 1053 hidden_cursor = !hidden_cursor;
1117 want_refresh = 1; 1054 want_refresh = 1;
1118 1055 refresh_check ();
1119 w.start (w.at + CURSOR_BLINK_INTERVAL);
1120} 1056}
1121#endif 1057#endif
1122 1058
1123#ifdef TEXT_BLINK 1059#ifdef TEXT_BLINK
1124void 1060void
1125rxvt_term::text_blink_cb (time_watcher &w) 1061rxvt_term::text_blink_cb (ev::timer &w, int revents)
1126{ 1062{
1127 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1063 if (scr_refresh_rend (RS_Blink, RS_Blink))
1128 { 1064 {
1129 hidden_text = !hidden_text; 1065 hidden_text = !hidden_text;
1130 want_refresh = 1; 1066 want_refresh = 1;
1131 w.start (w.at + TEXT_BLINK_INTERVAL); 1067 refresh_check ();
1132 } 1068 }
1069 else
1070 w.stop ();
1133} 1071}
1134#endif 1072#endif
1135 1073
1136#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1074#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1137void 1075void
1138rxvt_term::cont_scroll_cb (time_watcher &w) 1076rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1139{ 1077{
1140 if ((scrollbar_isUp() || scrollbar_isDn()) && 1078 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1141 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1079 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1142 { 1080 {
1143 want_refresh = 1; 1081 want_refresh = 1;
1144 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1082 refresh_check ();
1145 } 1083 }
1084 else
1085 w.stop ();
1146} 1086}
1147#endif 1087#endif
1148 1088
1149#ifdef SELECTION_SCROLLING 1089#ifdef SELECTION_SCROLLING
1150void 1090void
1151rxvt_term::sel_scroll_cb (time_watcher &w) 1091rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1152{ 1092{
1153 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1093 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1154 { 1094 {
1155 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1095 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1156 want_refresh = 1; 1096 want_refresh = 1;
1157 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1097 refresh_check ();
1158 } 1098 }
1099 else
1100 w.stop ();
1159} 1101}
1160#endif 1102#endif
1161 1103
1162#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1104#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1163void 1105void
1164rxvt_term::slip_wheel_cb (time_watcher &w) 1106rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1165{ 1107{
1166 if (mouse_slip_wheel_speed == 0 1108 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1167 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1168 : scr_page (UP, mouse_slip_wheel_speed))
1169 { 1109 {
1170 if (view_start == top_row || view_start == 0)
1171 mouse_slip_wheel_speed = 0;
1172
1173 want_refresh = 1; 1110 want_refresh = 1;
1174 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 ();
1175 } 1118 }
1176} 1119}
1177#endif 1120#endif
1178 1121
1179#if LINUX_YIELD_HACK 1122#if LINUX_YIELD_HACK
1180static struct event_handler 1123static struct event_handler
1181{ 1124{
1182 check_watcher yield_ev; 1125 ev::prepare yield_ev;
1183 1126
1184 void yield_cb (check_watcher &w) 1127 void yield_cb (ev::prepare &w, int revents)
1185 { 1128 {
1186 // this should really be sched_yield(), but the linux guys thought 1129 // this should really be sched_yield(), but the linux guys thought
1187 // that giving a process calling sched_yield () less cpu time than 1130 // that giving a process calling sched_yield () less cpu time than
1188 // ones with high nice levels is a useful thing to do. It surely is is 1131 // ones with high nice levels is a useful thing to do. It surely is is
1189 // allowed by the sus... as is returning ENOSYS. 1132 // allowed by the sus... as is returning ENOSYS.
… …
1232 } 1175 }
1233 else 1176 else
1234 { 1177 {
1235 pty_ev.stop (); 1178 pty_ev.stop ();
1236 1179
1237 if (!OPTION (Opt_hold)) 1180 if (!option (Opt_hold))
1238 destroy (); 1181 destroy ();
1239 } 1182 }
1240 1183
1241 return false; 1184 return false;
1242} 1185}
1243 1186
1244void 1187void
1245rxvt_term::pty_cb (io_watcher &w, short revents) 1188rxvt_term::pty_cb (ev::io &w, int revents)
1246{ 1189{
1247 make_current (); 1190 make_current ();
1248 1191
1249 if (revents & EVENT_READ) 1192 if (revents & ev::READ)
1250 // loop, but don't allow a single term to monopolize us 1193 // loop, but don't allow a single term to monopolize us
1251 while (pty_fill ()) 1194 while (pty_fill ())
1252 if (cmd_parse ()) 1195 if (cmd_parse ())
1253 break; 1196 break;
1254 1197
1255 if (revents & EVENT_WRITE) 1198 if (revents & ev::WRITE)
1256 pty_write (); 1199 pty_write ();
1200
1201 refresh_check ();
1257} 1202}
1258 1203
1259void 1204void
1260rxvt_term::pointer_unblank () 1205rxvt_term::pointer_unblank ()
1261{ 1206{
… …
1263 recolour_cursor (); 1208 recolour_cursor ();
1264 1209
1265#ifdef POINTER_BLANK 1210#ifdef POINTER_BLANK
1266 hidden_pointer = 0; 1211 hidden_pointer = 0;
1267 1212
1268 if (OPTION (Opt_pointerBlank)) 1213 if (option (Opt_pointerBlank))
1269 pointer_ev.start (NOW + pointerBlankDelay); 1214 pointer_ev.start (pointerBlankDelay);
1270#endif 1215#endif
1271} 1216}
1272 1217
1273#ifdef POINTER_BLANK 1218#ifdef POINTER_BLANK
1274void 1219void
1275rxvt_term::pointer_blank () 1220rxvt_term::pointer_blank ()
1276{ 1221{
1277 if (!OPTION (Opt_pointerBlank)) 1222 if (!option (Opt_pointerBlank))
1278 return; 1223 return;
1279 1224
1280 XDefineCursor (dpy, vt, display->blank_cursor); 1225 XDefineCursor (dpy, vt, display->blank_cursor);
1281 XFlush (dpy); 1226 XFlush (dpy);
1282 1227
1283 hidden_pointer = 1; 1228 hidden_pointer = 1;
1284} 1229}
1285 1230
1286void 1231void
1287rxvt_term::pointer_cb (time_watcher &w) 1232rxvt_term::pointer_cb (ev::timer &w, int revents)
1288{ 1233{
1289 make_current (); 1234 make_current ();
1290 1235
1291 pointer_blank (); 1236 pointer_blank ();
1292} 1237}
… …
1295void 1240void
1296rxvt_term::mouse_report (XButtonEvent &ev) 1241rxvt_term::mouse_report (XButtonEvent &ev)
1297{ 1242{
1298 int button_number, key_state = 0; 1243 int button_number, key_state = 0;
1299 int x, y; 1244 int x, y;
1245 int code = 32;
1300 1246
1301 x = ev.x; 1247 x = Pixel2Col (ev.x);
1302 y = ev.y; 1248 y = Pixel2Row (ev.y);
1303 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 }
1304 1257
1305 if (MEvent.button == AnyButton) 1258 if (MEvent.button == AnyButton)
1306 button_number = 3; 1259 button_number = 3;
1307 else 1260 else
1308 { 1261 {
… …
1354 x + 1, 1307 x + 1,
1355 y + 1); 1308 y + 1);
1356#endif 1309#endif
1357 1310
1358 tt_printf ("\033[M%c%c%c", 1311 tt_printf ("\033[M%c%c%c",
1359 (32 + button_number + key_state), 1312 (code + button_number + key_state),
1360 (32 + x + 1), 1313 (32 + x + 1),
1361 (32 + y + 1)); 1314 (32 + y + 1));
1362} 1315}
1363 1316
1364/*{{{ process an X event */ 1317/*{{{ process an X event */
… …
1426 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1379 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1427 focus_out (); 1380 focus_out ();
1428 } 1381 }
1429#endif 1382#endif
1430 } 1383 }
1431 break;
1432
1433 case MappingNotify:
1434 XRefreshKeyboardMapping (&ev.xmapping);
1435 break; 1384 break;
1436 1385
1437 /* 1386 /*
1438 * XXX: this is not the _current_ arrangement 1387 * XXX: this is not the _current_ arrangement
1439 * Here's my conclusion: 1388 * Here's my conclusion:
… …
1458 break; 1407 break;
1459 } 1408 }
1460 break; 1409 break;
1461 1410
1462 case FocusIn: 1411 case FocusIn:
1412 if (ev.xfocus.detail != NotifyInferior
1413 && ev.xfocus.detail != NotifyPointer
1414 && ev.xfocus.mode != NotifyGrab)
1463 focus_in (); 1415 focus_in ();
1464 break; 1416 break;
1465 1417
1466 case FocusOut: 1418 case FocusOut:
1419 if (ev.xfocus.detail != NotifyInferior
1420 && ev.xfocus.detail != NotifyPointer
1421 && ev.xfocus.mode != NotifyGrab)
1467 focus_out (); 1422 focus_out ();
1468 break; 1423 break;
1469 1424
1470 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);*/
1471 if (ev.xconfigure.window == parent[0]) 1429 if (ev.xconfigure.window == parent[0])
1472 { 1430 {
1473 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1431 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1474 ; 1432 ;
1475 1433
1476 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1434 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1477 { 1435 {
1478 seen_resize = 1; 1436 seen_resize = 1;
1479 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1437 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1480 } 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 }
1481 1451
1482 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1452 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1483
1484#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1485 if (OPTION (Opt_transparent))
1486 check_our_parents ();
1487#endif
1488 } 1453 }
1489 break; 1454 break;
1490 1455
1491 case PropertyNotify: 1456 case PropertyNotify:
1492 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)))
… …
1508 case SelectionRequest: 1473 case SelectionRequest:
1509 selection_send (ev.xselectionrequest); 1474 selection_send (ev.xselectionrequest);
1510 break; 1475 break;
1511 1476
1512 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
1513 mapped = 1; 1494 mapped = 1;
1514#ifdef TEXT_BLINK 1495#ifdef TEXT_BLINK
1515 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1496 text_blink_ev.start ();
1516#endif 1497#endif
1517 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1498 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1518 break; 1499 break;
1519 1500
1520 case UnmapNotify: 1501 case UnmapNotify:
… …
1522#ifdef TEXT_BLINK 1503#ifdef TEXT_BLINK
1523 text_blink_ev.stop (); 1504 text_blink_ev.stop ();
1524#endif 1505#endif
1525 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1506 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1526 break; 1507 break;
1527
1528#ifdef TRANSPARENT
1529 case ReparentNotify:
1530 rootwin_cb (ev);
1531 break;
1532#endif /* TRANSPARENT */
1533 1508
1534 case GraphicsExpose: 1509 case GraphicsExpose:
1535 case Expose: 1510 case Expose:
1536 if (ev.xany.window == vt) 1511 if (ev.xany.window == vt)
1537 { 1512 {
1538 do 1513 do
1514 {
1539 scr_expose (ev.xexpose.x, ev.xexpose.y, 1515 scr_expose (ev.xexpose.x, ev.xexpose.y,
1540 ev.xexpose.width, ev.xexpose.height, False); 1516 ev.xexpose.width, ev.xexpose.height, False);
1517 }
1541 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1518 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1542 1519
1543 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1520 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1544 1521
1545 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1522 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1523 {
1546 scr_expose (ev.xexpose.x, ev.xexpose.y, 1524 scr_expose (ev.xexpose.x, ev.xexpose.y,
1547 ev.xexpose.width, ev.xexpose.height, False); 1525 ev.xexpose.width, ev.xexpose.height, False);
1526 }
1548 1527
1549 want_refresh = 1; 1528 want_refresh = 1;
1550 } 1529 }
1551 else 1530 else
1552 { 1531 {
… …
1555 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1534 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1556 ; 1535 ;
1557 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1536 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1558 ; 1537 ;
1559 1538
1560 if (isScrollbarWindow (ev.xany.window)) 1539 if (scrollBar.state && ev.xany.window == scrollBar.win)
1561 { 1540 {
1562 scrollBar.setIdle (); 1541 scrollBar.state = STATE_IDLE;
1563 scrollbar_show (0); 1542 scrollbar_show (0);
1564 } 1543 }
1565
1566#ifdef TRANSPARENT
1567 if (am_transparent && ev.xany.window == parent[0])
1568 XClearWindow (dpy, ev.xany.window);
1569#endif
1570 } 1544 }
1571 break; 1545 break;
1572 1546
1573 case MotionNotify: 1547 case MotionNotify:
1574#ifdef POINTER_BLANK 1548#ifdef POINTER_BLANK
1575 if (hidden_pointer) 1549 if (hidden_pointer)
1576 pointer_unblank (); 1550 pointer_unblank ();
1577#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);
1578 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1555 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1579 break; 1556 break;
1580 1557
1581 if (ev.xany.window == vt) 1558 if (ev.xany.window == vt)
1582 { 1559 {
… …
1616 int dist; 1593 int dist;
1617 1594
1618 /* don't clobber the current delay if we are 1595 /* don't clobber the current delay if we are
1619 * already in the middle of scrolling. 1596 * already in the middle of scrolling.
1620 */ 1597 */
1621 if (!sel_scroll_ev.active) 1598 if (!sel_scroll_ev.is_active ())
1622 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1599 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1623 1600
1624 /* save the event params so we can highlight 1601 /* save the event params so we can highlight
1625 * the selection in the pending-scroll loop 1602 * the selection in the pending-scroll loop
1626 */ 1603 */
1627 selection_save_x = ev.xbutton.x; 1604 selection_save_x = ev.xbutton.x;
… …
1649 else 1626 else
1650 { 1627 {
1651 /* we are within the text window, so we 1628 /* we are within the text window, so we
1652 * shouldn't be scrolling 1629 * shouldn't be scrolling
1653 */ 1630 */
1654 if (sel_scroll_ev.active)
1655 sel_scroll_ev.stop(); 1631 sel_scroll_ev.stop();
1656 } 1632 }
1657#endif 1633#endif
1658#ifdef MOUSE_THRESHOLD 1634#ifdef MOUSE_THRESHOLD
1659 } 1635 }
1660#endif 1636#endif
1661 } 1637 }
1662 } 1638 }
1663 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1639 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1664 { 1640 {
1665 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1641 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1666 MotionNotify, &ev)) 1642 MotionNotify, &ev))
1667 ; 1643 ;
1668 1644
… …
1672 &ev.xbutton.x, &ev.xbutton.y, 1648 &ev.xbutton.x, &ev.xbutton.y,
1673 &unused_mask); 1649 &unused_mask);
1674 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1650 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1675 scrollbar_size ()); 1651 scrollbar_size ());
1676 want_refresh = 1; 1652 want_refresh = 1;
1677 refresh_limit = 0;
1678 scrollbar_show (1); 1653 scrollbar_show (1);
1679 } 1654 }
1680 break; 1655 break;
1681 } 1656 }
1682 1657
1683#if defined(CURSOR_BLINK) 1658#if defined(CURSOR_BLINK)
1684 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1659 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1685 { 1660 {
1686 if (hidden_cursor) 1661 if (hidden_cursor)
1687 { 1662 {
1688 hidden_cursor = 0; 1663 hidden_cursor = 0;
1689 want_refresh = 1; 1664 want_refresh = 1;
1690 } 1665 }
1691 1666
1692 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1667 cursor_blink_ev.again ();
1693 } 1668 }
1694#endif 1669#endif
1695 1670
1696#if defined(POINTER_BLANK) 1671#if defined(POINTER_BLANK)
1697 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1672 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1698 { 1673 {
1699 if (ev.type == MotionNotify 1674 if (ev.type == MotionNotify
1700 || ev.type == ButtonPress 1675 || ev.type == ButtonPress
1701 || ev.type == ButtonRelease) 1676 || ev.type == ButtonRelease)
1702 if (hidden_pointer) 1677 if (hidden_pointer)
… …
1704 1679
1705 if (ev.type == KeyPress && hidden_pointer == 0) 1680 if (ev.type == KeyPress && hidden_pointer == 0)
1706 pointer_blank (); 1681 pointer_blank ();
1707 } 1682 }
1708#endif 1683#endif
1684
1685 refresh_check ();
1709} 1686}
1710 1687
1711void 1688void
1712rxvt_term::focus_in () 1689rxvt_term::focus_in ()
1713{ 1690{
… …
1724 IMSetPosition (); 1701 IMSetPosition ();
1725 XSetICFocus (Input_Context); 1702 XSetICFocus (Input_Context);
1726 } 1703 }
1727#endif 1704#endif
1728#if CURSOR_BLINK 1705#if CURSOR_BLINK
1729 if (OPTION (Opt_cursorBlink)) 1706 if (option (Opt_cursorBlink))
1730 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1707 cursor_blink_ev.again ();
1731#endif 1708#endif
1732#if OFF_FOCUS_FADING 1709#if OFF_FOCUS_FADING
1733 if (rs[Rs_fade]) 1710 if (rs[Rs_fade])
1734 { 1711 {
1735 pix_colors = pix_colors_focused; 1712 pix_colors = pix_colors_focused;
1736 scr_recolour (); 1713 scr_recolour ();
1737 } 1714 }
1738#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
1739 } 1726 }
1740} 1727}
1741 1728
1742void 1729void
1743rxvt_term::focus_out () 1730rxvt_term::focus_out ()
… …
1751 1738
1752#if ENABLE_FRILLS || ISO_14755 1739#if ENABLE_FRILLS || ISO_14755
1753 if (iso14755buf) 1740 if (iso14755buf)
1754 { 1741 {
1755 iso14755buf = 0; 1742 iso14755buf = 0;
1756# if ENABLE_OVERLAY 1743# if ISO_14755
1757 scr_overlay_off (); 1744 scr_overlay_off ();
1758# endif 1745# endif
1759 } 1746 }
1760#endif 1747#endif
1761#if USE_XIM 1748#if USE_XIM
1762 if (Input_Context != NULL) 1749 if (Input_Context != NULL)
1763 XUnsetICFocus (Input_Context); 1750 XUnsetICFocus (Input_Context);
1764#endif 1751#endif
1765#if CURSOR_BLINK 1752#if CURSOR_BLINK
1766 if (OPTION (Opt_cursorBlink)) 1753 if (option (Opt_cursorBlink))
1767 cursor_blink_ev.stop (); 1754 cursor_blink_ev.stop ();
1755
1768 hidden_cursor = 0; 1756 hidden_cursor = 0;
1769#endif 1757#endif
1770#if OFF_FOCUS_FADING 1758#if OFF_FOCUS_FADING
1771 if (rs[Rs_fade]) 1759 if (rs[Rs_fade])
1772 { 1760 {
… …
1775 } 1763 }
1776#endif 1764#endif
1777 } 1765 }
1778} 1766}
1779 1767
1780#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
1781void 1782void
1782rxvt_term::rootwin_cb (XEvent &ev) 1783rxvt_term::rootwin_cb (XEvent &ev)
1783{ 1784{
1784 make_current (); 1785 make_current ();
1785 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
1786 switch (ev.type) 1792 switch (ev.type)
1787 { 1793 {
1788 case PropertyNotify: 1794 case PropertyNotify:
1789 /* 1795 /*
1790 * 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,
1791 * 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.
1792 */ 1798 */
1793 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1799 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1794 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1800 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1795 return; 1801 {
1802 bgPixmap.set_root_pixmap ();
1803 update_background ();
1804 }
1796 1805
1797 /* FALLTHROUGH */
1798 case ReparentNotify:
1799 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1800 want_refresh = want_full_refresh = 1;
1801 break; 1806 break;
1802 } 1807 }
1808# endif
1809
1810 refresh_check ();
1803} 1811}
1804#endif 1812#endif
1805 1813
1806void 1814void
1807rxvt_term::button_press (XButtonEvent &ev) 1815rxvt_term::button_press (XButtonEvent &ev)
… …
1862 mouse_report (ev); 1870 mouse_report (ev);
1863 } 1871 }
1864#else 1872#else
1865 MEvent.button = ev.button; 1873 MEvent.button = ev.button;
1866 mouse_report (ev); 1874 mouse_report (ev);
1867#endif /* MOUSE_REPORT_DOUBLECLICK */ 1875#endif /* MOUSE_REPORT_DOUBLECLICK */
1868 1876
1869 } 1877 }
1870 else 1878 else
1871 { 1879 {
1872 if (ev.button != MEvent.button) 1880 if (ev.button != MEvent.button)
… …
1920 } 1928 }
1921 1929
1922 /* 1930 /*
1923 * Scrollbar window processing of button press 1931 * Scrollbar window processing of button press
1924 */ 1932 */
1925 if (isScrollbarWindow (ev.window)) 1933 if (scrollBar.state && ev.window == scrollBar.win)
1926 { 1934 {
1927 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;
1928 /* 1943 /*
1929 * Rxvt-style scrollbar: 1944 * Rxvt-style scrollbar:
1930 * move up if mouse is above slider 1945 * move up if mouse is above slider
1931 * move dn if mouse is below slider 1946 * move dn if mouse is below slider
1932 * 1947 *
… …
1941 /* 1956 /*
1942 * Mouse report disabled scrollbar: 1957 * Mouse report disabled scrollbar:
1943 * arrow buttons - send up/down 1958 * arrow buttons - send up/down
1944 * click on scrollbar - send pageup/down 1959 * click on scrollbar - send pageup/down
1945 */ 1960 */
1946 if ((scrollBar.style == R_SB_NEXT 1961 if (direction == UP)
1947 && scrollbarnext_upButton (ev.y))
1948 || (scrollBar.style == R_SB_RXVT
1949 && scrollbarrxvt_upButton (ev.y)))
1950 tt_printf ("\033[A"); 1962 tt_printf ("\033[A");
1951 else if ((scrollBar.style == R_SB_NEXT 1963 else if (direction == DN)
1952 && scrollbarnext_dnButton (ev.y))
1953 || (scrollBar.style == R_SB_RXVT
1954 && scrollbarrxvt_dnButton (ev.y)))
1955 tt_printf ("\033[B"); 1964 tt_printf ("\033[B");
1956 else 1965 else
1957 switch (ev.button) 1966 switch (ev.button)
1958 { 1967 {
1959 case Button2: 1968 case Button2:
… …
1966 tt_printf ("\033[5~"); 1975 tt_printf ("\033[5~");
1967 break; 1976 break;
1968 } 1977 }
1969 } 1978 }
1970 else 1979 else
1971#endif /* NO_SCROLLBAR_REPORT */ 1980#endif /* NO_SCROLLBAR_REPORT */
1972
1973 {
1974 char upordown = 0;
1975
1976 if (scrollBar.style == R_SB_NEXT)
1977 { 1981 {
1978 if (scrollbarnext_upButton (ev.y)) 1982 if (direction != NO_DIR)
1979 upordown = -1; /* up */
1980 else if (scrollbarnext_dnButton (ev.y))
1981 upordown = 1; /* down */
1982 }
1983 else if (scrollBar.style == R_SB_RXVT)
1984 {
1985 if (scrollbarrxvt_upButton (ev.y))
1986 upordown = -1; /* up */
1987 else if (scrollbarrxvt_dnButton (ev.y))
1988 upordown = 1; /* down */
1989 }
1990 if (upordown)
1991 { 1983 {
1992#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1984#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1985 if (!cont_scroll_ev.is_active ())
1993 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1986 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1994#endif 1987#endif
1995 if (scr_page (upordown < 0 ? UP : DN, 1)) 1988 if (scr_page (direction, 1))
1996 { 1989 {
1997 if (upordown < 0) 1990 if (direction == UP)
1998 scrollBar.setUp (); 1991 scrollBar.state = STATE_UP;
1999 else 1992 else
2000 scrollBar.setDn (); 1993 scrollBar.state = STATE_DOWN;
2001 } 1994 }
2002 } 1995 }
2003 else 1996 else
2004 switch (ev.button) 1997 switch (ev.button)
2005 { 1998 {
2006 case Button2: 1999 case Button2:
2007 switch (scrollbar_align) 2000 switch (scrollBar.align)
2008 { 2001 {
2009 case R_SB_ALIGN_TOP: 2002 case R_SB_ALIGN_TOP:
2010 csrO = 0; 2003 csrO = 0;
2011 break; 2004 break;
2012 case R_SB_ALIGN_CENTRE: 2005 case R_SB_ALIGN_CENTRE:
… …
2020 if (scrollBar.style == R_SB_XTERM 2013 if (scrollBar.style == R_SB_XTERM
2021 || scrollbar_above_slider (ev.y) 2014 || scrollbar_above_slider (ev.y)
2022 || scrollbar_below_slider (ev.y)) 2015 || scrollbar_below_slider (ev.y))
2023 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2016 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
2024 2017
2025 scrollBar.setMotion (); 2018 scrollBar.state = STATE_MOTION;
2026 break; 2019 break;
2027 2020
2028 case Button1: 2021 case Button1:
2029 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2022 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2030 csrO = ev.y - scrollBar.top; 2023 csrO = ev.y - scrollBar.top;
2031 /* FALLTHROUGH */ 2024 /* FALLTHROUGH */
2032 2025
2033 case Button3: 2026 case Button3:
2034 if (scrollBar.style != R_SB_XTERM) 2027 if (scrollBar.style != R_SB_XTERM)
… …
2044 scr_page (DN, nrow - 1); 2037 scr_page (DN, nrow - 1);
2045# else 2038# else
2046 scr_page (DN, nrow / 4); 2039 scr_page (DN, nrow / 4);
2047# endif 2040# endif
2048 else 2041 else
2049 scrollBar.setMotion (); 2042 scrollBar.state = STATE_MOTION;
2050 } 2043 }
2051 else 2044 else
2052 { 2045 {
2053 scr_page ((ev.button == Button1 ? DN : UP), 2046 scr_page ((ev.button == Button1 ? DN : UP),
2054 (nrow 2047 (nrow
… …
2071 2064
2072 csrO = 0; /* reset csr Offset */ 2065 csrO = 0; /* reset csr Offset */
2073 if (!bypass_keystate) 2066 if (!bypass_keystate)
2074 reportmode = !! (priv_modes & PrivMode_mouse_report); 2067 reportmode = !! (priv_modes & PrivMode_mouse_report);
2075 2068
2076 if (scrollbar_isUpDn ()) 2069 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2077 { 2070 {
2078 scrollBar.setIdle (); 2071 scrollBar.state = STATE_IDLE;
2079 scrollbar_show (0); 2072 scrollbar_show (0);
2080 } 2073 }
2081 2074
2082#ifdef SELECTION_SCROLLING 2075#ifdef SELECTION_SCROLLING
2083 if (sel_scroll_ev.active)
2084 sel_scroll_ev.stop(); 2076 sel_scroll_ev.stop();
2085#endif 2077#endif
2086 2078
2087 if (ev.window == vt) 2079 if (ev.window == vt)
2088 { 2080 {
2089 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)))
… …
2113 mouse_report (ev); 2105 mouse_report (ev);
2114 } 2106 }
2115#else /* MOUSE_REPORT_DOUBLECLICK */ 2107#else /* MOUSE_REPORT_DOUBLECLICK */
2116 MEvent.button = AnyButton; 2108 MEvent.button = AnyButton;
2117 mouse_report (ev); 2109 mouse_report (ev);
2118#endif /* MOUSE_REPORT_DOUBLECLICK */ 2110#endif /* MOUSE_REPORT_DOUBLECLICK */
2119 return; 2111 return;
2120 } 2112 }
2121 2113
2122 /* 2114 /*
2123 * dumb hack to compensate for the failure of click-and-drag 2115 * dumb hack to compensate for the failure of click-and-drag
… …
2135 selection_make (ev.time); 2127 selection_make (ev.time);
2136 break; 2128 break;
2137 2129
2138 case Button2: 2130 case Button2:
2139 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?
2140 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary); 2132 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2141 break; 2133 break;
2142 2134
2143#ifdef MOUSE_WHEEL 2135#ifdef MOUSE_WHEEL
2144 case Button4: 2136 case Button4:
2145 case Button5: 2137 case Button5:
… …
2149 2141
2150 v = ev.button == Button4 ? UP : DN; 2142 v = ev.button == Button4 ? UP : DN;
2151 2143
2152 if (ev.state & ShiftMask) 2144 if (ev.state & ShiftMask)
2153 i = 1; 2145 i = 1;
2154 else if (OPTION (Opt_mouseWheelScrollPage)) 2146 else if (option (Opt_mouseWheelScrollPage))
2155 i = nrow - 1; 2147 i = nrow - 1;
2156 else 2148 else
2157 i = 5; 2149 i = 5;
2158 2150
2159# ifdef MOUSE_SLIP_WHEELING 2151# ifdef MOUSE_SLIP_WHEELING
… …
2161 { 2153 {
2162 mouse_slip_wheel_speed += v ? -1 : 1; 2154 mouse_slip_wheel_speed += v ? -1 : 1;
2163 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2155 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2164 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2156 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2165 2157
2166 if (slip_wheel_ev.at < NOW) 2158 if (!slip_wheel_ev.is_active ())
2167 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2159 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2168
2169 slip_wheel_ev.start ();
2170 } 2160 }
2171 else 2161 else
2162# endif
2172 { 2163 {
2173# endif
2174 scr_page (v, i); 2164 scr_page (v, i);
2175 scrollbar_show (1); 2165 scrollbar_show (1);
2176# ifdef MOUSE_SLIP_WHEELING
2177 } 2166 }
2178# endif
2179 } 2167 }
2180 break; 2168 break;
2181#endif 2169#endif
2182 } 2170 }
2183 } 2171 }
2184} 2172}
2185
2186#ifdef TRANSPARENT
2187#if TINTING
2188/* taken from aterm-0.4.2 */
2189
2190typedef uint32_t RUINT32T;
2191
2192void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2193{
2194 int sh_r, sh_g, sh_b;
2195 RUINT32T mask_r, mask_g, mask_b;
2196 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2197 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2198 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2199 int i;
2200
2201 Visual *visual = term->visual;
2202
2203 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2204
2205 /* for convenience */
2206 mask_r = visual->red_mask;
2207 mask_g = visual->green_mask;
2208 mask_b = visual->blue_mask;
2209
2210 /* boring lookup table pre-initialization */
2211 switch (srcImage->bits_per_pixel) {
2212 case 15:
2213 if ((mask_r != 0x7c00) ||
2214 (mask_g != 0x03e0) ||
2215 (mask_b != 0x001f))
2216 return;
2217 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2218 lookup_r = lookup;
2219 lookup_g = lookup+32;
2220 lookup_b = lookup+32+32;
2221 sh_r = 10;
2222 sh_g = 5;
2223 sh_b = 0;
2224 break;
2225 case 16:
2226 if ((mask_r != 0xf800) ||
2227 (mask_g != 0x07e0) ||
2228 (mask_b != 0x001f))
2229 return;
2230 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2231 lookup_r = lookup;
2232 lookup_g = lookup+32;
2233 lookup_b = lookup+32+64;
2234 sh_r = 11;
2235 sh_g = 5;
2236 sh_b = 0;
2237 break;
2238 case 24:
2239 if ((mask_r != 0xff0000) ||
2240 (mask_g != 0x00ff00) ||
2241 (mask_b != 0x0000ff))
2242 return;
2243 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2244 lookup_r = lookup;
2245 lookup_g = lookup+256;
2246 lookup_b = lookup+256+256;
2247 sh_r = 16;
2248 sh_g = 8;
2249 sh_b = 0;
2250 break;
2251 case 32:
2252 if ((mask_r != 0xff0000) ||
2253 (mask_g != 0x00ff00) ||
2254 (mask_b != 0x0000ff))
2255 return;
2256 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2257 lookup_r = lookup;
2258 lookup_g = lookup+256;
2259 lookup_b = lookup+256+256;
2260 sh_r = 16;
2261 sh_g = 8;
2262 sh_b = 0;
2263 break;
2264 default:
2265 return; /* we do not support this color depth */
2266 }
2267
2268 /* prepare limits for color transformation (each channel is handled separately) */
2269 if (shade < 0) {
2270 shade = -shade;
2271 if (shade < 0) shade = 0;
2272 if (shade > 100) shade = 100;
2273
2274 lower_lim_r = 65535-rm;
2275 lower_lim_g = 65535-gm;
2276 lower_lim_b = 65535-bm;
2277
2278 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2279 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2280 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2281
2282 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2283 } else {
2284 if (shade < 0) shade = 0;
2285 if (shade > 100) shade = 100;
2286
2287 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2288
2289 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2290 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2291 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2292 }
2293
2294 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2295 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2296 {
2297 unsigned int tmp;
2298
2299 tmp = lower_lim_r;
2300 lower_lim_r = lower_lim_b;
2301 lower_lim_b = tmp;
2302
2303 tmp = upper_lim_r;
2304 upper_lim_r = upper_lim_b;
2305 upper_lim_b = tmp;
2306 }
2307
2308 /* fill our lookup tables */
2309 for (i = 0; i <= mask_r>>sh_r; i++)
2310 {
2311 RUINT32T tmp;
2312 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2313 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2314 lookup_r[i] = (tmp/65535)<<sh_r;
2315 }
2316 for (i = 0; i <= mask_g>>sh_g; i++)
2317 {
2318 RUINT32T tmp;
2319 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2320 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2321 lookup_g[i] = (tmp/65535)<<sh_g;
2322 }
2323 for (i = 0; i <= mask_b>>sh_b; i++)
2324 {
2325 RUINT32T tmp;
2326 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2327 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2328 lookup_b[i] = (tmp/65535)<<sh_b;
2329 }
2330
2331 /* apply table to input image (replacing colors by newly calculated ones) */
2332 switch (srcImage->bits_per_pixel)
2333 {
2334 case 15:
2335 {
2336 unsigned short *p1, *pf, *p, *pl;
2337 p1 = (unsigned short *) srcImage->data;
2338 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2339 while (p1 < pf)
2340 {
2341 p = p1;
2342 pl = p1 + srcImage->width;
2343 for (; p < pl; p++)
2344 {
2345 *p = lookup_r[(*p & 0x7c00)>>10] |
2346 lookup_g[(*p & 0x03e0)>> 5] |
2347 lookup_b[(*p & 0x001f)];
2348 }
2349 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2350 }
2351 break;
2352 }
2353 case 16:
2354 {
2355 unsigned short *p1, *pf, *p, *pl;
2356 p1 = (unsigned short *) srcImage->data;
2357 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2358 while (p1 < pf)
2359 {
2360 p = p1;
2361 pl = p1 + srcImage->width;
2362 for (; p < pl; p++)
2363 {
2364 *p = lookup_r[(*p & 0xf800)>>11] |
2365 lookup_g[(*p & 0x07e0)>> 5] |
2366 lookup_b[(*p & 0x001f)];
2367 }
2368 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2369 }
2370 break;
2371 }
2372 case 24:
2373 {
2374 unsigned char *p1, *pf, *p, *pl;
2375 p1 = (unsigned char *) srcImage->data;
2376 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2377 while (p1 < pf)
2378 {
2379 p = p1;
2380 pl = p1 + srcImage->width * 3;
2381 for (; p < pl; p += 3)
2382 {
2383 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2384 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2385 p[2] = lookup_r[(p[2] & 0x0000ff)];
2386 }
2387 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2388 }
2389 break;
2390 }
2391 case 32:
2392 {
2393 RUINT32T *p1, *pf, *p, *pl;
2394 p1 = (RUINT32T *) srcImage->data;
2395 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2396
2397 while (p1 < pf)
2398 {
2399 p = p1;
2400 pl = p1 + srcImage->width;
2401 for (; p < pl; p++)
2402 {
2403 *p = lookup_r[(*p & 0xff0000)>>16] |
2404 lookup_g[(*p & 0x00ff00)>> 8] |
2405 lookup_b[(*p & 0x0000ff)] |
2406 (*p & ~0xffffff);
2407 }
2408 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2409 }
2410 break;
2411 }
2412 }
2413
2414 free (lookup);
2415}
2416#endif
2417
2418/*
2419 * Check our parents are still who we think they are.
2420 * Do transparency updates if required
2421 */
2422int
2423rxvt_term::check_our_parents ()
2424{
2425 int i, pchanged, aformat, have_pixmap, rootdepth;
2426 unsigned long nitems, bytes_after;
2427 Atom atype;
2428 unsigned char *prop = NULL;
2429 Window root, oldp, *list;
2430 Pixmap rootpixmap = None;
2431 XWindowAttributes wattr, wrootattr;
2432
2433 pchanged = 0;
2434
2435 if (!OPTION (Opt_transparent))
2436 return pchanged; /* Don't try any more */
2437
2438 XGetWindowAttributes (dpy, display->root, &wrootattr);
2439 rootdepth = wrootattr.depth;
2440
2441 XGetWindowAttributes (dpy, parent[0], &wattr);
2442
2443 if (rootdepth != wattr.depth)
2444 {
2445 if (am_transparent)
2446 {
2447 pchanged = 1;
2448 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2449 am_transparent = am_pixmap_trans = 0;
2450 }
2451
2452 return pchanged; /* Don't try any more */
2453 }
2454
2455 /* Get all X ops out of the queue so that our information is up-to-date. */
2456 XSync (dpy, False);
2457
2458 /*
2459 * Make the frame window set by the window manager have
2460 * the root background. Some window managers put multiple nested frame
2461 * windows for each client, so we have to take care about that.
2462 */
2463 i = (xa[XA_XROOTPMAP_ID]
2464 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2465 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2466 &nitems, &bytes_after, &prop) == Success);
2467
2468 if (!i || prop == NULL)
2469 i = (xa[XA_ESETROOT_PMAP_ID]
2470 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2471 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2472 &nitems, &bytes_after, &prop) == Success);
2473
2474 if (!i || prop == NULL
2475#if TINTING
2476 || !ISSET_PIXCOLOR (Color_tint)
2477#endif
2478 )
2479 have_pixmap = 0;
2480 else
2481 {
2482 have_pixmap = 1;
2483 rootpixmap = *(Pixmap *)prop;
2484 XFree (prop);
2485 }
2486
2487 if (have_pixmap)
2488 {
2489 /*
2490 * Copy display->root pixmap transparency
2491 */
2492 int sx, sy, nx, ny;
2493 unsigned int nw, nh;
2494 Window cr;
2495 XImage *image;
2496 GC gc;
2497 XGCValues gcvalue;
2498
2499 XTranslateCoordinates (dpy, parent[0], display->root,
2500 0, 0, &sx, &sy, &cr);
2501 nw = (unsigned int)szHint.width;
2502 nh = (unsigned int)szHint.height;
2503 nx = ny = 0;
2504
2505 if (sx < 0)
2506 {
2507 nw += sx;
2508 nx = -sx;
2509 sx = 0;
2510 }
2511
2512 if (sy < 0)
2513 {
2514 nh += sy;
2515 ny = -sy;
2516 sy = 0;
2517 }
2518
2519 min_it (nw, (unsigned int) (wrootattr.width - sx));
2520 min_it (nh, (unsigned int) (wrootattr.height - sy));
2521
2522 XSync (dpy, False);
2523 allowedxerror = -1;
2524 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2525
2526 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2527 /* XXX: may need a delay here? */
2528 allowedxerror = 0;
2529
2530 if (image == NULL)
2531 {
2532 if (am_transparent && am_pixmap_trans)
2533 {
2534 pchanged = 1;
2535 if (pixmap != None)
2536 {
2537 XFreePixmap (dpy, pixmap);
2538 pixmap = None;
2539 }
2540 }
2541
2542 am_pixmap_trans = 0;
2543 }
2544 else
2545 {
2546 if (pixmap != None)
2547 XFreePixmap (dpy, pixmap);
2548
2549#if TINTING
2550 if (ISSET_PIXCOLOR (Color_tint))
2551 {
2552 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2553
2554 rgba c;
2555 pix_colors_focused [Color_tint].get (c);
2556
2557 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2558 }
2559#endif
2560
2561 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2562 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2563 XPutImage (dpy, pixmap, gc, image, 0, 0,
2564 nx, ny, image->width, image->height);
2565 XFreeGC (dpy, gc);
2566 XDestroyImage (image);
2567 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2568 XClearWindow (dpy, parent[0]);
2569
2570 if (!am_transparent || !am_pixmap_trans)
2571 pchanged = 1;
2572
2573 am_transparent = am_pixmap_trans = 1;
2574 }
2575 }
2576
2577 if (am_pixmap_trans)
2578 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2579 else
2580 {
2581 unsigned int n;
2582 /*
2583 * InheritPixmap transparency
2584 */
2585 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2586 {
2587 oldp = parent[i];
2588 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2589 XFree (list);
2590
2591 if (parent[i] == display->root)
2592 {
2593 if (oldp != None)
2594 pchanged = 1;
2595
2596 break;
2597 }
2598
2599 if (oldp != parent[i])
2600 pchanged = 1;
2601 }
2602
2603 n = 0;
2604
2605 if (pchanged)
2606 for (; n < (unsigned int)i; n++)
2607 {
2608 XGetWindowAttributes (dpy, parent[n], &wattr);
2609
2610 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2611 {
2612 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2613 break;
2614 }
2615 }
2616
2617 if (n > (sizeof (parent) / sizeof (parent[0])))
2618 {
2619 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2620 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2621 am_transparent = 0;
2622 /* XXX: also turn off Opt_transparent? */
2623 }
2624 else
2625 {
2626 for (n = 0; n < (unsigned int)i; n++)
2627 {
2628 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2629 XClearWindow (dpy, parent[n]);
2630 }
2631
2632 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2633 am_transparent = 1;
2634 }
2635
2636 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2637 parent[i] = None;
2638 }
2639
2640 if (scrollBar.win)
2641 {
2642 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2643 scrollBar.setIdle ();
2644 scrollbar_show (0);
2645 }
2646
2647 if (am_transparent)
2648 {
2649 want_refresh = want_full_refresh = 1;
2650 if (am_pixmap_trans)
2651 flush ();
2652 }
2653
2654 return pchanged;
2655}
2656#endif
2657 2173
2658/*}}} */ 2174/*}}} */
2659 2175
2660bool 2176bool
2661rxvt_term::cmd_parse () 2177rxvt_term::cmd_parse ()
… …
2710 if (ch == C0_LF) 2226 if (ch == C0_LF)
2711 nlines++; 2227 nlines++;
2712 2228
2713 refresh_count++; 2229 refresh_count++;
2714 2230
2715 if (!OPTION (Opt_jumpScroll) 2231 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2716 || (refresh_count >= refresh_limit * (nrow - 1)))
2717 { 2232 {
2718 refreshnow = true;
2719 refresh_count = 0; 2233 refresh_count = 0;
2234
2235 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2236 {
2237 refreshnow = true;
2720 ch = NOCHAR; 2238 ch = NOCHAR;
2721 break; 2239 break;
2240 }
2722 } 2241 }
2723 2242
2724 // scr_add_lines only works for nlines <= nrow - 1. 2243 // scr_add_lines only works for nlines <= nrow - 1.
2725 if (nlines >= nrow - 1) 2244 if (nlines >= nrow - 1)
2726 { 2245 {
… …
2754 && 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))))
2755 scr_add_lines (buf, str - buf, nlines); 2274 scr_add_lines (buf, str - buf, nlines);
2756 2275
2757 /* 2276 /*
2758 * 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
2759 * 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.
2760 * the number of pages between refreshes is refresh_limit, which 2279 * if skipScroll is enabled.
2761 * is incremented here because we must be doing flat-out scrolling.
2762 */ 2280 */
2763 if (refreshnow) 2281 if (refreshnow)
2764 { 2282 {
2765 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2766 refresh_limit++;
2767 else
2768 {
2769 flag = true; 2283 flag = true;
2770 scr_refresh (); 2284 scr_refresh ();
2771 want_refresh = 1; 2285 want_refresh = 1;
2772 }
2773 } 2286 }
2774 2287
2775 } 2288 }
2776 else 2289 else
2777 { 2290 {
… …
2926 { 2439 {
2927 if ((buf[len++] = cmd_getc ()) == 'i') 2440 if ((buf[len++] = cmd_getc ()) == 'i')
2928 break; /* done = 1 */ 2441 break; /* done = 1 */
2929 } 2442 }
2930 } 2443 }
2931 2444
2932 for (i = 0; i < len; i++) 2445 for (i = 0; i < len; i++)
2933 if (putc (buf[i], fd) == EOF) 2446 if (putc (buf[i], fd) == EOF)
2934 { 2447 {
2935 done = 1; 2448 done = 1;
2936 break; 2449 break;
… …
2938 } 2451 }
2939 } 2452 }
2940 2453
2941 pclose_printer (fd); 2454 pclose_printer (fd);
2942} 2455}
2943#endif /* PRINTPIPE */ 2456#endif /* PRINTPIPE */
2944/*}}} */ 2457/*}}} */
2945 2458
2946/* *INDENT-OFF* */ 2459/* *INDENT-OFF* */
2947enum { 2460enum {
2948 C1_40 = 0x40, 2461 C1_40 = 0x40,
… …
2998 process_dcs_seq (); 2511 process_dcs_seq ();
2999 break; 2512 break;
3000 case 0x9b: /* CSI */ 2513 case 0x9b: /* CSI */
3001 process_csi_seq (); 2514 process_csi_seq ();
3002 break; 2515 break;
3003 case 0x9d: /* CSI */ 2516 case 0x9d: /* OSC */
3004 process_osc_seq (); 2517 process_osc_seq ();
3005 break; 2518 break;
3006#endif 2519#endif
3007 } 2520 }
3008} 2521}
… …
3234rxvt_term::process_csi_seq () 2747rxvt_term::process_csi_seq ()
3235{ 2748{
3236 unicode_t ch, priv, i; 2749 unicode_t ch, priv, i;
3237 unsigned int nargs, p; 2750 unsigned int nargs, p;
3238 int n, ndef; 2751 int n, ndef;
3239 int arg[ESC_ARGS]; 2752 int arg[ESC_ARGS] = { };
3240 2753
3241 for (nargs = ESC_ARGS; nargs > 0;) 2754 nargs = 0;
3242 arg[--nargs] = 0;
3243 2755
3244 priv = 0; 2756 priv = 0;
3245 ch = cmd_getc (); 2757 ch = cmd_getc ();
3246 if (ch >= '<' && ch <= '?') 2758 if (ch >= '<' && ch <= '?')
2759 {
3247 { /* '<' '=' '>' '?' */ 2760 /* '<' '=' '>' '?' */
3248 priv = ch; 2761 priv = ch;
3249 ch = cmd_getc (); 2762 ch = cmd_getc ();
3250 } 2763 }
3251 2764
3252 /* read any numerical arguments */ 2765 /* read any numerical arguments */
… …
3291 switch (priv) 2804 switch (priv)
3292 { 2805 {
3293 case '>': 2806 case '>':
3294 if (ch == CSI_DA) /* secondary device attributes */ 2807 if (ch == CSI_DA) /* secondary device attributes */
3295 { 2808 {
3296 // 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,
3297 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2810 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3298 // 2811 //
3299 // 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
3300 // 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
3301 // that we do not support xterm mouse reporting (should be 95 when we do). 2814 // versions.
3302 // 2815 //
3303 tt_printf ("\033[>%d;94;0c", 'U'); 2816 tt_printf ("\033[>%d;95;0c", 'U');
3304 } 2817 }
3305 break; 2818 break;
2819
3306 case '?': 2820 case '?':
3307 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2821 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3308 process_terminal_mode (ch, priv, nargs, arg); 2822 process_terminal_mode (ch, priv, nargs, arg);
3309 break; 2823 break;
3310 } 2824 }
… …
3435 break; 2949 break;
3436 case 6: /* CPR requested */ 2950 case 6: /* CPR requested */
3437 scr_report_position (); 2951 scr_report_position ();
3438 break; 2952 break;
3439 case 7: /* unofficial extension */ 2953 case 7: /* unofficial extension */
3440 if (OPTION (Opt_insecure)) 2954 if (option (Opt_insecure))
3441 tt_printf ("%-.250s\012", rs[Rs_display_name]); 2955 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3442 break; 2956 break;
3443 case 8: /* unofficial extension */ 2957 case 8: /* unofficial extension */
3444 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2958 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3445 break; 2959 break;
… …
3609 break; 3123 break;
3610 case 20: /* report icon label */ 3124 case 20: /* report icon label */
3611 { 3125 {
3612 char *s; 3126 char *s;
3613 XGetIconName (dpy, parent[0], &s); 3127 XGetIconName (dpy, parent[0], &s);
3614 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 */
3615 XFree (s); 3129 XFree (s);
3616 } 3130 }
3617 break; 3131 break;
3618 case 21: /* report window title */ 3132 case 21: /* report window title */
3619 { 3133 {
3620 char *s; 3134 char *s;
3621 XFetchName (dpy, parent[0], &s); 3135 XFetchName (dpy, parent[0], &s);
3622 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 */
3623 XFree (s); 3137 XFree (s);
3624 } 3138 }
3625 break; 3139 break;
3626 } 3140 }
3627} 3141}
… …
3654 seen_esc = true; 3168 seen_esc = true;
3655 continue; 3169 continue;
3656 } 3170 }
3657 else if (ch == C0_BEL || ch == CHAR_ST) 3171 else if (ch == C0_BEL || ch == CHAR_ST)
3658 break; 3172 break;
3173 else if (ch == C0_SYN)
3174 ch = cmd_get8 ();
3659 else if (ch < 0x20) 3175 else if (ch < 0x20)
3660 return NULL; /* other control character - exit */ 3176 return NULL; /* other control character - exit */
3661 3177
3662 seen_esc = false; 3178 seen_esc = false;
3663 3179
3664 if (n >= STRING_MAX - 1) 3180 if (n >= STRING_MAX - 1)
3665 // stop at some sane length 3181 // stop at some sane length
3666 return NULL; 3182 return NULL;
3667 3183
3668 if (ch == C0_SYN)
3669 string[n++] = cmd_get8 ();
3670 else
3671 string[n++] = ch; 3184 string[n++] = ch;
3672 } 3185 }
3673 3186
3674 string[n++] = '\0'; 3187 string[n++] = '\0';
3675 3188
3676 ends_how = (ch == 0x5c ? C0_ESC : ch); 3189 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3755 int saveop = op; 3268 int saveop = op;
3756 3269
3757 dLocal (Display *, dpy); 3270 dLocal (Display *, dpy);
3758 3271
3759 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
3760 switch (op) 3277 switch (op)
3761 { 3278 {
3762 case XTerm_name: 3279 case XTerm_name:
3763 set_title (str); 3280 set_title (str);
3764 /* FALLTHROUGH */ 3281 /* FALLTHROUGH */
… …
3823 *buf++ = '\0'; 3340 *buf++ = '\0';
3824 3341
3825 process_color_seq (op, color, name, resp); 3342 process_color_seq (op, color, name, resp);
3826 } 3343 }
3827 break; 3344 break;
3345 case Rxvt_restoreFG:
3828 case XTerm_Color00: 3346 case XTerm_Color00:
3829 process_color_seq (op, Color_fg, str, resp); 3347 process_color_seq (op, Color_fg, str, resp);
3830 break; 3348 break;
3349 case Rxvt_restoreBG:
3831 case XTerm_Color01: 3350 case XTerm_Color01:
3832 process_color_seq (op, Color_bg, str, resp); 3351 process_color_seq (op, Color_bg, str, resp);
3833 break; 3352 break;
3834#ifndef NO_CURSORCOLOR 3353#ifndef NO_CURSORCOLOR
3835 case XTerm_Color_cursor: 3354 case XTerm_Color_cursor:
… …
3856 break; 3375 break;
3857 case URxvt_Color_IT: 3376 case URxvt_Color_IT:
3858 process_color_seq (op, Color_IT, str, resp); 3377 process_color_seq (op, Color_IT, str, resp);
3859 break; 3378 break;
3860#endif 3379#endif
3861#if TRANSPARENT && TINTING 3380#if ENABLE_TRANSPARENCY
3862 case URxvt_Color_tint: 3381 case URxvt_Color_tint:
3863 process_color_seq (op, Color_tint, str, resp); 3382 process_color_seq (op, Color_tint, str, resp);
3383 {
3384 bool changed = false;
3864 3385
3865 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 ();
3866 3390
3867 if (am_transparent) 3391 if (changed)
3868 want_full_refresh = want_refresh = 1; 3392 update_background ();
3393 }
3869 3394
3870 break; 3395 break;
3871#endif 3396#endif
3872 3397
3398#if BG_IMAGE_FROM_FILE
3873 case Rxvt_Pixmap: 3399 case Rxvt_Pixmap:
3874 { 3400 if (!strcmp (str, "?"))
3875 if (*str != ';')
3876 { 3401 {
3877#if XPM_BACKGROUND 3402 char str[256];
3878 scale_pixmap (""); /* reset to default scaling */ 3403
3879 set_bgPixmap (str); /* change pixmap */ 3404 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3880 scr_touch (true); 3405 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3881#endif 3406 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3407 process_xterm_seq (XTerm_title, str, CHAR_ST);
3882 } 3408 }
3883 3409 else
3410 {
3884 int changed = 0; 3411 int changed = 0;
3885 3412
3886 while ((str = strchr (str, ';')) != NULL) 3413 if (*str != ';')
3887 { 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 {
3888 str++; 3426 str++;
3889#if XPM_BACKGROUND 3427 if (bgPixmap.set_geometry (str))
3890 changed += scale_pixmap (str); 3428 changed++;
3891#endif 3429 str = strchr (str, ';');
3892 } 3430 }
3893 3431
3894 if (changed) 3432 if (changed)
3895 { 3433 update_background ();
3896#ifdef XPM_BACKGROUND
3897 resize_pixmap ();
3898 scr_touch (true);
3899#endif
3900 } 3434 }
3901 }
3902 break; 3435 break;
3903 3436#endif
3904 case Rxvt_restoreFG:
3905 set_window_color (Color_fg, str);
3906 break;
3907 case Rxvt_restoreBG:
3908 set_window_color (Color_bg, str);
3909 break;
3910 3437
3911 case XTerm_logfile: 3438 case XTerm_logfile:
3912 // TODO, when secure mode? 3439 // TODO, when secure mode?
3913 break; 3440 break;
3914 3441
… …
3932 case URxvt_italicFont: 3459 case URxvt_italicFont:
3933 case URxvt_boldItalicFont: 3460 case URxvt_boldItalicFont:
3934#endif 3461#endif
3935 if (query) 3462 if (query)
3936 tt_printf ("\33]%d;%-.250s%c", saveop, 3463 tt_printf ("\33]%d;%-.250s%c", saveop,
3937 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3464 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3938 ? fontset[op - URxvt_font]->fontdesc : "", 3465 ? fontset[op - URxvt_font]->fontdesc : "",
3939 resp); 3466 resp);
3940 else 3467 else
3941 { 3468 {
3942 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3469 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3956 break; 3483 break;
3957 3484
3958#if !ENABLE_MINIMAL 3485#if !ENABLE_MINIMAL
3959 case URxvt_locale: 3486 case URxvt_locale:
3960 if (query) 3487 if (query)
3961 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);
3962 else 3489 else
3963 { 3490 {
3964 set_locale (str); 3491 set_locale (str);
3965 pty->set_utf8_mode (enc_utf8); 3492 pty->set_utf8_mode (enc_utf8);
3966 init_xlocale (); 3493 init_xlocale ();
… …
3981 break; 3508 break;
3982#endif 3509#endif
3983 3510
3984#if ENABLE_PERL 3511#if ENABLE_PERL
3985 case URxvt_perl: 3512 case URxvt_perl:
3986 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)))
3987 ; // no responses yet 3514 ; // no responses yet
3988 break; 3515 break;
3989#endif 3516#endif
3990 } 3517 }
3991} 3518}
… …
4029{ 3556{
4030 unsigned int i, j; 3557 unsigned int i, j;
4031 int state; 3558 int state;
4032 3559
4033 static const struct 3560 static const struct
4034 { 3561 {
4035 const int argval; 3562 const int argval;
4036 const unsigned long bit; 3563 const unsigned long bit;
4037 }
4038
4039 argtopriv[] = { 3564 } argtopriv[] = {
4040 { 1, PrivMode_aplCUR }, 3565 { 1, PrivMode_aplCUR },
4041 { 2, PrivMode_vt52 }, 3566 { 2, PrivMode_vt52 },
4042 { 3, PrivMode_132 }, 3567 { 3, PrivMode_132 },
4043 { 4, PrivMode_smoothScroll }, 3568 { 4, PrivMode_smoothScroll },
4044 { 5, PrivMode_rVideo }, 3569 { 5, PrivMode_rVideo },
… …
4060 { 66, PrivMode_aplKP }, 3585 { 66, PrivMode_aplKP },
4061#ifndef NO_BACKSPACE_KEY 3586#ifndef NO_BACKSPACE_KEY
4062 { 67, PrivMode_BackSpace }, 3587 { 67, PrivMode_BackSpace },
4063#endif 3588#endif
4064 { 1000, PrivMode_MouseX11 }, 3589 { 1000, PrivMode_MouseX11 },
4065 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3590 { 1002, PrivMode_MouseBtnEvent },
4066 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3591 { 1003, PrivMode_MouseAnyEvent },
4067 // 1003 Use All Motion Mouse Tracking. NYI, TODO
4068 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3592 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4069 { 1011, PrivMode_Keypress }, // rxvt extension 3593 { 1011, PrivMode_Keypress }, // rxvt extension
4070 // 1035 enable modifiers for alt, numlock NYI 3594 // 1035 enable modifiers for alt, numlock NYI
4071 // 1036 send ESC for meta keys NYI 3595 // 1036 send ESC for meta keys NYI
4072 // 1037 send DEL for keypad delete NYI 3596 // 1037 send DEL for keypad delete NYI
4073 { 1047, PrivMode_Screen }, 3597 { 1047, PrivMode_Screen },
4074 // 1048 save and restore cursor 3598 // 1048 save and restore cursor
4075 { 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 */
4076 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3600 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3601 { 2004, PrivMode_BracketPaste },
4077 }; 3602 };
4078 3603
4079 if (nargs == 0) 3604 if (nargs == 0)
4080 return; 3605 return;
4081 3606
… …
4107 scr_touch (true); 3632 scr_touch (true);
4108 break; 3633 break;
4109#endif 3634#endif
4110 case 1048: /* alternative cursor save */ 3635 case 1048: /* alternative cursor save */
4111 case 1049: 3636 case 1049:
4112 if (OPTION (Opt_secondaryScreen)) 3637 if (option (Opt_secondaryScreen))
4113 if (mode == 0) 3638 if (mode == 0)
4114 scr_cursor (RESTORE); 3639 scr_cursor (RESTORE);
4115 else if (mode == 1) 3640 else if (mode == 1)
4116 scr_cursor (SAVE); 3641 scr_cursor (SAVE);
4117 break; 3642 break;
… …
4129 */ 3654 */
4130 PrivMode (1, PrivMode_vt52); 3655 PrivMode (1, PrivMode_vt52);
4131 break; 3656 break;
4132 case 3: /* 80/132 */ 3657 case 3: /* 80/132 */
4133 if (priv_modes & PrivMode_132OK) 3658 if (priv_modes & PrivMode_132OK)
3659 {
3660 scr_poweron ();
4134 set_widthheight (((state ? 132 : 80) * fwidth), height); 3661 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight);
3662 }
4135 break; 3663 break;
4136 case 4: /* smooth scrolling */ 3664 case 4: /* smooth scrolling */
4137 set_option (Opt_jumpScroll, !state); 3665 set_option (Opt_jumpScroll, !state);
4138 break; 3666 break;
4139 case 5: /* reverse video */ 3667 case 5: /* reverse video */
… …
4146 scr_autowrap (state); 3674 scr_autowrap (state);
4147 break; 3675 break;
4148 /* 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 */
4149 case 9: /* X10 mouse reporting */ 3677 case 9: /* X10 mouse reporting */
4150 if (state) /* orthogonal */ 3678 if (state) /* orthogonal */
4151 priv_modes &= ~PrivMode_MouseX11; 3679 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4152 break; 3680 break;
4153#ifdef scrollBar_esc 3681#ifdef scrollBar_esc
4154 case scrollBar_esc: 3682 case scrollBar_esc:
4155 if (scrollbar_mapping (state)) 3683 if (scrollbar_mapping (state))
4156 { 3684 {
… …
4169 break; 3697 break;
4170 /* case 66: - application key pad */ 3698 /* case 66: - application key pad */
4171 /* case 67: - backspace key */ 3699 /* case 67: - backspace key */
4172 case 1000: /* X11 mouse reporting */ 3700 case 1000: /* X11 mouse reporting */
4173 if (state) /* orthogonal */ 3701 if (state) /* orthogonal */
4174 priv_modes &= ~PrivMode_MouseX10; 3702 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4175 break; 3703 break;
4176#if 0
4177 case 1001: 3704 case 1002:
4178 break; /* X11 mouse highlighting */ 3705 case 1003:
4179#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;
4180 case 1010: /* scroll to bottom on TTY output inhibit */ 3716 case 1010: /* scroll to bottom on TTY output inhibit */
4181 set_option (Opt_scrollTtyOutput, !state); 3717 set_option (Opt_scrollTtyOutput, !state);
4182 break; 3718 break;
4183 case 1011: /* scroll to bottom on key press */ 3719 case 1011: /* scroll to bottom on key press */
4184 set_option (Opt_scrollTtyKeypress, state); 3720 set_option (Opt_scrollTtyKeypress, state);
4185 break; 3721 break;
4186 case 1047: /* secondary screen w/ clearing last */ 3722 case 1047: /* secondary screen w/ clearing last */
4187 if (OPTION (Opt_secondaryScreen)) 3723 if (option (Opt_secondaryScreen))
4188 if (current_screen != PRIMARY) 3724 if (current_screen != PRIMARY)
4189 scr_erase_screen (2); 3725 scr_erase_screen (2);
4190 scr_change_screen (state); 3726 scr_change_screen (state);
4191 break; 3727 break;
4192 case 1049: /* secondary screen w/ clearing first */ 3728 case 1049: /* secondary screen w/ clearing first */
4193 scr_change_screen (state); 3729 scr_change_screen (state);
4194 if (OPTION (Opt_secondaryScreen)) 3730 if (option (Opt_secondaryScreen))
4195 if (current_screen != PRIMARY) 3731 if (current_screen != PRIMARY)
4196 scr_erase_screen (2); 3732 scr_erase_screen (2);
4197 break; 3733 break;
4198 default: 3734 default:
4199 break; 3735 break;
… …
4361rxvt_term::process_graphics () 3897rxvt_term::process_graphics ()
4362{ 3898{
4363 unicode_t ch, cmd = cmd_getc (); 3899 unicode_t ch, cmd = cmd_getc ();
4364 3900
4365 if (cmd == 'Q') 3901 if (cmd == 'Q')
3902 {
4366 { /* query graphics */ 3903 /* query graphics */
4367 tt_printf ("\033G0\012"); /* no graphics */ 3904 tt_printf ("\033G0\012"); /* no graphics */
4368 return; 3905 return;
4369 } 3906 }
4370 /* swallow other graphics sequences until terminating ':' */ 3907 /* swallow other graphics sequences until terminating ':' */
4371 do 3908 do
… …
4421 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 3958 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4422 3959
4423 memcpy (v_buffer + v_buflen, data, len); 3960 memcpy (v_buffer + v_buflen, data, len);
4424 v_buflen += len; 3961 v_buflen += len;
4425 3962
4426 pty_ev.set (EVENT_READ | EVENT_WRITE); 3963 pty_ev.set (ev::READ | ev::WRITE);
4427} 3964}
4428 3965
4429void rxvt_term::pty_write () 3966void rxvt_term::pty_write ()
4430{ 3967{
4431 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));
… …
4436 3973
4437 if (v_buflen == 0) 3974 if (v_buflen == 0)
4438 { 3975 {
4439 free (v_buffer); 3976 free (v_buffer);
4440 v_buffer = 0; 3977 v_buffer = 0;
4441 v_buflen = 0;
4442 3978
4443 pty_ev.set (EVENT_READ); 3979 pty_ev.set (ev::READ);
4444 return; 3980 return;
4445 } 3981 }
4446 3982
4447 memmove (v_buffer, v_buffer + written, v_buflen); 3983 memmove (v_buffer, v_buffer + written, v_buflen);
4448 } 3984 }
4449 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 3985 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4450 pty_ev.set (EVENT_READ); 3986 pty_ev.set (ev::READ);
4451} 3987}
4452 3988
4453/*----------------------- end-of-file (C source) -----------------------*/ 3989/*----------------------- end-of-file (C source) -----------------------*/
4454 3990

Diff Legend

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