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.358 by sasha, Tue Sep 18 22:27:41 2007 UTC vs.
Revision 1.421 by root, Wed Oct 15 17:16:47 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
1034 965
1035void 966void
1036rxvt_term::flush () 967rxvt_term::flush ()
1037{ 968{
1038 flush_ev.stop (); 969 flush_ev.stop ();
1039 970
1040#ifdef HAVE_BG_PIXMAP 971#ifdef HAVE_BG_PIXMAP
1041 if (bgPixmap.check_clearChanged ()) 972 if (bgPixmap.check_clearChanged ())
1042 { 973 {
1043// scr_clear (true); This needs to be researched further! 974// scr_clear (true); This needs to be researched further!
1044 scr_touch (false); 975 scr_touch (false);
1045 } 976 }
1084 } 1015 }
1085 while (row < end_row); 1016 while (row < end_row);
1086 } 1017 }
1087 1018
1088 scr_refresh (); 1019 scr_refresh ();
1089 scrollbar_show (1); 1020 scrollBar.show (1);
1090#ifdef USE_XIM 1021#ifdef USE_XIM
1091 IMSendSpot (); 1022 IMSendSpot ();
1092#endif 1023#endif
1093 } 1024 }
1094 1025
1095 display->flush (); 1026 display->flush ();
1096} 1027}
1097 1028
1029/* checks wether a refresh is requested and starts the refresh timer */
1098void 1030void
1099rxvt_term::check_cb (check_watcher &w) 1031rxvt_term::refresh_check ()
1100{ 1032{
1101 make_current (); 1033 if (want_refresh && !flush_ev.is_active ())
1034 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1102 1035
1103 display->flush (); 1036 display->flush ();
1104
1105 if (want_refresh && !flush_ev.active)
1106 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1107} 1037}
1108 1038
1109void 1039void
1110rxvt_term::flush_cb (time_watcher &w) 1040rxvt_term::flush_cb (ev::timer &w, int revents)
1111{ 1041{
1112 make_current (); 1042 make_current ();
1113 1043
1114 refresh_count = 0; 1044 refresh_count = 0;
1115 flush (); 1045 flush ();
1116} 1046}
1117 1047
1118#ifdef CURSOR_BLINK 1048#ifdef CURSOR_BLINK
1119void 1049void
1120rxvt_term::cursor_blink_cb (time_watcher &w) 1050rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1121{ 1051{
1122 hidden_cursor = !hidden_cursor; 1052 hidden_cursor = !hidden_cursor;
1123 want_refresh = 1; 1053 want_refresh = 1;
1124 1054 refresh_check ();
1125 w.start (w.at + CURSOR_BLINK_INTERVAL);
1126} 1055}
1127#endif 1056#endif
1128 1057
1129#ifdef TEXT_BLINK 1058#ifdef TEXT_BLINK
1130void 1059void
1131rxvt_term::text_blink_cb (time_watcher &w) 1060rxvt_term::text_blink_cb (ev::timer &w, int revents)
1132{ 1061{
1133 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1062 if (scr_refresh_rend (RS_Blink, RS_Blink))
1134 { 1063 {
1135 hidden_text = !hidden_text; 1064 hidden_text = !hidden_text;
1136 want_refresh = 1; 1065 want_refresh = 1;
1137 w.start (w.at + TEXT_BLINK_INTERVAL); 1066 refresh_check ();
1138 } 1067 }
1068 else
1069 w.stop ();
1139} 1070}
1140#endif 1071#endif
1141 1072
1142#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1073#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1143void 1074void
1144rxvt_term::cont_scroll_cb (time_watcher &w) 1075rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1145{ 1076{
1146 if ((scrollbar_isUp() || scrollbar_isDn()) && 1077 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1147 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1078 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1148 { 1079 {
1149 want_refresh = 1; 1080 want_refresh = 1;
1150 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1081 refresh_check ();
1151 } 1082 }
1083 else
1084 w.stop ();
1152} 1085}
1153#endif 1086#endif
1154 1087
1155#ifdef SELECTION_SCROLLING 1088#ifdef SELECTION_SCROLLING
1156void 1089void
1157rxvt_term::sel_scroll_cb (time_watcher &w) 1090rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1158{ 1091{
1159 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1092 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1160 { 1093 {
1161 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1094 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1162 want_refresh = 1; 1095 want_refresh = 1;
1163 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1096 refresh_check ();
1164 } 1097 }
1098 else
1099 w.stop ();
1165} 1100}
1166#endif 1101#endif
1167 1102
1168#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1103#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1169void 1104void
1170rxvt_term::slip_wheel_cb (time_watcher &w) 1105rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1171{ 1106{
1172 if (mouse_slip_wheel_speed == 0 1107 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1173 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1174 : scr_page (UP, mouse_slip_wheel_speed))
1175 { 1108 {
1176 if (view_start == top_row || view_start == 0)
1177 mouse_slip_wheel_speed = 0;
1178
1179 want_refresh = 1; 1109 want_refresh = 1;
1180 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 ();
1181 } 1117 }
1182} 1118}
1183#endif 1119#endif
1184 1120
1185#if LINUX_YIELD_HACK 1121#if LINUX_YIELD_HACK
1186static struct event_handler 1122static struct event_handler
1187{ 1123{
1188 check_watcher yield_ev; 1124 ev::prepare yield_ev;
1189 1125
1190 void yield_cb (check_watcher &w) 1126 void yield_cb (ev::prepare &w, int revents)
1191 { 1127 {
1192 // this should really be sched_yield(), but the linux guys thought 1128 // this should really be sched_yield(), but the linux guys thought
1193 // that giving a process calling sched_yield () less cpu time than 1129 // that giving a process calling sched_yield () less cpu time than
1194 // 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
1195 // allowed by the sus... as is returning ENOSYS. 1131 // allowed by the sus... as is returning ENOSYS.
1132 // since the linux guys additionally thought that breaking the only
1133 // known workaroudn against their unusable sched_yield hack is cool,
1134 // we just nanosleep a bit and hope for the best.
1196 1135
1197 struct timespec ts = { 0, 0 }; 1136 struct timespec ts = { 0, 1000 };
1198 nanosleep (&ts, 0); 1137 nanosleep (&ts, 0);
1199 1138
1200 w.stop (); 1139 w.stop ();
1201 } 1140 }
1202 1141
1246 1185
1247 return false; 1186 return false;
1248} 1187}
1249 1188
1250void 1189void
1251rxvt_term::pty_cb (io_watcher &w, short revents) 1190rxvt_term::pty_cb (ev::io &w, int revents)
1252{ 1191{
1253 make_current (); 1192 make_current ();
1254 1193
1255 if (revents & EVENT_READ) 1194 if (revents & ev::READ)
1256 // loop, but don't allow a single term to monopolize us 1195 // loop, but don't allow a single term to monopolize us
1257 while (pty_fill ()) 1196 while (pty_fill ())
1258 if (cmd_parse ()) 1197 if (cmd_parse ())
1259 break; 1198 break;
1260 1199
1261 if (revents & EVENT_WRITE) 1200 if (revents & ev::WRITE)
1262 pty_write (); 1201 pty_write ();
1202
1203 refresh_check ();
1263} 1204}
1264 1205
1265void 1206void
1266rxvt_term::pointer_unblank () 1207rxvt_term::pointer_unblank ()
1267{ 1208{
1270 1211
1271#ifdef POINTER_BLANK 1212#ifdef POINTER_BLANK
1272 hidden_pointer = 0; 1213 hidden_pointer = 0;
1273 1214
1274 if (option (Opt_pointerBlank)) 1215 if (option (Opt_pointerBlank))
1275 pointer_ev.start (NOW + pointerBlankDelay); 1216 pointer_ev.start (pointerBlankDelay);
1276#endif 1217#endif
1277} 1218}
1278 1219
1279#ifdef POINTER_BLANK 1220#ifdef POINTER_BLANK
1280void 1221void
1288 1229
1289 hidden_pointer = 1; 1230 hidden_pointer = 1;
1290} 1231}
1291 1232
1292void 1233void
1293rxvt_term::pointer_cb (time_watcher &w) 1234rxvt_term::pointer_cb (ev::timer &w, int revents)
1294{ 1235{
1295 make_current (); 1236 make_current ();
1296 1237
1297 pointer_blank (); 1238 pointer_blank ();
1298} 1239}
1301void 1242void
1302rxvt_term::mouse_report (XButtonEvent &ev) 1243rxvt_term::mouse_report (XButtonEvent &ev)
1303{ 1244{
1304 int button_number, key_state = 0; 1245 int button_number, key_state = 0;
1305 int x, y; 1246 int x, y;
1247 int code = 32;
1306 1248
1307 x = ev.x; 1249 x = Pixel2Col (ev.x);
1308 y = ev.y; 1250 y = Pixel2Row (ev.y);
1309 pixel_position (&x, &y); 1251 if (ev.type == MotionNotify)
1252 {
1253 if (x == mouse_row && y == mouse_col)
1254 return;
1255 mouse_row = x;
1256 mouse_col = y;
1257 code += 32;
1258 }
1310 1259
1311 if (MEvent.button == AnyButton) 1260 if (MEvent.button == AnyButton)
1312 button_number = 3; 1261 button_number = 3;
1313 else 1262 else
1314 { 1263 {
1360 x + 1, 1309 x + 1,
1361 y + 1); 1310 y + 1);
1362#endif 1311#endif
1363 1312
1364 tt_printf ("\033[M%c%c%c", 1313 tt_printf ("\033[M%c%c%c",
1365 (32 + button_number + key_state), 1314 (code + button_number + key_state),
1366 (32 + x + 1), 1315 (32 + x + 1),
1367 (32 + y + 1)); 1316 (32 + y + 1));
1368} 1317}
1369 1318
1370/*{{{ process an X event */ 1319/*{{{ process an X event */
1474 && ev.xfocus.mode != NotifyGrab) 1423 && ev.xfocus.mode != NotifyGrab)
1475 focus_out (); 1424 focus_out ();
1476 break; 1425 break;
1477 1426
1478 case ConfigureNotify: 1427 case ConfigureNotify:
1479 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n", 1428 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1480 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y, 1429 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1481 szHint.width, szHint.height); */ 1430 szHint.width, szHint.height);*/
1482 if (ev.xconfigure.window == parent[0]) 1431 if (ev.xconfigure.window == parent[0])
1483 { 1432 {
1484 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1433 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1485 ; 1434 ;
1486 1435
1491 } 1440 }
1492 else 1441 else
1493 { 1442 {
1494#ifdef HAVE_BG_PIXMAP 1443#ifdef HAVE_BG_PIXMAP
1495 if (bgPixmap.window_position_sensitive ()) 1444 if (bgPixmap.window_position_sensitive ())
1445 {
1446 if (mapped)
1496 update_background (); 1447 update_background ();
1448 else
1449 bgPixmap.invalidate ();
1450 }
1497#endif 1451#endif
1498 } 1452 }
1453
1499 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1454 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1500 } 1455 }
1501 break; 1456 break;
1502 1457
1503 case PropertyNotify: 1458 case PropertyNotify:
1520 case SelectionRequest: 1475 case SelectionRequest:
1521 selection_send (ev.xselectionrequest); 1476 selection_send (ev.xselectionrequest);
1522 break; 1477 break;
1523 1478
1524 case MapNotify: 1479 case MapNotify:
1480#ifdef HAVE_BG_PIXMAP
1481 /* This is needed spcifically to fix the case of no window manager or a
1482 * non-reparenting window manager. In those cases we never get first
1483 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1484 * care of multiplicity of ConfigureNotify events arriwing while WM does
1485 * reparenting.
1486 * We should not render background immidiately, as there could be several
1487 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1488 * by scheduling background redraw as soon as we can, but giving a short
1489 * bit of time for ConfigureNotifies to arrive.
1490 * We should render background PRIOR to drawing any text, but AFTER all
1491 * of ConfigureNotifys for the best results.
1492 */
1493 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1494 update_background_ev.start (0.025);
1495#endif
1525 mapped = 1; 1496 mapped = 1;
1526#ifdef TEXT_BLINK 1497#ifdef TEXT_BLINK
1527 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1498 text_blink_ev.start ();
1528#endif 1499#endif
1529 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1500 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1530 break; 1501 break;
1531 1502
1532 case UnmapNotify: 1503 case UnmapNotify:
1553 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1524 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1554 { 1525 {
1555 scr_expose (ev.xexpose.x, ev.xexpose.y, 1526 scr_expose (ev.xexpose.x, ev.xexpose.y,
1556 ev.xexpose.width, ev.xexpose.height, False); 1527 ev.xexpose.width, ev.xexpose.height, False);
1557 } 1528 }
1529
1558 want_refresh = 1; 1530 want_refresh = 1;
1559 } 1531 }
1560 else 1532 else
1561 { 1533 {
1562 XEvent unused_event; 1534 XEvent unused_event;
1564 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1536 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1565 ; 1537 ;
1566 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1538 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1567 ; 1539 ;
1568 1540
1569 if (isScrollbarWindow (ev.xany.window)) 1541 if (scrollBar.state && ev.xany.window == scrollBar.win)
1570 { 1542 {
1571 scrollBar.setIdle (); 1543 scrollBar.state = STATE_IDLE;
1572 scrollbar_show (0); 1544 scrollBar.show (0);
1573 } 1545 }
1574 } 1546 }
1575 break; 1547 break;
1576 1548
1577 case MotionNotify: 1549 case MotionNotify:
1578#ifdef POINTER_BLANK 1550#ifdef POINTER_BLANK
1579 if (hidden_pointer) 1551 if (hidden_pointer)
1580 pointer_unblank (); 1552 pointer_unblank ();
1581#endif 1553#endif
1554 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1555 || priv_modes & PrivMode_MouseAnyEvent)
1556 mouse_report (ev.xbutton);
1582 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1557 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1583 break; 1558 break;
1584 1559
1585 if (ev.xany.window == vt) 1560 if (ev.xany.window == vt)
1586 { 1561 {
1620 int dist; 1595 int dist;
1621 1596
1622 /* don't clobber the current delay if we are 1597 /* don't clobber the current delay if we are
1623 * already in the middle of scrolling. 1598 * already in the middle of scrolling.
1624 */ 1599 */
1625 if (!sel_scroll_ev.active) 1600 if (!sel_scroll_ev.is_active ())
1626 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1601 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1627 1602
1628 /* save the event params so we can highlight 1603 /* save the event params so we can highlight
1629 * the selection in the pending-scroll loop 1604 * the selection in the pending-scroll loop
1630 */ 1605 */
1631 selection_save_x = ev.xbutton.x; 1606 selection_save_x = ev.xbutton.x;
1653 else 1628 else
1654 { 1629 {
1655 /* we are within the text window, so we 1630 /* we are within the text window, so we
1656 * shouldn't be scrolling 1631 * shouldn't be scrolling
1657 */ 1632 */
1658 if (sel_scroll_ev.active)
1659 sel_scroll_ev.stop(); 1633 sel_scroll_ev.stop();
1660 } 1634 }
1661#endif 1635#endif
1662#ifdef MOUSE_THRESHOLD 1636#ifdef MOUSE_THRESHOLD
1663 } 1637 }
1664#endif 1638#endif
1665 } 1639 }
1666 } 1640 }
1667 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1641 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1668 { 1642 {
1669 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1643 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1670 MotionNotify, &ev)) 1644 MotionNotify, &ev))
1671 ; 1645 ;
1672 1646
1674 &unused_root, &unused_child, 1648 &unused_root, &unused_child,
1675 &unused_root_x, &unused_root_y, 1649 &unused_root_x, &unused_root_y,
1676 &ev.xbutton.x, &ev.xbutton.y, 1650 &ev.xbutton.x, &ev.xbutton.y,
1677 &unused_mask); 1651 &unused_mask);
1678 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1652 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1679 scrollbar_size ()); 1653 scrollBar.size ());
1680 want_refresh = 1; 1654 want_refresh = 1;
1681 scrollbar_show (1); 1655 scrollBar.show (1);
1682 } 1656 }
1683 break; 1657 break;
1684 } 1658 }
1685 1659
1686#if defined(CURSOR_BLINK) 1660#if defined(CURSOR_BLINK)
1690 { 1664 {
1691 hidden_cursor = 0; 1665 hidden_cursor = 0;
1692 want_refresh = 1; 1666 want_refresh = 1;
1693 } 1667 }
1694 1668
1695 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1669 cursor_blink_ev.again ();
1696 } 1670 }
1697#endif 1671#endif
1698 1672
1699#if defined(POINTER_BLANK) 1673#if defined(POINTER_BLANK)
1700 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1674 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1707 1681
1708 if (ev.type == KeyPress && hidden_pointer == 0) 1682 if (ev.type == KeyPress && hidden_pointer == 0)
1709 pointer_blank (); 1683 pointer_blank ();
1710 } 1684 }
1711#endif 1685#endif
1686
1687 refresh_check ();
1688}
1689
1690void
1691rxvt_term::set_urgency (bool enable)
1692{
1693 if (enable == urgency_hint)
1694 return;
1695
1696 if (XWMHints *h = XGetWMHints (dpy, parent[0]))
1697 {
1698 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1699 XSetWMHints (dpy, parent[0], h);
1700 urgency_hint = enable;
1701 }
1712} 1702}
1713 1703
1714void 1704void
1715rxvt_term::focus_in () 1705rxvt_term::focus_in ()
1716{ 1706{
1717 if (!focus) 1707 if (!focus)
1718 { 1708 {
1719 focus = 1; 1709 focus = 1;
1720 want_refresh = 1; 1710 want_refresh = 1;
1721 1711
1722 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1723
1724#if USE_XIM 1712#if USE_XIM
1725 if (Input_Context != NULL) 1713 if (Input_Context != NULL)
1726 { 1714 {
1727 IMSetPosition (); 1715 IMSetPosition ();
1728 XSetICFocus (Input_Context); 1716 XSetICFocus (Input_Context);
1729 } 1717 }
1730#endif 1718#endif
1731#if CURSOR_BLINK 1719#if CURSOR_BLINK
1732 if (option (Opt_cursorBlink)) 1720 if (option (Opt_cursorBlink))
1733 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1721 cursor_blink_ev.again ();
1734#endif 1722#endif
1735#if OFF_FOCUS_FADING 1723#if OFF_FOCUS_FADING
1736 if (rs[Rs_fade]) 1724 if (rs[Rs_fade])
1737 { 1725 {
1738 pix_colors = pix_colors_focused; 1726 pix_colors = pix_colors_focused;
1739 scr_recolour (); 1727 scr_recolour ();
1740 } 1728 }
1741#endif 1729#endif
1742#if ENABLE_FRILLS 1730#if ENABLE_FRILLS
1743 if (option (Opt_urgentOnBell)) 1731 if (option (Opt_urgentOnBell))
1744 { 1732 set_urgency (0);
1745 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1746 {
1747 h->flags &= ~XUrgencyHint;
1748 XSetWMHints (dpy, parent[0], h);
1749 }
1750 }
1751#endif 1733#endif
1734
1735 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1752 } 1736 }
1753} 1737}
1754 1738
1755void 1739void
1756rxvt_term::focus_out () 1740rxvt_term::focus_out ()
1758 if (focus) 1742 if (focus)
1759 { 1743 {
1760 focus = 0; 1744 focus = 0;
1761 want_refresh = 1; 1745 want_refresh = 1;
1762 1746
1763 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1747#if ENABLE_FRILLS
1764 1748 if (option (Opt_urgentOnBell))
1749 set_urgency (0);
1750#endif
1765#if ENABLE_FRILLS || ISO_14755 1751#if ENABLE_FRILLS || ISO_14755
1766 if (iso14755buf) 1752 if (iso14755buf)
1767 { 1753 {
1768 iso14755buf = 0; 1754 iso14755buf = 0;
1769# if ISO_14755 1755# if ISO_14755
1776 XUnsetICFocus (Input_Context); 1762 XUnsetICFocus (Input_Context);
1777#endif 1763#endif
1778#if CURSOR_BLINK 1764#if CURSOR_BLINK
1779 if (option (Opt_cursorBlink)) 1765 if (option (Opt_cursorBlink))
1780 cursor_blink_ev.stop (); 1766 cursor_blink_ev.stop ();
1767
1781 hidden_cursor = 0; 1768 hidden_cursor = 0;
1782#endif 1769#endif
1783#if OFF_FOCUS_FADING 1770#if OFF_FOCUS_FADING
1784 if (rs[Rs_fade]) 1771 if (rs[Rs_fade])
1785 { 1772 {
1786 pix_colors = pix_colors_unfocused; 1773 pix_colors = pix_colors_unfocused;
1787 scr_recolour (); 1774 scr_recolour ();
1788 } 1775 }
1789#endif 1776#endif
1777
1778 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1790 } 1779 }
1791} 1780}
1792 1781
1793void 1782void
1794rxvt_term::update_fade_color (unsigned int idx) 1783rxvt_term::update_fade_color (unsigned int idx)
1825 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1814 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1826 { 1815 {
1827 bgPixmap.set_root_pixmap (); 1816 bgPixmap.set_root_pixmap ();
1828 update_background (); 1817 update_background ();
1829 } 1818 }
1819
1830 break; 1820 break;
1831 } 1821 }
1832# endif 1822# endif
1823
1824 refresh_check ();
1833} 1825}
1834#endif 1826#endif
1835 1827
1836void 1828void
1837rxvt_term::button_press (XButtonEvent &ev) 1829rxvt_term::button_press (XButtonEvent &ev)
1892 mouse_report (ev); 1884 mouse_report (ev);
1893 } 1885 }
1894#else 1886#else
1895 MEvent.button = ev.button; 1887 MEvent.button = ev.button;
1896 mouse_report (ev); 1888 mouse_report (ev);
1897#endif /* MOUSE_REPORT_DOUBLECLICK */ 1889#endif /* MOUSE_REPORT_DOUBLECLICK */
1898 1890
1899 } 1891 }
1900 else 1892 else
1901 { 1893 {
1902 if (ev.button != MEvent.button) 1894 if (ev.button != MEvent.button)
1950 } 1942 }
1951 1943
1952 /* 1944 /*
1953 * Scrollbar window processing of button press 1945 * Scrollbar window processing of button press
1954 */ 1946 */
1955 if (isScrollbarWindow (ev.window)) 1947 if (scrollBar.state && ev.window == scrollBar.win)
1956 { 1948 {
1957 scrollBar.setIdle (); 1949 page_dirn direction = NO_DIR;
1950
1951 if (scrollBar.upButton (ev.y))
1952 direction = UP; /* up */
1953 else if (scrollBar.dnButton (ev.y))
1954 direction = DN; /* down */
1955
1956 scrollBar.state = STATE_IDLE;
1958 /* 1957 /*
1959 * Rxvt-style scrollbar: 1958 * Rxvt-style scrollbar:
1960 * move up if mouse is above slider 1959 * move up if mouse is above slider
1961 * move dn if mouse is below slider 1960 * move dn if mouse is below slider
1962 * 1961 *
1971 /* 1970 /*
1972 * Mouse report disabled scrollbar: 1971 * Mouse report disabled scrollbar:
1973 * arrow buttons - send up/down 1972 * arrow buttons - send up/down
1974 * click on scrollbar - send pageup/down 1973 * click on scrollbar - send pageup/down
1975 */ 1974 */
1976 if ((scrollBar.style == R_SB_NEXT 1975 if (direction == UP)
1977 && scrollbarnext_upButton (ev.y))
1978 || (scrollBar.style == R_SB_RXVT
1979 && scrollbarrxvt_upButton (ev.y)))
1980 tt_printf ("\033[A"); 1976 tt_printf ("\033[A");
1981 else if ((scrollBar.style == R_SB_NEXT 1977 else if (direction == DN)
1982 && scrollbarnext_dnButton (ev.y))
1983 || (scrollBar.style == R_SB_RXVT
1984 && scrollbarrxvt_dnButton (ev.y)))
1985 tt_printf ("\033[B"); 1978 tt_printf ("\033[B");
1986 else 1979 else
1987 switch (ev.button) 1980 switch (ev.button)
1988 { 1981 {
1989 case Button2: 1982 case Button2:
1996 tt_printf ("\033[5~"); 1989 tt_printf ("\033[5~");
1997 break; 1990 break;
1998 } 1991 }
1999 } 1992 }
2000 else 1993 else
2001#endif /* NO_SCROLLBAR_REPORT */ 1994#endif /* NO_SCROLLBAR_REPORT */
2002
2003 {
2004 char upordown = 0;
2005
2006 if (scrollBar.style == R_SB_NEXT)
2007 { 1995 {
2008 if (scrollbarnext_upButton (ev.y)) 1996 if (direction != NO_DIR)
2009 upordown = -1; /* up */
2010 else if (scrollbarnext_dnButton (ev.y))
2011 upordown = 1; /* down */
2012 }
2013 else if (scrollBar.style == R_SB_RXVT)
2014 {
2015 if (scrollbarrxvt_upButton (ev.y))
2016 upordown = -1; /* up */
2017 else if (scrollbarrxvt_dnButton (ev.y))
2018 upordown = 1; /* down */
2019 }
2020 if (upordown)
2021 { 1997 {
2022#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1998#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1999 if (!cont_scroll_ev.is_active ())
2023 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2000 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2024#endif 2001#endif
2025 if (scr_page (upordown < 0 ? UP : DN, 1)) 2002 if (scr_page (direction, 1))
2026 { 2003 {
2027 if (upordown < 0) 2004 if (direction == UP)
2028 scrollBar.setUp (); 2005 scrollBar.state = STATE_UP;
2029 else 2006 else
2030 scrollBar.setDn (); 2007 scrollBar.state = STATE_DOWN;
2031 } 2008 }
2032 } 2009 }
2033 else 2010 else
2034 switch (ev.button) 2011 switch (ev.button)
2035 { 2012 {
2036 case Button2: 2013 case Button2:
2037 switch (scrollbar_align) 2014 switch (scrollBar.align)
2038 { 2015 {
2039 case R_SB_ALIGN_TOP: 2016 case R_SB_ALIGN_TOP:
2040 csrO = 0; 2017 csrO = 0;
2041 break; 2018 break;
2042 case R_SB_ALIGN_CENTRE: 2019 case R_SB_ALIGN_CENTRE:
2048 } 2025 }
2049 2026
2050 if (scrollBar.style == R_SB_XTERM 2027 if (scrollBar.style == R_SB_XTERM
2051 || scrollbar_above_slider (ev.y) 2028 || scrollbar_above_slider (ev.y)
2052 || scrollbar_below_slider (ev.y)) 2029 || scrollbar_below_slider (ev.y))
2053 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2030 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2054 2031
2055 scrollBar.setMotion (); 2032 scrollBar.state = STATE_MOTION;
2056 break; 2033 break;
2057 2034
2058 case Button1: 2035 case Button1:
2059 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2036 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2060 csrO = ev.y - scrollBar.top; 2037 csrO = ev.y - scrollBar.top;
2061 /* FALLTHROUGH */ 2038 /* FALLTHROUGH */
2062 2039
2063 case Button3: 2040 case Button3:
2064 if (scrollBar.style != R_SB_XTERM) 2041 if (scrollBar.style != R_SB_XTERM)
2074 scr_page (DN, nrow - 1); 2051 scr_page (DN, nrow - 1);
2075# else 2052# else
2076 scr_page (DN, nrow / 4); 2053 scr_page (DN, nrow / 4);
2077# endif 2054# endif
2078 else 2055 else
2079 scrollBar.setMotion (); 2056 scrollBar.state = STATE_MOTION;
2080 } 2057 }
2081 else 2058 else
2082 { 2059 {
2083 scr_page ((ev.button == Button1 ? DN : UP), 2060 scr_page ((ev.button == Button1 ? DN : UP),
2084 (nrow 2061 (nrow
2085 * scrollbar_position (ev.y) 2062 * scrollbar_position (ev.y)
2086 / scrollbar_size ())); 2063 / scrollBar.size ()));
2087 } 2064 }
2088 2065
2089 break; 2066 break;
2090 } 2067 }
2091 } 2068 }
2101 2078
2102 csrO = 0; /* reset csr Offset */ 2079 csrO = 0; /* reset csr Offset */
2103 if (!bypass_keystate) 2080 if (!bypass_keystate)
2104 reportmode = !! (priv_modes & PrivMode_mouse_report); 2081 reportmode = !! (priv_modes & PrivMode_mouse_report);
2105 2082
2106 if (scrollbar_isUpDn ()) 2083 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2107 { 2084 {
2108 scrollBar.setIdle (); 2085 scrollBar.state = STATE_IDLE;
2109 scrollbar_show (0); 2086 scrollBar.show (0);
2110 } 2087 }
2111 2088
2112#ifdef SELECTION_SCROLLING 2089#ifdef SELECTION_SCROLLING
2113 if (sel_scroll_ev.active)
2114 sel_scroll_ev.stop(); 2090 sel_scroll_ev.stop();
2115#endif 2091#endif
2116 2092
2117 if (ev.window == vt) 2093 if (ev.window == vt)
2118 { 2094 {
2119 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2095 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2143 mouse_report (ev); 2119 mouse_report (ev);
2144 } 2120 }
2145#else /* MOUSE_REPORT_DOUBLECLICK */ 2121#else /* MOUSE_REPORT_DOUBLECLICK */
2146 MEvent.button = AnyButton; 2122 MEvent.button = AnyButton;
2147 mouse_report (ev); 2123 mouse_report (ev);
2148#endif /* MOUSE_REPORT_DOUBLECLICK */ 2124#endif /* MOUSE_REPORT_DOUBLECLICK */
2149 return; 2125 return;
2150 } 2126 }
2151 2127
2152 /* 2128 /*
2153 * dumb hack to compensate for the failure of click-and-drag 2129 * dumb hack to compensate for the failure of click-and-drag
2191 { 2167 {
2192 mouse_slip_wheel_speed += v ? -1 : 1; 2168 mouse_slip_wheel_speed += v ? -1 : 1;
2193 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2169 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2194 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2170 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2195 2171
2196 if (slip_wheel_ev.at < NOW) 2172 if (!slip_wheel_ev.is_active ())
2197 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2173 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2198
2199 slip_wheel_ev.start ();
2200 } 2174 }
2201 else 2175 else
2176# endif
2202 { 2177 {
2203# endif
2204 scr_page (v, i); 2178 scr_page (v, i);
2205 scrollbar_show (1); 2179 scrollBar.show (1);
2206# ifdef MOUSE_SLIP_WHEELING
2207 } 2180 }
2208# endif
2209 } 2181 }
2210 break; 2182 break;
2211#endif 2183#endif
2212 } 2184 }
2213 } 2185 }
2222 wchar_t ch = NOCHAR; 2194 wchar_t ch = NOCHAR;
2223 char *seq_begin; // remember start of esc-sequence here 2195 char *seq_begin; // remember start of esc-sequence here
2224 2196
2225 for (;;) 2197 for (;;)
2226 { 2198 {
2227 if (ch == NOCHAR) 2199 if (expect_false (ch == NOCHAR))
2228 { 2200 {
2229 seq_begin = cmdbuf_ptr; 2201 seq_begin = cmdbuf_ptr;
2230 ch = next_char (); 2202 ch = next_char ();
2231 2203
2232 if (ch == NOCHAR) 2204 if (ch == NOCHAR)
2233 break; 2205 break;
2234 } 2206 }
2235 2207
2236 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2208 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2237 { 2209 {
2238 if (!seen_input) 2210 if (expect_false (!seen_input))
2239 { 2211 {
2240 seen_input = 1; 2212 seen_input = 1;
2241 // many badly-written programs (e.g. jed) contain a race condition: 2213 // many badly-written programs (e.g. jed) contain a race condition:
2242 // they first read the screensize and then install a SIGWINCH handler. 2214 // they first read the screensize and then install a SIGWINCH handler.
2243 // some window managers resize the window early, and these programs 2215 // some window managers resize the window early, and these programs
2256 wchar_t *str = buf; 2228 wchar_t *str = buf;
2257 wchar_t *eol = str + min (ncol, UBUFSIZ); 2229 wchar_t *eol = str + min (ncol, UBUFSIZ);
2258 2230
2259 for (;;) 2231 for (;;)
2260 { 2232 {
2261 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2233 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2262 break; 2234 break;
2263 2235
2264 *str++ = ch; 2236 *str++ = ch;
2265 2237
2266 if (ch == C0_LF || str >= eol) 2238 if (expect_false (ch == C0_LF || str >= eol))
2267 { 2239 {
2268 if (ch == C0_LF) 2240 if (ch == C0_LF)
2269 nlines++; 2241 nlines++;
2270 2242
2271 refresh_count++; 2243 refresh_count++;
2272 2244
2273 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1) 2245 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2274 { 2246 {
2275 refresh_count = 0; 2247 refresh_count = 0;
2276 2248
2277 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.) 2249 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2278 { 2250 {
2279 refreshnow = true; 2251 refreshnow = true;
2280 ch = NOCHAR; 2252 ch = NOCHAR;
2281 break; 2253 break;
2282 } 2254 }
2353rxvt_term::next_char () NOTHROW 2325rxvt_term::next_char () NOTHROW
2354{ 2326{
2355 while (cmdbuf_ptr < cmdbuf_endp) 2327 while (cmdbuf_ptr < cmdbuf_endp)
2356 { 2328 {
2357 // assume 7-bit to be ascii ALWAYS 2329 // assume 7-bit to be ascii ALWAYS
2358 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2330 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2359 return *cmdbuf_ptr++; 2331 return *cmdbuf_ptr++;
2360 2332
2361 wchar_t wc; 2333 wchar_t wc;
2362 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2334 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2363 2335
2367 cmdbuf_ptr = cmdbuf_endp; 2339 cmdbuf_ptr = cmdbuf_endp;
2368 break; 2340 break;
2369 } 2341 }
2370 2342
2371 if (len == (size_t)-1) 2343 if (len == (size_t)-1)
2344 {
2345 mbrtowc (0, 0, 0, mbstate); // reset now undefined conversion state
2372 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2346 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2347 }
2373 2348
2374 // assume wchar == unicode 2349 // assume wchar == unicode
2375 cmdbuf_ptr += len; 2350 cmdbuf_ptr += len;
2376 return wc & UNICODE_MASK; 2351 return wc & UNICODE_MASK;
2377 } 2352 }
2421/*----------------------------------------------------------------------*/ 2396/*----------------------------------------------------------------------*/
2422#ifdef PRINTPIPE 2397#ifdef PRINTPIPE
2423FILE * 2398FILE *
2424rxvt_term::popen_printer () 2399rxvt_term::popen_printer ()
2425{ 2400{
2426 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2401 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2427 2402
2428 if (stream == NULL) 2403 if (stream == NULL)
2429 rxvt_warn ("can't open printer pipe, not printing.\n"); 2404 rxvt_warn ("can't open printer pipe, not printing.\n");
2430 2405
2431 return stream; 2406 return stream;
2442 * simulate attached vt100 printer 2417 * simulate attached vt100 printer
2443 */ 2418 */
2444void 2419void
2445rxvt_term::process_print_pipe () 2420rxvt_term::process_print_pipe ()
2446{ 2421{
2447 int done; 2422 FILE *fd = popen_printer ();
2448 FILE *fd;
2449 2423
2450 if ((fd = popen_printer ()) == NULL) 2424 if (!fd)
2451 return; 2425 return;
2452 2426
2453 /* 2427 /*
2454 * Send all input to the printer until either ESC[4i or ESC[?4i 2428 * Send all input to the printer until either ESC[4i or ESC[?4i
2455 * is received. 2429 * is received.
2456 */ 2430 */
2457 for (done = 0; !done;) 2431 for (int done = 0; !done; )
2458 { 2432 {
2459 unsigned char buf[8]; 2433 unsigned char buf[8];
2460 unicode_t ch; 2434 unicode_t ch;
2461 unsigned int i, len; 2435 unsigned int i, len;
2462 2436
2493 } 2467 }
2494 } 2468 }
2495 2469
2496 pclose_printer (fd); 2470 pclose_printer (fd);
2497} 2471}
2498#endif /* PRINTPIPE */ 2472#endif /* PRINTPIPE */
2499/*}}} */ 2473/*}}} */
2500 2474
2501/* *INDENT-OFF* */ 2475/* *INDENT-OFF* */
2502enum { 2476enum {
2503 C1_40 = 0x40, 2477 C1_40 = 0x40,
2607 break; 2581 break;
2608 case 'Z': /* identify the terminal type */ 2582 case 'Z': /* identify the terminal type */
2609 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2583 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2610 break; 2584 break;
2611 case '<': /* turn off VT52 mode */ 2585 case '<': /* turn off VT52 mode */
2612 PrivMode (0, PrivMode_vt52); 2586 set_privmode (PrivMode_vt52, 0);
2613 break; 2587 break;
2614 case 'F': /* use special graphics character set */ 2588 case 'F': /* use special graphics character set */
2615 case 'G': /* use regular character set */ 2589 case 'G': /* use regular character set */
2616 /* unimplemented */ 2590 /* unimplemented */
2617 break; 2591 break;
2671 scr_forwardindex (); 2645 scr_forwardindex ();
2672 break; 2646 break;
2673#endif 2647#endif
2674 case '=': 2648 case '=':
2675 case '>': 2649 case '>':
2676 PrivMode ((ch == '='), PrivMode_aplKP); 2650 set_privmode (PrivMode_aplKP, ch == '=');
2677 break; 2651 break;
2678 2652
2679 case C1_40: 2653 case C1_40:
2680 cmd_getc (); 2654 cmd_getc ();
2681 break; 2655 break;
2734 2708
2735 /* 8.3.106: RESET TO INITIAL STATE */ 2709 /* 8.3.106: RESET TO INITIAL STATE */
2736 case 'c': 2710 case 'c':
2737 mbstate.reset (); 2711 mbstate.reset ();
2738 scr_poweron (); 2712 scr_poweron ();
2739 scrollbar_show (1); 2713 scrollBar.show (1);
2740 break; 2714 break;
2741 2715
2742 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2716 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2743 case 'n': 2717 case 'n':
2744 scr_charset_choose (2); 2718 scr_charset_choose (2);
2796 nargs = 0; 2770 nargs = 0;
2797 2771
2798 priv = 0; 2772 priv = 0;
2799 ch = cmd_getc (); 2773 ch = cmd_getc ();
2800 if (ch >= '<' && ch <= '?') 2774 if (ch >= '<' && ch <= '?')
2775 {
2801 { /* '<' '=' '>' '?' */ 2776 /* '<' '=' '>' '?' */
2802 priv = ch; 2777 priv = ch;
2803 ch = cmd_getc (); 2778 ch = cmd_getc ();
2804 } 2779 }
2805 2780
2806 /* read any numerical arguments */ 2781 /* read any numerical arguments */
2849 { 2824 {
2850 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt, 2825 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2851 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2826 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2852 // 2827 //
2853 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2828 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2854 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2829 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2855 // that we do not support xterm mouse reporting (should be 95 when we do). 2830 // versions.
2856 // 2831 //
2857 tt_printf ("\033[>%d;94;0c", 'U'); 2832 tt_printf ("\033[>%d;95;0c", 'U');
2858 } 2833 }
2859 break; 2834 break;
2835
2860 case '?': 2836 case '?':
2861 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2837 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2862 process_terminal_mode (ch, priv, nargs, arg); 2838 process_terminal_mode (ch, priv, nargs, arg);
2863 break; 2839 break;
2864 } 2840 }
3380 *buf++ = '\0'; 3356 *buf++ = '\0';
3381 3357
3382 process_color_seq (op, color, name, resp); 3358 process_color_seq (op, color, name, resp);
3383 } 3359 }
3384 break; 3360 break;
3361 case Rxvt_restoreFG:
3385 case XTerm_Color00: 3362 case XTerm_Color00:
3386 process_color_seq (op, Color_fg, str, resp); 3363 process_color_seq (op, Color_fg, str, resp);
3387 break; 3364 break;
3365 case Rxvt_restoreBG:
3388 case XTerm_Color01: 3366 case XTerm_Color01:
3389 process_color_seq (op, Color_bg, str, resp); 3367 process_color_seq (op, Color_bg, str, resp);
3390 break; 3368 break;
3391#ifndef NO_CURSORCOLOR 3369#ifndef NO_CURSORCOLOR
3392 case XTerm_Color_cursor: 3370 case XTerm_Color_cursor:
3418#if ENABLE_TRANSPARENCY 3396#if ENABLE_TRANSPARENCY
3419 case URxvt_Color_tint: 3397 case URxvt_Color_tint:
3420 process_color_seq (op, Color_tint, str, resp); 3398 process_color_seq (op, Color_tint, str, resp);
3421 { 3399 {
3422 bool changed = false; 3400 bool changed = false;
3401
3423 if (ISSET_PIXCOLOR (Color_tint)) 3402 if (ISSET_PIXCOLOR (Color_tint))
3424 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3403 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3425 else 3404 else
3426 changed = bgPixmap.unset_tint (); 3405 changed = bgPixmap.unset_tint ();
3406
3427 if (changed) 3407 if (changed)
3428 update_background (); 3408 update_background ();
3429 } 3409 }
3430 3410
3431 break; 3411 break;
3454 changed++; 3434 changed++;
3455 str = strchr (str, ';'); 3435 str = strchr (str, ';');
3456 if (str == NULL) 3436 if (str == NULL)
3457 bgPixmap.set_defaultGeometry (); 3437 bgPixmap.set_defaultGeometry ();
3458 } 3438 }
3439
3459 while (str) 3440 while (str)
3460 { 3441 {
3461 str++; 3442 str++;
3462 if (bgPixmap.set_geometry (str)) 3443 if (bgPixmap.set_geometry (str))
3463 changed++; 3444 changed++;
3464 str = strchr (str, ';'); 3445 str = strchr (str, ';');
3465 } 3446 }
3447
3466 if (changed) 3448 if (changed)
3467 update_background (); 3449 update_background ();
3468 } 3450 }
3469 break; 3451 break;
3470#endif 3452#endif
3471
3472 case Rxvt_restoreFG:
3473 set_window_color (Color_fg, str);
3474 break;
3475 case Rxvt_restoreBG:
3476 set_window_color (Color_bg, str);
3477 break;
3478 3453
3479 case XTerm_logfile: 3454 case XTerm_logfile:
3480 // TODO, when secure mode? 3455 // TODO, when secure mode?
3481 break; 3456 break;
3482 3457
3549 break; 3524 break;
3550#endif 3525#endif
3551 3526
3552#if ENABLE_PERL 3527#if ENABLE_PERL
3553 case URxvt_perl: 3528 case URxvt_perl:
3554 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3529 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3555 ; // no responses yet
3556 break; 3530 break;
3557#endif 3531#endif
3558 } 3532 }
3559} 3533}
3560/*----------------------------------------------------------------------*/ 3534/*----------------------------------------------------------------------*/
3583 { 3557 {
3584 if (mode == 'r') 3558 if (mode == 'r')
3585 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3559 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3586 else 3560 else
3587 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3561 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3588 PrivMode (state, bit); 3562 set_privmode (bit, state);
3589 } 3563 }
3590 3564
3591 return state; 3565 return state;
3592} 3566}
3593 3567
3626 { 66, PrivMode_aplKP }, 3600 { 66, PrivMode_aplKP },
3627#ifndef NO_BACKSPACE_KEY 3601#ifndef NO_BACKSPACE_KEY
3628 { 67, PrivMode_BackSpace }, 3602 { 67, PrivMode_BackSpace },
3629#endif 3603#endif
3630 { 1000, PrivMode_MouseX11 }, 3604 { 1000, PrivMode_MouseX11 },
3631 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3605 { 1002, PrivMode_MouseBtnEvent },
3632 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3606 { 1003, PrivMode_MouseAnyEvent },
3633 // 1003 Use All Motion Mouse Tracking. NYI, TODO
3634 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3607 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3635 { 1011, PrivMode_Keypress }, // rxvt extension 3608 { 1011, PrivMode_Keypress }, // rxvt extension
3636 // 1035 enable modifiers for alt, numlock NYI 3609 // 1035 enable modifiers for alt, numlock NYI
3637 // 1036 send ESC for meta keys NYI 3610 // 1036 send ESC for meta keys NYI
3638 // 1037 send DEL for keypad delete NYI 3611 // 1037 send DEL for keypad delete NYI
3639 { 1047, PrivMode_Screen }, 3612 { 1047, PrivMode_Screen },
3640 // 1048 save and restore cursor 3613 // 1048 save and restore cursor
3641 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3614 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3642 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3615 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3616 { 2004, PrivMode_BracketPaste },
3643 }; 3617 };
3644 3618
3645 if (nargs == 0) 3619 if (nargs == 0)
3646 return; 3620 return;
3647 3621
3691 case 2: /* VT52 mode */ 3665 case 2: /* VT52 mode */
3692 /* oddball mode. should be set regardless of set/reset 3666 /* oddball mode. should be set regardless of set/reset
3693 * parameter. Return from VT52 mode with an ESC < from 3667 * parameter. Return from VT52 mode with an ESC < from
3694 * within VT52 mode 3668 * within VT52 mode
3695 */ 3669 */
3696 PrivMode (1, PrivMode_vt52); 3670 set_privmode (PrivMode_vt52, 1);
3697 break; 3671 break;
3698 case 3: /* 80/132 */ 3672 case 3: /* 80/132 */
3699 if (priv_modes & PrivMode_132OK) 3673 if (priv_modes & PrivMode_132OK)
3674 {
3675 scr_poweron ();
3700 set_widthheight (((state ? 132 : 80) * fwidth), height); 3676 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight);
3677 }
3701 break; 3678 break;
3702 case 4: /* smooth scrolling */ 3679 case 4: /* smooth scrolling */
3703 set_option (Opt_jumpScroll, !state); 3680 set_option (Opt_jumpScroll, !state);
3704 break; 3681 break;
3705 case 5: /* reverse video */ 3682 case 5: /* reverse video */
3712 scr_autowrap (state); 3689 scr_autowrap (state);
3713 break; 3690 break;
3714 /* case 8: - auto repeat, can't do on a per window basis */ 3691 /* case 8: - auto repeat, can't do on a per window basis */
3715 case 9: /* X10 mouse reporting */ 3692 case 9: /* X10 mouse reporting */
3716 if (state) /* orthogonal */ 3693 if (state) /* orthogonal */
3717 priv_modes &= ~PrivMode_MouseX11; 3694 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3718 break; 3695 break;
3719#ifdef scrollBar_esc 3696#ifdef scrollBar_esc
3720 case scrollBar_esc: 3697 case scrollBar_esc:
3721 if (scrollbar_mapping (state)) 3698 if (scrollBar.map (state))
3722 { 3699 {
3723 resize_all_windows (0, 0, 0); 3700 resize_all_windows (0, 0, 0);
3724 scr_touch (true); 3701 scr_touch (true);
3725 } 3702 }
3726 break; 3703 break;
3735 break; 3712 break;
3736 /* case 66: - application key pad */ 3713 /* case 66: - application key pad */
3737 /* case 67: - backspace key */ 3714 /* case 67: - backspace key */
3738 case 1000: /* X11 mouse reporting */ 3715 case 1000: /* X11 mouse reporting */
3739 if (state) /* orthogonal */ 3716 if (state) /* orthogonal */
3740 priv_modes &= ~PrivMode_MouseX10; 3717 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3741 break; 3718 break;
3742#if 0
3743 case 1001: 3719 case 1002:
3744 break; /* X11 mouse highlighting */ 3720 case 1003:
3745#endif 3721 if (state)
3722 {
3723 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3724 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3725 vt_emask_mouse = PointerMotionMask;
3726 }
3727 else
3728 vt_emask_mouse = NoEventMask;
3729 vt_select_input ();
3730 break;
3746 case 1010: /* scroll to bottom on TTY output inhibit */ 3731 case 1010: /* scroll to bottom on TTY output inhibit */
3747 set_option (Opt_scrollTtyOutput, !state); 3732 set_option (Opt_scrollTtyOutput, !state);
3748 break; 3733 break;
3749 case 1011: /* scroll to bottom on key press */ 3734 case 1011: /* scroll to bottom on key press */
3750 set_option (Opt_scrollTtyKeypress, state); 3735 set_option (Opt_scrollTtyKeypress, state);
3927rxvt_term::process_graphics () 3912rxvt_term::process_graphics ()
3928{ 3913{
3929 unicode_t ch, cmd = cmd_getc (); 3914 unicode_t ch, cmd = cmd_getc ();
3930 3915
3931 if (cmd == 'Q') 3916 if (cmd == 'Q')
3917 {
3932 { /* query graphics */ 3918 /* query graphics */
3933 tt_printf ("\033G0\012"); /* no graphics */ 3919 tt_printf ("\033G0\012"); /* no graphics */
3934 return; 3920 return;
3935 } 3921 }
3936 /* swallow other graphics sequences until terminating ':' */ 3922 /* swallow other graphics sequences until terminating ':' */
3937 do 3923 do
3987 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 3973 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
3988 3974
3989 memcpy (v_buffer + v_buflen, data, len); 3975 memcpy (v_buffer + v_buflen, data, len);
3990 v_buflen += len; 3976 v_buflen += len;
3991 3977
3992 pty_ev.set (EVENT_READ | EVENT_WRITE); 3978 pty_ev.set (ev::READ | ev::WRITE);
3993} 3979}
3994 3980
3995void rxvt_term::pty_write () 3981void rxvt_term::pty_write ()
3996{ 3982{
3997 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 3983 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4003 if (v_buflen == 0) 3989 if (v_buflen == 0)
4004 { 3990 {
4005 free (v_buffer); 3991 free (v_buffer);
4006 v_buffer = 0; 3992 v_buffer = 0;
4007 3993
4008 pty_ev.set (EVENT_READ); 3994 pty_ev.set (ev::READ);
4009 return; 3995 return;
4010 } 3996 }
4011 3997
4012 memmove (v_buffer, v_buffer + written, v_buflen); 3998 memmove (v_buffer, v_buffer + written, v_buflen);
4013 } 3999 }
4014 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4000 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4015 pty_ev.set (EVENT_READ); 4001 pty_ev.set (ev::READ);
4016} 4002}
4017 4003
4018/*----------------------- end-of-file (C source) -----------------------*/ 4004/*----------------------- end-of-file (C source) -----------------------*/
4019 4005

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines