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.352 by ayin, Sun Sep 9 10:35:00 2007 UTC vs.
Revision 1.418 by root, Fri Oct 10 00:11:44 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.
198 r & RS_Uline ? " uline" : "", 199 r & RS_Uline ? " uline" : "",
199 r & RS_Careful ? " careful" : ""); 200 r & RS_Careful ? " careful" : "");
200 201
201 int width = wcswidth (fname, wcslen (fname)); 202 int width = wcswidth (fname, wcslen (fname));
202 203
203 max_it (width, 8+5); // for char + hey 204 max_it (width, 8+5); // for char + hex
204 max_it (width, strlen (attr)); 205 max_it (width, strlen (attr));
205 206
206 if (y >= 0) 207 if (y >= 0)
207 { 208 {
208 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
220 ch = *chr++; 221 ch = *chr++;
221 222
222 sprintf (buf, "%8x", ch); 223 sprintf (buf, "%8x", ch);
223 scr_overlay_set (0, y, buf); 224 scr_overlay_set (0, y, buf);
224 scr_overlay_set (9, y, '='); 225 scr_overlay_set (9, y, '=');
225# if !UNICODE3 226# if !UNICODE_3
226 if (ch >= 0x10000) 227 if (ch >= 0x10000)
227 ch = 0xfffd; 228 ch = 0xfffd;
228# endif 229# endif
229 scr_overlay_set (11, y, ch, r); 230 scr_overlay_set (11, y, ch, r);
230 231
278 } 279 }
279 280
280 iso14755buf = 0; 281 iso14755buf = 0;
281} 282}
282 283
283int 284static int
284rxvt_term::hex_keyval (XKeyEvent &ev) 285hex_keyval (XKeyEvent &ev)
285{ 286{
286 // check wether this event corresponds to a hex digit 287 // check wether this event corresponds to a hex digit
287 // if the modifiers had not been pressed. 288 // if the modifiers had not been pressed.
288 for (int index = 0; index < 8; index++) 289 for (int index = 0; index < 8; index++)
289 { 290 {
297 298
298 return -1; 299 return -1;
299} 300}
300#endif 301#endif
301 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
302void 398void
303rxvt_term::key_press (XKeyEvent &ev) 399rxvt_term::key_press (XKeyEvent &ev)
304{ 400{
305 int ctrl, meta, shft, len; 401 int ctrl, meta, shft, len;
306 unsigned int newlen;
307 KeySym keysym; 402 KeySym keysym;
308 int valid_keysym; 403 int valid_keysym;
309 char kbuf[KBUFSZ]; 404 char kbuf[KBUFSZ];
310 405
311#if ISO_14755 406#if ISO_14755
324 meta = ev.state & ModMetaMask; 419 meta = ev.state & ModMetaMask;
325 420
326 if (numlock_state || (ev.state & ModNumLockMask)) 421 if (numlock_state || (ev.state & ModNumLockMask))
327 { 422 {
328 numlock_state = (ev.state & ModNumLockMask); 423 numlock_state = (ev.state & ModNumLockMask);
329 PrivMode ((!numlock_state), PrivMode_aplKP); 424 set_privmode (PrivMode_aplKP, !numlock_state);
330 } 425 }
331 426
332 kbuf[0] = 0; 427 kbuf[0] = 0;
333 428
334#ifdef USE_XIM 429#ifdef USE_XIM
546 } 641 }
547#endif 642#endif
548 643
549 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 644 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
550 { 645 {
646 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
647 unsigned int newlen = 1;
648
649 switch (translate_keypad (keysym, kp))
551 { 650 {
552 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft; 651#ifndef NO_BACKSPACE_KEY
652 case XK_BackSpace:
653 if (priv_modes & PrivMode_HaveBackSpace)
654 {
655 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
656 ^ !!ctrl) ? '\b' : '\177';
657 kbuf[1] = '\0';
658 }
659 else
660 strcpy (kbuf, rs[Rs_backspace_key]);
661 break;
662#endif
663#ifndef NO_DELETE_KEY
664 case XK_Delete:
665 strcpy (kbuf, rs[Rs_delete_key]);
666 break;
667#endif
668 case XK_Tab:
669 if (shft)
670 strcpy (kbuf, "\033[Z");
671 else
672 {
673#ifdef CTRL_TAB_MAKES_META
674 if (ctrl)
675 meta = 1;
676#endif
677#ifdef MOD4_TAB_MAKES_META
678 if (ev.state & Mod4Mask)
679 meta = 1;
680#endif
553 newlen = 1; 681 newlen = 0;
554 switch (keysym) 682 }
683 break;
684
685 case XK_Up: /* "\033[A" */
686 case XK_Down: /* "\033[B" */
687 case XK_Right: /* "\033[C" */
688 case XK_Left: /* "\033[D" */
689 strcpy (kbuf, "\033[Z");
690 kbuf[2] = "DACB"[keysym - XK_Left];
691 /* do Shift first */
692 if (shft)
693 kbuf[2] = "dacb"[keysym - XK_Left];
694 else if (ctrl)
695 {
696 kbuf[1] = 'O';
697 kbuf[2] = "dacb"[keysym - XK_Left];
698 }
699 else if (priv_modes & PrivMode_aplCUR)
700 kbuf[1] = 'O';
701 break;
702
703 case XK_KP_Enter:
704 /* allow shift to override */
705 if (kp)
706 {
707 strcpy (kbuf, "\033OM");
708 break;
709 }
710
711 /* FALLTHROUGH */
712
713 case XK_Return:
714 if (priv_modes & PrivMode_LFNL)
715 {
716 kbuf[0] = '\015';
717 kbuf[1] = '\012';
718 kbuf[2] = '\0';
719 }
720 else
721 {
722 kbuf[0] = '\015';
723 kbuf[1] = '\0';
724 }
725 break;
726
727 case XK_KP_F1: /* "\033OP" */
728 case XK_KP_F2: /* "\033OQ" */
729 case XK_KP_F3: /* "\033OR" */
730 case XK_KP_F4: /* "\033OS" */
731 strcpy (kbuf, "\033OP");
732 kbuf[2] += (keysym - XK_KP_F1);
733 break;
734
735 case XK_KP_Multiply: /* "\033Oj" : "*" */
736 case XK_KP_Add: /* "\033Ok" : "+" */
737 case XK_KP_Separator: /* "\033Ol" : "," */
738 case XK_KP_Subtract: /* "\033Om" : "-" */
739 case XK_KP_Decimal: /* "\033On" : "." */
740 case XK_KP_Divide: /* "\033Oo" : "/" */
741 case XK_KP_0: /* "\033Op" : "0" */
742 case XK_KP_1: /* "\033Oq" : "1" */
743 case XK_KP_2: /* "\033Or" : "2" */
744 case XK_KP_3: /* "\033Os" : "3" */
745 case XK_KP_4: /* "\033Ot" : "4" */
746 case XK_KP_5: /* "\033Ou" : "5" */
747 case XK_KP_6: /* "\033Ov" : "6" */
748 case XK_KP_7: /* "\033Ow" : "7" */
749 case XK_KP_8: /* "\033Ox" : "8" */
750 case XK_KP_9: /* "\033Oy" : "9" */
751 /* allow shift to override */
752 if (kp)
753 {
754 strcpy (kbuf, "\033Oj");
755 kbuf[2] += (keysym - XK_KP_Multiply);
756 }
757 else
758 {
759 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
760 kbuf[1] = '\0';
761 }
762 break;
763
764 default:
555 { 765 {
556#ifndef NO_BACKSPACE_KEY 766 int param = map_function_key (keysym);
557 case XK_BackSpace: 767 if (param > 0)
558 if (priv_modes & PrivMode_HaveBackSpace) 768 sprintf (kbuf,"\033[%d~", param);
559 {
560 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
561 ^ !!ctrl) ? '\b' : '\177';
562 kbuf[1] = '\0';
563 }
564 else 769 else
565 strcpy (kbuf, rs[Rs_backspace_key]);
566 break;
567#endif
568#ifndef NO_DELETE_KEY
569# ifdef XK_KP_Delete
570 case XK_KP_Delete:
571 /* allow shift to override */
572 if (kp)
573 {
574 strcpy (kbuf, "\033On");
575 break;
576 }
577 /* FALLTHROUGH */
578# endif
579 case XK_Delete:
580 strcpy (kbuf, rs[Rs_delete_key]);
581 break;
582#endif
583 case XK_Tab:
584 if (shft)
585 strcpy (kbuf, "\033[Z");
586 else
587 {
588#ifdef CTRL_TAB_MAKES_META
589 if (ctrl)
590 meta = 1;
591#endif
592#ifdef MOD4_TAB_MAKES_META
593 if (ev.state & Mod4Mask)
594 meta = 1;
595#endif
596 newlen = 0;
597 }
598 break;
599
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 (kp)
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" */
617 case XK_Down: /* "\033[B" */
618 case XK_Right: /* "\033[C" */
619 case XK_Left: /* "\033[D" */
620 strcpy (kbuf, "\033[Z");
621 kbuf[2] = "DACB"[keysym - XK_Left];
622 /* do Shift first */
623 if (shft)
624 kbuf[2] = "dacb"[keysym - XK_Left];
625 else if (ctrl)
626 {
627 kbuf[1] = 'O';
628 kbuf[2] = "dacb"[keysym - XK_Left];
629 }
630 else if (priv_modes & PrivMode_aplCUR)
631 kbuf[1] = 'O';
632 break;
633
634#ifndef UNSHIFTED_SCROLLKEYS
635# ifdef XK_KP_Prior
636 case XK_KP_Prior:
637 /* allow shift to override */
638 if (kp)
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 (kp)
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:
663 /* allow shift to override */
664 if (kp)
665 {
666 strcpy (kbuf, "\033OM");
667 break;
668 }
669
670 /* FALLTHROUGH */
671
672 case XK_Return:
673 if (priv_modes & PrivMode_LFNL)
674 {
675 kbuf[0] = '\015';
676 kbuf[1] = '\012';
677 kbuf[2] = '\0';
678 }
679 else
680 {
681 kbuf[0] = '\015';
682 kbuf[1] = '\0';
683 }
684 break;
685
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" */
693 case XK_KP_F2: /* "\033OQ" */
694 case XK_KP_F3: /* "\033OR" */
695 case XK_KP_F4: /* "\033OS" */
696 strcpy (kbuf, "\033OP");
697 kbuf[2] += (keysym - XK_KP_F1);
698 break;
699
700 case XK_KP_Multiply: /* "\033Oj" : "*" */
701 case XK_KP_Add: /* "\033Ok" : "+" */
702 case XK_KP_Separator: /* "\033Ol" : "," */
703 case XK_KP_Subtract: /* "\033Om" : "-" */
704 case XK_KP_Decimal: /* "\033On" : "." */
705 case XK_KP_Divide: /* "\033Oo" : "/" */
706 case XK_KP_0: /* "\033Op" : "0" */
707 case XK_KP_1: /* "\033Oq" : "1" */
708 case XK_KP_2: /* "\033Or" : "2" */
709 case XK_KP_3: /* "\033Os" : "3" */
710 case XK_KP_4: /* "\033Ot" : "4" */
711 case XK_KP_5: /* "\033Ou" : "5" */
712 case XK_KP_6: /* "\033Ov" : "6" */
713 case XK_KP_7: /* "\033Ow" : "7" */
714 case XK_KP_8: /* "\033Ox" : "8" */
715 case XK_KP_9: /* "\033Oy" : "9" */
716 /* allow shift to override */
717 if (kp)
718 {
719 strcpy (kbuf, "\033Oj");
720 kbuf[2] += (keysym - XK_KP_Multiply);
721 }
722 else
723 {
724 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
725 kbuf[1] = '\0';
726 }
727 break;
728
729 case XK_Find:
730 strcpy (kbuf, "\033[1~");
731 break;
732
733#ifdef XK_KP_Insert
734 case XK_KP_Insert:
735 /* allow shift to override */
736 if (kp)
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 (kp)
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 (kp)
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:
839 newlen = 0; 770 newlen = 0;
840 break;
841 } 771 }
842 772 break;
843 if (newlen)
844 len = strlen (kbuf);
845 } 773 }
774
775 if (newlen)
776 len = strlen (kbuf);
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
1035void 966void
1036rxvt_term::flush () 967rxvt_term::flush ()
1037{ 968{
1038 flush_ev.stop (); 969 flush_ev.stop ();
1039 970
1040#ifdef ENABLE_TRANSPARENCY 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)
1085 } 1015 }
1086 while (row < end_row); 1016 while (row < end_row);
1087 } 1017 }
1088 1018
1089 scr_refresh (); 1019 scr_refresh ();
1090 scrollbar_show (1); 1020 scrollBar.show (1);
1091#ifdef USE_XIM 1021#ifdef USE_XIM
1092 IMSendSpot (); 1022 IMSendSpot ();
1093#endif 1023#endif
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 ()
1101{ 1032{
1102 make_current (); 1033 if (want_refresh && !flush_ev.is_active ())
1034 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1103 1035
1104 display->flush (); 1036 display->flush ();
1105
1106 if (want_refresh && !flush_ev.active)
1107 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1108} 1037}
1109 1038
1110void 1039void
1111rxvt_term::flush_cb (time_watcher &w) 1040rxvt_term::flush_cb (ev::timer &w, int revents)
1112{ 1041{
1113 make_current (); 1042 make_current ();
1114 1043
1115 refresh_count = 0; 1044 refresh_count = 0;
1116 flush (); 1045 flush ();
1117} 1046}
1118 1047
1119#ifdef CURSOR_BLINK 1048#ifdef CURSOR_BLINK
1120void 1049void
1121rxvt_term::cursor_blink_cb (time_watcher &w) 1050rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1122{ 1051{
1123 hidden_cursor = !hidden_cursor; 1052 hidden_cursor = !hidden_cursor;
1124 want_refresh = 1; 1053 want_refresh = 1;
1125 1054 refresh_check ();
1126 w.start (w.at + CURSOR_BLINK_INTERVAL);
1127} 1055}
1128#endif 1056#endif
1129 1057
1130#ifdef TEXT_BLINK 1058#ifdef TEXT_BLINK
1131void 1059void
1132rxvt_term::text_blink_cb (time_watcher &w) 1060rxvt_term::text_blink_cb (ev::timer &w, int revents)
1133{ 1061{
1134 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1062 if (scr_refresh_rend (RS_Blink, RS_Blink))
1135 { 1063 {
1136 hidden_text = !hidden_text; 1064 hidden_text = !hidden_text;
1137 want_refresh = 1; 1065 want_refresh = 1;
1138 w.start (w.at + TEXT_BLINK_INTERVAL); 1066 refresh_check ();
1139 } 1067 }
1068 else
1069 w.stop ();
1140} 1070}
1141#endif 1071#endif
1142 1072
1143#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1073#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1144void 1074void
1145rxvt_term::cont_scroll_cb (time_watcher &w) 1075rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1146{ 1076{
1147 if ((scrollbar_isUp() || scrollbar_isDn()) && 1077 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1148 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1078 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1149 { 1079 {
1150 want_refresh = 1; 1080 want_refresh = 1;
1151 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1081 refresh_check ();
1152 } 1082 }
1083 else
1084 w.stop ();
1153} 1085}
1154#endif 1086#endif
1155 1087
1156#ifdef SELECTION_SCROLLING 1088#ifdef SELECTION_SCROLLING
1157void 1089void
1158rxvt_term::sel_scroll_cb (time_watcher &w) 1090rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1159{ 1091{
1160 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1092 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1161 { 1093 {
1162 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1094 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1163 want_refresh = 1; 1095 want_refresh = 1;
1164 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1096 refresh_check ();
1165 } 1097 }
1098 else
1099 w.stop ();
1166} 1100}
1167#endif 1101#endif
1168 1102
1169#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1103#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1170void 1104void
1171rxvt_term::slip_wheel_cb (time_watcher &w) 1105rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1172{ 1106{
1173 if (mouse_slip_wheel_speed == 0 1107 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1174 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1175 : scr_page (UP, mouse_slip_wheel_speed))
1176 { 1108 {
1177 if (view_start == top_row || view_start == 0)
1178 mouse_slip_wheel_speed = 0;
1179
1180 want_refresh = 1; 1109 want_refresh = 1;
1181 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 ();
1182 } 1117 }
1183} 1118}
1184#endif 1119#endif
1185 1120
1186#if LINUX_YIELD_HACK 1121#if LINUX_YIELD_HACK
1187static struct event_handler 1122static struct event_handler
1188{ 1123{
1189 check_watcher yield_ev; 1124 ev::prepare yield_ev;
1190 1125
1191 void yield_cb (check_watcher &w) 1126 void yield_cb (ev::prepare &w, int revents)
1192 { 1127 {
1193 // this should really be sched_yield(), but the linux guys thought 1128 // this should really be sched_yield(), but the linux guys thought
1194 // that giving a process calling sched_yield () less cpu time than 1129 // that giving a process calling sched_yield () less cpu time than
1195 // 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
1196 // allowed by the sus... as is returning ENOSYS. 1131 // allowed by the sus... as is returning ENOSYS.
1247 1182
1248 return false; 1183 return false;
1249} 1184}
1250 1185
1251void 1186void
1252rxvt_term::pty_cb (io_watcher &w, short revents) 1187rxvt_term::pty_cb (ev::io &w, int revents)
1253{ 1188{
1254 make_current (); 1189 make_current ();
1255 1190
1256 if (revents & EVENT_READ) 1191 if (revents & ev::READ)
1257 // loop, but don't allow a single term to monopolize us 1192 // loop, but don't allow a single term to monopolize us
1258 while (pty_fill ()) 1193 while (pty_fill ())
1259 if (cmd_parse ()) 1194 if (cmd_parse ())
1260 break; 1195 break;
1261 1196
1262 if (revents & EVENT_WRITE) 1197 if (revents & ev::WRITE)
1263 pty_write (); 1198 pty_write ();
1199
1200 refresh_check ();
1264} 1201}
1265 1202
1266void 1203void
1267rxvt_term::pointer_unblank () 1204rxvt_term::pointer_unblank ()
1268{ 1205{
1271 1208
1272#ifdef POINTER_BLANK 1209#ifdef POINTER_BLANK
1273 hidden_pointer = 0; 1210 hidden_pointer = 0;
1274 1211
1275 if (option (Opt_pointerBlank)) 1212 if (option (Opt_pointerBlank))
1276 pointer_ev.start (NOW + pointerBlankDelay); 1213 pointer_ev.start (pointerBlankDelay);
1277#endif 1214#endif
1278} 1215}
1279 1216
1280#ifdef POINTER_BLANK 1217#ifdef POINTER_BLANK
1281void 1218void
1289 1226
1290 hidden_pointer = 1; 1227 hidden_pointer = 1;
1291} 1228}
1292 1229
1293void 1230void
1294rxvt_term::pointer_cb (time_watcher &w) 1231rxvt_term::pointer_cb (ev::timer &w, int revents)
1295{ 1232{
1296 make_current (); 1233 make_current ();
1297 1234
1298 pointer_blank (); 1235 pointer_blank ();
1299} 1236}
1302void 1239void
1303rxvt_term::mouse_report (XButtonEvent &ev) 1240rxvt_term::mouse_report (XButtonEvent &ev)
1304{ 1241{
1305 int button_number, key_state = 0; 1242 int button_number, key_state = 0;
1306 int x, y; 1243 int x, y;
1244 int code = 32;
1307 1245
1308 x = ev.x; 1246 x = Pixel2Col (ev.x);
1309 y = ev.y; 1247 y = Pixel2Row (ev.y);
1310 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 }
1311 1256
1312 if (MEvent.button == AnyButton) 1257 if (MEvent.button == AnyButton)
1313 button_number = 3; 1258 button_number = 3;
1314 else 1259 else
1315 { 1260 {
1361 x + 1, 1306 x + 1,
1362 y + 1); 1307 y + 1);
1363#endif 1308#endif
1364 1309
1365 tt_printf ("\033[M%c%c%c", 1310 tt_printf ("\033[M%c%c%c",
1366 (32 + button_number + key_state), 1311 (code + button_number + key_state),
1367 (32 + x + 1), 1312 (32 + x + 1),
1368 (32 + y + 1)); 1313 (32 + y + 1));
1369} 1314}
1370 1315
1371/*{{{ process an X event */ 1316/*{{{ process an X event */
1475 && ev.xfocus.mode != NotifyGrab) 1420 && ev.xfocus.mode != NotifyGrab)
1476 focus_out (); 1421 focus_out ();
1477 break; 1422 break;
1478 1423
1479 case ConfigureNotify: 1424 case ConfigureNotify:
1480/* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n", 1425 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1481 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y, 1426 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1482 szHint.width, szHint.height);*/ 1427 szHint.width, szHint.height);*/
1483 if (ev.xconfigure.window == parent[0]) 1428 if (ev.xconfigure.window == parent[0])
1484 { 1429 {
1485 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1430 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1490 seen_resize = 1; 1435 seen_resize = 1;
1491 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1436 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1492 } 1437 }
1493 else 1438 else
1494 { 1439 {
1495#ifdef ENABLE_TRANSPARENCY 1440#ifdef HAVE_BG_PIXMAP
1496 if (option (Opt_transparent)) 1441 if (bgPixmap.window_position_sensitive ())
1442 {
1443 if (mapped)
1497 update_background (); 1444 update_background ();
1445 else
1446 bgPixmap.invalidate ();
1447 }
1498#endif 1448#endif
1499 } 1449 }
1450
1500 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1451 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1501 } 1452 }
1502 break; 1453 break;
1503 1454
1504 case PropertyNotify: 1455 case PropertyNotify:
1521 case SelectionRequest: 1472 case SelectionRequest:
1522 selection_send (ev.xselectionrequest); 1473 selection_send (ev.xselectionrequest);
1523 break; 1474 break;
1524 1475
1525 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
1526 mapped = 1; 1493 mapped = 1;
1527#ifdef TEXT_BLINK 1494#ifdef TEXT_BLINK
1528 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1495 text_blink_ev.start ();
1529#endif 1496#endif
1530 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1497 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1531 break; 1498 break;
1532 1499
1533 case UnmapNotify: 1500 case UnmapNotify:
1535#ifdef TEXT_BLINK 1502#ifdef TEXT_BLINK
1536 text_blink_ev.stop (); 1503 text_blink_ev.stop ();
1537#endif 1504#endif
1538 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1505 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1539 break; 1506 break;
1540
1541#ifdef ENABLE_TRANSPARENCY
1542 case ReparentNotify:
1543 rootwin_cb (ev);
1544 break;
1545#endif /* ENABLE_TRANSPARENCY */
1546 1507
1547 case GraphicsExpose: 1508 case GraphicsExpose:
1548 case Expose: 1509 case Expose:
1549 if (ev.xany.window == vt) 1510 if (ev.xany.window == vt)
1550 { 1511 {
1551 do 1512 do
1513 {
1552 scr_expose (ev.xexpose.x, ev.xexpose.y, 1514 scr_expose (ev.xexpose.x, ev.xexpose.y,
1553 ev.xexpose.width, ev.xexpose.height, False); 1515 ev.xexpose.width, ev.xexpose.height, False);
1516 }
1554 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1517 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1555 1518
1556 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1519 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1557 1520
1558 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1521 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1522 {
1559 scr_expose (ev.xexpose.x, ev.xexpose.y, 1523 scr_expose (ev.xexpose.x, ev.xexpose.y,
1560 ev.xexpose.width, ev.xexpose.height, False); 1524 ev.xexpose.width, ev.xexpose.height, False);
1525 }
1561 1526
1562 want_refresh = 1; 1527 want_refresh = 1;
1563 } 1528 }
1564 else 1529 else
1565 { 1530 {
1568 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1533 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1569 ; 1534 ;
1570 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1535 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1571 ; 1536 ;
1572 1537
1573 if (isScrollbarWindow (ev.xany.window)) 1538 if (scrollBar.state && ev.xany.window == scrollBar.win)
1574 { 1539 {
1575 scrollBar.setIdle (); 1540 scrollBar.state = STATE_IDLE;
1576 scrollbar_show (0); 1541 scrollBar.show (0);
1577 } 1542 }
1578 } 1543 }
1579 break; 1544 break;
1580 1545
1581 case MotionNotify: 1546 case MotionNotify:
1582#ifdef POINTER_BLANK 1547#ifdef POINTER_BLANK
1583 if (hidden_pointer) 1548 if (hidden_pointer)
1584 pointer_unblank (); 1549 pointer_unblank ();
1585#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);
1586 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1554 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1587 break; 1555 break;
1588 1556
1589 if (ev.xany.window == vt) 1557 if (ev.xany.window == vt)
1590 { 1558 {
1624 int dist; 1592 int dist;
1625 1593
1626 /* don't clobber the current delay if we are 1594 /* don't clobber the current delay if we are
1627 * already in the middle of scrolling. 1595 * already in the middle of scrolling.
1628 */ 1596 */
1629 if (!sel_scroll_ev.active) 1597 if (!sel_scroll_ev.is_active ())
1630 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1598 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1631 1599
1632 /* save the event params so we can highlight 1600 /* save the event params so we can highlight
1633 * the selection in the pending-scroll loop 1601 * the selection in the pending-scroll loop
1634 */ 1602 */
1635 selection_save_x = ev.xbutton.x; 1603 selection_save_x = ev.xbutton.x;
1657 else 1625 else
1658 { 1626 {
1659 /* we are within the text window, so we 1627 /* we are within the text window, so we
1660 * shouldn't be scrolling 1628 * shouldn't be scrolling
1661 */ 1629 */
1662 if (sel_scroll_ev.active)
1663 sel_scroll_ev.stop(); 1630 sel_scroll_ev.stop();
1664 } 1631 }
1665#endif 1632#endif
1666#ifdef MOUSE_THRESHOLD 1633#ifdef MOUSE_THRESHOLD
1667 } 1634 }
1668#endif 1635#endif
1669 } 1636 }
1670 } 1637 }
1671 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1638 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1672 { 1639 {
1673 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1640 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1674 MotionNotify, &ev)) 1641 MotionNotify, &ev))
1675 ; 1642 ;
1676 1643
1678 &unused_root, &unused_child, 1645 &unused_root, &unused_child,
1679 &unused_root_x, &unused_root_y, 1646 &unused_root_x, &unused_root_y,
1680 &ev.xbutton.x, &ev.xbutton.y, 1647 &ev.xbutton.x, &ev.xbutton.y,
1681 &unused_mask); 1648 &unused_mask);
1682 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1649 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1683 scrollbar_size ()); 1650 scrollBar.size ());
1684 want_refresh = 1; 1651 want_refresh = 1;
1685 scrollbar_show (1); 1652 scrollBar.show (1);
1686 } 1653 }
1687 break; 1654 break;
1688 } 1655 }
1689 1656
1690#if defined(CURSOR_BLINK) 1657#if defined(CURSOR_BLINK)
1694 { 1661 {
1695 hidden_cursor = 0; 1662 hidden_cursor = 0;
1696 want_refresh = 1; 1663 want_refresh = 1;
1697 } 1664 }
1698 1665
1699 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1666 cursor_blink_ev.again ();
1700 } 1667 }
1701#endif 1668#endif
1702 1669
1703#if defined(POINTER_BLANK) 1670#if defined(POINTER_BLANK)
1704 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1671 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1711 1678
1712 if (ev.type == KeyPress && hidden_pointer == 0) 1679 if (ev.type == KeyPress && hidden_pointer == 0)
1713 pointer_blank (); 1680 pointer_blank ();
1714 } 1681 }
1715#endif 1682#endif
1683
1684 refresh_check ();
1716} 1685}
1717 1686
1718void 1687void
1719rxvt_term::focus_in () 1688rxvt_term::focus_in ()
1720{ 1689{
1732 XSetICFocus (Input_Context); 1701 XSetICFocus (Input_Context);
1733 } 1702 }
1734#endif 1703#endif
1735#if CURSOR_BLINK 1704#if CURSOR_BLINK
1736 if (option (Opt_cursorBlink)) 1705 if (option (Opt_cursorBlink))
1737 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1706 cursor_blink_ev.again ();
1738#endif 1707#endif
1739#if OFF_FOCUS_FADING 1708#if OFF_FOCUS_FADING
1740 if (rs[Rs_fade]) 1709 if (rs[Rs_fade])
1741 { 1710 {
1742 pix_colors = pix_colors_focused; 1711 pix_colors = pix_colors_focused;
1744 } 1713 }
1745#endif 1714#endif
1746#if ENABLE_FRILLS 1715#if ENABLE_FRILLS
1747 if (option (Opt_urgentOnBell)) 1716 if (option (Opt_urgentOnBell))
1748 { 1717 {
1749 XWMHints *h;
1750
1751 h = XGetWMHints(dpy, parent[0]); 1718 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1752 if (h != NULL)
1753 { 1719 {
1754 h->flags &= ~XUrgencyHint; 1720 h->flags &= ~XUrgencyHint;
1755 XSetWMHints(dpy, parent[0], h); 1721 XSetWMHints (dpy, parent[0], h);
1756 } 1722 }
1757 } 1723 }
1758#endif 1724#endif
1759 } 1725 }
1760} 1726}
1783 XUnsetICFocus (Input_Context); 1749 XUnsetICFocus (Input_Context);
1784#endif 1750#endif
1785#if CURSOR_BLINK 1751#if CURSOR_BLINK
1786 if (option (Opt_cursorBlink)) 1752 if (option (Opt_cursorBlink))
1787 cursor_blink_ev.stop (); 1753 cursor_blink_ev.stop ();
1754
1788 hidden_cursor = 0; 1755 hidden_cursor = 0;
1789#endif 1756#endif
1790#if OFF_FOCUS_FADING 1757#if OFF_FOCUS_FADING
1791 if (rs[Rs_fade]) 1758 if (rs[Rs_fade])
1792 { 1759 {
1832 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1799 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1833 { 1800 {
1834 bgPixmap.set_root_pixmap (); 1801 bgPixmap.set_root_pixmap ();
1835 update_background (); 1802 update_background ();
1836 } 1803 }
1804
1837 break; 1805 break;
1838 } 1806 }
1839# endif 1807# endif
1808
1809 refresh_check ();
1840} 1810}
1841#endif 1811#endif
1842 1812
1843void 1813void
1844rxvt_term::button_press (XButtonEvent &ev) 1814rxvt_term::button_press (XButtonEvent &ev)
1899 mouse_report (ev); 1869 mouse_report (ev);
1900 } 1870 }
1901#else 1871#else
1902 MEvent.button = ev.button; 1872 MEvent.button = ev.button;
1903 mouse_report (ev); 1873 mouse_report (ev);
1904#endif /* MOUSE_REPORT_DOUBLECLICK */ 1874#endif /* MOUSE_REPORT_DOUBLECLICK */
1905 1875
1906 } 1876 }
1907 else 1877 else
1908 { 1878 {
1909 if (ev.button != MEvent.button) 1879 if (ev.button != MEvent.button)
1957 } 1927 }
1958 1928
1959 /* 1929 /*
1960 * Scrollbar window processing of button press 1930 * Scrollbar window processing of button press
1961 */ 1931 */
1962 if (isScrollbarWindow (ev.window)) 1932 if (scrollBar.state && ev.window == scrollBar.win)
1963 { 1933 {
1964 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;
1965 /* 1942 /*
1966 * Rxvt-style scrollbar: 1943 * Rxvt-style scrollbar:
1967 * move up if mouse is above slider 1944 * move up if mouse is above slider
1968 * move dn if mouse is below slider 1945 * move dn if mouse is below slider
1969 * 1946 *
1978 /* 1955 /*
1979 * Mouse report disabled scrollbar: 1956 * Mouse report disabled scrollbar:
1980 * arrow buttons - send up/down 1957 * arrow buttons - send up/down
1981 * click on scrollbar - send pageup/down 1958 * click on scrollbar - send pageup/down
1982 */ 1959 */
1983 if ((scrollBar.style == R_SB_NEXT 1960 if (direction == UP)
1984 && scrollbarnext_upButton (ev.y))
1985 || (scrollBar.style == R_SB_RXVT
1986 && scrollbarrxvt_upButton (ev.y)))
1987 tt_printf ("\033[A"); 1961 tt_printf ("\033[A");
1988 else if ((scrollBar.style == R_SB_NEXT 1962 else if (direction == DN)
1989 && scrollbarnext_dnButton (ev.y))
1990 || (scrollBar.style == R_SB_RXVT
1991 && scrollbarrxvt_dnButton (ev.y)))
1992 tt_printf ("\033[B"); 1963 tt_printf ("\033[B");
1993 else 1964 else
1994 switch (ev.button) 1965 switch (ev.button)
1995 { 1966 {
1996 case Button2: 1967 case Button2:
2003 tt_printf ("\033[5~"); 1974 tt_printf ("\033[5~");
2004 break; 1975 break;
2005 } 1976 }
2006 } 1977 }
2007 else 1978 else
2008#endif /* NO_SCROLLBAR_REPORT */ 1979#endif /* NO_SCROLLBAR_REPORT */
2009
2010 {
2011 char upordown = 0;
2012
2013 if (scrollBar.style == R_SB_NEXT)
2014 { 1980 {
2015 if (scrollbarnext_upButton (ev.y)) 1981 if (direction != NO_DIR)
2016 upordown = -1; /* up */
2017 else if (scrollbarnext_dnButton (ev.y))
2018 upordown = 1; /* down */
2019 }
2020 else if (scrollBar.style == R_SB_RXVT)
2021 {
2022 if (scrollbarrxvt_upButton (ev.y))
2023 upordown = -1; /* up */
2024 else if (scrollbarrxvt_dnButton (ev.y))
2025 upordown = 1; /* down */
2026 }
2027 if (upordown)
2028 { 1982 {
2029#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1983#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1984 if (!cont_scroll_ev.is_active ())
2030 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1985 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2031#endif 1986#endif
2032 if (scr_page (upordown < 0 ? UP : DN, 1)) 1987 if (scr_page (direction, 1))
2033 { 1988 {
2034 if (upordown < 0) 1989 if (direction == UP)
2035 scrollBar.setUp (); 1990 scrollBar.state = STATE_UP;
2036 else 1991 else
2037 scrollBar.setDn (); 1992 scrollBar.state = STATE_DOWN;
2038 } 1993 }
2039 } 1994 }
2040 else 1995 else
2041 switch (ev.button) 1996 switch (ev.button)
2042 { 1997 {
2043 case Button2: 1998 case Button2:
2044 switch (scrollbar_align) 1999 switch (scrollBar.align)
2045 { 2000 {
2046 case R_SB_ALIGN_TOP: 2001 case R_SB_ALIGN_TOP:
2047 csrO = 0; 2002 csrO = 0;
2048 break; 2003 break;
2049 case R_SB_ALIGN_CENTRE: 2004 case R_SB_ALIGN_CENTRE:
2055 } 2010 }
2056 2011
2057 if (scrollBar.style == R_SB_XTERM 2012 if (scrollBar.style == R_SB_XTERM
2058 || scrollbar_above_slider (ev.y) 2013 || scrollbar_above_slider (ev.y)
2059 || scrollbar_below_slider (ev.y)) 2014 || scrollbar_below_slider (ev.y))
2060 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2015 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2061 2016
2062 scrollBar.setMotion (); 2017 scrollBar.state = STATE_MOTION;
2063 break; 2018 break;
2064 2019
2065 case Button1: 2020 case Button1:
2066 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2021 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2067 csrO = ev.y - scrollBar.top; 2022 csrO = ev.y - scrollBar.top;
2068 /* FALLTHROUGH */ 2023 /* FALLTHROUGH */
2069 2024
2070 case Button3: 2025 case Button3:
2071 if (scrollBar.style != R_SB_XTERM) 2026 if (scrollBar.style != R_SB_XTERM)
2081 scr_page (DN, nrow - 1); 2036 scr_page (DN, nrow - 1);
2082# else 2037# else
2083 scr_page (DN, nrow / 4); 2038 scr_page (DN, nrow / 4);
2084# endif 2039# endif
2085 else 2040 else
2086 scrollBar.setMotion (); 2041 scrollBar.state = STATE_MOTION;
2087 } 2042 }
2088 else 2043 else
2089 { 2044 {
2090 scr_page ((ev.button == Button1 ? DN : UP), 2045 scr_page ((ev.button == Button1 ? DN : UP),
2091 (nrow 2046 (nrow
2092 * scrollbar_position (ev.y) 2047 * scrollbar_position (ev.y)
2093 / scrollbar_size ())); 2048 / scrollBar.size ()));
2094 } 2049 }
2095 2050
2096 break; 2051 break;
2097 } 2052 }
2098 } 2053 }
2108 2063
2109 csrO = 0; /* reset csr Offset */ 2064 csrO = 0; /* reset csr Offset */
2110 if (!bypass_keystate) 2065 if (!bypass_keystate)
2111 reportmode = !! (priv_modes & PrivMode_mouse_report); 2066 reportmode = !! (priv_modes & PrivMode_mouse_report);
2112 2067
2113 if (scrollbar_isUpDn ()) 2068 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2114 { 2069 {
2115 scrollBar.setIdle (); 2070 scrollBar.state = STATE_IDLE;
2116 scrollbar_show (0); 2071 scrollBar.show (0);
2117 } 2072 }
2118 2073
2119#ifdef SELECTION_SCROLLING 2074#ifdef SELECTION_SCROLLING
2120 if (sel_scroll_ev.active)
2121 sel_scroll_ev.stop(); 2075 sel_scroll_ev.stop();
2122#endif 2076#endif
2123 2077
2124 if (ev.window == vt) 2078 if (ev.window == vt)
2125 { 2079 {
2126 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)))
2150 mouse_report (ev); 2104 mouse_report (ev);
2151 } 2105 }
2152#else /* MOUSE_REPORT_DOUBLECLICK */ 2106#else /* MOUSE_REPORT_DOUBLECLICK */
2153 MEvent.button = AnyButton; 2107 MEvent.button = AnyButton;
2154 mouse_report (ev); 2108 mouse_report (ev);
2155#endif /* MOUSE_REPORT_DOUBLECLICK */ 2109#endif /* MOUSE_REPORT_DOUBLECLICK */
2156 return; 2110 return;
2157 } 2111 }
2158 2112
2159 /* 2113 /*
2160 * dumb hack to compensate for the failure of click-and-drag 2114 * dumb hack to compensate for the failure of click-and-drag
2198 { 2152 {
2199 mouse_slip_wheel_speed += v ? -1 : 1; 2153 mouse_slip_wheel_speed += v ? -1 : 1;
2200 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2154 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2201 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2155 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2202 2156
2203 if (slip_wheel_ev.at < NOW) 2157 if (!slip_wheel_ev.is_active ())
2204 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2158 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2205
2206 slip_wheel_ev.start ();
2207 } 2159 }
2208 else 2160 else
2161# endif
2209 { 2162 {
2210# endif
2211 scr_page (v, i); 2163 scr_page (v, i);
2212 scrollbar_show (1); 2164 scrollBar.show (1);
2213# ifdef MOUSE_SLIP_WHEELING
2214 } 2165 }
2215# endif
2216 } 2166 }
2217 break; 2167 break;
2218#endif 2168#endif
2219 } 2169 }
2220 } 2170 }
2229 wchar_t ch = NOCHAR; 2179 wchar_t ch = NOCHAR;
2230 char *seq_begin; // remember start of esc-sequence here 2180 char *seq_begin; // remember start of esc-sequence here
2231 2181
2232 for (;;) 2182 for (;;)
2233 { 2183 {
2234 if (ch == NOCHAR) 2184 if (expect_false (ch == NOCHAR))
2235 { 2185 {
2236 seq_begin = cmdbuf_ptr; 2186 seq_begin = cmdbuf_ptr;
2237 ch = next_char (); 2187 ch = next_char ();
2238 2188
2239 if (ch == NOCHAR) 2189 if (ch == NOCHAR)
2240 break; 2190 break;
2241 } 2191 }
2242 2192
2243 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2193 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2244 { 2194 {
2245 if (!seen_input) 2195 if (expect_false (!seen_input))
2246 { 2196 {
2247 seen_input = 1; 2197 seen_input = 1;
2248 // many badly-written programs (e.g. jed) contain a race condition: 2198 // many badly-written programs (e.g. jed) contain a race condition:
2249 // they first read the screensize and then install a SIGWINCH handler. 2199 // they first read the screensize and then install a SIGWINCH handler.
2250 // some window managers resize the window early, and these programs 2200 // some window managers resize the window early, and these programs
2263 wchar_t *str = buf; 2213 wchar_t *str = buf;
2264 wchar_t *eol = str + min (ncol, UBUFSIZ); 2214 wchar_t *eol = str + min (ncol, UBUFSIZ);
2265 2215
2266 for (;;) 2216 for (;;)
2267 { 2217 {
2268 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2218 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2269 break; 2219 break;
2270 2220
2271 *str++ = ch; 2221 *str++ = ch;
2272 2222
2273 if (ch == C0_LF || str >= eol) 2223 if (expect_false (ch == C0_LF || str >= eol))
2274 { 2224 {
2275 if (ch == C0_LF) 2225 if (ch == C0_LF)
2276 nlines++; 2226 nlines++;
2277 2227
2278 refresh_count++; 2228 refresh_count++;
2279 2229
2280 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1) 2230 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2281 { 2231 {
2282 refresh_count = 0; 2232 refresh_count = 0;
2283 2233
2284 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.) 2234 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2285 { 2235 {
2286 refreshnow = true; 2236 refreshnow = true;
2287 ch = NOCHAR; 2237 ch = NOCHAR;
2288 break; 2238 break;
2289 } 2239 }
2360rxvt_term::next_char () NOTHROW 2310rxvt_term::next_char () NOTHROW
2361{ 2311{
2362 while (cmdbuf_ptr < cmdbuf_endp) 2312 while (cmdbuf_ptr < cmdbuf_endp)
2363 { 2313 {
2364 // assume 7-bit to be ascii ALWAYS 2314 // assume 7-bit to be ascii ALWAYS
2365 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2315 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2366 return *cmdbuf_ptr++; 2316 return *cmdbuf_ptr++;
2367 2317
2368 wchar_t wc; 2318 wchar_t wc;
2369 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2319 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2370 2320
2374 cmdbuf_ptr = cmdbuf_endp; 2324 cmdbuf_ptr = cmdbuf_endp;
2375 break; 2325 break;
2376 } 2326 }
2377 2327
2378 if (len == (size_t)-1) 2328 if (len == (size_t)-1)
2329 {
2330 mbrtowc (0, 0, 0, mbstate); // reset now undefined conversion state
2379 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2331 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2332 }
2380 2333
2381 // assume wchar == unicode 2334 // assume wchar == unicode
2382 cmdbuf_ptr += len; 2335 cmdbuf_ptr += len;
2383 return wc & UNICODE_MASK; 2336 return wc & UNICODE_MASK;
2384 } 2337 }
2428/*----------------------------------------------------------------------*/ 2381/*----------------------------------------------------------------------*/
2429#ifdef PRINTPIPE 2382#ifdef PRINTPIPE
2430FILE * 2383FILE *
2431rxvt_term::popen_printer () 2384rxvt_term::popen_printer ()
2432{ 2385{
2433 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2386 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2434 2387
2435 if (stream == NULL) 2388 if (stream == NULL)
2436 rxvt_warn ("can't open printer pipe, not printing.\n"); 2389 rxvt_warn ("can't open printer pipe, not printing.\n");
2437 2390
2438 return stream; 2391 return stream;
2449 * simulate attached vt100 printer 2402 * simulate attached vt100 printer
2450 */ 2403 */
2451void 2404void
2452rxvt_term::process_print_pipe () 2405rxvt_term::process_print_pipe ()
2453{ 2406{
2454 int done; 2407 FILE *fd = popen_printer ();
2455 FILE *fd;
2456 2408
2457 if ((fd = popen_printer ()) == NULL) 2409 if (!fd)
2458 return; 2410 return;
2459 2411
2460 /* 2412 /*
2461 * Send all input to the printer until either ESC[4i or ESC[?4i 2413 * Send all input to the printer until either ESC[4i or ESC[?4i
2462 * is received. 2414 * is received.
2463 */ 2415 */
2464 for (done = 0; !done;) 2416 for (int done = 0; !done; )
2465 { 2417 {
2466 unsigned char buf[8]; 2418 unsigned char buf[8];
2467 unicode_t ch; 2419 unicode_t ch;
2468 unsigned int i, len; 2420 unsigned int i, len;
2469 2421
2500 } 2452 }
2501 } 2453 }
2502 2454
2503 pclose_printer (fd); 2455 pclose_printer (fd);
2504} 2456}
2505#endif /* PRINTPIPE */ 2457#endif /* PRINTPIPE */
2506/*}}} */ 2458/*}}} */
2507 2459
2508/* *INDENT-OFF* */ 2460/* *INDENT-OFF* */
2509enum { 2461enum {
2510 C1_40 = 0x40, 2462 C1_40 = 0x40,
2614 break; 2566 break;
2615 case 'Z': /* identify the terminal type */ 2567 case 'Z': /* identify the terminal type */
2616 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2568 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2617 break; 2569 break;
2618 case '<': /* turn off VT52 mode */ 2570 case '<': /* turn off VT52 mode */
2619 PrivMode (0, PrivMode_vt52); 2571 set_privmode (PrivMode_vt52, 0);
2620 break; 2572 break;
2621 case 'F': /* use special graphics character set */ 2573 case 'F': /* use special graphics character set */
2622 case 'G': /* use regular character set */ 2574 case 'G': /* use regular character set */
2623 /* unimplemented */ 2575 /* unimplemented */
2624 break; 2576 break;
2678 scr_forwardindex (); 2630 scr_forwardindex ();
2679 break; 2631 break;
2680#endif 2632#endif
2681 case '=': 2633 case '=':
2682 case '>': 2634 case '>':
2683 PrivMode ((ch == '='), PrivMode_aplKP); 2635 set_privmode (PrivMode_aplKP, ch == '=');
2684 break; 2636 break;
2685 2637
2686 case C1_40: 2638 case C1_40:
2687 cmd_getc (); 2639 cmd_getc ();
2688 break; 2640 break;
2741 2693
2742 /* 8.3.106: RESET TO INITIAL STATE */ 2694 /* 8.3.106: RESET TO INITIAL STATE */
2743 case 'c': 2695 case 'c':
2744 mbstate.reset (); 2696 mbstate.reset ();
2745 scr_poweron (); 2697 scr_poweron ();
2746 scrollbar_show (1); 2698 scrollBar.show (1);
2747 break; 2699 break;
2748 2700
2749 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2701 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2750 case 'n': 2702 case 'n':
2751 scr_charset_choose (2); 2703 scr_charset_choose (2);
2803 nargs = 0; 2755 nargs = 0;
2804 2756
2805 priv = 0; 2757 priv = 0;
2806 ch = cmd_getc (); 2758 ch = cmd_getc ();
2807 if (ch >= '<' && ch <= '?') 2759 if (ch >= '<' && ch <= '?')
2760 {
2808 { /* '<' '=' '>' '?' */ 2761 /* '<' '=' '>' '?' */
2809 priv = ch; 2762 priv = ch;
2810 ch = cmd_getc (); 2763 ch = cmd_getc ();
2811 } 2764 }
2812 2765
2813 /* read any numerical arguments */ 2766 /* read any numerical arguments */
2856 { 2809 {
2857 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt, 2810 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2858 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2811 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2859 // 2812 //
2860 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2813 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2861 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2814 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2862 // that we do not support xterm mouse reporting (should be 95 when we do). 2815 // versions.
2863 // 2816 //
2864 tt_printf ("\033[>%d;94;0c", 'U'); 2817 tt_printf ("\033[>%d;95;0c", 'U');
2865 } 2818 }
2866 break; 2819 break;
2820
2867 case '?': 2821 case '?':
2868 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2822 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2869 process_terminal_mode (ch, priv, nargs, arg); 2823 process_terminal_mode (ch, priv, nargs, arg);
2870 break; 2824 break;
2871 } 2825 }
3318 3272
3319 assert (str != NULL); 3273 assert (str != NULL);
3320 3274
3321 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END))) 3275 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3322 return; 3276 return;
3277 fprintf (stderr, "op %d<%s>\n", op, str);//D
3323 3278
3324 switch (op) 3279 switch (op)
3325 { 3280 {
3326 case XTerm_name: 3281 case XTerm_name:
3327 set_title (str); 3282 set_title (str);
3387 *buf++ = '\0'; 3342 *buf++ = '\0';
3388 3343
3389 process_color_seq (op, color, name, resp); 3344 process_color_seq (op, color, name, resp);
3390 } 3345 }
3391 break; 3346 break;
3347 case Rxvt_restoreFG:
3392 case XTerm_Color00: 3348 case XTerm_Color00:
3393 process_color_seq (op, Color_fg, str, resp); 3349 process_color_seq (op, Color_fg, str, resp);
3394 break; 3350 break;
3351 case Rxvt_restoreBG:
3395 case XTerm_Color01: 3352 case XTerm_Color01:
3396 process_color_seq (op, Color_bg, str, resp); 3353 process_color_seq (op, Color_bg, str, resp);
3397 break; 3354 break;
3398#ifndef NO_CURSORCOLOR 3355#ifndef NO_CURSORCOLOR
3399 case XTerm_Color_cursor: 3356 case XTerm_Color_cursor:
3425#if ENABLE_TRANSPARENCY 3382#if ENABLE_TRANSPARENCY
3426 case URxvt_Color_tint: 3383 case URxvt_Color_tint:
3427 process_color_seq (op, Color_tint, str, resp); 3384 process_color_seq (op, Color_tint, str, resp);
3428 { 3385 {
3429 bool changed = false; 3386 bool changed = false;
3387
3430 if (ISSET_PIXCOLOR (Color_tint)) 3388 if (ISSET_PIXCOLOR (Color_tint))
3431 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3389 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3432 else 3390 else
3433 changed = bgPixmap.unset_tint (); 3391 changed = bgPixmap.unset_tint ();
3392
3434 if (changed) 3393 if (changed)
3435 update_background (); 3394 update_background ();
3436 } 3395 }
3437 3396
3438 break; 3397 break;
3439#endif 3398#endif
3440 3399
3441#if XPM_BACKGROUND 3400#if BG_IMAGE_FROM_FILE
3442 case Rxvt_Pixmap: 3401 case Rxvt_Pixmap:
3443 if (!strcmp (str, "?")) 3402 if (!strcmp (str, "?"))
3444 { 3403 {
3445 char str[256]; 3404 char str[256];
3446 3405
3461 changed++; 3420 changed++;
3462 str = strchr (str, ';'); 3421 str = strchr (str, ';');
3463 if (str == NULL) 3422 if (str == NULL)
3464 bgPixmap.set_defaultGeometry (); 3423 bgPixmap.set_defaultGeometry ();
3465 } 3424 }
3425
3466 while (str) 3426 while (str)
3467 { 3427 {
3468 str++; 3428 str++;
3469 if (bgPixmap.set_geometry (str)) 3429 if (bgPixmap.set_geometry (str))
3470 changed++; 3430 changed++;
3471 str = strchr (str, ';'); 3431 str = strchr (str, ';');
3472 } 3432 }
3433
3473 if (changed) 3434 if (changed)
3474 update_background (); 3435 update_background ();
3475 } 3436 }
3476 break; 3437 break;
3477#endif 3438#endif
3478
3479 case Rxvt_restoreFG:
3480 set_window_color (Color_fg, str);
3481 break;
3482 case Rxvt_restoreBG:
3483 set_window_color (Color_bg, str);
3484 break;
3485 3439
3486 case XTerm_logfile: 3440 case XTerm_logfile:
3487 // TODO, when secure mode? 3441 // TODO, when secure mode?
3488 break; 3442 break;
3489 3443
3556 break; 3510 break;
3557#endif 3511#endif
3558 3512
3559#if ENABLE_PERL 3513#if ENABLE_PERL
3560 case URxvt_perl: 3514 case URxvt_perl:
3561 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3515 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3562 ; // no responses yet
3563 break; 3516 break;
3564#endif 3517#endif
3565 } 3518 }
3566} 3519}
3567/*----------------------------------------------------------------------*/ 3520/*----------------------------------------------------------------------*/
3590 { 3543 {
3591 if (mode == 'r') 3544 if (mode == 'r')
3592 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3545 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3593 else 3546 else
3594 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3547 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3595 PrivMode (state, bit); 3548 set_privmode (bit, state);
3596 } 3549 }
3597 3550
3598 return state; 3551 return state;
3599} 3552}
3600 3553
3633 { 66, PrivMode_aplKP }, 3586 { 66, PrivMode_aplKP },
3634#ifndef NO_BACKSPACE_KEY 3587#ifndef NO_BACKSPACE_KEY
3635 { 67, PrivMode_BackSpace }, 3588 { 67, PrivMode_BackSpace },
3636#endif 3589#endif
3637 { 1000, PrivMode_MouseX11 }, 3590 { 1000, PrivMode_MouseX11 },
3638 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3591 { 1002, PrivMode_MouseBtnEvent },
3639 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3592 { 1003, PrivMode_MouseAnyEvent },
3640 // 1003 Use All Motion Mouse Tracking. NYI, TODO
3641 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3593 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3642 { 1011, PrivMode_Keypress }, // rxvt extension 3594 { 1011, PrivMode_Keypress }, // rxvt extension
3643 // 1035 enable modifiers for alt, numlock NYI 3595 // 1035 enable modifiers for alt, numlock NYI
3644 // 1036 send ESC for meta keys NYI 3596 // 1036 send ESC for meta keys NYI
3645 // 1037 send DEL for keypad delete NYI 3597 // 1037 send DEL for keypad delete NYI
3646 { 1047, PrivMode_Screen }, 3598 { 1047, PrivMode_Screen },
3647 // 1048 save and restore cursor 3599 // 1048 save and restore cursor
3648 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3600 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3649 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3601 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3602 { 2004, PrivMode_BracketPaste },
3650 }; 3603 };
3651 3604
3652 if (nargs == 0) 3605 if (nargs == 0)
3653 return; 3606 return;
3654 3607
3698 case 2: /* VT52 mode */ 3651 case 2: /* VT52 mode */
3699 /* oddball mode. should be set regardless of set/reset 3652 /* oddball mode. should be set regardless of set/reset
3700 * parameter. Return from VT52 mode with an ESC < from 3653 * parameter. Return from VT52 mode with an ESC < from
3701 * within VT52 mode 3654 * within VT52 mode
3702 */ 3655 */
3703 PrivMode (1, PrivMode_vt52); 3656 set_privmode (PrivMode_vt52, 1);
3704 break; 3657 break;
3705 case 3: /* 80/132 */ 3658 case 3: /* 80/132 */
3706 if (priv_modes & PrivMode_132OK) 3659 if (priv_modes & PrivMode_132OK)
3660 {
3661 scr_poweron ();
3707 set_widthheight (((state ? 132 : 80) * fwidth), height); 3662 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight);
3663 }
3708 break; 3664 break;
3709 case 4: /* smooth scrolling */ 3665 case 4: /* smooth scrolling */
3710 set_option (Opt_jumpScroll, !state); 3666 set_option (Opt_jumpScroll, !state);
3711 break; 3667 break;
3712 case 5: /* reverse video */ 3668 case 5: /* reverse video */
3719 scr_autowrap (state); 3675 scr_autowrap (state);
3720 break; 3676 break;
3721 /* case 8: - auto repeat, can't do on a per window basis */ 3677 /* case 8: - auto repeat, can't do on a per window basis */
3722 case 9: /* X10 mouse reporting */ 3678 case 9: /* X10 mouse reporting */
3723 if (state) /* orthogonal */ 3679 if (state) /* orthogonal */
3724 priv_modes &= ~PrivMode_MouseX11; 3680 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3725 break; 3681 break;
3726#ifdef scrollBar_esc 3682#ifdef scrollBar_esc
3727 case scrollBar_esc: 3683 case scrollBar_esc:
3728 if (scrollbar_mapping (state)) 3684 if (scrollBar.map (state))
3729 { 3685 {
3730 resize_all_windows (0, 0, 0); 3686 resize_all_windows (0, 0, 0);
3731 scr_touch (true); 3687 scr_touch (true);
3732 } 3688 }
3733 break; 3689 break;
3742 break; 3698 break;
3743 /* case 66: - application key pad */ 3699 /* case 66: - application key pad */
3744 /* case 67: - backspace key */ 3700 /* case 67: - backspace key */
3745 case 1000: /* X11 mouse reporting */ 3701 case 1000: /* X11 mouse reporting */
3746 if (state) /* orthogonal */ 3702 if (state) /* orthogonal */
3747 priv_modes &= ~PrivMode_MouseX10; 3703 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3748 break; 3704 break;
3749#if 0
3750 case 1001: 3705 case 1002:
3751 break; /* X11 mouse highlighting */ 3706 case 1003:
3752#endif 3707 if (state)
3708 {
3709 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3710 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3711 vt_emask_mouse = PointerMotionMask;
3712 }
3713 else
3714 vt_emask_mouse = NoEventMask;
3715 vt_select_input ();
3716 break;
3753 case 1010: /* scroll to bottom on TTY output inhibit */ 3717 case 1010: /* scroll to bottom on TTY output inhibit */
3754 set_option (Opt_scrollTtyOutput, !state); 3718 set_option (Opt_scrollTtyOutput, !state);
3755 break; 3719 break;
3756 case 1011: /* scroll to bottom on key press */ 3720 case 1011: /* scroll to bottom on key press */
3757 set_option (Opt_scrollTtyKeypress, state); 3721 set_option (Opt_scrollTtyKeypress, state);
3934rxvt_term::process_graphics () 3898rxvt_term::process_graphics ()
3935{ 3899{
3936 unicode_t ch, cmd = cmd_getc (); 3900 unicode_t ch, cmd = cmd_getc ();
3937 3901
3938 if (cmd == 'Q') 3902 if (cmd == 'Q')
3903 {
3939 { /* query graphics */ 3904 /* query graphics */
3940 tt_printf ("\033G0\012"); /* no graphics */ 3905 tt_printf ("\033G0\012"); /* no graphics */
3941 return; 3906 return;
3942 } 3907 }
3943 /* swallow other graphics sequences until terminating ':' */ 3908 /* swallow other graphics sequences until terminating ':' */
3944 do 3909 do
3994 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 3959 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
3995 3960
3996 memcpy (v_buffer + v_buflen, data, len); 3961 memcpy (v_buffer + v_buflen, data, len);
3997 v_buflen += len; 3962 v_buflen += len;
3998 3963
3999 pty_ev.set (EVENT_READ | EVENT_WRITE); 3964 pty_ev.set (ev::READ | ev::WRITE);
4000} 3965}
4001 3966
4002void rxvt_term::pty_write () 3967void rxvt_term::pty_write ()
4003{ 3968{
4004 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 3969 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4009 3974
4010 if (v_buflen == 0) 3975 if (v_buflen == 0)
4011 { 3976 {
4012 free (v_buffer); 3977 free (v_buffer);
4013 v_buffer = 0; 3978 v_buffer = 0;
4014 v_buflen = 0;
4015 3979
4016 pty_ev.set (EVENT_READ); 3980 pty_ev.set (ev::READ);
4017 return; 3981 return;
4018 } 3982 }
4019 3983
4020 memmove (v_buffer, v_buffer + written, v_buflen); 3984 memmove (v_buffer, v_buffer + written, v_buflen);
4021 } 3985 }
4022 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 3986 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4023 pty_ev.set (EVENT_READ); 3987 pty_ev.set (ev::READ);
4024} 3988}
4025 3989
4026/*----------------------- end-of-file (C source) -----------------------*/ 3990/*----------------------- end-of-file (C source) -----------------------*/
4027 3991

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines