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

Diff Legend

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