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.360 by ayin, Wed Oct 24 10:39:57 2007 UTC vs.
Revision 1.428 by root, Wed Nov 5 16:17:23 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 for (int i = CBUFCNT; i-- && pty_fill (); )
1258 if (cmd_parse ()) 1197 cmd_parse ();
1259 break;
1260 1198
1261 if (revents & EVENT_WRITE) 1199 if (revents & ev::WRITE)
1262 pty_write (); 1200 pty_write ();
1201
1202 refresh_check ();
1263} 1203}
1264 1204
1265void 1205void
1266rxvt_term::pointer_unblank () 1206rxvt_term::pointer_unblank ()
1267{ 1207{
1270 1210
1271#ifdef POINTER_BLANK 1211#ifdef POINTER_BLANK
1272 hidden_pointer = 0; 1212 hidden_pointer = 0;
1273 1213
1274 if (option (Opt_pointerBlank)) 1214 if (option (Opt_pointerBlank))
1275 pointer_ev.start (NOW + pointerBlankDelay); 1215 pointer_ev.start (pointerBlankDelay);
1276#endif 1216#endif
1277} 1217}
1278 1218
1279#ifdef POINTER_BLANK 1219#ifdef POINTER_BLANK
1280void 1220void
1288 1228
1289 hidden_pointer = 1; 1229 hidden_pointer = 1;
1290} 1230}
1291 1231
1292void 1232void
1293rxvt_term::pointer_cb (time_watcher &w) 1233rxvt_term::pointer_cb (ev::timer &w, int revents)
1294{ 1234{
1295 make_current (); 1235 make_current ();
1296 1236
1297 pointer_blank (); 1237 pointer_blank ();
1298} 1238}
1305 int x, y; 1245 int x, y;
1306 int code = 32; 1246 int code = 32;
1307 1247
1308 x = Pixel2Col (ev.x); 1248 x = Pixel2Col (ev.x);
1309 y = Pixel2Row (ev.y); 1249 y = Pixel2Row (ev.y);
1310 if (ev.type == MotionNotify) { 1250 if (ev.type == MotionNotify)
1251 {
1311 if (x == mouse_row && y == mouse_col) 1252 if (x == mouse_row && y == mouse_col)
1312 return; 1253 return;
1313 mouse_row = x; 1254 mouse_row = x;
1314 mouse_col = y; 1255 mouse_col = y;
1315 code += 32; 1256 code += 32;
1316 } 1257 }
1317 1258
1318 if (MEvent.button == AnyButton) 1259 if (MEvent.button == AnyButton)
1319 button_number = 3; 1260 button_number = 3;
1320 else 1261 else
1321 { 1262 {
1481 && ev.xfocus.mode != NotifyGrab) 1422 && ev.xfocus.mode != NotifyGrab)
1482 focus_out (); 1423 focus_out ();
1483 break; 1424 break;
1484 1425
1485 case ConfigureNotify: 1426 case ConfigureNotify:
1486 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n", 1427 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1487 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y, 1428 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1488 szHint.width, szHint.height); */ 1429 szHint.width, szHint.height);*/
1489 if (ev.xconfigure.window == parent[0]) 1430 if (ev.xconfigure.window == parent[0])
1490 { 1431 {
1491 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1432 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1492 ; 1433 ;
1493 1434
1498 } 1439 }
1499 else 1440 else
1500 { 1441 {
1501#ifdef HAVE_BG_PIXMAP 1442#ifdef HAVE_BG_PIXMAP
1502 if (bgPixmap.window_position_sensitive ()) 1443 if (bgPixmap.window_position_sensitive ())
1444 {
1445 if (mapped)
1503 update_background (); 1446 update_background ();
1447 else
1448 bgPixmap.invalidate ();
1449 }
1504#endif 1450#endif
1505 } 1451 }
1452
1506 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1453 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1507 } 1454 }
1508 break; 1455 break;
1509 1456
1510 case PropertyNotify: 1457 case PropertyNotify:
1527 case SelectionRequest: 1474 case SelectionRequest:
1528 selection_send (ev.xselectionrequest); 1475 selection_send (ev.xselectionrequest);
1529 break; 1476 break;
1530 1477
1531 case MapNotify: 1478 case MapNotify:
1479#ifdef HAVE_BG_PIXMAP
1480 /* This is needed spcifically to fix the case of no window manager or a
1481 * non-reparenting window manager. In those cases we never get first
1482 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1483 * care of multiplicity of ConfigureNotify events arriwing while WM does
1484 * reparenting.
1485 * We should not render background immidiately, as there could be several
1486 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1487 * by scheduling background redraw as soon as we can, but giving a short
1488 * bit of time for ConfigureNotifies to arrive.
1489 * We should render background PRIOR to drawing any text, but AFTER all
1490 * of ConfigureNotifys for the best results.
1491 */
1492 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1493 update_background_ev.start (0.025);
1494#endif
1532 mapped = 1; 1495 mapped = 1;
1533#ifdef TEXT_BLINK 1496#ifdef TEXT_BLINK
1534 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1497 text_blink_ev.start ();
1535#endif 1498#endif
1536 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1499 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1537 break; 1500 break;
1538 1501
1539 case UnmapNotify: 1502 case UnmapNotify:
1560 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1523 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1561 { 1524 {
1562 scr_expose (ev.xexpose.x, ev.xexpose.y, 1525 scr_expose (ev.xexpose.x, ev.xexpose.y,
1563 ev.xexpose.width, ev.xexpose.height, False); 1526 ev.xexpose.width, ev.xexpose.height, False);
1564 } 1527 }
1528
1565 want_refresh = 1; 1529 want_refresh = 1;
1566 } 1530 }
1567 else 1531 else
1568 { 1532 {
1569 XEvent unused_event; 1533 XEvent unused_event;
1571 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1535 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1572 ; 1536 ;
1573 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1537 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1574 ; 1538 ;
1575 1539
1576 if (isScrollbarWindow (ev.xany.window)) 1540 if (scrollBar.state && ev.xany.window == scrollBar.win)
1577 { 1541 {
1578 scrollBar.setIdle (); 1542 scrollBar.state = STATE_IDLE;
1579 scrollbar_show (0); 1543 scrollBar.show (0);
1580 } 1544 }
1581 } 1545 }
1582 break; 1546 break;
1583 1547
1584 case MotionNotify: 1548 case MotionNotify:
1630 int dist; 1594 int dist;
1631 1595
1632 /* don't clobber the current delay if we are 1596 /* don't clobber the current delay if we are
1633 * already in the middle of scrolling. 1597 * already in the middle of scrolling.
1634 */ 1598 */
1635 if (!sel_scroll_ev.active) 1599 if (!sel_scroll_ev.is_active ())
1636 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1600 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1637 1601
1638 /* save the event params so we can highlight 1602 /* save the event params so we can highlight
1639 * the selection in the pending-scroll loop 1603 * the selection in the pending-scroll loop
1640 */ 1604 */
1641 selection_save_x = ev.xbutton.x; 1605 selection_save_x = ev.xbutton.x;
1663 else 1627 else
1664 { 1628 {
1665 /* we are within the text window, so we 1629 /* we are within the text window, so we
1666 * shouldn't be scrolling 1630 * shouldn't be scrolling
1667 */ 1631 */
1668 if (sel_scroll_ev.active)
1669 sel_scroll_ev.stop(); 1632 sel_scroll_ev.stop();
1670 } 1633 }
1671#endif 1634#endif
1672#ifdef MOUSE_THRESHOLD 1635#ifdef MOUSE_THRESHOLD
1673 } 1636 }
1674#endif 1637#endif
1675 } 1638 }
1676 } 1639 }
1677 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1640 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1678 { 1641 {
1679 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1642 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1680 MotionNotify, &ev)) 1643 MotionNotify, &ev))
1681 ; 1644 ;
1682 1645
1684 &unused_root, &unused_child, 1647 &unused_root, &unused_child,
1685 &unused_root_x, &unused_root_y, 1648 &unused_root_x, &unused_root_y,
1686 &ev.xbutton.x, &ev.xbutton.y, 1649 &ev.xbutton.x, &ev.xbutton.y,
1687 &unused_mask); 1650 &unused_mask);
1688 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1651 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1689 scrollbar_size ()); 1652 scrollBar.size ());
1690 want_refresh = 1; 1653 want_refresh = 1;
1691 scrollbar_show (1); 1654 scrollBar.show (1);
1692 } 1655 }
1693 break; 1656 break;
1694 } 1657 }
1695 1658
1696#if defined(CURSOR_BLINK) 1659#if defined(CURSOR_BLINK)
1700 { 1663 {
1701 hidden_cursor = 0; 1664 hidden_cursor = 0;
1702 want_refresh = 1; 1665 want_refresh = 1;
1703 } 1666 }
1704 1667
1705 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1668 cursor_blink_ev.again ();
1706 } 1669 }
1707#endif 1670#endif
1708 1671
1709#if defined(POINTER_BLANK) 1672#if defined(POINTER_BLANK)
1710 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1673 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1717 1680
1718 if (ev.type == KeyPress && hidden_pointer == 0) 1681 if (ev.type == KeyPress && hidden_pointer == 0)
1719 pointer_blank (); 1682 pointer_blank ();
1720 } 1683 }
1721#endif 1684#endif
1685
1686 refresh_check ();
1687}
1688
1689void
1690rxvt_term::set_urgency (bool enable)
1691{
1692 if (enable == urgency_hint)
1693 return;
1694
1695 if (XWMHints *h = XGetWMHints (dpy, parent[0]))
1696 {
1697 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1698 XSetWMHints (dpy, parent[0], h);
1699 urgency_hint = enable;
1700 }
1722} 1701}
1723 1702
1724void 1703void
1725rxvt_term::focus_in () 1704rxvt_term::focus_in ()
1726{ 1705{
1727 if (!focus) 1706 if (!focus)
1728 { 1707 {
1729 focus = 1; 1708 focus = 1;
1730 want_refresh = 1; 1709 want_refresh = 1;
1731 1710
1732 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1733
1734#if USE_XIM 1711#if USE_XIM
1735 if (Input_Context != NULL) 1712 if (Input_Context != NULL)
1736 { 1713 {
1737 IMSetPosition (); 1714 IMSetPosition ();
1738 XSetICFocus (Input_Context); 1715 XSetICFocus (Input_Context);
1739 } 1716 }
1740#endif 1717#endif
1741#if CURSOR_BLINK 1718#if CURSOR_BLINK
1742 if (option (Opt_cursorBlink)) 1719 if (option (Opt_cursorBlink))
1743 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1720 cursor_blink_ev.again ();
1744#endif 1721#endif
1745#if OFF_FOCUS_FADING 1722#if OFF_FOCUS_FADING
1746 if (rs[Rs_fade]) 1723 if (rs[Rs_fade])
1747 { 1724 {
1748 pix_colors = pix_colors_focused; 1725 pix_colors = pix_colors_focused;
1749 scr_recolour (); 1726 scr_recolour ();
1750 } 1727 }
1751#endif 1728#endif
1752#if ENABLE_FRILLS 1729#if ENABLE_FRILLS
1753 if (option (Opt_urgentOnBell)) 1730 if (option (Opt_urgentOnBell))
1754 { 1731 set_urgency (0);
1755 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1756 {
1757 h->flags &= ~XUrgencyHint;
1758 XSetWMHints (dpy, parent[0], h);
1759 }
1760 }
1761#endif 1732#endif
1733
1734 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1762 } 1735 }
1763} 1736}
1764 1737
1765void 1738void
1766rxvt_term::focus_out () 1739rxvt_term::focus_out ()
1768 if (focus) 1741 if (focus)
1769 { 1742 {
1770 focus = 0; 1743 focus = 0;
1771 want_refresh = 1; 1744 want_refresh = 1;
1772 1745
1773 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1746#if ENABLE_FRILLS
1774 1747 if (option (Opt_urgentOnBell))
1748 set_urgency (0);
1749#endif
1775#if ENABLE_FRILLS || ISO_14755 1750#if ENABLE_FRILLS || ISO_14755
1776 if (iso14755buf) 1751 if (iso14755buf)
1777 { 1752 {
1778 iso14755buf = 0; 1753 iso14755buf = 0;
1779# if ISO_14755 1754# if ISO_14755
1786 XUnsetICFocus (Input_Context); 1761 XUnsetICFocus (Input_Context);
1787#endif 1762#endif
1788#if CURSOR_BLINK 1763#if CURSOR_BLINK
1789 if (option (Opt_cursorBlink)) 1764 if (option (Opt_cursorBlink))
1790 cursor_blink_ev.stop (); 1765 cursor_blink_ev.stop ();
1766
1791 hidden_cursor = 0; 1767 hidden_cursor = 0;
1792#endif 1768#endif
1793#if OFF_FOCUS_FADING 1769#if OFF_FOCUS_FADING
1794 if (rs[Rs_fade]) 1770 if (rs[Rs_fade])
1795 { 1771 {
1796 pix_colors = pix_colors_unfocused; 1772 pix_colors = pix_colors_unfocused;
1797 scr_recolour (); 1773 scr_recolour ();
1798 } 1774 }
1799#endif 1775#endif
1776
1777 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1800 } 1778 }
1801} 1779}
1802 1780
1803void 1781void
1804rxvt_term::update_fade_color (unsigned int idx) 1782rxvt_term::update_fade_color (unsigned int idx)
1835 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1813 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1836 { 1814 {
1837 bgPixmap.set_root_pixmap (); 1815 bgPixmap.set_root_pixmap ();
1838 update_background (); 1816 update_background ();
1839 } 1817 }
1818
1840 break; 1819 break;
1841 } 1820 }
1842# endif 1821# endif
1822
1823 refresh_check ();
1843} 1824}
1844#endif 1825#endif
1845 1826
1846void 1827void
1847rxvt_term::button_press (XButtonEvent &ev) 1828rxvt_term::button_press (XButtonEvent &ev)
1902 mouse_report (ev); 1883 mouse_report (ev);
1903 } 1884 }
1904#else 1885#else
1905 MEvent.button = ev.button; 1886 MEvent.button = ev.button;
1906 mouse_report (ev); 1887 mouse_report (ev);
1907#endif /* MOUSE_REPORT_DOUBLECLICK */ 1888#endif /* MOUSE_REPORT_DOUBLECLICK */
1908 1889
1909 } 1890 }
1910 else 1891 else
1911 { 1892 {
1912 if (ev.button != MEvent.button) 1893 if (ev.button != MEvent.button)
1960 } 1941 }
1961 1942
1962 /* 1943 /*
1963 * Scrollbar window processing of button press 1944 * Scrollbar window processing of button press
1964 */ 1945 */
1965 if (isScrollbarWindow (ev.window)) 1946 if (scrollBar.state && ev.window == scrollBar.win)
1966 { 1947 {
1967 scrollBar.setIdle (); 1948 page_dirn direction = NO_DIR;
1949
1950 if (scrollBar.upButton (ev.y))
1951 direction = UP; /* up */
1952 else if (scrollBar.dnButton (ev.y))
1953 direction = DN; /* down */
1954
1955 scrollBar.state = STATE_IDLE;
1968 /* 1956 /*
1969 * Rxvt-style scrollbar: 1957 * Rxvt-style scrollbar:
1970 * move up if mouse is above slider 1958 * move up if mouse is above slider
1971 * move dn if mouse is below slider 1959 * move dn if mouse is below slider
1972 * 1960 *
1981 /* 1969 /*
1982 * Mouse report disabled scrollbar: 1970 * Mouse report disabled scrollbar:
1983 * arrow buttons - send up/down 1971 * arrow buttons - send up/down
1984 * click on scrollbar - send pageup/down 1972 * click on scrollbar - send pageup/down
1985 */ 1973 */
1986 if ((scrollBar.style == R_SB_NEXT 1974 if (direction == UP)
1987 && scrollbarnext_upButton (ev.y))
1988 || (scrollBar.style == R_SB_RXVT
1989 && scrollbarrxvt_upButton (ev.y)))
1990 tt_printf ("\033[A"); 1975 tt_printf ("\033[A");
1991 else if ((scrollBar.style == R_SB_NEXT 1976 else if (direction == DN)
1992 && scrollbarnext_dnButton (ev.y))
1993 || (scrollBar.style == R_SB_RXVT
1994 && scrollbarrxvt_dnButton (ev.y)))
1995 tt_printf ("\033[B"); 1977 tt_printf ("\033[B");
1996 else 1978 else
1997 switch (ev.button) 1979 switch (ev.button)
1998 { 1980 {
1999 case Button2: 1981 case Button2:
2006 tt_printf ("\033[5~"); 1988 tt_printf ("\033[5~");
2007 break; 1989 break;
2008 } 1990 }
2009 } 1991 }
2010 else 1992 else
2011#endif /* NO_SCROLLBAR_REPORT */ 1993#endif /* NO_SCROLLBAR_REPORT */
2012
2013 {
2014 char upordown = 0;
2015
2016 if (scrollBar.style == R_SB_NEXT)
2017 { 1994 {
2018 if (scrollbarnext_upButton (ev.y)) 1995 if (direction != NO_DIR)
2019 upordown = -1; /* up */
2020 else if (scrollbarnext_dnButton (ev.y))
2021 upordown = 1; /* down */
2022 }
2023 else if (scrollBar.style == R_SB_RXVT)
2024 {
2025 if (scrollbarrxvt_upButton (ev.y))
2026 upordown = -1; /* up */
2027 else if (scrollbarrxvt_dnButton (ev.y))
2028 upordown = 1; /* down */
2029 }
2030 if (upordown)
2031 { 1996 {
2032#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1997#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1998 if (!cont_scroll_ev.is_active ())
2033 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1999 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2034#endif 2000#endif
2035 if (scr_page (upordown < 0 ? UP : DN, 1)) 2001 if (scr_page (direction, 1))
2036 { 2002 {
2037 if (upordown < 0) 2003 if (direction == UP)
2038 scrollBar.setUp (); 2004 scrollBar.state = STATE_UP;
2039 else 2005 else
2040 scrollBar.setDn (); 2006 scrollBar.state = STATE_DOWN;
2041 } 2007 }
2042 } 2008 }
2043 else 2009 else
2044 switch (ev.button) 2010 switch (ev.button)
2045 { 2011 {
2046 case Button2: 2012 case Button2:
2047 switch (scrollbar_align) 2013 switch (scrollBar.align)
2048 { 2014 {
2049 case R_SB_ALIGN_TOP: 2015 case R_SB_ALIGN_TOP:
2050 csrO = 0; 2016 csrO = 0;
2051 break; 2017 break;
2052 case R_SB_ALIGN_CENTRE: 2018 case R_SB_ALIGN_CENTRE:
2058 } 2024 }
2059 2025
2060 if (scrollBar.style == R_SB_XTERM 2026 if (scrollBar.style == R_SB_XTERM
2061 || scrollbar_above_slider (ev.y) 2027 || scrollbar_above_slider (ev.y)
2062 || scrollbar_below_slider (ev.y)) 2028 || scrollbar_below_slider (ev.y))
2063 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2029 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2064 2030
2065 scrollBar.setMotion (); 2031 scrollBar.state = STATE_MOTION;
2066 break; 2032 break;
2067 2033
2068 case Button1: 2034 case Button1:
2069 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2035 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2070 csrO = ev.y - scrollBar.top; 2036 csrO = ev.y - scrollBar.top;
2071 /* FALLTHROUGH */ 2037 /* FALLTHROUGH */
2072 2038
2073 case Button3: 2039 case Button3:
2074 if (scrollBar.style != R_SB_XTERM) 2040 if (scrollBar.style != R_SB_XTERM)
2084 scr_page (DN, nrow - 1); 2050 scr_page (DN, nrow - 1);
2085# else 2051# else
2086 scr_page (DN, nrow / 4); 2052 scr_page (DN, nrow / 4);
2087# endif 2053# endif
2088 else 2054 else
2089 scrollBar.setMotion (); 2055 scrollBar.state = STATE_MOTION;
2090 } 2056 }
2091 else 2057 else
2092 { 2058 {
2093 scr_page ((ev.button == Button1 ? DN : UP), 2059 scr_page ((ev.button == Button1 ? DN : UP),
2094 (nrow 2060 (nrow
2095 * scrollbar_position (ev.y) 2061 * scrollbar_position (ev.y)
2096 / scrollbar_size ())); 2062 / scrollBar.size ()));
2097 } 2063 }
2098 2064
2099 break; 2065 break;
2100 } 2066 }
2101 } 2067 }
2111 2077
2112 csrO = 0; /* reset csr Offset */ 2078 csrO = 0; /* reset csr Offset */
2113 if (!bypass_keystate) 2079 if (!bypass_keystate)
2114 reportmode = !! (priv_modes & PrivMode_mouse_report); 2080 reportmode = !! (priv_modes & PrivMode_mouse_report);
2115 2081
2116 if (scrollbar_isUpDn ()) 2082 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2117 { 2083 {
2118 scrollBar.setIdle (); 2084 scrollBar.state = STATE_IDLE;
2119 scrollbar_show (0); 2085 scrollBar.show (0);
2120 } 2086 }
2121 2087
2122#ifdef SELECTION_SCROLLING 2088#ifdef SELECTION_SCROLLING
2123 if (sel_scroll_ev.active)
2124 sel_scroll_ev.stop(); 2089 sel_scroll_ev.stop();
2125#endif 2090#endif
2126 2091
2127 if (ev.window == vt) 2092 if (ev.window == vt)
2128 { 2093 {
2129 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2094 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2153 mouse_report (ev); 2118 mouse_report (ev);
2154 } 2119 }
2155#else /* MOUSE_REPORT_DOUBLECLICK */ 2120#else /* MOUSE_REPORT_DOUBLECLICK */
2156 MEvent.button = AnyButton; 2121 MEvent.button = AnyButton;
2157 mouse_report (ev); 2122 mouse_report (ev);
2158#endif /* MOUSE_REPORT_DOUBLECLICK */ 2123#endif /* MOUSE_REPORT_DOUBLECLICK */
2159 return; 2124 return;
2160 } 2125 }
2161 2126
2162 /* 2127 /*
2163 * dumb hack to compensate for the failure of click-and-drag 2128 * dumb hack to compensate for the failure of click-and-drag
2201 { 2166 {
2202 mouse_slip_wheel_speed += v ? -1 : 1; 2167 mouse_slip_wheel_speed += v ? -1 : 1;
2203 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2168 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2204 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2169 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2205 2170
2206 if (slip_wheel_ev.at < NOW) 2171 if (!slip_wheel_ev.is_active ())
2207 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2172 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2208
2209 slip_wheel_ev.start ();
2210 } 2173 }
2211 else 2174 else
2175# endif
2212 { 2176 {
2213# endif
2214 scr_page (v, i); 2177 scr_page (v, i);
2215 scrollbar_show (1); 2178 scrollBar.show (1);
2216# ifdef MOUSE_SLIP_WHEELING
2217 } 2179 }
2218# endif
2219 } 2180 }
2220 break; 2181 break;
2221#endif 2182#endif
2222 } 2183 }
2223 } 2184 }
2224} 2185}
2225 2186
2226/*}}} */ 2187/*}}} */
2227 2188
2228bool 2189void
2229rxvt_term::cmd_parse () 2190rxvt_term::cmd_parse ()
2230{ 2191{
2231 bool flag = false;
2232 wchar_t ch = NOCHAR; 2192 wchar_t ch = NOCHAR;
2233 char *seq_begin; // remember start of esc-sequence here 2193 char *seq_begin; // remember start of esc-sequence here
2234 2194
2235 for (;;) 2195 for (;;)
2236 { 2196 {
2237 if (ch == NOCHAR) 2197 if (expect_false (ch == NOCHAR))
2238 { 2198 {
2239 seq_begin = cmdbuf_ptr; 2199 seq_begin = cmdbuf_ptr;
2240 ch = next_char (); 2200 ch = next_char ();
2241 2201
2242 if (ch == NOCHAR) 2202 if (ch == NOCHAR)
2243 break; 2203 break;
2244 } 2204 }
2245 2205
2246 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2206 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2247 { 2207 {
2248 if (!seen_input) 2208 if (expect_false (!seen_input))
2249 { 2209 {
2250 seen_input = 1; 2210 seen_input = 1;
2251 // many badly-written programs (e.g. jed) contain a race condition: 2211 // many badly-written programs (e.g. jed) contain a race condition:
2252 // they first read the screensize and then install a SIGWINCH handler. 2212 // they first read the screensize and then install a SIGWINCH handler.
2253 // some window managers resize the window early, and these programs 2213 // some window managers resize the window early, and these programs
2266 wchar_t *str = buf; 2226 wchar_t *str = buf;
2267 wchar_t *eol = str + min (ncol, UBUFSIZ); 2227 wchar_t *eol = str + min (ncol, UBUFSIZ);
2268 2228
2269 for (;;) 2229 for (;;)
2270 { 2230 {
2271 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2231 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2272 break; 2232 break;
2273 2233
2274 *str++ = ch; 2234 *str++ = ch;
2275 2235
2276 if (ch == C0_LF || str >= eol) 2236 if (expect_false (ch == C0_LF || str >= eol))
2277 { 2237 {
2278 if (ch == C0_LF) 2238 if (ch == C0_LF)
2279 nlines++; 2239 nlines++;
2280 2240
2281 refresh_count++; 2241 refresh_count++;
2282 2242
2283 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1) 2243 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2284 { 2244 {
2285 refresh_count = 0; 2245 refresh_count = 0;
2286 2246
2287 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.) 2247 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2288 { 2248 {
2289 refreshnow = true; 2249 refreshnow = true;
2290 ch = NOCHAR; 2250 ch = NOCHAR;
2291 break; 2251 break;
2292 } 2252 }
2330 * What the heck we'll cheat and only refresh less than every page-full. 2290 * What the heck we'll cheat and only refresh less than every page-full.
2331 * if skipScroll is enabled. 2291 * if skipScroll is enabled.
2332 */ 2292 */
2333 if (refreshnow) 2293 if (refreshnow)
2334 { 2294 {
2335 flag = true;
2336 scr_refresh (); 2295 scr_refresh ();
2337 want_refresh = 1; 2296 want_refresh = 1;
2338 } 2297 }
2339
2340 } 2298 }
2341 else 2299 else
2342 { 2300 {
2343 try 2301 try
2344 { 2302 {
2352 } 2310 }
2353 2311
2354 ch = NOCHAR; 2312 ch = NOCHAR;
2355 } 2313 }
2356 } 2314 }
2357
2358 return flag;
2359} 2315}
2360 2316
2361// read the next character 2317// read the next character
2362wchar_t 2318wchar_t
2363rxvt_term::next_char () NOTHROW 2319rxvt_term::next_char () NOTHROW
2364{ 2320{
2365 while (cmdbuf_ptr < cmdbuf_endp) 2321 while (cmdbuf_ptr < cmdbuf_endp)
2366 { 2322 {
2367 // assume 7-bit to be ascii ALWAYS 2323 // assume 7-bit to be ascii ALWAYS
2368 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2324 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2369 return *cmdbuf_ptr++; 2325 return *cmdbuf_ptr++;
2370 2326
2371 wchar_t wc; 2327 wchar_t wc;
2372 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2328 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2373 2329
2377 cmdbuf_ptr = cmdbuf_endp; 2333 cmdbuf_ptr = cmdbuf_endp;
2378 break; 2334 break;
2379 } 2335 }
2380 2336
2381 if (len == (size_t)-1) 2337 if (len == (size_t)-1)
2338 {
2339 mbrtowc (0, 0, 0, mbstate); // reset now undefined conversion state
2382 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2340 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2341 }
2383 2342
2384 // assume wchar == unicode 2343 // assume wchar == unicode
2385 cmdbuf_ptr += len; 2344 cmdbuf_ptr += len;
2386 return wc & UNICODE_MASK; 2345 return wc & UNICODE_MASK;
2387 } 2346 }
2431/*----------------------------------------------------------------------*/ 2390/*----------------------------------------------------------------------*/
2432#ifdef PRINTPIPE 2391#ifdef PRINTPIPE
2433FILE * 2392FILE *
2434rxvt_term::popen_printer () 2393rxvt_term::popen_printer ()
2435{ 2394{
2436 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2395 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2437 2396
2438 if (stream == NULL) 2397 if (stream == NULL)
2439 rxvt_warn ("can't open printer pipe, not printing.\n"); 2398 rxvt_warn ("can't open printer pipe, not printing.\n");
2440 2399
2441 return stream; 2400 return stream;
2452 * simulate attached vt100 printer 2411 * simulate attached vt100 printer
2453 */ 2412 */
2454void 2413void
2455rxvt_term::process_print_pipe () 2414rxvt_term::process_print_pipe ()
2456{ 2415{
2457 int done; 2416 FILE *fd = popen_printer ();
2458 FILE *fd;
2459 2417
2460 if ((fd = popen_printer ()) == NULL) 2418 if (!fd)
2461 return; 2419 return;
2462 2420
2463 /* 2421 /*
2464 * Send all input to the printer until either ESC[4i or ESC[?4i 2422 * Send all input to the printer until either ESC[4i or ESC[?4i
2465 * is received. 2423 * is received.
2466 */ 2424 */
2467 for (done = 0; !done;) 2425 for (int done = 0; !done; )
2468 { 2426 {
2469 unsigned char buf[8]; 2427 unsigned char buf[8];
2470 unicode_t ch; 2428 unicode_t ch;
2471 unsigned int i, len; 2429 unsigned int i, len;
2472 2430
2503 } 2461 }
2504 } 2462 }
2505 2463
2506 pclose_printer (fd); 2464 pclose_printer (fd);
2507} 2465}
2508#endif /* PRINTPIPE */ 2466#endif /* PRINTPIPE */
2509/*}}} */ 2467/*}}} */
2510 2468
2511/* *INDENT-OFF* */ 2469/* *INDENT-OFF* */
2512enum { 2470enum {
2513 C1_40 = 0x40, 2471 C1_40 = 0x40,
2617 break; 2575 break;
2618 case 'Z': /* identify the terminal type */ 2576 case 'Z': /* identify the terminal type */
2619 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2577 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2620 break; 2578 break;
2621 case '<': /* turn off VT52 mode */ 2579 case '<': /* turn off VT52 mode */
2622 PrivMode (0, PrivMode_vt52); 2580 set_privmode (PrivMode_vt52, 0);
2623 break; 2581 break;
2624 case 'F': /* use special graphics character set */ 2582 case 'F': /* use special graphics character set */
2625 case 'G': /* use regular character set */ 2583 case 'G': /* use regular character set */
2626 /* unimplemented */ 2584 /* unimplemented */
2627 break; 2585 break;
2681 scr_forwardindex (); 2639 scr_forwardindex ();
2682 break; 2640 break;
2683#endif 2641#endif
2684 case '=': 2642 case '=':
2685 case '>': 2643 case '>':
2686 PrivMode ((ch == '='), PrivMode_aplKP); 2644 set_privmode (PrivMode_aplKP, ch == '=');
2687 break; 2645 break;
2688 2646
2689 case C1_40: 2647 case C1_40:
2690 cmd_getc (); 2648 cmd_getc ();
2691 break; 2649 break;
2730 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2688 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2731 case C1_SCI: /* ESC Z */ 2689 case C1_SCI: /* ESC Z */
2732 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2690 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2733 break; /* steal obsolete ESC [ c */ 2691 break; /* steal obsolete ESC [ c */
2734 2692
2735 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2693 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2736 case C1_CSI: /* ESC [ */ 2694 case C1_CSI: /* ESC [ */
2737 process_csi_seq (); 2695 process_csi_seq ();
2738 break; 2696 break;
2739 2697
2740 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2698 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2741 case C1_OSC: /* ESC ] */ 2699 case C1_OSC: /* ESC ] */
2742 process_osc_seq (); 2700 process_osc_seq ();
2743 break; 2701 break;
2744 2702
2745 /* 8.3.106: RESET TO INITIAL STATE */ 2703 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2746 case 'c': 2704 case 'c':
2747 mbstate.reset (); 2705 mbstate.reset ();
2748 scr_poweron (); 2706 scr_poweron ();
2749 scrollbar_show (1); 2707 scrollBar.show (1);
2750 break; 2708 break;
2751 2709
2752 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2710 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2753 case 'n': 2711 case 'n':
2754 scr_charset_choose (2); 2712 scr_charset_choose (2);
2805 2763
2806 nargs = 0; 2764 nargs = 0;
2807 2765
2808 priv = 0; 2766 priv = 0;
2809 ch = cmd_getc (); 2767 ch = cmd_getc ();
2810 if (ch >= '<' && ch <= '?') 2768 if ((ch >= '<' && ch <= '?') || ch == '!')
2769 {
2811 { /* '<' '=' '>' '?' */ 2770 /* '<' '=' '>' '?' '!' */
2812 priv = ch; 2771 priv = ch;
2813 ch = cmd_getc (); 2772 ch = cmd_getc ();
2814 } 2773 }
2815 2774
2816 /* read any numerical arguments */ 2775 /* read any numerical arguments */
2865 // versions. 2824 // versions.
2866 // 2825 //
2867 tt_printf ("\033[>%d;95;0c", 'U'); 2826 tt_printf ("\033[>%d;95;0c", 'U');
2868 } 2827 }
2869 break; 2828 break;
2829
2870 case '?': 2830 case '?':
2871 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2831 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2872 process_terminal_mode (ch, priv, nargs, arg); 2832 process_terminal_mode (ch, priv, nargs, arg);
2873 break; 2833 break;
2834
2835 case '!':
2836 if (ch == CSI_70)
2837 {
2838 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2839 scr_soft_reset ();
2840
2841 static const int pm_h[] = { 7, 25 };
2842 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 };
2843
2844 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h);
2845 process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l);
2874 } 2846 }
2847 break;
2848 }
2849
2875 return; 2850 return;
2876 } 2851 }
2877 2852
2878 switch (ch) 2853 switch (ch)
2879 { 2854 {
3390 *buf++ = '\0'; 3365 *buf++ = '\0';
3391 3366
3392 process_color_seq (op, color, name, resp); 3367 process_color_seq (op, color, name, resp);
3393 } 3368 }
3394 break; 3369 break;
3370 case Rxvt_restoreFG:
3395 case XTerm_Color00: 3371 case XTerm_Color00:
3396 process_color_seq (op, Color_fg, str, resp); 3372 process_color_seq (op, Color_fg, str, resp);
3397 break; 3373 break;
3374 case Rxvt_restoreBG:
3398 case XTerm_Color01: 3375 case XTerm_Color01:
3399 process_color_seq (op, Color_bg, str, resp); 3376 process_color_seq (op, Color_bg, str, resp);
3400 break; 3377 break;
3401#ifndef NO_CURSORCOLOR 3378#ifndef NO_CURSORCOLOR
3402 case XTerm_Color_cursor: 3379 case XTerm_Color_cursor:
3423 break; 3400 break;
3424 case URxvt_Color_IT: 3401 case URxvt_Color_IT:
3425 process_color_seq (op, Color_IT, str, resp); 3402 process_color_seq (op, Color_IT, str, resp);
3426 break; 3403 break;
3427#endif 3404#endif
3405 case URxvt_Color_border:
3406 process_color_seq (op, Color_border, str, resp);
3407 break;
3428#if ENABLE_TRANSPARENCY 3408#if ENABLE_TRANSPARENCY
3429 case URxvt_Color_tint: 3409 case URxvt_Color_tint:
3430 process_color_seq (op, Color_tint, str, resp); 3410 process_color_seq (op, Color_tint, str, resp);
3431 { 3411 {
3432 bool changed = false; 3412 bool changed = false;
3413
3433 if (ISSET_PIXCOLOR (Color_tint)) 3414 if (ISSET_PIXCOLOR (Color_tint))
3434 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3415 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3435 else 3416 else
3436 changed = bgPixmap.unset_tint (); 3417 changed = bgPixmap.unset_tint ();
3418
3437 if (changed) 3419 if (changed)
3438 update_background (); 3420 update_background ();
3439 } 3421 }
3440 3422
3441 break; 3423 break;
3464 changed++; 3446 changed++;
3465 str = strchr (str, ';'); 3447 str = strchr (str, ';');
3466 if (str == NULL) 3448 if (str == NULL)
3467 bgPixmap.set_defaultGeometry (); 3449 bgPixmap.set_defaultGeometry ();
3468 } 3450 }
3451
3469 while (str) 3452 while (str)
3470 { 3453 {
3471 str++; 3454 str++;
3472 if (bgPixmap.set_geometry (str)) 3455 if (bgPixmap.set_geometry (str))
3473 changed++; 3456 changed++;
3474 str = strchr (str, ';'); 3457 str = strchr (str, ';');
3475 } 3458 }
3459
3476 if (changed) 3460 if (changed)
3477 update_background (); 3461 update_background ();
3478 } 3462 }
3479 break; 3463 break;
3480#endif 3464#endif
3481
3482 case Rxvt_restoreFG:
3483 set_window_color (Color_fg, str);
3484 break;
3485 case Rxvt_restoreBG:
3486 set_window_color (Color_bg, str);
3487 break;
3488 3465
3489 case XTerm_logfile: 3466 case XTerm_logfile:
3490 // TODO, when secure mode? 3467 // TODO, when secure mode?
3491 break; 3468 break;
3492 3469
3559 break; 3536 break;
3560#endif 3537#endif
3561 3538
3562#if ENABLE_PERL 3539#if ENABLE_PERL
3563 case URxvt_perl: 3540 case URxvt_perl:
3564 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3541 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3565 ; // no responses yet
3566 break; 3542 break;
3567#endif 3543#endif
3568 } 3544 }
3569} 3545}
3570/*----------------------------------------------------------------------*/ 3546/*----------------------------------------------------------------------*/
3593 { 3569 {
3594 if (mode == 'r') 3570 if (mode == 'r')
3595 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3571 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3596 else 3572 else
3597 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3573 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3598 PrivMode (state, bit); 3574 set_privmode (bit, state);
3599 } 3575 }
3600 3576
3601 return state; 3577 return state;
3602} 3578}
3603 3579
3611 static const struct 3587 static const struct
3612 { 3588 {
3613 const int argval; 3589 const int argval;
3614 const unsigned long bit; 3590 const unsigned long bit;
3615 } argtopriv[] = { 3591 } argtopriv[] = {
3616 { 1, PrivMode_aplCUR }, 3592 { 1, PrivMode_aplCUR }, // DECCKM
3617 { 2, PrivMode_vt52 }, 3593 { 2, PrivMode_vt52 },
3618 { 3, PrivMode_132 }, 3594 { 3, PrivMode_132 }, // DECCOLM
3619 { 4, PrivMode_smoothScroll }, 3595 { 4, PrivMode_smoothScroll }, // DECSCLM
3620 { 5, PrivMode_rVideo }, 3596 { 5, PrivMode_rVideo }, // DECSCNM
3621 { 6, PrivMode_relOrigin }, 3597 { 6, PrivMode_relOrigin }, // DECOM
3622 { 7, PrivMode_Autowrap }, 3598 { 7, PrivMode_Autowrap }, // DECAWM
3623 // 8, bi-directional support mode 3599 // 8, auto-repeat keys // DECARM
3624 { 9, PrivMode_MouseX10 }, 3600 { 9, PrivMode_MouseX10 },
3625 // 18, 19 printing-related 3601 // 18 end FF to printer after print screen
3602 // 19 Print screen prints full screen/scorll region
3626 { 25, PrivMode_VisibleCursor }, 3603 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3627#ifdef scrollBar_esc 3604#ifdef scrollBar_esc
3628 { scrollBar_esc, PrivMode_scrollBar }, 3605 { scrollBar_esc, PrivMode_scrollBar },
3629#endif 3606#endif
3630 { 35, PrivMode_ShiftKeys }, // rxvt extension 3607 { 35, PrivMode_ShiftKeys }, // rxvt extension
3608 // 38, tektronix mode // DECTEK
3631 { 40, PrivMode_132OK }, 3609 { 40, PrivMode_132OK },
3632 // 41 xterm more fixes NYI 3610 // 41 xterm more fixes NYI
3633 // 45 margin bell NYI 3611 // 45 margin bell NYI
3634 // 46 start logging 3612 // 46 start logging
3635 { 47, PrivMode_Screen }, 3613 { 47, PrivMode_Screen },
3636 { 66, PrivMode_aplKP }, 3614 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
3637#ifndef NO_BACKSPACE_KEY 3615#ifndef NO_BACKSPACE_KEY
3638 { 67, PrivMode_BackSpace }, 3616 { 67, PrivMode_BackSpace }, // DECBKM
3639#endif 3617#endif
3640 { 1000, PrivMode_MouseX11 }, 3618 { 1000, PrivMode_MouseX11 },
3641 // 1001 Use Hilite Mouse Tracking. NYI, TODO
3642 { 1002, PrivMode_MouseBtnEvent }, 3619 { 1002, PrivMode_MouseBtnEvent },
3643 { 1003, PrivMode_MouseAnyEvent }, 3620 { 1003, PrivMode_MouseAnyEvent },
3644 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3621 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3645 { 1011, PrivMode_Keypress }, // rxvt extension 3622 { 1011, PrivMode_Keypress }, // rxvt extension
3646 // 1035 enable modifiers for alt, numlock NYI 3623 // 1035 enable modifiers for alt, numlock NYI
3648 // 1037 send DEL for keypad delete NYI 3625 // 1037 send DEL for keypad delete NYI
3649 { 1047, PrivMode_Screen }, 3626 { 1047, PrivMode_Screen },
3650 // 1048 save and restore cursor 3627 // 1048 save and restore cursor
3651 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3628 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3652 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3629 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3630 { 2004, PrivMode_BracketPaste },
3653 }; 3631 };
3654 3632
3655 if (nargs == 0) 3633 if (nargs == 0)
3656 return; 3634 return;
3657 3635
3682 3660
3683 scr_touch (true); 3661 scr_touch (true);
3684 break; 3662 break;
3685#endif 3663#endif
3686 case 1048: /* alternative cursor save */ 3664 case 1048: /* alternative cursor save */
3687 case 1049:
3688 if (option (Opt_secondaryScreen)) 3665 if (option (Opt_secondaryScreen))
3689 if (mode == 0) 3666 if (mode == 0)
3690 scr_cursor (RESTORE); 3667 scr_cursor (RESTORE);
3691 else if (mode == 1) 3668 else if (mode == 1)
3692 scr_cursor (SAVE); 3669 scr_cursor (SAVE);
3701 case 2: /* VT52 mode */ 3678 case 2: /* VT52 mode */
3702 /* oddball mode. should be set regardless of set/reset 3679 /* oddball mode. should be set regardless of set/reset
3703 * parameter. Return from VT52 mode with an ESC < from 3680 * parameter. Return from VT52 mode with an ESC < from
3704 * within VT52 mode 3681 * within VT52 mode
3705 */ 3682 */
3706 PrivMode (1, PrivMode_vt52); 3683 set_privmode (PrivMode_vt52, 1);
3707 break; 3684 break;
3708 case 3: /* 80/132 */ 3685 case 3: /* 80/132 */
3709 if (priv_modes & PrivMode_132OK) 3686 if (priv_modes & PrivMode_132OK)
3710 set_widthheight (((state ? 132 : 80) * fwidth), height); 3687 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3711 break; 3688 break;
3712 case 4: /* smooth scrolling */ 3689 case 4: /* smooth scrolling */
3713 set_option (Opt_jumpScroll, !state); 3690 set_option (Opt_jumpScroll, !state);
3714 break; 3691 break;
3715 case 5: /* reverse video */ 3692 case 5: /* reverse video */
3726 if (state) /* orthogonal */ 3703 if (state) /* orthogonal */
3727 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3704 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3728 break; 3705 break;
3729#ifdef scrollBar_esc 3706#ifdef scrollBar_esc
3730 case scrollBar_esc: 3707 case scrollBar_esc:
3731 if (scrollbar_mapping (state)) 3708 if (scrollBar.map (state))
3732 { 3709 {
3733 resize_all_windows (0, 0, 0); 3710 resize_all_windows (0, 0, 0);
3734 scr_touch (true); 3711 scr_touch (true);
3735 } 3712 }
3736 break; 3713 break;
3747 /* case 67: - backspace key */ 3724 /* case 67: - backspace key */
3748 case 1000: /* X11 mouse reporting */ 3725 case 1000: /* X11 mouse reporting */
3749 if (state) /* orthogonal */ 3726 if (state) /* orthogonal */
3750 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3727 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3751 break; 3728 break;
3752#if 0
3753 case 1001:
3754 break; /* X11 mouse highlighting */
3755#endif
3756 case 1002: 3729 case 1002:
3757 case 1003: 3730 case 1003:
3758 if (state) { 3731 if (state)
3732 {
3759 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3733 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3760 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3734 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3761 vt_emask_mouse = PointerMotionMask; 3735 vt_emask_mouse = PointerMotionMask;
3736 }
3762 } else 3737 else
3763 vt_emask_mouse = NoEventMask; 3738 vt_emask_mouse = NoEventMask;
3739
3764 vt_select_input (); 3740 vt_select_input ();
3765 break; 3741 break;
3766 case 1010: /* scroll to bottom on TTY output inhibit */ 3742 case 1010: /* scroll to bottom on TTY output inhibit */
3767 set_option (Opt_scrollTtyOutput, !state); 3743 set_option (Opt_scrollTtyOutput, !state);
3768 break; 3744 break;
3769 case 1011: /* scroll to bottom on key press */ 3745 case 1011: /* scroll to bottom on key press */
3770 set_option (Opt_scrollTtyKeypress, state); 3746 set_option (Opt_scrollTtyKeypress, state);
3771 break; 3747 break;
3772 case 1047: /* secondary screen w/ clearing last */ 3748 case 1047: /* secondary screen w/ clearing last */
3773 if (option (Opt_secondaryScreen)) 3749 if (option (Opt_secondaryScreen))
3774 if (current_screen != PRIMARY) 3750 if (!state)
3775 scr_erase_screen (2); 3751 scr_erase_screen (2);
3752
3776 scr_change_screen (state); 3753 scr_change_screen (state);
3777 break; 3754 break;
3778 case 1049: /* secondary screen w/ clearing first */ 3755 case 1049: /* secondary screen w/ clearing first */
3756 if (state)
3757 scr_cursor (SAVE);
3758
3779 scr_change_screen (state); 3759 scr_change_screen (state);
3780 if (option (Opt_secondaryScreen)) 3760
3781 if (current_screen != PRIMARY) 3761 if (state)
3782 scr_erase_screen (2); 3762 scr_erase_screen (2);
3763 else
3764 scr_cursor (RESTORE);
3783 break; 3765 break;
3784 default: 3766 default:
3785 break; 3767 break;
3786 } 3768 }
3787 } 3769 }
3947rxvt_term::process_graphics () 3929rxvt_term::process_graphics ()
3948{ 3930{
3949 unicode_t ch, cmd = cmd_getc (); 3931 unicode_t ch, cmd = cmd_getc ();
3950 3932
3951 if (cmd == 'Q') 3933 if (cmd == 'Q')
3934 {
3952 { /* query graphics */ 3935 /* query graphics */
3953 tt_printf ("\033G0\012"); /* no graphics */ 3936 tt_printf ("\033G0\012"); /* no graphics */
3954 return; 3937 return;
3955 } 3938 }
3956 /* swallow other graphics sequences until terminating ':' */ 3939 /* swallow other graphics sequences until terminating ':' */
3957 do 3940 do
4007 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 3990 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4008 3991
4009 memcpy (v_buffer + v_buflen, data, len); 3992 memcpy (v_buffer + v_buflen, data, len);
4010 v_buflen += len; 3993 v_buflen += len;
4011 3994
4012 pty_ev.set (EVENT_READ | EVENT_WRITE); 3995 pty_ev.set (ev::READ | ev::WRITE);
4013} 3996}
4014 3997
4015void rxvt_term::pty_write () 3998void rxvt_term::pty_write ()
4016{ 3999{
4017 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4000 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4023 if (v_buflen == 0) 4006 if (v_buflen == 0)
4024 { 4007 {
4025 free (v_buffer); 4008 free (v_buffer);
4026 v_buffer = 0; 4009 v_buffer = 0;
4027 4010
4028 pty_ev.set (EVENT_READ); 4011 pty_ev.set (ev::READ);
4029 return; 4012 return;
4030 } 4013 }
4031 4014
4032 memmove (v_buffer, v_buffer + written, v_buflen); 4015 memmove (v_buffer, v_buffer + written, v_buflen);
4033 } 4016 }
4034 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4017 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4035 pty_ev.set (EVENT_READ); 4018 pty_ev.set (ev::READ);
4036} 4019}
4037 4020
4038/*----------------------- end-of-file (C source) -----------------------*/ 4021/*----------------------- end-of-file (C source) -----------------------*/
4039 4022

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines