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.329 by ayin, Mon Jun 11 19:57:28 2007 UTC vs.
Revision 1.410 by ayin, Sat Feb 16 15:48:36 2008 UTC

25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
31 * 32 *
32 * This program is free software; you can redistribute it and/or modify 33 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 34 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 36 * (at your option) any later version.
95 XK_Shift_L, 0x21e7, 96 XK_Shift_L, 0x21e7,
96 XK_Shift_R, 0x21e7, 97 XK_Shift_R, 0x21e7,
97 98
98 XK_Shift_Lock, 0x21eb, 99 XK_Shift_Lock, 0x21eb,
99 XK_ISO_Lock, 0x21eb, 100 XK_ISO_Lock, 0x21eb,
100 XK_ISO_Lock, 0x21eb,
101 XK_Caps_Lock, 0x21ec, 101 XK_Caps_Lock, 0x21ec,
102 XK_Num_Lock, 0x21ed, 102 XK_Num_Lock, 0x21ed,
103 XK_ISO_Level3_Shift, 0x21ee, 103 XK_ISO_Level3_Shift, 0x21ee,
104 XK_ISO_Level3_Lock, 0x21ef, 104 XK_ISO_Level3_Lock, 0x21ef,
105 XK_ISO_Group_Lock, 0x21f0, 105 XK_ISO_Group_Lock, 0x21f0,
199 r & RS_Uline ? " uline" : "", 199 r & RS_Uline ? " uline" : "",
200 r & RS_Careful ? " careful" : ""); 200 r & RS_Careful ? " careful" : "");
201 201
202 int width = wcswidth (fname, wcslen (fname)); 202 int width = wcswidth (fname, wcslen (fname));
203 203
204 max_it (width, 8+5); // for char + hey 204 max_it (width, 8+5); // for char + hex
205 max_it (width, strlen (attr)); 205 max_it (width, strlen (attr));
206 206
207 if (y >= 0) 207 if (y >= 0)
208 { 208 {
209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
221 ch = *chr++; 221 ch = *chr++;
222 222
223 sprintf (buf, "%8x", ch); 223 sprintf (buf, "%8x", ch);
224 scr_overlay_set (0, y, buf); 224 scr_overlay_set (0, y, buf);
225 scr_overlay_set (9, y, '='); 225 scr_overlay_set (9, y, '=');
226# if !UNICODE3 226# if !UNICODE_3
227 if (ch >= 0x10000) 227 if (ch >= 0x10000)
228 ch = 0xfffd; 228 ch = 0xfffd;
229# endif 229# endif
230 scr_overlay_set (11, y, ch, r); 230 scr_overlay_set (11, y, ch, r);
231 231
279 } 279 }
280 280
281 iso14755buf = 0; 281 iso14755buf = 0;
282} 282}
283 283
284int 284static int
285rxvt_term::hex_keyval (XKeyEvent &ev) 285hex_keyval (XKeyEvent &ev)
286{ 286{
287 // check wether this event corresponds to a hex digit 287 // check wether this event corresponds to a hex digit
288 // if the modifiers had not been pressed. 288 // if the modifiers had not been pressed.
289 for (int index = 0; index < 8; index++) 289 for (int index = 0; index < 8; index++)
290 { 290 {
298 298
299 return -1; 299 return -1;
300} 300}
301#endif 301#endif
302 302
303static inline KeySym
304translate_keypad (KeySym keysym, bool kp)
305{
306#ifdef XK_KP_Home
307 static const KeySym keypadtrans[] = {
308 XK_KP_7, // XK_KP_Home
309 XK_KP_4, // XK_KP_Left
310 XK_KP_8, // XK_KP_Up
311 XK_KP_6, // XK_KP_Right
312 XK_KP_2, // XK_KP_Down
313# ifndef UNSHIFTED_SCROLLKEYS
314 XK_KP_9, // XK_KP_Prior
315 XK_KP_3, // XK_KP_Next
316# else
317 XK_Prior,
318 XK_Next,
319# endif
320 XK_KP_1, // XK_KP_End
321 XK_KP_5, // XK_KP_Begin
322 };
323
324 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
325 {
326 unsigned int index = keysym - XK_KP_Home;
327 keysym = kp ? keypadtrans[index] : XK_Home + index;
328 }
329 else if (keysym == XK_KP_Insert)
330 keysym = kp ? XK_KP_0 : XK_Insert;
331# ifndef NO_DELETE_KEY
332 else if (keysym == XK_KP_Delete)
333 keysym = kp ? XK_KP_Decimal : XK_Delete;
334# endif
335#endif
336 return keysym;
337}
338
339static inline int
340map_function_key (KeySym keysym)
341{
342 int param = 0;
343
344 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
345 {
346 param = 11 + keysym - XK_F1;
347 if (keysym >= XK_F17)
348 param += 4;
349 else if (keysym >= XK_F15)
350 param += 3;
351 else if (keysym >= XK_F11)
352 param += 2;
353 else if (keysym >= XK_F6)
354 param += 1;
355 }
356 else
357 switch (keysym)
358 {
359 case XK_Find:
360 param = 1;
361 break;
362 case XK_Insert:
363 param = 2;
364 break;
365#ifdef DXK_Remove
366 case DXK_Remove:
367#endif
368 case XK_Execute:
369 param = 3;
370 break;
371 case XK_Select:
372 param = 4;
373 break;
374#ifndef UNSHIFTED_SCROLLKEYS
375 case XK_Prior:
376 param = 5;
377 break;
378 case XK_Next:
379 param = 6;
380 break;
381 case XK_Home:
382 param = 7;
383 break;
384 case XK_End:
385 param = 8;
386 break;
387#endif
388 case XK_Help:
389 param = 28;
390 break;
391 case XK_Menu:
392 param = 29;
393 break;
394 }
395 return param;
396}
397
303void 398void
304rxvt_term::key_press (XKeyEvent &ev) 399rxvt_term::key_press (XKeyEvent &ev)
305{ 400{
306 int ctrl, meta, shft, len; 401 int ctrl, meta, shft, len;
307 unsigned int newlen;
308 KeySym keysym; 402 KeySym keysym;
309 int valid_keysym; 403 int valid_keysym;
310 char kbuf[KBUFSZ]; 404 char kbuf[KBUFSZ];
311 405
312#if ISO_14755 406#if ISO_14755
519# endif 613# endif
520 return; 614 return;
521 } 615 }
522 else 616 else
523 { 617 {
524# if ENABLE_OVERLAY 618# if ISO_14755
525 scr_overlay_off (); 619 scr_overlay_off ();
526# endif 620# endif
527 iso14755buf = 0; 621 iso14755buf = 0;
528 } 622 }
529 } 623 }
530 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 624 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
531 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 625 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
532 if (!(iso14755buf & ISO_14755_STARTED)) 626 if (!(iso14755buf & ISO_14755_STARTED))
533 { 627 {
534 iso14755buf |= ISO_14755_STARTED; 628 iso14755buf |= ISO_14755_STARTED;
535# if ENABLE_OVERLAY 629# if ISO_14755
536 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 630 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
537 scr_overlay_set (0, 0, "ISO 14755 mode"); 631 scr_overlay_set (0, 0, "ISO 14755 mode");
538# endif 632# endif
539 } 633 }
540#endif 634#endif
547 } 641 }
548#endif 642#endif
549 643
550 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 644 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
551 { 645 {
552 { 646 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
553 newlen = 1; 647 unsigned int newlen = 1;
554 switch (keysym) 648
649 switch (translate_keypad (keysym, kp))
555 { 650 {
556#ifndef NO_BACKSPACE_KEY 651#ifndef NO_BACKSPACE_KEY
557 case XK_BackSpace: 652 case XK_BackSpace:
558 if (priv_modes & PrivMode_HaveBackSpace) 653 if (priv_modes & PrivMode_HaveBackSpace)
559 { 654 {
560 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace) 655 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
561 ^ !!ctrl) ? '\b' : '\177'; 656 ^ !!ctrl) ? '\b' : '\177';
562 kbuf[1] = '\0'; 657 kbuf[1] = '\0';
563 } 658 }
564 else 659 else
565 strcpy (kbuf, key_backspace); 660 strcpy (kbuf, rs[Rs_backspace_key]);
566 break; 661 break;
567#endif 662#endif
568#ifndef NO_DELETE_KEY 663#ifndef NO_DELETE_KEY
569# ifdef XK_KP_Prior
570 case XK_KP_Delete:
571 /* allow shift to override */
572 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
573 {
574 strcpy (kbuf, "\033On");
575 break;
576 }
577 /* FALLTHROUGH */
578# endif
579 case XK_Delete: 664 case XK_Delete:
580 strcpy (kbuf, key_delete); 665 strcpy (kbuf, rs[Rs_delete_key]);
581 break; 666 break;
582#endif 667#endif
583 case XK_Tab: 668 case XK_Tab:
584 if (shft) 669 if (shft)
585 strcpy (kbuf, "\033[Z"); 670 strcpy (kbuf, "\033[Z");
595#endif 680#endif
596 newlen = 0; 681 newlen = 0;
597 } 682 }
598 break; 683 break;
599 684
600#ifdef XK_KP_Left
601 case XK_KP_Up: /* \033Ox or standard */
602 case XK_KP_Down: /* \033Or or standard */
603 case XK_KP_Right: /* \033Ov or standard */
604 case XK_KP_Left: /* \033Ot or standard */
605 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
606 {
607 strcpy (kbuf, "\033OZ");
608 kbuf[2] = "txvr"[keysym - XK_KP_Left];
609 break;
610 }
611 else
612 /* translate to std. cursor key */
613 keysym = XK_Left + (keysym - XK_KP_Left);
614 /* FALLTHROUGH */
615#endif
616 case XK_Up: /* "\033[A" */ 685 case XK_Up: /* "\033[A" */
617 case XK_Down: /* "\033[B" */ 686 case XK_Down: /* "\033[B" */
618 case XK_Right: /* "\033[C" */ 687 case XK_Right: /* "\033[C" */
619 case XK_Left: /* "\033[D" */ 688 case XK_Left: /* "\033[D" */
620 strcpy (kbuf, "\033[Z"); 689 strcpy (kbuf, "\033[Z");
629 } 698 }
630 else if (priv_modes & PrivMode_aplCUR) 699 else if (priv_modes & PrivMode_aplCUR)
631 kbuf[1] = 'O'; 700 kbuf[1] = 'O';
632 break; 701 break;
633 702
634#ifndef UNSHIFTED_SCROLLKEYS
635# ifdef XK_KP_Prior
636 case XK_KP_Prior:
637 /* allow shift to override */
638 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
639 {
640 strcpy (kbuf, "\033Oy");
641 break;
642 }
643 /* FALLTHROUGH */
644# endif
645 case XK_Prior:
646 strcpy (kbuf, "\033[5~");
647 break;
648# ifdef XK_KP_Next
649 case XK_KP_Next:
650 /* allow shift to override */
651 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
652 {
653 strcpy (kbuf, "\033Os");
654 break;
655 }
656 /* FALLTHROUGH */
657# endif
658 case XK_Next:
659 strcpy (kbuf, "\033[6~");
660 break;
661#endif
662 case XK_KP_Enter: 703 case XK_KP_Enter:
663 /* allow shift to override */ 704 /* allow shift to override */
664 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 705 if (kp)
665 { 706 {
666 strcpy (kbuf, "\033OM"); 707 strcpy (kbuf, "\033OM");
667 break; 708 break;
668 } 709 }
669 710
681 kbuf[0] = '\015'; 722 kbuf[0] = '\015';
682 kbuf[1] = '\0'; 723 kbuf[1] = '\0';
683 } 724 }
684 break; 725 break;
685 726
686#ifdef XK_KP_Begin
687 case XK_KP_Begin:
688 strcpy (kbuf, "\033Ou");
689 break;
690
691#endif
692 case XK_KP_F1: /* "\033OP" */ 727 case XK_KP_F1: /* "\033OP" */
693 case XK_KP_F2: /* "\033OQ" */ 728 case XK_KP_F2: /* "\033OQ" */
694 case XK_KP_F3: /* "\033OR" */ 729 case XK_KP_F3: /* "\033OR" */
695 case XK_KP_F4: /* "\033OS" */ 730 case XK_KP_F4: /* "\033OS" */
696 strcpy (kbuf, "\033OP"); 731 strcpy (kbuf, "\033OP");
712 case XK_KP_6: /* "\033Ov" : "6" */ 747 case XK_KP_6: /* "\033Ov" : "6" */
713 case XK_KP_7: /* "\033Ow" : "7" */ 748 case XK_KP_7: /* "\033Ow" : "7" */
714 case XK_KP_8: /* "\033Ox" : "8" */ 749 case XK_KP_8: /* "\033Ox" : "8" */
715 case XK_KP_9: /* "\033Oy" : "9" */ 750 case XK_KP_9: /* "\033Oy" : "9" */
716 /* allow shift to override */ 751 /* allow shift to override */
717 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 752 if (kp)
718 { 753 {
719 strcpy (kbuf, "\033Oj"); 754 strcpy (kbuf, "\033Oj");
720 kbuf[2] += (keysym - XK_KP_Multiply); 755 kbuf[2] += (keysym - XK_KP_Multiply);
721 } 756 }
722 else 757 else
724 kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); 759 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
725 kbuf[1] = '\0'; 760 kbuf[1] = '\0';
726 } 761 }
727 break; 762 break;
728 763
729 case XK_Find:
730 strcpy (kbuf, "\033[1~");
731 break;
732
733#ifdef XK_KP_End
734 case XK_KP_Insert:
735 /* allow shift to override */
736 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
737 {
738 strcpy (kbuf, "\033Op");
739 break;
740 }
741 /* FALLTHROUGH */
742#endif
743 case XK_Insert:
744 strcpy (kbuf, "\033[2~");
745 break;
746#ifdef DXK_Remove /* support for DEC remove like key */
747 case DXK_Remove:
748 /* FALLTHROUGH */
749#endif
750 case XK_Execute:
751 strcpy (kbuf, "\033[3~");
752 break;
753 case XK_Select:
754 strcpy (kbuf, "\033[4~");
755 break;
756#ifdef XK_KP_End
757 case XK_KP_End:
758 /* allow shift to override */
759 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
760 {
761 strcpy (kbuf, "\033Oq");
762 break;
763 }
764 /* FALLTHROUGH */
765#endif
766 case XK_End:
767 strcpy (kbuf, KS_END);
768 break;
769#ifdef XK_KP_Home
770 case XK_KP_Home:
771 /* allow shift to override */
772 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
773 {
774 strcpy (kbuf, "\033Ow");
775 break;
776 }
777 /* FALLTHROUGH */
778#endif
779 case XK_Home:
780 strcpy (kbuf, KS_HOME);
781 break;
782
783#define FKEY(n, fkey) \
784 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
785
786 case XK_F1: /* "\033[11~" */
787 case XK_F2: /* "\033[12~" */
788 case XK_F3: /* "\033[13~" */
789 case XK_F4: /* "\033[14~" */
790 case XK_F5: /* "\033[15~" */
791 FKEY (11, XK_F1);
792 break;
793 case XK_F6: /* "\033[17~" */
794 case XK_F7: /* "\033[18~" */
795 case XK_F8: /* "\033[19~" */
796 case XK_F9: /* "\033[20~" */
797 case XK_F10: /* "\033[21~" */
798 FKEY (17, XK_F6);
799 break;
800 case XK_F11: /* "\033[23~" */
801 case XK_F12: /* "\033[24~" */
802 case XK_F13: /* "\033[25~" */
803 case XK_F14: /* "\033[26~" */
804 FKEY (23, XK_F11);
805 break;
806 case XK_F15: /* "\033[28~" */
807 case XK_F16: /* "\033[29~" */
808 FKEY (28, XK_F15);
809 break;
810 case XK_Help: /* "\033[28~" */
811 FKEY (28, XK_Help);
812 break;
813 case XK_Menu: /* "\033[29~" */
814 FKEY (29, XK_Menu);
815 break;
816 case XK_F17: /* "\033[31~" */
817 case XK_F18: /* "\033[32~" */
818 case XK_F19: /* "\033[33~" */
819 case XK_F20: /* "\033[34~" */
820 case XK_F21: /* "\033[35~" */
821 case XK_F22: /* "\033[36~" */
822 case XK_F23: /* "\033[37~" */
823 case XK_F24: /* "\033[38~" */
824 case XK_F25: /* "\033[39~" */
825 case XK_F26: /* "\033[40~" */
826 case XK_F27: /* "\033[41~" */
827 case XK_F28: /* "\033[42~" */
828 case XK_F29: /* "\033[43~" */
829 case XK_F30: /* "\033[44~" */
830 case XK_F31: /* "\033[45~" */
831 case XK_F32: /* "\033[46~" */
832 case XK_F33: /* "\033[47~" */
833 case XK_F34: /* "\033[48~" */
834 case XK_F35: /* "\033[49~" */
835 FKEY (31, XK_F17);
836 break;
837#undef FKEY
838 default: 764 default:
765 {
766 int param = map_function_key (keysym);
767 if (param > 0)
768 sprintf (kbuf,"\033[%d~", param);
769 else
839 newlen = 0; 770 newlen = 0;
771 }
840 break; 772 break;
841 } 773 }
842 774
843 if (newlen) 775 if (newlen)
844 len = strlen (kbuf); 776 len = strlen (kbuf);
845 }
846 777
847 /* 778 /*
848 * Pass meta for all function keys, if 'meta' option set 779 * Pass meta for all function keys, if 'meta' option set
849 */ 780 */
850#ifdef META8_OPTION 781#ifdef META8_OPTION
934#if ENABLE_FRILLS || ISO_14755 865#if ENABLE_FRILLS || ISO_14755
935 // ISO 14755 support 866 // ISO 14755 support
936 if (iso14755buf) 867 if (iso14755buf)
937 if (iso14755buf & ISO_14755_52) 868 if (iso14755buf & ISO_14755_52)
938 { 869 {
939# if ENABLE_OVERLAY 870# if ISO_14755
940 scr_overlay_off (); 871 scr_overlay_off ();
941# endif 872# endif
942# if ISO_14755 873# if ISO_14755
943 // iso14755 part 5.2 handling: release time 874 // iso14755 part 5.2 handling: release time
944 // first: controls 875 // first: controls
967 898
968 return; 899 return;
969 } 900 }
970 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask)) 901 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
971 { 902 {
972# if ENABLE_OVERLAY 903# if ISO_14755
973 scr_overlay_off (); 904 scr_overlay_off ();
974# endif 905# endif
975 if (iso14755buf & ISO_14755_51) 906 if (iso14755buf & ISO_14755_51)
976 commit_iso14755 (); 907 commit_iso14755 ();
977#if ISO_14755 908#if ISO_14755
1035void 966void
1036rxvt_term::flush () 967rxvt_term::flush ()
1037{ 968{
1038 flush_ev.stop (); 969 flush_ev.stop ();
1039 970
1040#ifdef TRANSPARENT 971#ifdef HAVE_BG_PIXMAP
1041 if (want_full_refresh) 972 if (bgPixmap.check_clearChanged ())
1042 { 973 {
1043 want_full_refresh = 0; 974// scr_clear (true); This needs to be researched further!
1044 scr_clear ();
1045 scr_touch (false); 975 scr_touch (false);
1046 } 976 }
1047#endif 977#endif
1048 978
1049 if (want_refresh) 979 if (want_refresh)
1094 } 1024 }
1095 1025
1096 display->flush (); 1026 display->flush ();
1097} 1027}
1098 1028
1029/* checks wether a refresh is requested and starts the refresh timer */
1099void 1030void
1100rxvt_term::check_cb (check_watcher &w) 1031rxvt_term::refresh_check ()
1032{
1033 if (want_refresh && !flush_ev.is_active ())
1034 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1035
1036 display->flush ();
1037}
1038
1039void
1040rxvt_term::flush_cb (ev::timer &w, int revents)
1101{ 1041{
1102 make_current (); 1042 make_current ();
1103 1043
1104 display->flush ();
1105
1106 if (want_refresh && !flush_ev.active)
1107 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1108}
1109
1110void
1111rxvt_term::flush_cb (time_watcher &w)
1112{
1113 make_current ();
1114
1115 refresh_limit = 1;
1116 refresh_count = 0; 1044 refresh_count = 0;
1117 flush (); 1045 flush ();
1118} 1046}
1119 1047
1120#ifdef CURSOR_BLINK 1048#ifdef CURSOR_BLINK
1121void 1049void
1122rxvt_term::cursor_blink_cb (time_watcher &w) 1050rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1123{ 1051{
1124 hidden_cursor = !hidden_cursor; 1052 hidden_cursor = !hidden_cursor;
1125 want_refresh = 1; 1053 want_refresh = 1;
1126 1054 refresh_check ();
1127 w.start (w.at + CURSOR_BLINK_INTERVAL);
1128} 1055}
1129#endif 1056#endif
1130 1057
1131#ifdef TEXT_BLINK 1058#ifdef TEXT_BLINK
1132void 1059void
1133rxvt_term::text_blink_cb (time_watcher &w) 1060rxvt_term::text_blink_cb (ev::timer &w, int revents)
1134{ 1061{
1135 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1062 if (scr_refresh_rend (RS_Blink, RS_Blink))
1136 { 1063 {
1137 hidden_text = !hidden_text; 1064 hidden_text = !hidden_text;
1138 want_refresh = 1; 1065 want_refresh = 1;
1139 w.start (w.at + TEXT_BLINK_INTERVAL); 1066 refresh_check ();
1140 } 1067 }
1068 else
1069 w.stop ();
1141} 1070}
1142#endif 1071#endif
1143 1072
1144#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1073#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1145void 1074void
1146rxvt_term::cont_scroll_cb (time_watcher &w) 1075rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1147{ 1076{
1148 if ((scrollbar_isUp() || scrollbar_isDn()) && 1077 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1149 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1078 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1150 { 1079 {
1151 want_refresh = 1; 1080 want_refresh = 1;
1152 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1081 refresh_check ();
1153 } 1082 }
1083 else
1084 w.stop ();
1154} 1085}
1155#endif 1086#endif
1156 1087
1157#ifdef SELECTION_SCROLLING 1088#ifdef SELECTION_SCROLLING
1158void 1089void
1159rxvt_term::sel_scroll_cb (time_watcher &w) 1090rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1160{ 1091{
1161 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1092 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1162 { 1093 {
1163 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1094 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1164 want_refresh = 1; 1095 want_refresh = 1;
1165 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1096 refresh_check ();
1166 } 1097 }
1098 else
1099 w.stop ();
1167} 1100}
1168#endif 1101#endif
1169 1102
1170#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1103#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1171void 1104void
1172rxvt_term::slip_wheel_cb (time_watcher &w) 1105rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1173{ 1106{
1174 if (mouse_slip_wheel_speed == 0 1107 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1175 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1176 : scr_page (UP, mouse_slip_wheel_speed))
1177 { 1108 {
1178 if (view_start == top_row || view_start == 0)
1179 mouse_slip_wheel_speed = 0;
1180
1181 want_refresh = 1; 1109 want_refresh = 1;
1182 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1110 refresh_check ();
1111 }
1112
1113 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1114 {
1115 mouse_slip_wheel_speed = 0;
1116 w.stop ();
1183 } 1117 }
1184} 1118}
1185#endif 1119#endif
1186 1120
1187#if LINUX_YIELD_HACK 1121#if LINUX_YIELD_HACK
1188static struct event_handler 1122static struct event_handler
1189{ 1123{
1190 check_watcher yield_ev; 1124 ev::prepare yield_ev;
1191 1125
1192 void yield_cb (check_watcher &w) 1126 void yield_cb (ev::prepare &w, int revents)
1193 { 1127 {
1194 // this should really be sched_yield(), but the linux guys thought 1128 // this should really be sched_yield(), but the linux guys thought
1195 // that giving a process calling sched_yield () less cpu time than 1129 // that giving a process calling sched_yield () less cpu time than
1196 // ones with high nice levels is a useful thing to do. It surely is is 1130 // ones with high nice levels is a useful thing to do. It surely is is
1197 // allowed by the sus... as is returning ENOSYS. 1131 // allowed by the sus... as is returning ENOSYS.
1248 1182
1249 return false; 1183 return false;
1250} 1184}
1251 1185
1252void 1186void
1253rxvt_term::pty_cb (io_watcher &w, short revents) 1187rxvt_term::pty_cb (ev::io &w, int revents)
1254{ 1188{
1255 make_current (); 1189 make_current ();
1256 1190
1257 if (revents & EVENT_READ) 1191 if (revents & ev::READ)
1258 // loop, but don't allow a single term to monopolize us 1192 // loop, but don't allow a single term to monopolize us
1259 while (pty_fill ()) 1193 while (pty_fill ())
1260 if (cmd_parse ()) 1194 if (cmd_parse ())
1261 break; 1195 break;
1262 1196
1263 if (revents & EVENT_WRITE) 1197 if (revents & ev::WRITE)
1264 pty_write (); 1198 pty_write ();
1199
1200 refresh_check ();
1265} 1201}
1266 1202
1267void 1203void
1268rxvt_term::pointer_unblank () 1204rxvt_term::pointer_unblank ()
1269{ 1205{
1272 1208
1273#ifdef POINTER_BLANK 1209#ifdef POINTER_BLANK
1274 hidden_pointer = 0; 1210 hidden_pointer = 0;
1275 1211
1276 if (option (Opt_pointerBlank)) 1212 if (option (Opt_pointerBlank))
1277 pointer_ev.start (NOW + pointerBlankDelay); 1213 pointer_ev.start (pointerBlankDelay);
1278#endif 1214#endif
1279} 1215}
1280 1216
1281#ifdef POINTER_BLANK 1217#ifdef POINTER_BLANK
1282void 1218void
1290 1226
1291 hidden_pointer = 1; 1227 hidden_pointer = 1;
1292} 1228}
1293 1229
1294void 1230void
1295rxvt_term::pointer_cb (time_watcher &w) 1231rxvt_term::pointer_cb (ev::timer &w, int revents)
1296{ 1232{
1297 make_current (); 1233 make_current ();
1298 1234
1299 pointer_blank (); 1235 pointer_blank ();
1300} 1236}
1303void 1239void
1304rxvt_term::mouse_report (XButtonEvent &ev) 1240rxvt_term::mouse_report (XButtonEvent &ev)
1305{ 1241{
1306 int button_number, key_state = 0; 1242 int button_number, key_state = 0;
1307 int x, y; 1243 int x, y;
1244 int code = 32;
1308 1245
1309 x = ev.x; 1246 x = Pixel2Col (ev.x);
1310 y = ev.y; 1247 y = Pixel2Row (ev.y);
1311 pixel_position (&x, &y); 1248 if (ev.type == MotionNotify)
1249 {
1250 if (x == mouse_row && y == mouse_col)
1251 return;
1252 mouse_row = x;
1253 mouse_col = y;
1254 code += 32;
1255 }
1312 1256
1313 if (MEvent.button == AnyButton) 1257 if (MEvent.button == AnyButton)
1314 button_number = 3; 1258 button_number = 3;
1315 else 1259 else
1316 { 1260 {
1362 x + 1, 1306 x + 1,
1363 y + 1); 1307 y + 1);
1364#endif 1308#endif
1365 1309
1366 tt_printf ("\033[M%c%c%c", 1310 tt_printf ("\033[M%c%c%c",
1367 (32 + button_number + key_state), 1311 (code + button_number + key_state),
1368 (32 + x + 1), 1312 (32 + x + 1),
1369 (32 + y + 1)); 1313 (32 + y + 1));
1370} 1314}
1371 1315
1372/*{{{ process an X event */ 1316/*{{{ process an X event */
1434 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1378 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1435 focus_out (); 1379 focus_out ();
1436 } 1380 }
1437#endif 1381#endif
1438 } 1382 }
1439 break;
1440
1441 case MappingNotify:
1442 XRefreshKeyboardMapping (&ev.xmapping);
1443 break; 1383 break;
1444 1384
1445 /* 1385 /*
1446 * XXX: this is not the _current_ arrangement 1386 * XXX: this is not the _current_ arrangement
1447 * Here's my conclusion: 1387 * Here's my conclusion:
1480 && ev.xfocus.mode != NotifyGrab) 1420 && ev.xfocus.mode != NotifyGrab)
1481 focus_out (); 1421 focus_out ();
1482 break; 1422 break;
1483 1423
1484 case ConfigureNotify: 1424 case ConfigureNotify:
1425 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1426 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1427 szHint.width, szHint.height);*/
1485 if (ev.xconfigure.window == parent[0]) 1428 if (ev.xconfigure.window == parent[0])
1486 { 1429 {
1487 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1430 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1488 ; 1431 ;
1489 1432
1490 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1433 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1491 { 1434 {
1492 seen_resize = 1; 1435 seen_resize = 1;
1493 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1436 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1494#ifdef XPM_BACKGROUND 1437 }
1495 if (!option (Opt_transparent) && bgPixmap.auto_resize) 1438 else
1439 {
1440#ifdef HAVE_BG_PIXMAP
1441 if (bgPixmap.window_position_sensitive ())
1496 { 1442 {
1443 if (mapped)
1444 update_background ();
1497 resize_pixmap (); 1445 else
1498 scr_touch (true); 1446 bgPixmap.invalidate ();
1499 } 1447 }
1500#endif 1448#endif
1501 } 1449 }
1502 1450
1503 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1451 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1504
1505#ifdef TRANSPARENT
1506 if (option (Opt_transparent))
1507 check_our_parents ();
1508#endif
1509 } 1452 }
1510 break; 1453 break;
1511 1454
1512 case PropertyNotify: 1455 case PropertyNotify:
1513 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1456 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1529 case SelectionRequest: 1472 case SelectionRequest:
1530 selection_send (ev.xselectionrequest); 1473 selection_send (ev.xselectionrequest);
1531 break; 1474 break;
1532 1475
1533 case MapNotify: 1476 case MapNotify:
1477#ifdef HAVE_BG_PIXMAP
1478 /* This is needed spcifically to fix the case of no window manager or a
1479 * non-reparenting window manager. In those cases we never get first
1480 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1481 * care of multiplicity of ConfigureNotify events arriwing while WM does
1482 * reparenting.
1483 * We should not render background immidiately, as there could be several
1484 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1485 * by scheduling background redraw as soon as we can, but giving a short
1486 * bit of time for ConfigureNotifies to arrive.
1487 * We should render background PRIOR to drawing any text, but AFTER all
1488 * of ConfigureNotifys for the best results.
1489 */
1490 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1491 update_background_ev.start (0.025);
1492#endif
1534 mapped = 1; 1493 mapped = 1;
1535#ifdef TEXT_BLINK 1494#ifdef TEXT_BLINK
1536 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1495 text_blink_ev.start ();
1537#endif 1496#endif
1538 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1497 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1539 break; 1498 break;
1540 1499
1541 case UnmapNotify: 1500 case UnmapNotify:
1543#ifdef TEXT_BLINK 1502#ifdef TEXT_BLINK
1544 text_blink_ev.stop (); 1503 text_blink_ev.stop ();
1545#endif 1504#endif
1546 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1505 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1547 break; 1506 break;
1548
1549#ifdef TRANSPARENT
1550 case ReparentNotify:
1551 rootwin_cb (ev);
1552 break;
1553#endif /* TRANSPARENT */
1554 1507
1555 case GraphicsExpose: 1508 case GraphicsExpose:
1556 case Expose: 1509 case Expose:
1557 if (ev.xany.window == vt) 1510 if (ev.xany.window == vt)
1558 { 1511 {
1559 do 1512 do
1513 {
1560 scr_expose (ev.xexpose.x, ev.xexpose.y, 1514 scr_expose (ev.xexpose.x, ev.xexpose.y,
1561 ev.xexpose.width, ev.xexpose.height, False); 1515 ev.xexpose.width, ev.xexpose.height, False);
1516 }
1562 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1517 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1563 1518
1564 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1519 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1565 1520
1566 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1521 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1522 {
1567 scr_expose (ev.xexpose.x, ev.xexpose.y, 1523 scr_expose (ev.xexpose.x, ev.xexpose.y,
1568 ev.xexpose.width, ev.xexpose.height, False); 1524 ev.xexpose.width, ev.xexpose.height, False);
1525 }
1569 1526
1570 want_refresh = 1; 1527 want_refresh = 1;
1571 } 1528 }
1572 else 1529 else
1573 { 1530 {
1576 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1533 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1577 ; 1534 ;
1578 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1535 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1579 ; 1536 ;
1580 1537
1581 if (isScrollbarWindow (ev.xany.window)) 1538 if (scrollBar.state && ev.xany.window == scrollBar.win)
1582 { 1539 {
1583 scrollBar.setIdle (); 1540 scrollBar.state = STATE_IDLE;
1584 scrollbar_show (0); 1541 scrollbar_show (0);
1585 } 1542 }
1586
1587#ifdef TRANSPARENT
1588 if (am_transparent && ev.xany.window == parent[0])
1589 XClearWindow (dpy, ev.xany.window);
1590#endif
1591 } 1543 }
1592 break; 1544 break;
1593 1545
1594 case MotionNotify: 1546 case MotionNotify:
1595#ifdef POINTER_BLANK 1547#ifdef POINTER_BLANK
1596 if (hidden_pointer) 1548 if (hidden_pointer)
1597 pointer_unblank (); 1549 pointer_unblank ();
1598#endif 1550#endif
1551 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1552 || priv_modes & PrivMode_MouseAnyEvent)
1553 mouse_report (ev.xbutton);
1599 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1554 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1600 break; 1555 break;
1601 1556
1602 if (ev.xany.window == vt) 1557 if (ev.xany.window == vt)
1603 { 1558 {
1637 int dist; 1592 int dist;
1638 1593
1639 /* don't clobber the current delay if we are 1594 /* don't clobber the current delay if we are
1640 * already in the middle of scrolling. 1595 * already in the middle of scrolling.
1641 */ 1596 */
1642 if (!sel_scroll_ev.active) 1597 if (!sel_scroll_ev.is_active ())
1643 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1598 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1644 1599
1645 /* save the event params so we can highlight 1600 /* save the event params so we can highlight
1646 * the selection in the pending-scroll loop 1601 * the selection in the pending-scroll loop
1647 */ 1602 */
1648 selection_save_x = ev.xbutton.x; 1603 selection_save_x = ev.xbutton.x;
1670 else 1625 else
1671 { 1626 {
1672 /* we are within the text window, so we 1627 /* we are within the text window, so we
1673 * shouldn't be scrolling 1628 * shouldn't be scrolling
1674 */ 1629 */
1675 if (sel_scroll_ev.active)
1676 sel_scroll_ev.stop(); 1630 sel_scroll_ev.stop();
1677 } 1631 }
1678#endif 1632#endif
1679#ifdef MOUSE_THRESHOLD 1633#ifdef MOUSE_THRESHOLD
1680 } 1634 }
1681#endif 1635#endif
1682 } 1636 }
1683 } 1637 }
1684 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1638 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1685 { 1639 {
1686 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1640 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1687 MotionNotify, &ev)) 1641 MotionNotify, &ev))
1688 ; 1642 ;
1689 1643
1693 &ev.xbutton.x, &ev.xbutton.y, 1647 &ev.xbutton.x, &ev.xbutton.y,
1694 &unused_mask); 1648 &unused_mask);
1695 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1649 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1696 scrollbar_size ()); 1650 scrollbar_size ());
1697 want_refresh = 1; 1651 want_refresh = 1;
1698 refresh_limit = 0;
1699 scrollbar_show (1); 1652 scrollbar_show (1);
1700 } 1653 }
1701 break; 1654 break;
1702 } 1655 }
1703 1656
1708 { 1661 {
1709 hidden_cursor = 0; 1662 hidden_cursor = 0;
1710 want_refresh = 1; 1663 want_refresh = 1;
1711 } 1664 }
1712 1665
1713 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1666 cursor_blink_ev.again ();
1714 } 1667 }
1715#endif 1668#endif
1716 1669
1717#if defined(POINTER_BLANK) 1670#if defined(POINTER_BLANK)
1718 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1671 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1725 1678
1726 if (ev.type == KeyPress && hidden_pointer == 0) 1679 if (ev.type == KeyPress && hidden_pointer == 0)
1727 pointer_blank (); 1680 pointer_blank ();
1728 } 1681 }
1729#endif 1682#endif
1683
1684 refresh_check ();
1730} 1685}
1731 1686
1732void 1687void
1733rxvt_term::focus_in () 1688rxvt_term::focus_in ()
1734{ 1689{
1746 XSetICFocus (Input_Context); 1701 XSetICFocus (Input_Context);
1747 } 1702 }
1748#endif 1703#endif
1749#if CURSOR_BLINK 1704#if CURSOR_BLINK
1750 if (option (Opt_cursorBlink)) 1705 if (option (Opt_cursorBlink))
1751 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1706 cursor_blink_ev.again ();
1752#endif 1707#endif
1753#if OFF_FOCUS_FADING 1708#if OFF_FOCUS_FADING
1754 if (rs[Rs_fade]) 1709 if (rs[Rs_fade])
1755 { 1710 {
1756 pix_colors = pix_colors_focused; 1711 pix_colors = pix_colors_focused;
1758 } 1713 }
1759#endif 1714#endif
1760#if ENABLE_FRILLS 1715#if ENABLE_FRILLS
1761 if (option (Opt_urgentOnBell)) 1716 if (option (Opt_urgentOnBell))
1762 { 1717 {
1763 XWMHints *h;
1764
1765 h = XGetWMHints(dpy, parent[0]); 1718 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1766 if (h != NULL)
1767 { 1719 {
1768 h->flags &= ~XUrgencyHint; 1720 h->flags &= ~XUrgencyHint;
1769 XSetWMHints(dpy, parent[0], h); 1721 XSetWMHints (dpy, parent[0], h);
1770 } 1722 }
1771 } 1723 }
1772#endif 1724#endif
1773 } 1725 }
1774} 1726}
1785 1737
1786#if ENABLE_FRILLS || ISO_14755 1738#if ENABLE_FRILLS || ISO_14755
1787 if (iso14755buf) 1739 if (iso14755buf)
1788 { 1740 {
1789 iso14755buf = 0; 1741 iso14755buf = 0;
1790# if ENABLE_OVERLAY 1742# if ISO_14755
1791 scr_overlay_off (); 1743 scr_overlay_off ();
1792# endif 1744# endif
1793 } 1745 }
1794#endif 1746#endif
1795#if USE_XIM 1747#if USE_XIM
1797 XUnsetICFocus (Input_Context); 1749 XUnsetICFocus (Input_Context);
1798#endif 1750#endif
1799#if CURSOR_BLINK 1751#if CURSOR_BLINK
1800 if (option (Opt_cursorBlink)) 1752 if (option (Opt_cursorBlink))
1801 cursor_blink_ev.stop (); 1753 cursor_blink_ev.stop ();
1754
1802 hidden_cursor = 0; 1755 hidden_cursor = 0;
1803#endif 1756#endif
1804#if OFF_FOCUS_FADING 1757#if OFF_FOCUS_FADING
1805 if (rs[Rs_fade]) 1758 if (rs[Rs_fade])
1806 { 1759 {
1822 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1775 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1823 } 1776 }
1824#endif 1777#endif
1825} 1778}
1826 1779
1827#if TRANSPARENT || ENABLE_PERL 1780#if ENABLE_TRANSPARENCY || ENABLE_PERL
1828void 1781void
1829rxvt_term::rootwin_cb (XEvent &ev) 1782rxvt_term::rootwin_cb (XEvent &ev)
1830{ 1783{
1831 make_current (); 1784 make_current ();
1832 1785
1833 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1786 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1834 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1787 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1835 return; 1788 return;
1836 1789
1837# if TRANSPARENT 1790# if ENABLE_TRANSPARENCY
1838 switch (ev.type) 1791 switch (ev.type)
1839 { 1792 {
1840 case PropertyNotify: 1793 case PropertyNotify:
1841 /* 1794 /*
1842 * if user used some Esetroot compatible prog to set the root bg, 1795 * if user used some Esetroot compatible prog to set the root bg,
1843 * use the property to determine the pixmap. We use it later on. 1796 * use the property to determine the pixmap. We use it later on.
1844 */ 1797 */
1845 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1798 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1846 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1799 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1847 return; 1800 {
1801 bgPixmap.set_root_pixmap ();
1802 update_background ();
1803 }
1848 1804
1849 /* FALLTHROUGH */
1850 case ReparentNotify:
1851 if (option (Opt_transparent))
1852 check_our_parents ();
1853 break; 1805 break;
1854 } 1806 }
1855# endif 1807# endif
1808
1809 refresh_check ();
1856} 1810}
1857#endif 1811#endif
1858 1812
1859void 1813void
1860rxvt_term::button_press (XButtonEvent &ev) 1814rxvt_term::button_press (XButtonEvent &ev)
1915 mouse_report (ev); 1869 mouse_report (ev);
1916 } 1870 }
1917#else 1871#else
1918 MEvent.button = ev.button; 1872 MEvent.button = ev.button;
1919 mouse_report (ev); 1873 mouse_report (ev);
1920#endif /* MOUSE_REPORT_DOUBLECLICK */ 1874#endif /* MOUSE_REPORT_DOUBLECLICK */
1921 1875
1922 } 1876 }
1923 else 1877 else
1924 { 1878 {
1925 if (ev.button != MEvent.button) 1879 if (ev.button != MEvent.button)
1973 } 1927 }
1974 1928
1975 /* 1929 /*
1976 * Scrollbar window processing of button press 1930 * Scrollbar window processing of button press
1977 */ 1931 */
1978 if (isScrollbarWindow (ev.window)) 1932 if (scrollBar.state && ev.window == scrollBar.win)
1979 { 1933 {
1980 scrollBar.setIdle (); 1934 page_dirn direction = NO_DIR;
1935
1936 if (scrollBar.upButton (ev.y))
1937 direction = UP; /* up */
1938 else if (scrollBar.dnButton (ev.y))
1939 direction = DN; /* down */
1940
1941 scrollBar.state = STATE_IDLE;
1981 /* 1942 /*
1982 * Rxvt-style scrollbar: 1943 * Rxvt-style scrollbar:
1983 * move up if mouse is above slider 1944 * move up if mouse is above slider
1984 * move dn if mouse is below slider 1945 * move dn if mouse is below slider
1985 * 1946 *
1994 /* 1955 /*
1995 * Mouse report disabled scrollbar: 1956 * Mouse report disabled scrollbar:
1996 * arrow buttons - send up/down 1957 * arrow buttons - send up/down
1997 * click on scrollbar - send pageup/down 1958 * click on scrollbar - send pageup/down
1998 */ 1959 */
1999 if ((scrollBar.style == R_SB_NEXT 1960 if (direction == UP)
2000 && scrollbarnext_upButton (ev.y))
2001 || (scrollBar.style == R_SB_RXVT
2002 && scrollbarrxvt_upButton (ev.y)))
2003 tt_printf ("\033[A"); 1961 tt_printf ("\033[A");
2004 else if ((scrollBar.style == R_SB_NEXT 1962 else if (direction == DN)
2005 && scrollbarnext_dnButton (ev.y))
2006 || (scrollBar.style == R_SB_RXVT
2007 && scrollbarrxvt_dnButton (ev.y)))
2008 tt_printf ("\033[B"); 1963 tt_printf ("\033[B");
2009 else 1964 else
2010 switch (ev.button) 1965 switch (ev.button)
2011 { 1966 {
2012 case Button2: 1967 case Button2:
2019 tt_printf ("\033[5~"); 1974 tt_printf ("\033[5~");
2020 break; 1975 break;
2021 } 1976 }
2022 } 1977 }
2023 else 1978 else
2024#endif /* NO_SCROLLBAR_REPORT */ 1979#endif /* NO_SCROLLBAR_REPORT */
2025
2026 {
2027 char upordown = 0;
2028
2029 if (scrollBar.style == R_SB_NEXT)
2030 { 1980 {
2031 if (scrollbarnext_upButton (ev.y)) 1981 if (direction != NO_DIR)
2032 upordown = -1; /* up */
2033 else if (scrollbarnext_dnButton (ev.y))
2034 upordown = 1; /* down */
2035 }
2036 else if (scrollBar.style == R_SB_RXVT)
2037 {
2038 if (scrollbarrxvt_upButton (ev.y))
2039 upordown = -1; /* up */
2040 else if (scrollbarrxvt_dnButton (ev.y))
2041 upordown = 1; /* down */
2042 }
2043 if (upordown)
2044 { 1982 {
2045#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1983#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1984 if (!cont_scroll_ev.is_active ())
2046 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1985 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2047#endif 1986#endif
2048 if (scr_page (upordown < 0 ? UP : DN, 1)) 1987 if (scr_page (direction, 1))
2049 { 1988 {
2050 if (upordown < 0) 1989 if (direction == UP)
2051 scrollBar.setUp (); 1990 scrollBar.state = STATE_UP;
2052 else 1991 else
2053 scrollBar.setDn (); 1992 scrollBar.state = STATE_DOWN;
2054 } 1993 }
2055 } 1994 }
2056 else 1995 else
2057 switch (ev.button) 1996 switch (ev.button)
2058 { 1997 {
2059 case Button2: 1998 case Button2:
2060 switch (scrollbar_align) 1999 switch (scrollBar.align)
2061 { 2000 {
2062 case R_SB_ALIGN_TOP: 2001 case R_SB_ALIGN_TOP:
2063 csrO = 0; 2002 csrO = 0;
2064 break; 2003 break;
2065 case R_SB_ALIGN_CENTRE: 2004 case R_SB_ALIGN_CENTRE:
2073 if (scrollBar.style == R_SB_XTERM 2012 if (scrollBar.style == R_SB_XTERM
2074 || scrollbar_above_slider (ev.y) 2013 || scrollbar_above_slider (ev.y)
2075 || scrollbar_below_slider (ev.y)) 2014 || scrollbar_below_slider (ev.y))
2076 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2015 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
2077 2016
2078 scrollBar.setMotion (); 2017 scrollBar.state = STATE_MOTION;
2079 break; 2018 break;
2080 2019
2081 case Button1: 2020 case Button1:
2082 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2021 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2083 csrO = ev.y - scrollBar.top; 2022 csrO = ev.y - scrollBar.top;
2084 /* FALLTHROUGH */ 2023 /* FALLTHROUGH */
2085 2024
2086 case Button3: 2025 case Button3:
2087 if (scrollBar.style != R_SB_XTERM) 2026 if (scrollBar.style != R_SB_XTERM)
2097 scr_page (DN, nrow - 1); 2036 scr_page (DN, nrow - 1);
2098# else 2037# else
2099 scr_page (DN, nrow / 4); 2038 scr_page (DN, nrow / 4);
2100# endif 2039# endif
2101 else 2040 else
2102 scrollBar.setMotion (); 2041 scrollBar.state = STATE_MOTION;
2103 } 2042 }
2104 else 2043 else
2105 { 2044 {
2106 scr_page ((ev.button == Button1 ? DN : UP), 2045 scr_page ((ev.button == Button1 ? DN : UP),
2107 (nrow 2046 (nrow
2124 2063
2125 csrO = 0; /* reset csr Offset */ 2064 csrO = 0; /* reset csr Offset */
2126 if (!bypass_keystate) 2065 if (!bypass_keystate)
2127 reportmode = !! (priv_modes & PrivMode_mouse_report); 2066 reportmode = !! (priv_modes & PrivMode_mouse_report);
2128 2067
2129 if (scrollbar_isUpDn ()) 2068 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2130 { 2069 {
2131 scrollBar.setIdle (); 2070 scrollBar.state = STATE_IDLE;
2132 scrollbar_show (0); 2071 scrollbar_show (0);
2133 } 2072 }
2134 2073
2135#ifdef SELECTION_SCROLLING 2074#ifdef SELECTION_SCROLLING
2136 if (sel_scroll_ev.active)
2137 sel_scroll_ev.stop(); 2075 sel_scroll_ev.stop();
2138#endif 2076#endif
2139 2077
2140 if (ev.window == vt) 2078 if (ev.window == vt)
2141 { 2079 {
2142 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2080 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2166 mouse_report (ev); 2104 mouse_report (ev);
2167 } 2105 }
2168#else /* MOUSE_REPORT_DOUBLECLICK */ 2106#else /* MOUSE_REPORT_DOUBLECLICK */
2169 MEvent.button = AnyButton; 2107 MEvent.button = AnyButton;
2170 mouse_report (ev); 2108 mouse_report (ev);
2171#endif /* MOUSE_REPORT_DOUBLECLICK */ 2109#endif /* MOUSE_REPORT_DOUBLECLICK */
2172 return; 2110 return;
2173 } 2111 }
2174 2112
2175 /* 2113 /*
2176 * dumb hack to compensate for the failure of click-and-drag 2114 * dumb hack to compensate for the failure of click-and-drag
2214 { 2152 {
2215 mouse_slip_wheel_speed += v ? -1 : 1; 2153 mouse_slip_wheel_speed += v ? -1 : 1;
2216 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2154 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2217 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2155 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2218 2156
2219 if (slip_wheel_ev.at < NOW) 2157 if (!slip_wheel_ev.is_active ())
2220 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2158 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2221
2222 slip_wheel_ev.start ();
2223 } 2159 }
2224 else 2160 else
2161# endif
2225 { 2162 {
2226# endif
2227 scr_page (v, i); 2163 scr_page (v, i);
2228 scrollbar_show (1); 2164 scrollbar_show (1);
2229# ifdef MOUSE_SLIP_WHEELING
2230 } 2165 }
2231# endif
2232 } 2166 }
2233 break; 2167 break;
2234#endif 2168#endif
2235 } 2169 }
2236 } 2170 }
2291 if (ch == C0_LF) 2225 if (ch == C0_LF)
2292 nlines++; 2226 nlines++;
2293 2227
2294 refresh_count++; 2228 refresh_count++;
2295 2229
2296 if (!option (Opt_jumpScroll) 2230 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2297 || (refresh_count >= refresh_limit * (nrow - 1)))
2298 { 2231 {
2299 refreshnow = true;
2300 refresh_count = 0; 2232 refresh_count = 0;
2233
2234 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2235 {
2236 refreshnow = true;
2301 ch = NOCHAR; 2237 ch = NOCHAR;
2302 break; 2238 break;
2239 }
2303 } 2240 }
2304 2241
2305 // scr_add_lines only works for nlines <= nrow - 1. 2242 // scr_add_lines only works for nlines <= nrow - 1.
2306 if (nlines >= nrow - 1) 2243 if (nlines >= nrow - 1)
2307 { 2244 {
2335 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2272 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2336 scr_add_lines (buf, str - buf, nlines); 2273 scr_add_lines (buf, str - buf, nlines);
2337 2274
2338 /* 2275 /*
2339 * If there have been a lot of new lines, then update the screen 2276 * If there have been a lot of new lines, then update the screen
2340 * What the heck I'll cheat and only refresh less than every page-full. 2277 * What the heck we'll cheat and only refresh less than every page-full.
2341 * the number of pages between refreshes is refresh_limit, which 2278 * if skipScroll is enabled.
2342 * is incremented here because we must be doing flat-out scrolling.
2343 */ 2279 */
2344 if (refreshnow) 2280 if (refreshnow)
2345 { 2281 {
2346 if (option (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2347 refresh_limit++;
2348 else
2349 {
2350 flag = true; 2282 flag = true;
2351 //TODO: due to popular request, implement "skipscroll" option here
2352 scr_refresh (); 2283 scr_refresh ();
2353 want_refresh = 1; 2284 want_refresh = 1;
2354 }
2355 } 2285 }
2356 2286
2357 } 2287 }
2358 else 2288 else
2359 { 2289 {
2520 } 2450 }
2521 } 2451 }
2522 2452
2523 pclose_printer (fd); 2453 pclose_printer (fd);
2524} 2454}
2525#endif /* PRINTPIPE */ 2455#endif /* PRINTPIPE */
2526/*}}} */ 2456/*}}} */
2527 2457
2528/* *INDENT-OFF* */ 2458/* *INDENT-OFF* */
2529enum { 2459enum {
2530 C1_40 = 0x40, 2460 C1_40 = 0x40,
2580 process_dcs_seq (); 2510 process_dcs_seq ();
2581 break; 2511 break;
2582 case 0x9b: /* CSI */ 2512 case 0x9b: /* CSI */
2583 process_csi_seq (); 2513 process_csi_seq ();
2584 break; 2514 break;
2585 case 0x9d: /* CSI */ 2515 case 0x9d: /* OSC */
2586 process_osc_seq (); 2516 process_osc_seq ();
2587 break; 2517 break;
2588#endif 2518#endif
2589 } 2519 }
2590} 2520}
2816rxvt_term::process_csi_seq () 2746rxvt_term::process_csi_seq ()
2817{ 2747{
2818 unicode_t ch, priv, i; 2748 unicode_t ch, priv, i;
2819 unsigned int nargs, p; 2749 unsigned int nargs, p;
2820 int n, ndef; 2750 int n, ndef;
2821 int arg[ESC_ARGS]; 2751 int arg[ESC_ARGS] = { };
2822 2752
2823 for (nargs = ESC_ARGS; nargs > 0;) 2753 nargs = 0;
2824 arg[--nargs] = 0;
2825 2754
2826 priv = 0; 2755 priv = 0;
2827 ch = cmd_getc (); 2756 ch = cmd_getc ();
2828 if (ch >= '<' && ch <= '?') 2757 if (ch >= '<' && ch <= '?')
2758 {
2829 { /* '<' '=' '>' '?' */ 2759 /* '<' '=' '>' '?' */
2830 priv = ch; 2760 priv = ch;
2831 ch = cmd_getc (); 2761 ch = cmd_getc ();
2832 } 2762 }
2833 2763
2834 /* read any numerical arguments */ 2764 /* read any numerical arguments */
2873 switch (priv) 2803 switch (priv)
2874 { 2804 {
2875 case '>': 2805 case '>':
2876 if (ch == CSI_DA) /* secondary device attributes */ 2806 if (ch == CSI_DA) /* secondary device attributes */
2877 { 2807 {
2878 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt, 2808 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2879 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2809 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2880 // 2810 //
2881 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2811 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2882 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2812 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2883 // that we do not support xterm mouse reporting (should be 95 when we do). 2813 // versions.
2884 // 2814 //
2885 tt_printf ("\033[>%d;94;0c", 'U'); 2815 tt_printf ("\033[>%d;95;0c", 'U');
2886 } 2816 }
2887 break; 2817 break;
2818
2888 case '?': 2819 case '?':
2889 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2820 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2890 process_terminal_mode (ch, priv, nargs, arg); 2821 process_terminal_mode (ch, priv, nargs, arg);
2891 break; 2822 break;
2892 } 2823 }
3408 *buf++ = '\0'; 3339 *buf++ = '\0';
3409 3340
3410 process_color_seq (op, color, name, resp); 3341 process_color_seq (op, color, name, resp);
3411 } 3342 }
3412 break; 3343 break;
3344 case Rxvt_restoreFG:
3413 case XTerm_Color00: 3345 case XTerm_Color00:
3414 process_color_seq (op, Color_fg, str, resp); 3346 process_color_seq (op, Color_fg, str, resp);
3415 break; 3347 break;
3348 case Rxvt_restoreBG:
3416 case XTerm_Color01: 3349 case XTerm_Color01:
3417 process_color_seq (op, Color_bg, str, resp); 3350 process_color_seq (op, Color_bg, str, resp);
3418 break; 3351 break;
3419#ifndef NO_CURSORCOLOR 3352#ifndef NO_CURSORCOLOR
3420 case XTerm_Color_cursor: 3353 case XTerm_Color_cursor:
3441 break; 3374 break;
3442 case URxvt_Color_IT: 3375 case URxvt_Color_IT:
3443 process_color_seq (op, Color_IT, str, resp); 3376 process_color_seq (op, Color_IT, str, resp);
3444 break; 3377 break;
3445#endif 3378#endif
3446#if TRANSPARENT && TINTING 3379#if ENABLE_TRANSPARENCY
3447 case URxvt_Color_tint: 3380 case URxvt_Color_tint:
3448 process_color_seq (op, Color_tint, str, resp); 3381 process_color_seq (op, Color_tint, str, resp);
3382 {
3383 bool changed = false;
3449 3384
3450 check_our_parents (); 3385 if (ISSET_PIXCOLOR (Color_tint))
3386 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3387 else
3388 changed = bgPixmap.unset_tint ();
3451 3389
3452 if (am_transparent) 3390 if (changed)
3453 want_full_refresh = want_refresh = 1; 3391 update_background ();
3392 }
3454 3393
3455 break; 3394 break;
3456#endif 3395#endif
3457 3396
3397#if BG_IMAGE_FROM_FILE
3458 case Rxvt_Pixmap: 3398 case Rxvt_Pixmap:
3459 { 3399 if (!strcmp (str, "?"))
3460 if (*str != ';')
3461 { 3400 {
3462#if XPM_BACKGROUND 3401 char str[256];
3463 scale_pixmap (""); /* reset to default scaling */ 3402
3464 set_bgPixmap (str); /* change pixmap */ 3403 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3465 scr_touch (true); 3404 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3466#endif 3405 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3406 process_xterm_seq (XTerm_title, str, CHAR_ST);
3467 } 3407 }
3468 3408 else
3409 {
3469 int changed = 0; 3410 int changed = 0;
3470 3411
3471 while ((str = strchr (str, ';')) != NULL) 3412 if (*str != ';')
3472 { 3413 {
3414 /* reset to default scaling :*/
3415 bgPixmap.unset_geometry ();
3416 if (bgPixmap.set_file (str)) /* change pixmap */
3417 changed++;
3418 str = strchr (str, ';');
3419 if (str == NULL)
3420 bgPixmap.set_defaultGeometry ();
3421 }
3422
3423 while (str)
3424 {
3473 str++; 3425 str++;
3474#if XPM_BACKGROUND 3426 if (bgPixmap.set_geometry (str))
3475 changed += scale_pixmap (str); 3427 changed++;
3476#endif 3428 str = strchr (str, ';');
3477 } 3429 }
3478 3430
3479 if (changed) 3431 if (changed)
3480 { 3432 update_background ();
3481#ifdef XPM_BACKGROUND
3482 resize_pixmap ();
3483 scr_touch (true);
3484#endif
3485 } 3433 }
3486#if TRANSPARENT && defined(HAVE_AFTERIMAGE)
3487 if (option (Opt_transparent))
3488 check_our_parents ();
3489#endif
3490 }
3491 break; 3434 break;
3492 3435#endif
3493 case Rxvt_restoreFG:
3494 set_window_color (Color_fg, str);
3495 break;
3496 case Rxvt_restoreBG:
3497 set_window_color (Color_bg, str);
3498 break;
3499 3436
3500 case XTerm_logfile: 3437 case XTerm_logfile:
3501 // TODO, when secure mode? 3438 // TODO, when secure mode?
3502 break; 3439 break;
3503 3440
3618{ 3555{
3619 unsigned int i, j; 3556 unsigned int i, j;
3620 int state; 3557 int state;
3621 3558
3622 static const struct 3559 static const struct
3623 { 3560 {
3624 const int argval; 3561 const int argval;
3625 const unsigned long bit; 3562 const unsigned long bit;
3626 }
3627
3628 argtopriv[] = { 3563 } argtopriv[] = {
3629 { 1, PrivMode_aplCUR }, 3564 { 1, PrivMode_aplCUR },
3630 { 2, PrivMode_vt52 }, 3565 { 2, PrivMode_vt52 },
3631 { 3, PrivMode_132 }, 3566 { 3, PrivMode_132 },
3632 { 4, PrivMode_smoothScroll }, 3567 { 4, PrivMode_smoothScroll },
3633 { 5, PrivMode_rVideo }, 3568 { 5, PrivMode_rVideo },
3649 { 66, PrivMode_aplKP }, 3584 { 66, PrivMode_aplKP },
3650#ifndef NO_BACKSPACE_KEY 3585#ifndef NO_BACKSPACE_KEY
3651 { 67, PrivMode_BackSpace }, 3586 { 67, PrivMode_BackSpace },
3652#endif 3587#endif
3653 { 1000, PrivMode_MouseX11 }, 3588 { 1000, PrivMode_MouseX11 },
3654 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3589 { 1002, PrivMode_MouseBtnEvent },
3655 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3590 { 1003, PrivMode_MouseAnyEvent },
3656 // 1003 Use All Motion Mouse Tracking. NYI, TODO
3657 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3591 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3658 { 1011, PrivMode_Keypress }, // rxvt extension 3592 { 1011, PrivMode_Keypress }, // rxvt extension
3659 // 1035 enable modifiers for alt, numlock NYI 3593 // 1035 enable modifiers for alt, numlock NYI
3660 // 1036 send ESC for meta keys NYI 3594 // 1036 send ESC for meta keys NYI
3661 // 1037 send DEL for keypad delete NYI 3595 // 1037 send DEL for keypad delete NYI
3662 { 1047, PrivMode_Screen }, 3596 { 1047, PrivMode_Screen },
3663 // 1048 save and restore cursor 3597 // 1048 save and restore cursor
3664 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3598 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3665 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3599 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3600 { 2004, PrivMode_BracketPaste },
3666 }; 3601 };
3667 3602
3668 if (nargs == 0) 3603 if (nargs == 0)
3669 return; 3604 return;
3670 3605
3718 */ 3653 */
3719 PrivMode (1, PrivMode_vt52); 3654 PrivMode (1, PrivMode_vt52);
3720 break; 3655 break;
3721 case 3: /* 80/132 */ 3656 case 3: /* 80/132 */
3722 if (priv_modes & PrivMode_132OK) 3657 if (priv_modes & PrivMode_132OK)
3658 {
3659 scr_poweron ();
3723 set_widthheight (((state ? 132 : 80) * fwidth), height); 3660 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight);
3661 }
3724 break; 3662 break;
3725 case 4: /* smooth scrolling */ 3663 case 4: /* smooth scrolling */
3726 set_option (Opt_jumpScroll, !state); 3664 set_option (Opt_jumpScroll, !state);
3727 break; 3665 break;
3728 case 5: /* reverse video */ 3666 case 5: /* reverse video */
3735 scr_autowrap (state); 3673 scr_autowrap (state);
3736 break; 3674 break;
3737 /* case 8: - auto repeat, can't do on a per window basis */ 3675 /* case 8: - auto repeat, can't do on a per window basis */
3738 case 9: /* X10 mouse reporting */ 3676 case 9: /* X10 mouse reporting */
3739 if (state) /* orthogonal */ 3677 if (state) /* orthogonal */
3740 priv_modes &= ~PrivMode_MouseX11; 3678 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3741 break; 3679 break;
3742#ifdef scrollBar_esc 3680#ifdef scrollBar_esc
3743 case scrollBar_esc: 3681 case scrollBar_esc:
3744 if (scrollbar_mapping (state)) 3682 if (scrollbar_mapping (state))
3745 { 3683 {
3758 break; 3696 break;
3759 /* case 66: - application key pad */ 3697 /* case 66: - application key pad */
3760 /* case 67: - backspace key */ 3698 /* case 67: - backspace key */
3761 case 1000: /* X11 mouse reporting */ 3699 case 1000: /* X11 mouse reporting */
3762 if (state) /* orthogonal */ 3700 if (state) /* orthogonal */
3763 priv_modes &= ~PrivMode_MouseX10; 3701 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3764 break; 3702 break;
3765#if 0
3766 case 1001: 3703 case 1002:
3767 break; /* X11 mouse highlighting */ 3704 case 1003:
3768#endif 3705 if (state)
3706 {
3707 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3708 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3709 vt_emask_mouse = PointerMotionMask;
3710 }
3711 else
3712 vt_emask_mouse = NoEventMask;
3713 vt_select_input ();
3714 break;
3769 case 1010: /* scroll to bottom on TTY output inhibit */ 3715 case 1010: /* scroll to bottom on TTY output inhibit */
3770 set_option (Opt_scrollTtyOutput, !state); 3716 set_option (Opt_scrollTtyOutput, !state);
3771 break; 3717 break;
3772 case 1011: /* scroll to bottom on key press */ 3718 case 1011: /* scroll to bottom on key press */
3773 set_option (Opt_scrollTtyKeypress, state); 3719 set_option (Opt_scrollTtyKeypress, state);
3950rxvt_term::process_graphics () 3896rxvt_term::process_graphics ()
3951{ 3897{
3952 unicode_t ch, cmd = cmd_getc (); 3898 unicode_t ch, cmd = cmd_getc ();
3953 3899
3954 if (cmd == 'Q') 3900 if (cmd == 'Q')
3901 {
3955 { /* query graphics */ 3902 /* query graphics */
3956 tt_printf ("\033G0\012"); /* no graphics */ 3903 tt_printf ("\033G0\012"); /* no graphics */
3957 return; 3904 return;
3958 } 3905 }
3959 /* swallow other graphics sequences until terminating ':' */ 3906 /* swallow other graphics sequences until terminating ':' */
3960 do 3907 do
4010 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 3957 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4011 3958
4012 memcpy (v_buffer + v_buflen, data, len); 3959 memcpy (v_buffer + v_buflen, data, len);
4013 v_buflen += len; 3960 v_buflen += len;
4014 3961
4015 pty_ev.set (EVENT_READ | EVENT_WRITE); 3962 pty_ev.set (ev::READ | ev::WRITE);
4016} 3963}
4017 3964
4018void rxvt_term::pty_write () 3965void rxvt_term::pty_write ()
4019{ 3966{
4020 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 3967 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4025 3972
4026 if (v_buflen == 0) 3973 if (v_buflen == 0)
4027 { 3974 {
4028 free (v_buffer); 3975 free (v_buffer);
4029 v_buffer = 0; 3976 v_buffer = 0;
4030 v_buflen = 0;
4031 3977
4032 pty_ev.set (EVENT_READ); 3978 pty_ev.set (ev::READ);
4033 return; 3979 return;
4034 } 3980 }
4035 3981
4036 memmove (v_buffer, v_buffer + written, v_buflen); 3982 memmove (v_buffer, v_buffer + written, v_buflen);
4037 } 3983 }
4038 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 3984 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4039 pty_ev.set (EVENT_READ); 3985 pty_ev.set (ev::READ);
4040} 3986}
4041 3987
4042/*----------------------- end-of-file (C source) -----------------------*/ 3988/*----------------------- end-of-file (C source) -----------------------*/
4043 3989

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines