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.315 by root, Tue Aug 22 13:07:17 2006 UTC vs.
Revision 1.394 by ayin, Sat Jan 19 15:00:49 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
500# if ISO_14755 500# if ISO_14755
501 iso14755_51 (0); 501 iso14755_51 (0);
502# endif 502# endif
503 return; 503 return;
504 } 504 }
505 else if (keysym == XK_BackSpace)
506 {
507 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
508# if ISO_14755
509 iso14755_51 (iso14755buf & ISO_14755_MASK);
510# endif
511 return;
512 }
505 else if ((hv = hex_keyval (ev)) >= 0) 513 else if ((hv = hex_keyval (ev)) >= 0)
506 { 514 {
507 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK) 515 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
508 | hv | ISO_14755_51; 516 | hv | ISO_14755_51;
509# if ISO_14755 517# if ISO_14755
511# endif 519# endif
512 return; 520 return;
513 } 521 }
514 else 522 else
515 { 523 {
516# if ENABLE_OVERLAY 524# if ISO_14755
517 scr_overlay_off (); 525 scr_overlay_off ();
518# endif 526# endif
519 iso14755buf = 0; 527 iso14755buf = 0;
520 } 528 }
521 } 529 }
522 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 530 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
523 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 531 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
524 if (!(iso14755buf & ISO_14755_STARTED)) 532 if (!(iso14755buf & ISO_14755_STARTED))
525 { 533 {
526 iso14755buf |= ISO_14755_STARTED; 534 iso14755buf |= ISO_14755_STARTED;
527# if ENABLE_OVERLAY 535# if ISO_14755
528 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 536 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
529 scr_overlay_set (0, 0, "ISO 14755 mode"); 537 scr_overlay_set (0, 0, "ISO 14755 mode");
530# endif 538# endif
531 } 539 }
532#endif 540#endif
533 541
534#ifdef PRINTPIPE 542#ifdef PRINTPIPE
535 if (keysym == XK_Print) 543 if (keysym == XK_Print)
536 { 544 {
537 scr_printscreen (ctrl | shft); 545 scr_printscreen (ctrl | shft);
538 return; 546 return;
540#endif 548#endif
541 549
542 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 550 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
543 { 551 {
544 { 552 {
553 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
545 newlen = 1; 554 newlen = 1;
555#ifdef XK_KP_Home
556 static const KeySym keypadtrans[] = {
557 XK_KP_7, // XK_KP_Home
558 XK_KP_4, // XK_KP_Left
559 XK_KP_8, // XK_KP_Up
560 XK_KP_6, // XK_KP_Right
561 XK_KP_2, // XK_KP_Down
562#ifndef UNSHIFTED_SCROLLKEYS
563 XK_KP_9, // XK_KP_Prior
564 XK_KP_3, // XK_KP_Next
565#else
566 XK_Prior,
567 XK_Next,
568#endif
569 XK_KP_1, // XK_KP_End
570 XK_KP_5, // XK_KP_Begin
571 };
572
573 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
574 {
575 unsigned int index = keysym - XK_KP_Home;
576 keysym = kp ? keypadtrans[index] : XK_Home + index;
577 }
578 else if (keysym == XK_KP_Insert)
579 keysym = kp ? XK_KP_0 : XK_Insert;
580#ifndef NO_DELETE_KEY
581 else if (keysym == XK_KP_Delete)
582 keysym = kp ? XK_KP_Decimal : XK_Delete;
583#endif
584#endif
546 switch (keysym) 585 switch (keysym)
547 { 586 {
548#ifndef NO_BACKSPACE_KEY 587#ifndef NO_BACKSPACE_KEY
549 case XK_BackSpace: 588 case XK_BackSpace:
550 if (priv_modes & PrivMode_HaveBackSpace) 589 if (priv_modes & PrivMode_HaveBackSpace)
552 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace) 591 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
553 ^ !!ctrl) ? '\b' : '\177'; 592 ^ !!ctrl) ? '\b' : '\177';
554 kbuf[1] = '\0'; 593 kbuf[1] = '\0';
555 } 594 }
556 else 595 else
557 strcpy (kbuf, key_backspace); 596 strcpy (kbuf, rs[Rs_backspace_key]);
558 break; 597 break;
559#endif 598#endif
560#ifndef NO_DELETE_KEY 599#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: 600 case XK_Delete:
572 strcpy (kbuf, key_delete); 601 strcpy (kbuf, rs[Rs_delete_key]);
573 break; 602 break;
574#endif 603#endif
575 case XK_Tab: 604 case XK_Tab:
576 if (shft) 605 if (shft)
577 strcpy (kbuf, "\033[Z"); 606 strcpy (kbuf, "\033[Z");
587#endif 616#endif
588 newlen = 0; 617 newlen = 0;
589 } 618 }
590 break; 619 break;
591 620
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" */ 621 case XK_Up: /* "\033[A" */
609 case XK_Down: /* "\033[B" */ 622 case XK_Down: /* "\033[B" */
610 case XK_Right: /* "\033[C" */ 623 case XK_Right: /* "\033[C" */
611 case XK_Left: /* "\033[D" */ 624 case XK_Left: /* "\033[D" */
612 strcpy (kbuf, "\033[Z"); 625 strcpy (kbuf, "\033[Z");
622 else if (priv_modes & PrivMode_aplCUR) 635 else if (priv_modes & PrivMode_aplCUR)
623 kbuf[1] = 'O'; 636 kbuf[1] = 'O';
624 break; 637 break;
625 638
626#ifndef UNSHIFTED_SCROLLKEYS 639#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: 640 case XK_Prior:
638 strcpy (kbuf, "\033[5~"); 641 strcpy (kbuf, "\033[5~");
639 break; 642 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: 643 case XK_Next:
651 strcpy (kbuf, "\033[6~"); 644 strcpy (kbuf, "\033[6~");
652 break; 645 break;
653#endif 646#endif
654 case XK_KP_Enter: 647 case XK_KP_Enter:
655 /* allow shift to override */ 648 /* allow shift to override */
656 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 649 if (kp)
657 { 650 {
658 strcpy (kbuf, "\033OM"); 651 strcpy (kbuf, "\033OM");
659 break; 652 break;
660 } 653 }
661 654
673 kbuf[0] = '\015'; 666 kbuf[0] = '\015';
674 kbuf[1] = '\0'; 667 kbuf[1] = '\0';
675 } 668 }
676 break; 669 break;
677 670
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" */ 671 case XK_KP_F1: /* "\033OP" */
685 case XK_KP_F2: /* "\033OQ" */ 672 case XK_KP_F2: /* "\033OQ" */
686 case XK_KP_F3: /* "\033OR" */ 673 case XK_KP_F3: /* "\033OR" */
687 case XK_KP_F4: /* "\033OS" */ 674 case XK_KP_F4: /* "\033OS" */
688 strcpy (kbuf, "\033OP"); 675 strcpy (kbuf, "\033OP");
704 case XK_KP_6: /* "\033Ov" : "6" */ 691 case XK_KP_6: /* "\033Ov" : "6" */
705 case XK_KP_7: /* "\033Ow" : "7" */ 692 case XK_KP_7: /* "\033Ow" : "7" */
706 case XK_KP_8: /* "\033Ox" : "8" */ 693 case XK_KP_8: /* "\033Ox" : "8" */
707 case XK_KP_9: /* "\033Oy" : "9" */ 694 case XK_KP_9: /* "\033Oy" : "9" */
708 /* allow shift to override */ 695 /* allow shift to override */
709 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 696 if (kp)
710 { 697 {
711 strcpy (kbuf, "\033Oj"); 698 strcpy (kbuf, "\033Oj");
712 kbuf[2] += (keysym - XK_KP_Multiply); 699 kbuf[2] += (keysym - XK_KP_Multiply);
713 } 700 }
714 else 701 else
720 707
721 case XK_Find: 708 case XK_Find:
722 strcpy (kbuf, "\033[1~"); 709 strcpy (kbuf, "\033[1~");
723 break; 710 break;
724 711
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: 712 case XK_Insert:
736 strcpy (kbuf, "\033[2~"); 713 strcpy (kbuf, "\033[2~");
737 break; 714 break;
738#ifdef DXK_Remove /* support for DEC remove like key */ 715#ifdef DXK_Remove /* support for DEC remove like key */
739 case DXK_Remove: 716 case DXK_Remove:
743 strcpy (kbuf, "\033[3~"); 720 strcpy (kbuf, "\033[3~");
744 break; 721 break;
745 case XK_Select: 722 case XK_Select:
746 strcpy (kbuf, "\033[4~"); 723 strcpy (kbuf, "\033[4~");
747 break; 724 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: 725 case XK_End:
759 strcpy (kbuf, KS_END); 726 strcpy (kbuf, KS_END);
760 break; 727 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: 728 case XK_Home:
772 strcpy (kbuf, KS_HOME); 729 strcpy (kbuf, KS_HOME);
773 break; 730 break;
774 731
775#define FKEY(n, fkey) \ 732#define FKEY(n, fkey) \
877 return; 834 return;
878 835
879 if (len <= 0) 836 if (len <= 0)
880 return; /* not mapped */ 837 return; /* not mapped */
881 838
882 if (OPTION (Opt_scrollTtyKeypress)) 839 if (option (Opt_scrollTtyKeypress))
883 if (view_start) 840 if (view_start)
884 { 841 {
885 view_start = 0; 842 view_start = 0;
886 want_refresh = 1; 843 want_refresh = 1;
887 } 844 }
926#if ENABLE_FRILLS || ISO_14755 883#if ENABLE_FRILLS || ISO_14755
927 // ISO 14755 support 884 // ISO 14755 support
928 if (iso14755buf) 885 if (iso14755buf)
929 if (iso14755buf & ISO_14755_52) 886 if (iso14755buf & ISO_14755_52)
930 { 887 {
931# if ENABLE_OVERLAY 888# if ISO_14755
932 scr_overlay_off (); 889 scr_overlay_off ();
933# endif 890# endif
934# if ISO_14755 891# if ISO_14755
935 // iso14755 part 5.2 handling: release time 892 // iso14755 part 5.2 handling: release time
936 // first: controls 893 // first: controls
959 916
960 return; 917 return;
961 } 918 }
962 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask)) 919 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
963 { 920 {
964# if ENABLE_OVERLAY 921# if ISO_14755
965 scr_overlay_off (); 922 scr_overlay_off ();
966# endif 923# endif
967 if (iso14755buf & ISO_14755_51) 924 if (iso14755buf & ISO_14755_51)
968 commit_iso14755 (); 925 commit_iso14755 ();
969#if ISO_14755 926#if ISO_14755
970 else if (iso14755buf & ISO_14755_STARTED) 927 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
971 { 928 {
972 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair 929 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
973 930
974 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1); 931 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
975 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE"); 932 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1027void 984void
1028rxvt_term::flush () 985rxvt_term::flush ()
1029{ 986{
1030 flush_ev.stop (); 987 flush_ev.stop ();
1031 988
1032#ifdef TRANSPARENT 989#ifdef HAVE_BG_PIXMAP
1033 if (want_full_refresh) 990 if (bgPixmap.check_clearChanged ())
1034 { 991 {
1035 want_full_refresh = 0; 992// scr_clear (true); This needs to be researched further!
1036 scr_clear ();
1037 scr_touch (false); 993 scr_touch (false);
1038 } 994 }
1039#endif 995#endif
1040 996
1041 if (want_refresh) 997 if (want_refresh)
1086 } 1042 }
1087 1043
1088 display->flush (); 1044 display->flush ();
1089} 1045}
1090 1046
1047/* checks wether a refresh is requested and starts the refresh timer */
1091void 1048void
1092rxvt_term::check_cb (check_watcher &w) 1049rxvt_term::refresh_check ()
1050{
1051 if (want_refresh && !flush_ev.is_active ())
1052 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1053
1054 display->flush ();
1055}
1056
1057void
1058rxvt_term::flush_cb (ev::timer &w, int revents)
1093{ 1059{
1094 make_current (); 1060 make_current ();
1095 1061
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; 1062 refresh_count = 0;
1109 flush (); 1063 flush ();
1110} 1064}
1111 1065
1112#ifdef CURSOR_BLINK 1066#ifdef CURSOR_BLINK
1113void 1067void
1114rxvt_term::cursor_blink_cb (time_watcher &w) 1068rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1115{ 1069{
1116 hidden_cursor = !hidden_cursor; 1070 hidden_cursor = !hidden_cursor;
1117 want_refresh = 1; 1071 want_refresh = 1;
1118 1072 refresh_check ();
1119 w.start (w.at + CURSOR_BLINK_INTERVAL);
1120} 1073}
1121#endif 1074#endif
1122 1075
1123#ifdef TEXT_BLINK 1076#ifdef TEXT_BLINK
1124void 1077void
1125rxvt_term::text_blink_cb (time_watcher &w) 1078rxvt_term::text_blink_cb (ev::timer &w, int revents)
1126{ 1079{
1127 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1080 if (scr_refresh_rend (RS_Blink, RS_Blink))
1128 { 1081 {
1129 hidden_text = !hidden_text; 1082 hidden_text = !hidden_text;
1130 want_refresh = 1; 1083 want_refresh = 1;
1131 w.start (w.at + TEXT_BLINK_INTERVAL); 1084 refresh_check ();
1132 } 1085 }
1086 else
1087 w.stop ();
1133} 1088}
1134#endif 1089#endif
1135 1090
1136#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1091#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1137void 1092void
1138rxvt_term::cont_scroll_cb (time_watcher &w) 1093rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1139{ 1094{
1140 if ((scrollbar_isUp() || scrollbar_isDn()) && 1095 if ((scrollbar_isUp () || scrollbar_isDn ())
1141 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1096 && scr_page (scrollbar_isUp () ? UP : DN, 1))
1142 { 1097 {
1143 want_refresh = 1; 1098 want_refresh = 1;
1144 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1099 refresh_check ();
1145 } 1100 }
1101 else
1102 w.stop ();
1146} 1103}
1147#endif 1104#endif
1148 1105
1149#ifdef SELECTION_SCROLLING 1106#ifdef SELECTION_SCROLLING
1150void 1107void
1151rxvt_term::sel_scroll_cb (time_watcher &w) 1108rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1152{ 1109{
1153 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1110 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1154 { 1111 {
1155 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1112 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1156 want_refresh = 1; 1113 want_refresh = 1;
1157 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1114 refresh_check ();
1158 } 1115 }
1116 else
1117 w.stop ();
1159} 1118}
1160#endif 1119#endif
1161 1120
1162#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1121#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1163void 1122void
1164rxvt_term::slip_wheel_cb (time_watcher &w) 1123rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1165{ 1124{
1166 if (mouse_slip_wheel_speed == 0 1125 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 { 1126 {
1170 if (view_start == top_row || view_start == 0)
1171 mouse_slip_wheel_speed = 0;
1172
1173 want_refresh = 1; 1127 want_refresh = 1;
1174 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1128 refresh_check ();
1129 }
1130
1131 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1132 {
1133 mouse_slip_wheel_speed = 0;
1134 w.stop ();
1175 } 1135 }
1176} 1136}
1177#endif 1137#endif
1178 1138
1179#if LINUX_YIELD_HACK 1139#if LINUX_YIELD_HACK
1180static struct event_handler 1140static struct event_handler
1181{ 1141{
1182 check_watcher yield_ev; 1142 ev::prepare yield_ev;
1183 1143
1184 void yield_cb (check_watcher &w) 1144 void yield_cb (ev::prepare &w, int revents)
1185 { 1145 {
1186 // this should really be sched_yield(), but the linux guys thought 1146 // this should really be sched_yield(), but the linux guys thought
1187 // that giving a process calling sched_yield () less cpu time than 1147 // 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 1148 // ones with high nice levels is a useful thing to do. It surely is is
1189 // allowed by the sus... as is returning ENOSYS. 1149 // allowed by the sus... as is returning ENOSYS.
1232 } 1192 }
1233 else 1193 else
1234 { 1194 {
1235 pty_ev.stop (); 1195 pty_ev.stop ();
1236 1196
1237 if (!OPTION (Opt_hold)) 1197 if (!option (Opt_hold))
1238 destroy (); 1198 destroy ();
1239 } 1199 }
1240 1200
1241 return false; 1201 return false;
1242} 1202}
1243 1203
1244void 1204void
1245rxvt_term::pty_cb (io_watcher &w, short revents) 1205rxvt_term::pty_cb (ev::io &w, int revents)
1246{ 1206{
1247 make_current (); 1207 make_current ();
1248 1208
1249 if (revents & EVENT_READ) 1209 if (revents & ev::READ)
1250 // loop, but don't allow a single term to monopolize us 1210 // loop, but don't allow a single term to monopolize us
1251 while (pty_fill ()) 1211 while (pty_fill ())
1252 if (cmd_parse ()) 1212 if (cmd_parse ())
1253 break; 1213 break;
1254 1214
1255 if (revents & EVENT_WRITE) 1215 if (revents & ev::WRITE)
1256 pty_write (); 1216 pty_write ();
1217
1218 refresh_check ();
1257} 1219}
1258 1220
1259void 1221void
1260rxvt_term::pointer_unblank () 1222rxvt_term::pointer_unblank ()
1261{ 1223{
1263 recolour_cursor (); 1225 recolour_cursor ();
1264 1226
1265#ifdef POINTER_BLANK 1227#ifdef POINTER_BLANK
1266 hidden_pointer = 0; 1228 hidden_pointer = 0;
1267 1229
1268 if (OPTION (Opt_pointerBlank)) 1230 if (option (Opt_pointerBlank))
1269 pointer_ev.start (NOW + pointerBlankDelay); 1231 pointer_ev.start (pointerBlankDelay);
1270#endif 1232#endif
1271} 1233}
1272 1234
1273#ifdef POINTER_BLANK 1235#ifdef POINTER_BLANK
1274void 1236void
1275rxvt_term::pointer_blank () 1237rxvt_term::pointer_blank ()
1276{ 1238{
1277 if (!OPTION (Opt_pointerBlank)) 1239 if (!option (Opt_pointerBlank))
1278 return; 1240 return;
1279 1241
1280 XDefineCursor (dpy, vt, display->blank_cursor); 1242 XDefineCursor (dpy, vt, display->blank_cursor);
1281 XFlush (dpy); 1243 XFlush (dpy);
1282 1244
1283 hidden_pointer = 1; 1245 hidden_pointer = 1;
1284} 1246}
1285 1247
1286void 1248void
1287rxvt_term::pointer_cb (time_watcher &w) 1249rxvt_term::pointer_cb (ev::timer &w, int revents)
1288{ 1250{
1289 make_current (); 1251 make_current ();
1290 1252
1291 pointer_blank (); 1253 pointer_blank ();
1292} 1254}
1295void 1257void
1296rxvt_term::mouse_report (XButtonEvent &ev) 1258rxvt_term::mouse_report (XButtonEvent &ev)
1297{ 1259{
1298 int button_number, key_state = 0; 1260 int button_number, key_state = 0;
1299 int x, y; 1261 int x, y;
1262 int code = 32;
1300 1263
1301 x = ev.x; 1264 x = Pixel2Col (ev.x);
1302 y = ev.y; 1265 y = Pixel2Row (ev.y);
1303 pixel_position (&x, &y); 1266 if (ev.type == MotionNotify)
1267 {
1268 if (x == mouse_row && y == mouse_col)
1269 return;
1270 mouse_row = x;
1271 mouse_col = y;
1272 code += 32;
1273 }
1304 1274
1305 if (MEvent.button == AnyButton) 1275 if (MEvent.button == AnyButton)
1306 button_number = 3; 1276 button_number = 3;
1307 else 1277 else
1308 { 1278 {
1354 x + 1, 1324 x + 1,
1355 y + 1); 1325 y + 1);
1356#endif 1326#endif
1357 1327
1358 tt_printf ("\033[M%c%c%c", 1328 tt_printf ("\033[M%c%c%c",
1359 (32 + button_number + key_state), 1329 (code + button_number + key_state),
1360 (32 + x + 1), 1330 (32 + x + 1),
1361 (32 + y + 1)); 1331 (32 + y + 1));
1362} 1332}
1363 1333
1364/*{{{ process an X event */ 1334/*{{{ process an X event */
1426 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1396 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1427 focus_out (); 1397 focus_out ();
1428 } 1398 }
1429#endif 1399#endif
1430 } 1400 }
1431 break;
1432
1433 case MappingNotify:
1434 XRefreshKeyboardMapping (&ev.xmapping);
1435 break; 1401 break;
1436 1402
1437 /* 1403 /*
1438 * XXX: this is not the _current_ arrangement 1404 * XXX: this is not the _current_ arrangement
1439 * Here's my conclusion: 1405 * Here's my conclusion:
1458 break; 1424 break;
1459 } 1425 }
1460 break; 1426 break;
1461 1427
1462 case FocusIn: 1428 case FocusIn:
1429 if (ev.xfocus.detail != NotifyInferior
1430 && ev.xfocus.detail != NotifyPointer
1431 && ev.xfocus.mode != NotifyGrab)
1463 focus_in (); 1432 focus_in ();
1464 break; 1433 break;
1465 1434
1466 case FocusOut: 1435 case FocusOut:
1436 if (ev.xfocus.detail != NotifyInferior
1437 && ev.xfocus.detail != NotifyPointer
1438 && ev.xfocus.mode != NotifyGrab)
1467 focus_out (); 1439 focus_out ();
1468 break; 1440 break;
1469 1441
1470 case ConfigureNotify: 1442 case ConfigureNotify:
1443 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1444 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1445 szHint.width, szHint.height); */
1471 if (ev.xconfigure.window == parent[0]) 1446 if (ev.xconfigure.window == parent[0])
1472 { 1447 {
1473 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1448 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1474 ; 1449 ;
1475 1450
1476 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1451 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1477 { 1452 {
1478 seen_resize = 1; 1453 seen_resize = 1;
1479 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1454 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1480 } 1455 }
1456 else
1457 {
1458#ifdef HAVE_BG_PIXMAP
1459 if (bgPixmap.window_position_sensitive ())
1460 {
1461 if (mapped)
1462 update_background ();
1463 else
1464 bgPixmap.invalidate ();
1465 }
1466#endif
1467 }
1481 1468
1482 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1469 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 } 1470 }
1489 break; 1471 break;
1490 1472
1491 case PropertyNotify: 1473 case PropertyNotify:
1492 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1474 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1508 case SelectionRequest: 1490 case SelectionRequest:
1509 selection_send (ev.xselectionrequest); 1491 selection_send (ev.xselectionrequest);
1510 break; 1492 break;
1511 1493
1512 case MapNotify: 1494 case MapNotify:
1495#ifdef HAVE_BG_PIXMAP
1496 /* This is needed spcifically to fix the case of no window manager or a
1497 * non-reparenting window manager. In those cases we never get first
1498 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1499 * care of multiplicity of ConfigureNotify events arriwing while WM does
1500 * reparenting.
1501 * We should not render background immidiately, as there could be several
1502 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1503 * by scheduling background redraw as soon as we can, but giving a short
1504 * bit of time for ConfigureNotifies to arrive.
1505 * We should render background PRIOR to drawing any text, but AFTER all
1506 * of ConfigureNotifys for the best results.
1507 */
1508 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1509 update_background_ev.start (0.025);
1510#endif
1513 mapped = 1; 1511 mapped = 1;
1514#ifdef TEXT_BLINK 1512#ifdef TEXT_BLINK
1515 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1513 text_blink_ev.start ();
1516#endif 1514#endif
1517 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1515 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1518 break; 1516 break;
1519 1517
1520 case UnmapNotify: 1518 case UnmapNotify:
1522#ifdef TEXT_BLINK 1520#ifdef TEXT_BLINK
1523 text_blink_ev.stop (); 1521 text_blink_ev.stop ();
1524#endif 1522#endif
1525 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1523 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1526 break; 1524 break;
1527
1528#ifdef TRANSPARENT
1529 case ReparentNotify:
1530 rootwin_cb (ev);
1531 break;
1532#endif /* TRANSPARENT */
1533 1525
1534 case GraphicsExpose: 1526 case GraphicsExpose:
1535 case Expose: 1527 case Expose:
1536 if (ev.xany.window == vt) 1528 if (ev.xany.window == vt)
1537 { 1529 {
1538 do 1530 do
1531 {
1539 scr_expose (ev.xexpose.x, ev.xexpose.y, 1532 scr_expose (ev.xexpose.x, ev.xexpose.y,
1540 ev.xexpose.width, ev.xexpose.height, False); 1533 ev.xexpose.width, ev.xexpose.height, False);
1534 }
1541 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1535 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1542 1536
1543 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1537 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1544 1538
1545 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1539 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1540 {
1546 scr_expose (ev.xexpose.x, ev.xexpose.y, 1541 scr_expose (ev.xexpose.x, ev.xexpose.y,
1547 ev.xexpose.width, ev.xexpose.height, False); 1542 ev.xexpose.width, ev.xexpose.height, False);
1543 }
1548 1544
1549 want_refresh = 1; 1545 want_refresh = 1;
1550 } 1546 }
1551 else 1547 else
1552 { 1548 {
1555 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1551 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1556 ; 1552 ;
1557 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1553 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1558 ; 1554 ;
1559 1555
1560 if (isScrollbarWindow (ev.xany.window)) 1556 if (scrollBar.state && ev.xany.window == scrollBar.win)
1561 { 1557 {
1562 scrollBar.setIdle (); 1558 scrollBar.setIdle ();
1563 scrollbar_show (0); 1559 scrollbar_show (0);
1564 } 1560 }
1565
1566#ifdef TRANSPARENT
1567 if (am_transparent && ev.xany.window == parent[0])
1568 XClearWindow (dpy, ev.xany.window);
1569#endif
1570 } 1561 }
1571 break; 1562 break;
1572 1563
1573 case MotionNotify: 1564 case MotionNotify:
1574#ifdef POINTER_BLANK 1565#ifdef POINTER_BLANK
1575 if (hidden_pointer) 1566 if (hidden_pointer)
1576 pointer_unblank (); 1567 pointer_unblank ();
1577#endif 1568#endif
1569 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1570 || priv_modes & PrivMode_MouseAnyEvent)
1571 mouse_report (ev.xbutton);
1578 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1572 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1579 break; 1573 break;
1580 1574
1581 if (ev.xany.window == vt) 1575 if (ev.xany.window == vt)
1582 { 1576 {
1616 int dist; 1610 int dist;
1617 1611
1618 /* don't clobber the current delay if we are 1612 /* don't clobber the current delay if we are
1619 * already in the middle of scrolling. 1613 * already in the middle of scrolling.
1620 */ 1614 */
1621 if (!sel_scroll_ev.active) 1615 if (!sel_scroll_ev.is_active ())
1622 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1616 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1623 1617
1624 /* save the event params so we can highlight 1618 /* save the event params so we can highlight
1625 * the selection in the pending-scroll loop 1619 * the selection in the pending-scroll loop
1626 */ 1620 */
1627 selection_save_x = ev.xbutton.x; 1621 selection_save_x = ev.xbutton.x;
1649 else 1643 else
1650 { 1644 {
1651 /* we are within the text window, so we 1645 /* we are within the text window, so we
1652 * shouldn't be scrolling 1646 * shouldn't be scrolling
1653 */ 1647 */
1654 if (sel_scroll_ev.active)
1655 sel_scroll_ev.stop(); 1648 sel_scroll_ev.stop();
1656 } 1649 }
1657#endif 1650#endif
1658#ifdef MOUSE_THRESHOLD 1651#ifdef MOUSE_THRESHOLD
1659 } 1652 }
1660#endif 1653#endif
1661 } 1654 }
1662 } 1655 }
1663 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1656 else if (scrollbar_isMotion () && ev.xany.window == scrollBar.win)
1664 { 1657 {
1665 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1658 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1666 MotionNotify, &ev)) 1659 MotionNotify, &ev))
1667 ; 1660 ;
1668 1661
1672 &ev.xbutton.x, &ev.xbutton.y, 1665 &ev.xbutton.x, &ev.xbutton.y,
1673 &unused_mask); 1666 &unused_mask);
1674 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1667 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1675 scrollbar_size ()); 1668 scrollbar_size ());
1676 want_refresh = 1; 1669 want_refresh = 1;
1677 refresh_limit = 0;
1678 scrollbar_show (1); 1670 scrollbar_show (1);
1679 } 1671 }
1680 break; 1672 break;
1681 } 1673 }
1682 1674
1683#if defined(CURSOR_BLINK) 1675#if defined(CURSOR_BLINK)
1684 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1676 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1685 { 1677 {
1686 if (hidden_cursor) 1678 if (hidden_cursor)
1687 { 1679 {
1688 hidden_cursor = 0; 1680 hidden_cursor = 0;
1689 want_refresh = 1; 1681 want_refresh = 1;
1690 } 1682 }
1691 1683
1692 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1684 cursor_blink_ev.again ();
1693 } 1685 }
1694#endif 1686#endif
1695 1687
1696#if defined(POINTER_BLANK) 1688#if defined(POINTER_BLANK)
1697 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1689 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1698 { 1690 {
1699 if (ev.type == MotionNotify 1691 if (ev.type == MotionNotify
1700 || ev.type == ButtonPress 1692 || ev.type == ButtonPress
1701 || ev.type == ButtonRelease) 1693 || ev.type == ButtonRelease)
1702 if (hidden_pointer) 1694 if (hidden_pointer)
1704 1696
1705 if (ev.type == KeyPress && hidden_pointer == 0) 1697 if (ev.type == KeyPress && hidden_pointer == 0)
1706 pointer_blank (); 1698 pointer_blank ();
1707 } 1699 }
1708#endif 1700#endif
1701
1702 refresh_check ();
1709} 1703}
1710 1704
1711void 1705void
1712rxvt_term::focus_in () 1706rxvt_term::focus_in ()
1713{ 1707{
1724 IMSetPosition (); 1718 IMSetPosition ();
1725 XSetICFocus (Input_Context); 1719 XSetICFocus (Input_Context);
1726 } 1720 }
1727#endif 1721#endif
1728#if CURSOR_BLINK 1722#if CURSOR_BLINK
1729 if (OPTION (Opt_cursorBlink)) 1723 if (option (Opt_cursorBlink))
1730 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1724 cursor_blink_ev.again ();
1731#endif 1725#endif
1732#if OFF_FOCUS_FADING 1726#if OFF_FOCUS_FADING
1733 if (rs[Rs_fade]) 1727 if (rs[Rs_fade])
1734 { 1728 {
1735 pix_colors = pix_colors_focused; 1729 pix_colors = pix_colors_focused;
1736 scr_recolour (); 1730 scr_recolour ();
1737 } 1731 }
1738#endif 1732#endif
1733#if ENABLE_FRILLS
1734 if (option (Opt_urgentOnBell))
1735 {
1736 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1737 {
1738 h->flags &= ~XUrgencyHint;
1739 XSetWMHints (dpy, parent[0], h);
1740 }
1741 }
1742#endif
1739 } 1743 }
1740} 1744}
1741 1745
1742void 1746void
1743rxvt_term::focus_out () 1747rxvt_term::focus_out ()
1751 1755
1752#if ENABLE_FRILLS || ISO_14755 1756#if ENABLE_FRILLS || ISO_14755
1753 if (iso14755buf) 1757 if (iso14755buf)
1754 { 1758 {
1755 iso14755buf = 0; 1759 iso14755buf = 0;
1756# if ENABLE_OVERLAY 1760# if ISO_14755
1757 scr_overlay_off (); 1761 scr_overlay_off ();
1758# endif 1762# endif
1759 } 1763 }
1760#endif 1764#endif
1761#if USE_XIM 1765#if USE_XIM
1762 if (Input_Context != NULL) 1766 if (Input_Context != NULL)
1763 XUnsetICFocus (Input_Context); 1767 XUnsetICFocus (Input_Context);
1764#endif 1768#endif
1765#if CURSOR_BLINK 1769#if CURSOR_BLINK
1766 if (OPTION (Opt_cursorBlink)) 1770 if (option (Opt_cursorBlink))
1767 cursor_blink_ev.stop (); 1771 cursor_blink_ev.stop ();
1772
1768 hidden_cursor = 0; 1773 hidden_cursor = 0;
1769#endif 1774#endif
1770#if OFF_FOCUS_FADING 1775#if OFF_FOCUS_FADING
1771 if (rs[Rs_fade]) 1776 if (rs[Rs_fade])
1772 { 1777 {
1788 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1793 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1789 } 1794 }
1790#endif 1795#endif
1791} 1796}
1792 1797
1793#if TRANSPARENT || ENABLE_PERL 1798#if ENABLE_TRANSPARENCY || ENABLE_PERL
1794void 1799void
1795rxvt_term::rootwin_cb (XEvent &ev) 1800rxvt_term::rootwin_cb (XEvent &ev)
1796{ 1801{
1797 make_current (); 1802 make_current ();
1798 1803
1799 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1804 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1800 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1805 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1801 return; 1806 return;
1802 1807
1803# if TRANSPARENT 1808# if ENABLE_TRANSPARENCY
1804 switch (ev.type) 1809 switch (ev.type)
1805 { 1810 {
1806 case PropertyNotify: 1811 case PropertyNotify:
1807 /* 1812 /*
1808 * if user used some Esetroot compatible prog to set the root bg, 1813 * if user used some Esetroot compatible prog to set the root bg,
1809 * use the property to determine the pixmap. We use it later on. 1814 * use the property to determine the pixmap. We use it later on.
1810 */ 1815 */
1811 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1816 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1812 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1817 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1813 return; 1818 {
1819 bgPixmap.set_root_pixmap ();
1820 update_background ();
1821 }
1814 1822
1815 /* FALLTHROUGH */
1816 case ReparentNotify:
1817 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1818 want_refresh = want_full_refresh = 1;
1819 break; 1823 break;
1820 } 1824 }
1821# endif 1825# endif
1826
1827 refresh_check ();
1822} 1828}
1823#endif 1829#endif
1824 1830
1825void 1831void
1826rxvt_term::button_press (XButtonEvent &ev) 1832rxvt_term::button_press (XButtonEvent &ev)
1881 mouse_report (ev); 1887 mouse_report (ev);
1882 } 1888 }
1883#else 1889#else
1884 MEvent.button = ev.button; 1890 MEvent.button = ev.button;
1885 mouse_report (ev); 1891 mouse_report (ev);
1886#endif /* MOUSE_REPORT_DOUBLECLICK */ 1892#endif /* MOUSE_REPORT_DOUBLECLICK */
1887 1893
1888 } 1894 }
1889 else 1895 else
1890 { 1896 {
1891 if (ev.button != MEvent.button) 1897 if (ev.button != MEvent.button)
1939 } 1945 }
1940 1946
1941 /* 1947 /*
1942 * Scrollbar window processing of button press 1948 * Scrollbar window processing of button press
1943 */ 1949 */
1944 if (isScrollbarWindow (ev.window)) 1950 if (scrollBar.state && ev.window == scrollBar.win)
1945 { 1951 {
1946 scrollBar.setIdle (); 1952 scrollBar.setIdle ();
1947 /* 1953 /*
1948 * Rxvt-style scrollbar: 1954 * Rxvt-style scrollbar:
1949 * move up if mouse is above slider 1955 * move up if mouse is above slider
1985 tt_printf ("\033[5~"); 1991 tt_printf ("\033[5~");
1986 break; 1992 break;
1987 } 1993 }
1988 } 1994 }
1989 else 1995 else
1990#endif /* NO_SCROLLBAR_REPORT */ 1996#endif /* NO_SCROLLBAR_REPORT */
1991 1997
1992 { 1998 {
1993 char upordown = 0; 1999 char upordown = 0;
1994 2000
1995 if (scrollBar.style == R_SB_NEXT) 2001 if (scrollBar.style == R_SB_NEXT)
1996 { 2002 {
1997 if (scrollbarnext_upButton (ev.y)) 2003 if (scrollbarnext_upButton (ev.y))
1998 upordown = -1; /* up */ 2004 upordown = -1; /* up */
2004 if (scrollbarrxvt_upButton (ev.y)) 2010 if (scrollbarrxvt_upButton (ev.y))
2005 upordown = -1; /* up */ 2011 upordown = -1; /* up */
2006 else if (scrollbarrxvt_dnButton (ev.y)) 2012 else if (scrollbarrxvt_dnButton (ev.y))
2007 upordown = 1; /* down */ 2013 upordown = 1; /* down */
2008 } 2014 }
2015
2009 if (upordown) 2016 if (upordown)
2010 { 2017 {
2011#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2018#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2019 if (!cont_scroll_ev.is_active ())
2012 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2020 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2013#endif 2021#endif
2014 if (scr_page (upordown < 0 ? UP : DN, 1)) 2022 if (scr_page (upordown < 0 ? UP : DN, 1))
2015 { 2023 {
2016 if (upordown < 0) 2024 if (upordown < 0)
2017 scrollBar.setUp (); 2025 scrollBar.setUp ();
2021 } 2029 }
2022 else 2030 else
2023 switch (ev.button) 2031 switch (ev.button)
2024 { 2032 {
2025 case Button2: 2033 case Button2:
2026 switch (scrollbar_align) 2034 switch (scrollBar.align)
2027 { 2035 {
2028 case R_SB_ALIGN_TOP: 2036 case R_SB_ALIGN_TOP:
2029 csrO = 0; 2037 csrO = 0;
2030 break; 2038 break;
2031 case R_SB_ALIGN_CENTRE: 2039 case R_SB_ALIGN_CENTRE:
2043 2051
2044 scrollBar.setMotion (); 2052 scrollBar.setMotion ();
2045 break; 2053 break;
2046 2054
2047 case Button1: 2055 case Button1:
2048 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2056 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2049 csrO = ev.y - scrollBar.top; 2057 csrO = ev.y - scrollBar.top;
2050 /* FALLTHROUGH */ 2058 /* FALLTHROUGH */
2051 2059
2052 case Button3: 2060 case Button3:
2053 if (scrollBar.style != R_SB_XTERM) 2061 if (scrollBar.style != R_SB_XTERM)
2097 scrollBar.setIdle (); 2105 scrollBar.setIdle ();
2098 scrollbar_show (0); 2106 scrollbar_show (0);
2099 } 2107 }
2100 2108
2101#ifdef SELECTION_SCROLLING 2109#ifdef SELECTION_SCROLLING
2102 if (sel_scroll_ev.active)
2103 sel_scroll_ev.stop(); 2110 sel_scroll_ev.stop();
2104#endif 2111#endif
2105 2112
2106 if (ev.window == vt) 2113 if (ev.window == vt)
2107 { 2114 {
2108 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2115 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2132 mouse_report (ev); 2139 mouse_report (ev);
2133 } 2140 }
2134#else /* MOUSE_REPORT_DOUBLECLICK */ 2141#else /* MOUSE_REPORT_DOUBLECLICK */
2135 MEvent.button = AnyButton; 2142 MEvent.button = AnyButton;
2136 mouse_report (ev); 2143 mouse_report (ev);
2137#endif /* MOUSE_REPORT_DOUBLECLICK */ 2144#endif /* MOUSE_REPORT_DOUBLECLICK */
2138 return; 2145 return;
2139 } 2146 }
2140 2147
2141 /* 2148 /*
2142 * dumb hack to compensate for the failure of click-and-drag 2149 * dumb hack to compensate for the failure of click-and-drag
2154 selection_make (ev.time); 2161 selection_make (ev.time);
2155 break; 2162 break;
2156 2163
2157 case Button2: 2164 case Button2:
2158 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2165 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2159 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary); 2166 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2160 break; 2167 break;
2161 2168
2162#ifdef MOUSE_WHEEL 2169#ifdef MOUSE_WHEEL
2163 case Button4: 2170 case Button4:
2164 case Button5: 2171 case Button5:
2168 2175
2169 v = ev.button == Button4 ? UP : DN; 2176 v = ev.button == Button4 ? UP : DN;
2170 2177
2171 if (ev.state & ShiftMask) 2178 if (ev.state & ShiftMask)
2172 i = 1; 2179 i = 1;
2173 else if (OPTION (Opt_mouseWheelScrollPage)) 2180 else if (option (Opt_mouseWheelScrollPage))
2174 i = nrow - 1; 2181 i = nrow - 1;
2175 else 2182 else
2176 i = 5; 2183 i = 5;
2177 2184
2178# ifdef MOUSE_SLIP_WHEELING 2185# ifdef MOUSE_SLIP_WHEELING
2180 { 2187 {
2181 mouse_slip_wheel_speed += v ? -1 : 1; 2188 mouse_slip_wheel_speed += v ? -1 : 1;
2182 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2189 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2183 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2190 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2184 2191
2185 if (slip_wheel_ev.at < NOW) 2192 if (!slip_wheel_ev.is_active ())
2186 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2193 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2187
2188 slip_wheel_ev.start ();
2189 } 2194 }
2190 else 2195 else
2196# endif
2191 { 2197 {
2192# endif
2193 scr_page (v, i); 2198 scr_page (v, i);
2194 scrollbar_show (1); 2199 scrollbar_show (1);
2195# ifdef MOUSE_SLIP_WHEELING
2196 } 2200 }
2197# endif
2198 } 2201 }
2199 break; 2202 break;
2200#endif 2203#endif
2201 } 2204 }
2202 } 2205 }
2203} 2206}
2204
2205#ifdef TRANSPARENT
2206#if TINTING
2207/* taken from aterm-0.4.2 */
2208
2209typedef uint32_t RUINT32T;
2210
2211void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2212{
2213 int sh_r, sh_g, sh_b;
2214 RUINT32T mask_r, mask_g, mask_b;
2215 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2216 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2217 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2218 int i;
2219
2220 Visual *visual = term->visual;
2221
2222 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2223
2224 /* for convenience */
2225 mask_r = visual->red_mask;
2226 mask_g = visual->green_mask;
2227 mask_b = visual->blue_mask;
2228
2229 /* boring lookup table pre-initialization */
2230 switch (srcImage->bits_per_pixel) {
2231 case 15:
2232 if ((mask_r != 0x7c00) ||
2233 (mask_g != 0x03e0) ||
2234 (mask_b != 0x001f))
2235 return;
2236 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2237 lookup_r = lookup;
2238 lookup_g = lookup+32;
2239 lookup_b = lookup+32+32;
2240 sh_r = 10;
2241 sh_g = 5;
2242 sh_b = 0;
2243 break;
2244 case 16:
2245 if ((mask_r != 0xf800) ||
2246 (mask_g != 0x07e0) ||
2247 (mask_b != 0x001f))
2248 return;
2249 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2250 lookup_r = lookup;
2251 lookup_g = lookup+32;
2252 lookup_b = lookup+32+64;
2253 sh_r = 11;
2254 sh_g = 5;
2255 sh_b = 0;
2256 break;
2257 case 24:
2258 if ((mask_r != 0xff0000) ||
2259 (mask_g != 0x00ff00) ||
2260 (mask_b != 0x0000ff))
2261 return;
2262 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2263 lookup_r = lookup;
2264 lookup_g = lookup+256;
2265 lookup_b = lookup+256+256;
2266 sh_r = 16;
2267 sh_g = 8;
2268 sh_b = 0;
2269 break;
2270 case 32:
2271 if ((mask_r != 0xff0000) ||
2272 (mask_g != 0x00ff00) ||
2273 (mask_b != 0x0000ff))
2274 return;
2275 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2276 lookup_r = lookup;
2277 lookup_g = lookup+256;
2278 lookup_b = lookup+256+256;
2279 sh_r = 16;
2280 sh_g = 8;
2281 sh_b = 0;
2282 break;
2283 default:
2284 return; /* we do not support this color depth */
2285 }
2286
2287 /* prepare limits for color transformation (each channel is handled separately) */
2288 if (shade < 0) {
2289 shade = -shade;
2290 if (shade < 0) shade = 0;
2291 if (shade > 100) shade = 100;
2292
2293 lower_lim_r = 65535-rm;
2294 lower_lim_g = 65535-gm;
2295 lower_lim_b = 65535-bm;
2296
2297 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2298 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2299 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2300
2301 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2302 } else {
2303 if (shade < 0) shade = 0;
2304 if (shade > 100) shade = 100;
2305
2306 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2307
2308 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2309 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2310 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2311 }
2312
2313 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2314 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2315 {
2316 unsigned int tmp;
2317
2318 tmp = lower_lim_r;
2319 lower_lim_r = lower_lim_b;
2320 lower_lim_b = tmp;
2321
2322 tmp = upper_lim_r;
2323 upper_lim_r = upper_lim_b;
2324 upper_lim_b = tmp;
2325 }
2326
2327 /* fill our lookup tables */
2328 for (i = 0; i <= mask_r>>sh_r; i++)
2329 {
2330 RUINT32T tmp;
2331 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2332 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2333 lookup_r[i] = (tmp/65535)<<sh_r;
2334 }
2335 for (i = 0; i <= mask_g>>sh_g; i++)
2336 {
2337 RUINT32T tmp;
2338 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2339 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2340 lookup_g[i] = (tmp/65535)<<sh_g;
2341 }
2342 for (i = 0; i <= mask_b>>sh_b; i++)
2343 {
2344 RUINT32T tmp;
2345 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2346 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2347 lookup_b[i] = (tmp/65535)<<sh_b;
2348 }
2349
2350 /* apply table to input image (replacing colors by newly calculated ones) */
2351 switch (srcImage->bits_per_pixel)
2352 {
2353 case 15:
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 & 0x7c00)>>10] |
2365 lookup_g[(*p & 0x03e0)>> 5] |
2366 lookup_b[(*p & 0x001f)];
2367 }
2368 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2369 }
2370 break;
2371 }
2372 case 16:
2373 {
2374 unsigned short *p1, *pf, *p, *pl;
2375 p1 = (unsigned short *) srcImage->data;
2376 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2377 while (p1 < pf)
2378 {
2379 p = p1;
2380 pl = p1 + srcImage->width;
2381 for (; p < pl; p++)
2382 {
2383 *p = lookup_r[(*p & 0xf800)>>11] |
2384 lookup_g[(*p & 0x07e0)>> 5] |
2385 lookup_b[(*p & 0x001f)];
2386 }
2387 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2388 }
2389 break;
2390 }
2391 case 24:
2392 {
2393 unsigned char *p1, *pf, *p, *pl;
2394 p1 = (unsigned char *) srcImage->data;
2395 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2396 while (p1 < pf)
2397 {
2398 p = p1;
2399 pl = p1 + srcImage->width * 3;
2400 for (; p < pl; p += 3)
2401 {
2402 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2403 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2404 p[2] = lookup_r[(p[2] & 0x0000ff)];
2405 }
2406 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2407 }
2408 break;
2409 }
2410 case 32:
2411 {
2412 RUINT32T *p1, *pf, *p, *pl;
2413 p1 = (RUINT32T *) srcImage->data;
2414 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2415
2416 while (p1 < pf)
2417 {
2418 p = p1;
2419 pl = p1 + srcImage->width;
2420 for (; p < pl; p++)
2421 {
2422 *p = lookup_r[(*p & 0xff0000)>>16] |
2423 lookup_g[(*p & 0x00ff00)>> 8] |
2424 lookup_b[(*p & 0x0000ff)] |
2425 (*p & ~0xffffff);
2426 }
2427 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2428 }
2429 break;
2430 }
2431 }
2432
2433 free (lookup);
2434}
2435#endif
2436
2437/*
2438 * Check our parents are still who we think they are.
2439 * Do transparency updates if required
2440 */
2441int
2442rxvt_term::check_our_parents ()
2443{
2444 int i, pchanged, aformat, have_pixmap, rootdepth;
2445 unsigned long nitems, bytes_after;
2446 Atom atype;
2447 unsigned char *prop = NULL;
2448 Window root, oldp, *list;
2449 Pixmap rootpixmap = None;
2450 XWindowAttributes wattr, wrootattr;
2451
2452 pchanged = 0;
2453
2454 if (!OPTION (Opt_transparent))
2455 return pchanged; /* Don't try any more */
2456
2457 XGetWindowAttributes (dpy, display->root, &wrootattr);
2458 rootdepth = wrootattr.depth;
2459
2460 XGetWindowAttributes (dpy, parent[0], &wattr);
2461
2462 if (rootdepth != wattr.depth)
2463 {
2464 if (am_transparent)
2465 {
2466 pchanged = 1;
2467 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2468 am_transparent = am_pixmap_trans = 0;
2469 }
2470
2471 return pchanged; /* Don't try any more */
2472 }
2473
2474 /* Get all X ops out of the queue so that our information is up-to-date. */
2475 XSync (dpy, False);
2476
2477 /*
2478 * Make the frame window set by the window manager have
2479 * the root background. Some window managers put multiple nested frame
2480 * windows for each client, so we have to take care about that.
2481 */
2482 i = (xa[XA_XROOTPMAP_ID]
2483 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2484 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2485 &nitems, &bytes_after, &prop) == Success);
2486
2487 if (!i || prop == NULL)
2488 i = (xa[XA_ESETROOT_PMAP_ID]
2489 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2490 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2491 &nitems, &bytes_after, &prop) == Success);
2492
2493 if (!i || prop == NULL
2494#if TINTING
2495 || !ISSET_PIXCOLOR (Color_tint)
2496#endif
2497 )
2498 have_pixmap = 0;
2499 else
2500 {
2501 have_pixmap = 1;
2502 rootpixmap = *(Pixmap *)prop;
2503 XFree (prop);
2504 }
2505
2506 if (have_pixmap)
2507 {
2508 /*
2509 * Copy display->root pixmap transparency
2510 */
2511 int sx, sy, nx, ny;
2512 unsigned int nw, nh;
2513 Window cr;
2514 XImage *image;
2515 GC gc;
2516 XGCValues gcvalue;
2517
2518 XTranslateCoordinates (dpy, parent[0], display->root,
2519 0, 0, &sx, &sy, &cr);
2520 nw = (unsigned int)szHint.width;
2521 nh = (unsigned int)szHint.height;
2522 nx = ny = 0;
2523
2524 if (sx < 0)
2525 {
2526 nw += sx;
2527 nx = -sx;
2528 sx = 0;
2529 }
2530
2531 if (sy < 0)
2532 {
2533 nh += sy;
2534 ny = -sy;
2535 sy = 0;
2536 }
2537
2538 min_it (nw, (unsigned int) (wrootattr.width - sx));
2539 min_it (nh, (unsigned int) (wrootattr.height - sy));
2540
2541 XSync (dpy, False);
2542 allowedxerror = -1;
2543 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2544
2545 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2546 /* XXX: may need a delay here? */
2547 allowedxerror = 0;
2548
2549 if (image == NULL)
2550 {
2551 if (am_transparent && am_pixmap_trans)
2552 {
2553 pchanged = 1;
2554 if (pixmap != None)
2555 {
2556 XFreePixmap (dpy, pixmap);
2557 pixmap = None;
2558 }
2559 }
2560
2561 am_pixmap_trans = 0;
2562 }
2563 else
2564 {
2565 if (pixmap != None)
2566 XFreePixmap (dpy, pixmap);
2567
2568#if TINTING
2569 if (ISSET_PIXCOLOR (Color_tint))
2570 {
2571 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2572
2573 rgba c;
2574 pix_colors_focused [Color_tint].get (c);
2575
2576 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2577 }
2578#endif
2579
2580 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2581 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2582 XPutImage (dpy, pixmap, gc, image, 0, 0,
2583 nx, ny, image->width, image->height);
2584 XFreeGC (dpy, gc);
2585 XDestroyImage (image);
2586 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2587 XClearWindow (dpy, parent[0]);
2588
2589 if (!am_transparent || !am_pixmap_trans)
2590 pchanged = 1;
2591
2592 am_transparent = am_pixmap_trans = 1;
2593 }
2594 }
2595
2596 if (am_pixmap_trans)
2597 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2598 else
2599 {
2600 unsigned int n;
2601 /*
2602 * InheritPixmap transparency
2603 */
2604 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2605 {
2606 oldp = parent[i];
2607 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2608 XFree (list);
2609
2610 if (parent[i] == display->root)
2611 {
2612 if (oldp != None)
2613 pchanged = 1;
2614
2615 break;
2616 }
2617
2618 if (oldp != parent[i])
2619 pchanged = 1;
2620 }
2621
2622 n = 0;
2623
2624 if (pchanged)
2625 for (; n < (unsigned int)i; n++)
2626 {
2627 XGetWindowAttributes (dpy, parent[n], &wattr);
2628
2629 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2630 {
2631 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2632 break;
2633 }
2634 }
2635
2636 if (n > (sizeof (parent) / sizeof (parent[0])))
2637 {
2638 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2639 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2640 am_transparent = 0;
2641 /* XXX: also turn off Opt_transparent? */
2642 }
2643 else
2644 {
2645 for (n = 0; n < (unsigned int)i; n++)
2646 {
2647 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2648 XClearWindow (dpy, parent[n]);
2649 }
2650
2651 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2652 am_transparent = 1;
2653 }
2654
2655 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2656 parent[i] = None;
2657 }
2658
2659 if (scrollBar.win)
2660 {
2661 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2662 scrollBar.setIdle ();
2663 scrollbar_show (0);
2664 }
2665
2666 if (am_transparent)
2667 {
2668 want_refresh = want_full_refresh = 1;
2669 if (am_pixmap_trans)
2670 flush ();
2671 }
2672
2673 return pchanged;
2674}
2675#endif
2676 2207
2677/*}}} */ 2208/*}}} */
2678 2209
2679bool 2210bool
2680rxvt_term::cmd_parse () 2211rxvt_term::cmd_parse ()
2729 if (ch == C0_LF) 2260 if (ch == C0_LF)
2730 nlines++; 2261 nlines++;
2731 2262
2732 refresh_count++; 2263 refresh_count++;
2733 2264
2734 if (!OPTION (Opt_jumpScroll) 2265 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2735 || (refresh_count >= refresh_limit * (nrow - 1)))
2736 { 2266 {
2737 refreshnow = true;
2738 refresh_count = 0; 2267 refresh_count = 0;
2268
2269 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2270 {
2271 refreshnow = true;
2739 ch = NOCHAR; 2272 ch = NOCHAR;
2740 break; 2273 break;
2274 }
2741 } 2275 }
2742 2276
2743 // scr_add_lines only works for nlines <= nrow - 1. 2277 // scr_add_lines only works for nlines <= nrow - 1.
2744 if (nlines >= nrow - 1) 2278 if (nlines >= nrow - 1)
2745 { 2279 {
2773 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2307 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2774 scr_add_lines (buf, str - buf, nlines); 2308 scr_add_lines (buf, str - buf, nlines);
2775 2309
2776 /* 2310 /*
2777 * If there have been a lot of new lines, then update the screen 2311 * If there have been a lot of new lines, then update the screen
2778 * What the heck I'll cheat and only refresh less than every page-full. 2312 * What the heck we'll cheat and only refresh less than every page-full.
2779 * the number of pages between refreshes is refresh_limit, which 2313 * if skipScroll is enabled.
2780 * is incremented here because we must be doing flat-out scrolling.
2781 */ 2314 */
2782 if (refreshnow) 2315 if (refreshnow)
2783 { 2316 {
2784 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2785 refresh_limit++;
2786 else
2787 {
2788 flag = true; 2317 flag = true;
2789 //TODO: due to popular request, implement "skipscroll" option here
2790 scr_refresh (); 2318 scr_refresh ();
2791 want_refresh = 1; 2319 want_refresh = 1;
2792 }
2793 } 2320 }
2794 2321
2795 } 2322 }
2796 else 2323 else
2797 { 2324 {
2946 { 2473 {
2947 if ((buf[len++] = cmd_getc ()) == 'i') 2474 if ((buf[len++] = cmd_getc ()) == 'i')
2948 break; /* done = 1 */ 2475 break; /* done = 1 */
2949 } 2476 }
2950 } 2477 }
2951 2478
2952 for (i = 0; i < len; i++) 2479 for (i = 0; i < len; i++)
2953 if (putc (buf[i], fd) == EOF) 2480 if (putc (buf[i], fd) == EOF)
2954 { 2481 {
2955 done = 1; 2482 done = 1;
2956 break; 2483 break;
2958 } 2485 }
2959 } 2486 }
2960 2487
2961 pclose_printer (fd); 2488 pclose_printer (fd);
2962} 2489}
2963#endif /* PRINTPIPE */ 2490#endif /* PRINTPIPE */
2964/*}}} */ 2491/*}}} */
2965 2492
2966/* *INDENT-OFF* */ 2493/* *INDENT-OFF* */
2967enum { 2494enum {
2968 C1_40 = 0x40, 2495 C1_40 = 0x40,
3018 process_dcs_seq (); 2545 process_dcs_seq ();
3019 break; 2546 break;
3020 case 0x9b: /* CSI */ 2547 case 0x9b: /* CSI */
3021 process_csi_seq (); 2548 process_csi_seq ();
3022 break; 2549 break;
3023 case 0x9d: /* CSI */ 2550 case 0x9d: /* OSC */
3024 process_osc_seq (); 2551 process_osc_seq ();
3025 break; 2552 break;
3026#endif 2553#endif
3027 } 2554 }
3028} 2555}
3254rxvt_term::process_csi_seq () 2781rxvt_term::process_csi_seq ()
3255{ 2782{
3256 unicode_t ch, priv, i; 2783 unicode_t ch, priv, i;
3257 unsigned int nargs, p; 2784 unsigned int nargs, p;
3258 int n, ndef; 2785 int n, ndef;
3259 int arg[ESC_ARGS]; 2786 int arg[ESC_ARGS] = { };
3260 2787
3261 for (nargs = ESC_ARGS; nargs > 0;) 2788 nargs = 0;
3262 arg[--nargs] = 0;
3263 2789
3264 priv = 0; 2790 priv = 0;
3265 ch = cmd_getc (); 2791 ch = cmd_getc ();
3266 if (ch >= '<' && ch <= '?') 2792 if (ch >= '<' && ch <= '?')
2793 {
3267 { /* '<' '=' '>' '?' */ 2794 /* '<' '=' '>' '?' */
3268 priv = ch; 2795 priv = ch;
3269 ch = cmd_getc (); 2796 ch = cmd_getc ();
3270 } 2797 }
3271 2798
3272 /* read any numerical arguments */ 2799 /* read any numerical arguments */
3311 switch (priv) 2838 switch (priv)
3312 { 2839 {
3313 case '>': 2840 case '>':
3314 if (ch == CSI_DA) /* secondary device attributes */ 2841 if (ch == CSI_DA) /* secondary device attributes */
3315 { 2842 {
3316 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt, 2843 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
3317 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2844 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3318 // 2845 //
3319 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2846 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3320 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2847 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
3321 // that we do not support xterm mouse reporting (should be 95 when we do). 2848 // versions.
3322 // 2849 //
3323 tt_printf ("\033[>%d;94;0c", 'U'); 2850 tt_printf ("\033[>%d;95;0c", 'U');
3324 } 2851 }
3325 break; 2852 break;
3326 case '?': 2853 case '?':
3327 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2854 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3328 process_terminal_mode (ch, priv, nargs, arg); 2855 process_terminal_mode (ch, priv, nargs, arg);
3455 break; 2982 break;
3456 case 6: /* CPR requested */ 2983 case 6: /* CPR requested */
3457 scr_report_position (); 2984 scr_report_position ();
3458 break; 2985 break;
3459 case 7: /* unofficial extension */ 2986 case 7: /* unofficial extension */
3460 if (OPTION (Opt_insecure)) 2987 if (option (Opt_insecure))
3461 tt_printf ("%-.250s\012", rs[Rs_display_name]); 2988 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3462 break; 2989 break;
3463 case 8: /* unofficial extension */ 2990 case 8: /* unofficial extension */
3464 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2991 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3465 break; 2992 break;
3629 break; 3156 break;
3630 case 20: /* report icon label */ 3157 case 20: /* report icon label */
3631 { 3158 {
3632 char *s; 3159 char *s;
3633 XGetIconName (dpy, parent[0], &s); 3160 XGetIconName (dpy, parent[0], &s);
3634 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3161 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3635 XFree (s); 3162 XFree (s);
3636 } 3163 }
3637 break; 3164 break;
3638 case 21: /* report window title */ 3165 case 21: /* report window title */
3639 { 3166 {
3640 char *s; 3167 char *s;
3641 XFetchName (dpy, parent[0], &s); 3168 XFetchName (dpy, parent[0], &s);
3642 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3169 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3643 XFree (s); 3170 XFree (s);
3644 } 3171 }
3645 break; 3172 break;
3646 } 3173 }
3647} 3174}
3774 int saveop = op; 3301 int saveop = op;
3775 3302
3776 dLocal (Display *, dpy); 3303 dLocal (Display *, dpy);
3777 3304
3778 assert (str != NULL); 3305 assert (str != NULL);
3779 3306
3780 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END))) 3307 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3781 return; 3308 return;
3782 3309
3783 switch (op) 3310 switch (op)
3784 { 3311 {
3846 *buf++ = '\0'; 3373 *buf++ = '\0';
3847 3374
3848 process_color_seq (op, color, name, resp); 3375 process_color_seq (op, color, name, resp);
3849 } 3376 }
3850 break; 3377 break;
3378 case Rxvt_restoreFG:
3851 case XTerm_Color00: 3379 case XTerm_Color00:
3852 process_color_seq (op, Color_fg, str, resp); 3380 process_color_seq (op, Color_fg, str, resp);
3853 break; 3381 break;
3382 case Rxvt_restoreBG:
3854 case XTerm_Color01: 3383 case XTerm_Color01:
3855 process_color_seq (op, Color_bg, str, resp); 3384 process_color_seq (op, Color_bg, str, resp);
3856 break; 3385 break;
3857#ifndef NO_CURSORCOLOR 3386#ifndef NO_CURSORCOLOR
3858 case XTerm_Color_cursor: 3387 case XTerm_Color_cursor:
3879 break; 3408 break;
3880 case URxvt_Color_IT: 3409 case URxvt_Color_IT:
3881 process_color_seq (op, Color_IT, str, resp); 3410 process_color_seq (op, Color_IT, str, resp);
3882 break; 3411 break;
3883#endif 3412#endif
3884#if TRANSPARENT && TINTING 3413#if ENABLE_TRANSPARENCY
3885 case URxvt_Color_tint: 3414 case URxvt_Color_tint:
3886 process_color_seq (op, Color_tint, str, resp); 3415 process_color_seq (op, Color_tint, str, resp);
3416 {
3417 bool changed = false;
3887 3418
3888 check_our_parents (); 3419 if (ISSET_PIXCOLOR (Color_tint))
3420 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3421 else
3422 changed = bgPixmap.unset_tint ();
3889 3423
3890 if (am_transparent) 3424 if (changed)
3891 want_full_refresh = want_refresh = 1; 3425 update_background ();
3426 }
3892 3427
3893 break; 3428 break;
3894#endif 3429#endif
3895 3430
3431#if BG_IMAGE_FROM_FILE
3896 case Rxvt_Pixmap: 3432 case Rxvt_Pixmap:
3897 { 3433 if (!strcmp (str, "?"))
3898 if (*str != ';')
3899 { 3434 {
3900#if XPM_BACKGROUND 3435 char str[256];
3901 scale_pixmap (""); /* reset to default scaling */ 3436
3902 set_bgPixmap (str); /* change pixmap */ 3437 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3903 scr_touch (true); 3438 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3904#endif 3439 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3440 process_xterm_seq (XTerm_title, str, CHAR_ST);
3905 } 3441 }
3906 3442 else
3443 {
3907 int changed = 0; 3444 int changed = 0;
3908 3445
3909 while ((str = strchr (str, ';')) != NULL) 3446 if (*str != ';')
3910 { 3447 {
3448 /* reset to default scaling :*/
3449 bgPixmap.unset_geometry ();
3450 if (bgPixmap.set_file (str)) /* change pixmap */
3451 changed++;
3452 str = strchr (str, ';');
3453 if (str == NULL)
3454 bgPixmap.set_defaultGeometry ();
3455 }
3456
3457 while (str)
3458 {
3911 str++; 3459 str++;
3912#if XPM_BACKGROUND 3460 if (bgPixmap.set_geometry (str))
3913 changed += scale_pixmap (str); 3461 changed++;
3914#endif 3462 str = strchr (str, ';');
3915 } 3463 }
3916 3464
3917 if (changed) 3465 if (changed)
3918 { 3466 update_background ();
3919#ifdef XPM_BACKGROUND
3920 resize_pixmap ();
3921 scr_touch (true);
3922#endif
3923 } 3467 }
3924 }
3925 break; 3468 break;
3926 3469#endif
3927 case Rxvt_restoreFG:
3928 set_window_color (Color_fg, str);
3929 break;
3930 case Rxvt_restoreBG:
3931 set_window_color (Color_bg, str);
3932 break;
3933 3470
3934 case XTerm_logfile: 3471 case XTerm_logfile:
3935 // TODO, when secure mode? 3472 // TODO, when secure mode?
3936 break; 3473 break;
3937 3474
3955 case URxvt_italicFont: 3492 case URxvt_italicFont:
3956 case URxvt_boldItalicFont: 3493 case URxvt_boldItalicFont:
3957#endif 3494#endif
3958 if (query) 3495 if (query)
3959 tt_printf ("\33]%d;%-.250s%c", saveop, 3496 tt_printf ("\33]%d;%-.250s%c", saveop,
3960 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3497 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3961 ? fontset[op - URxvt_font]->fontdesc : "", 3498 ? fontset[op - URxvt_font]->fontdesc : "",
3962 resp); 3499 resp);
3963 else 3500 else
3964 { 3501 {
3965 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3502 const char *&res = rs[Rs_font + (op - URxvt_font)];
3979 break; 3516 break;
3980 3517
3981#if !ENABLE_MINIMAL 3518#if !ENABLE_MINIMAL
3982 case URxvt_locale: 3519 case URxvt_locale:
3983 if (query) 3520 if (query)
3984 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp); 3521 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3985 else 3522 else
3986 { 3523 {
3987 set_locale (str); 3524 set_locale (str);
3988 pty->set_utf8_mode (enc_utf8); 3525 pty->set_utf8_mode (enc_utf8);
3989 init_xlocale (); 3526 init_xlocale ();
4052{ 3589{
4053 unsigned int i, j; 3590 unsigned int i, j;
4054 int state; 3591 int state;
4055 3592
4056 static const struct 3593 static const struct
4057 { 3594 {
4058 const int argval; 3595 const int argval;
4059 const unsigned long bit; 3596 const unsigned long bit;
4060 }
4061
4062 argtopriv[] = { 3597 } argtopriv[] = {
4063 { 1, PrivMode_aplCUR }, 3598 { 1, PrivMode_aplCUR },
4064 { 2, PrivMode_vt52 }, 3599 { 2, PrivMode_vt52 },
4065 { 3, PrivMode_132 }, 3600 { 3, PrivMode_132 },
4066 { 4, PrivMode_smoothScroll }, 3601 { 4, PrivMode_smoothScroll },
4067 { 5, PrivMode_rVideo }, 3602 { 5, PrivMode_rVideo },
4083 { 66, PrivMode_aplKP }, 3618 { 66, PrivMode_aplKP },
4084#ifndef NO_BACKSPACE_KEY 3619#ifndef NO_BACKSPACE_KEY
4085 { 67, PrivMode_BackSpace }, 3620 { 67, PrivMode_BackSpace },
4086#endif 3621#endif
4087 { 1000, PrivMode_MouseX11 }, 3622 { 1000, PrivMode_MouseX11 },
4088 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3623 { 1002, PrivMode_MouseBtnEvent },
4089 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3624 { 1003, PrivMode_MouseAnyEvent },
4090 // 1003 Use All Motion Mouse Tracking. NYI, TODO
4091 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3625 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4092 { 1011, PrivMode_Keypress }, // rxvt extension 3626 { 1011, PrivMode_Keypress }, // rxvt extension
4093 // 1035 enable modifiers for alt, numlock NYI 3627 // 1035 enable modifiers for alt, numlock NYI
4094 // 1036 send ESC for meta keys NYI 3628 // 1036 send ESC for meta keys NYI
4095 // 1037 send DEL for keypad delete NYI 3629 // 1037 send DEL for keypad delete NYI
4130 scr_touch (true); 3664 scr_touch (true);
4131 break; 3665 break;
4132#endif 3666#endif
4133 case 1048: /* alternative cursor save */ 3667 case 1048: /* alternative cursor save */
4134 case 1049: 3668 case 1049:
4135 if (OPTION (Opt_secondaryScreen)) 3669 if (option (Opt_secondaryScreen))
4136 if (mode == 0) 3670 if (mode == 0)
4137 scr_cursor (RESTORE); 3671 scr_cursor (RESTORE);
4138 else if (mode == 1) 3672 else if (mode == 1)
4139 scr_cursor (SAVE); 3673 scr_cursor (SAVE);
4140 break; 3674 break;
4152 */ 3686 */
4153 PrivMode (1, PrivMode_vt52); 3687 PrivMode (1, PrivMode_vt52);
4154 break; 3688 break;
4155 case 3: /* 80/132 */ 3689 case 3: /* 80/132 */
4156 if (priv_modes & PrivMode_132OK) 3690 if (priv_modes & PrivMode_132OK)
3691 {
3692 scr_poweron ();
4157 set_widthheight (((state ? 132 : 80) * fwidth), height); 3693 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight);
3694 }
4158 break; 3695 break;
4159 case 4: /* smooth scrolling */ 3696 case 4: /* smooth scrolling */
4160 set_option (Opt_jumpScroll, !state); 3697 set_option (Opt_jumpScroll, !state);
4161 break; 3698 break;
4162 case 5: /* reverse video */ 3699 case 5: /* reverse video */
4169 scr_autowrap (state); 3706 scr_autowrap (state);
4170 break; 3707 break;
4171 /* case 8: - auto repeat, can't do on a per window basis */ 3708 /* case 8: - auto repeat, can't do on a per window basis */
4172 case 9: /* X10 mouse reporting */ 3709 case 9: /* X10 mouse reporting */
4173 if (state) /* orthogonal */ 3710 if (state) /* orthogonal */
4174 priv_modes &= ~PrivMode_MouseX11; 3711 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4175 break; 3712 break;
4176#ifdef scrollBar_esc 3713#ifdef scrollBar_esc
4177 case scrollBar_esc: 3714 case scrollBar_esc:
4178 if (scrollbar_mapping (state)) 3715 if (scrollbar_mapping (state))
4179 { 3716 {
4192 break; 3729 break;
4193 /* case 66: - application key pad */ 3730 /* case 66: - application key pad */
4194 /* case 67: - backspace key */ 3731 /* case 67: - backspace key */
4195 case 1000: /* X11 mouse reporting */ 3732 case 1000: /* X11 mouse reporting */
4196 if (state) /* orthogonal */ 3733 if (state) /* orthogonal */
4197 priv_modes &= ~PrivMode_MouseX10; 3734 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4198 break; 3735 break;
4199#if 0
4200 case 1001: 3736 case 1002:
4201 break; /* X11 mouse highlighting */ 3737 case 1003:
4202#endif 3738 if (state)
3739 {
3740 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3741 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3742 vt_emask_mouse = PointerMotionMask;
3743 }
3744 else
3745 vt_emask_mouse = NoEventMask;
3746 vt_select_input ();
3747 break;
4203 case 1010: /* scroll to bottom on TTY output inhibit */ 3748 case 1010: /* scroll to bottom on TTY output inhibit */
4204 set_option (Opt_scrollTtyOutput, !state); 3749 set_option (Opt_scrollTtyOutput, !state);
4205 break; 3750 break;
4206 case 1011: /* scroll to bottom on key press */ 3751 case 1011: /* scroll to bottom on key press */
4207 set_option (Opt_scrollTtyKeypress, state); 3752 set_option (Opt_scrollTtyKeypress, state);
4208 break; 3753 break;
4209 case 1047: /* secondary screen w/ clearing last */ 3754 case 1047: /* secondary screen w/ clearing last */
4210 if (OPTION (Opt_secondaryScreen)) 3755 if (option (Opt_secondaryScreen))
4211 if (current_screen != PRIMARY) 3756 if (current_screen != PRIMARY)
4212 scr_erase_screen (2); 3757 scr_erase_screen (2);
4213 scr_change_screen (state); 3758 scr_change_screen (state);
4214 break; 3759 break;
4215 case 1049: /* secondary screen w/ clearing first */ 3760 case 1049: /* secondary screen w/ clearing first */
4216 scr_change_screen (state); 3761 scr_change_screen (state);
4217 if (OPTION (Opt_secondaryScreen)) 3762 if (option (Opt_secondaryScreen))
4218 if (current_screen != PRIMARY) 3763 if (current_screen != PRIMARY)
4219 scr_erase_screen (2); 3764 scr_erase_screen (2);
4220 break; 3765 break;
4221 default: 3766 default:
4222 break; 3767 break;
4384rxvt_term::process_graphics () 3929rxvt_term::process_graphics ()
4385{ 3930{
4386 unicode_t ch, cmd = cmd_getc (); 3931 unicode_t ch, cmd = cmd_getc ();
4387 3932
4388 if (cmd == 'Q') 3933 if (cmd == 'Q')
3934 {
4389 { /* query graphics */ 3935 /* query graphics */
4390 tt_printf ("\033G0\012"); /* no graphics */ 3936 tt_printf ("\033G0\012"); /* no graphics */
4391 return; 3937 return;
4392 } 3938 }
4393 /* swallow other graphics sequences until terminating ':' */ 3939 /* swallow other graphics sequences until terminating ':' */
4394 do 3940 do
4444 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 3990 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4445 3991
4446 memcpy (v_buffer + v_buflen, data, len); 3992 memcpy (v_buffer + v_buflen, data, len);
4447 v_buflen += len; 3993 v_buflen += len;
4448 3994
4449 pty_ev.set (EVENT_READ | EVENT_WRITE); 3995 pty_ev.set (ev::READ | ev::WRITE);
4450} 3996}
4451 3997
4452void rxvt_term::pty_write () 3998void rxvt_term::pty_write ()
4453{ 3999{
4454 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4000 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4459 4005
4460 if (v_buflen == 0) 4006 if (v_buflen == 0)
4461 { 4007 {
4462 free (v_buffer); 4008 free (v_buffer);
4463 v_buffer = 0; 4009 v_buffer = 0;
4464 v_buflen = 0;
4465 4010
4466 pty_ev.set (EVENT_READ); 4011 pty_ev.set (ev::READ);
4467 return; 4012 return;
4468 } 4013 }
4469 4014
4470 memmove (v_buffer, v_buffer + written, v_buflen); 4015 memmove (v_buffer, v_buffer + written, v_buflen);
4471 } 4016 }
4472 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4017 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4473 pty_ev.set (EVENT_READ); 4018 pty_ev.set (ev::READ);
4474} 4019}
4475 4020
4476/*----------------------- end-of-file (C source) -----------------------*/ 4021/*----------------------- end-of-file (C source) -----------------------*/
4477 4022

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines