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.363 by root, Sun Nov 11 04:08:00 2007 UTC vs.
Revision 1.416 by root, Tue Jul 15 16:41:22 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_Left: /* \033Ot or standard */
602 case XK_KP_Up: /* \033Ox or standard */
603 case XK_KP_Right: /* \033Ov or standard */
604 case XK_KP_Down: /* \033Or 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
… …
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::prepare_cb (ev::prepare &w, int revents) 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 (1. / 60.); // refresh at max. 60 hz normally
1107} 1037}
1108 1038
1109void 1039void
1110rxvt_term::flush_cb (ev::timer &w, int revents) 1040rxvt_term::flush_cb (ev::timer &w, int revents)
1111{ 1041{
… …
1119void 1049void
1120rxvt_term::cursor_blink_cb (ev::timer &w, int revents) 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;
1054 refresh_check ();
1124} 1055}
1125#endif 1056#endif
1126 1057
1127#ifdef TEXT_BLINK 1058#ifdef TEXT_BLINK
1128void 1059void
… …
1130{ 1061{
1131 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1062 if (scr_refresh_rend (RS_Blink, RS_Blink))
1132 { 1063 {
1133 hidden_text = !hidden_text; 1064 hidden_text = !hidden_text;
1134 want_refresh = 1; 1065 want_refresh = 1;
1066 refresh_check ();
1135 } 1067 }
1068 else
1069 w.stop ();
1136} 1070}
1137#endif 1071#endif
1138 1072
1139#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1073#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1140void 1074void
1141rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1075rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1142{ 1076{
1143 if ((scrollbar_isUp() || scrollbar_isDn()) && 1077 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1144 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1078 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1079 {
1145 want_refresh = 1; 1080 want_refresh = 1;
1081 refresh_check ();
1082 }
1146 else 1083 else
1147 w.stop (); 1084 w.stop ();
1148} 1085}
1149#endif 1086#endif
1150 1087
… …
1154{ 1091{
1155 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1092 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1156 { 1093 {
1157 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1094 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1158 want_refresh = 1; 1095 want_refresh = 1;
1096 refresh_check ();
1159 } 1097 }
1160 else 1098 else
1161 w.stop (); 1099 w.stop ();
1162} 1100}
1163#endif 1101#endif
1164 1102
1165#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1103#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1166void 1104void
1167rxvt_term::slip_wheel_cb (ev::timer &w, int revents) 1105rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1168{ 1106{
1169 if (mouse_slip_wheel_speed == 0 1107 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1170 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1171 : scr_page (UP, mouse_slip_wheel_speed))
1172 { 1108 {
1173 if (view_start == top_row || view_start == 0)
1174 mouse_slip_wheel_speed = 0;
1175
1176 want_refresh = 1; 1109 want_refresh = 1;
1110 refresh_check ();
1111 }
1112
1113 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1177 } 1114 {
1178 else 1115 mouse_slip_wheel_speed = 0;
1179 w.stop (); 1116 w.stop ();
1117 }
1180} 1118}
1181#endif 1119#endif
1182 1120
1183#if LINUX_YIELD_HACK 1121#if LINUX_YIELD_HACK
1184static struct event_handler 1122static struct event_handler
… …
1256 if (cmd_parse ()) 1194 if (cmd_parse ())
1257 break; 1195 break;
1258 1196
1259 if (revents & ev::WRITE) 1197 if (revents & ev::WRITE)
1260 pty_write (); 1198 pty_write ();
1199
1200 refresh_check ();
1261} 1201}
1262 1202
1263void 1203void
1264rxvt_term::pointer_unblank () 1204rxvt_term::pointer_unblank ()
1265{ 1205{
… …
1303 int x, y; 1243 int x, y;
1304 int code = 32; 1244 int code = 32;
1305 1245
1306 x = Pixel2Col (ev.x); 1246 x = Pixel2Col (ev.x);
1307 y = Pixel2Row (ev.y); 1247 y = Pixel2Row (ev.y);
1308 if (ev.type == MotionNotify) { 1248 if (ev.type == MotionNotify)
1249 {
1309 if (x == mouse_row && y == mouse_col) 1250 if (x == mouse_row && y == mouse_col)
1310 return; 1251 return;
1311 mouse_row = x; 1252 mouse_row = x;
1312 mouse_col = y; 1253 mouse_col = y;
1313 code += 32; 1254 code += 32;
1314 } 1255 }
1315 1256
1316 if (MEvent.button == AnyButton) 1257 if (MEvent.button == AnyButton)
1317 button_number = 3; 1258 button_number = 3;
1318 else 1259 else
1319 { 1260 {
… …
1479 && ev.xfocus.mode != NotifyGrab) 1420 && ev.xfocus.mode != NotifyGrab)
1480 focus_out (); 1421 focus_out ();
1481 break; 1422 break;
1482 1423
1483 case ConfigureNotify: 1424 case ConfigureNotify:
1484 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n", 1425 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1485 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y, 1426 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1486 szHint.width, szHint.height); */ 1427 szHint.width, szHint.height);*/
1487 if (ev.xconfigure.window == parent[0]) 1428 if (ev.xconfigure.window == parent[0])
1488 { 1429 {
1489 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1430 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1490 ; 1431 ;
1491 1432
… …
1496 } 1437 }
1497 else 1438 else
1498 { 1439 {
1499#ifdef HAVE_BG_PIXMAP 1440#ifdef HAVE_BG_PIXMAP
1500 if (bgPixmap.window_position_sensitive ()) 1441 if (bgPixmap.window_position_sensitive ())
1442 {
1443 if (mapped)
1501 update_background (); 1444 update_background ();
1445 else
1446 bgPixmap.invalidate ();
1447 }
1502#endif 1448#endif
1503 } 1449 }
1450
1504 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1451 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1505 } 1452 }
1506 break; 1453 break;
1507 1454
1508 case PropertyNotify: 1455 case PropertyNotify:
… …
1525 case SelectionRequest: 1472 case SelectionRequest:
1526 selection_send (ev.xselectionrequest); 1473 selection_send (ev.xselectionrequest);
1527 break; 1474 break;
1528 1475
1529 case MapNotify: 1476 case MapNotify:
1477#ifdef HAVE_BG_PIXMAP
1478 /* This is needed spcifically to fix the case of no window manager or a
1479 * non-reparenting window manager. In those cases we never get first
1480 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1481 * care of multiplicity of ConfigureNotify events arriwing while WM does
1482 * reparenting.
1483 * We should not render background immidiately, as there could be several
1484 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1485 * by scheduling background redraw as soon as we can, but giving a short
1486 * bit of time for ConfigureNotifies to arrive.
1487 * We should render background PRIOR to drawing any text, but AFTER all
1488 * of ConfigureNotifys for the best results.
1489 */
1490 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1491 update_background_ev.start (0.025);
1492#endif
1530 mapped = 1; 1493 mapped = 1;
1531#ifdef TEXT_BLINK 1494#ifdef TEXT_BLINK
1532 text_blink_ev.start (TEXT_BLINK_INTERVAL); 1495 text_blink_ev.start ();
1533#endif 1496#endif
1534 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1497 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1535 break; 1498 break;
1536 1499
1537 case UnmapNotify: 1500 case UnmapNotify:
… …
1558 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1521 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1559 { 1522 {
1560 scr_expose (ev.xexpose.x, ev.xexpose.y, 1523 scr_expose (ev.xexpose.x, ev.xexpose.y,
1561 ev.xexpose.width, ev.xexpose.height, False); 1524 ev.xexpose.width, ev.xexpose.height, False);
1562 } 1525 }
1526
1563 want_refresh = 1; 1527 want_refresh = 1;
1564 } 1528 }
1565 else 1529 else
1566 { 1530 {
1567 XEvent unused_event; 1531 XEvent unused_event;
… …
1569 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1533 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1570 ; 1534 ;
1571 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1535 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1572 ; 1536 ;
1573 1537
1574 if (isScrollbarWindow (ev.xany.window)) 1538 if (scrollBar.state && ev.xany.window == scrollBar.win)
1575 { 1539 {
1576 scrollBar.setIdle (); 1540 scrollBar.state = STATE_IDLE;
1577 scrollbar_show (0); 1541 scrollBar.show (0);
1578 } 1542 }
1579 } 1543 }
1580 break; 1544 break;
1581 1545
1582 case MotionNotify: 1546 case MotionNotify:
… …
1628 int dist; 1592 int dist;
1629 1593
1630 /* don't clobber the current delay if we are 1594 /* don't clobber the current delay if we are
1631 * already in the middle of scrolling. 1595 * already in the middle of scrolling.
1632 */ 1596 */
1633 if (!sel_scroll_ev.active) 1597 if (!sel_scroll_ev.is_active ())
1634 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 1598 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1635 1599
1636 /* save the event params so we can highlight 1600 /* save the event params so we can highlight
1637 * the selection in the pending-scroll loop 1601 * the selection in the pending-scroll loop
1638 */ 1602 */
… …
1661 else 1625 else
1662 { 1626 {
1663 /* we are within the text window, so we 1627 /* we are within the text window, so we
1664 * shouldn't be scrolling 1628 * shouldn't be scrolling
1665 */ 1629 */
1666 if (sel_scroll_ev.active)
1667 sel_scroll_ev.stop(); 1630 sel_scroll_ev.stop();
1668 } 1631 }
1669#endif 1632#endif
1670#ifdef MOUSE_THRESHOLD 1633#ifdef MOUSE_THRESHOLD
1671 } 1634 }
1672#endif 1635#endif
1673 } 1636 }
1674 } 1637 }
1675 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1638 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1676 { 1639 {
1677 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1640 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1678 MotionNotify, &ev)) 1641 MotionNotify, &ev))
1679 ; 1642 ;
1680 1643
… …
1682 &unused_root, &unused_child, 1645 &unused_root, &unused_child,
1683 &unused_root_x, &unused_root_y, 1646 &unused_root_x, &unused_root_y,
1684 &ev.xbutton.x, &ev.xbutton.y, 1647 &ev.xbutton.x, &ev.xbutton.y,
1685 &unused_mask); 1648 &unused_mask);
1686 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1649 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1687 scrollbar_size ()); 1650 scrollBar.size ());
1688 want_refresh = 1; 1651 want_refresh = 1;
1689 scrollbar_show (1); 1652 scrollBar.show (1);
1690 } 1653 }
1691 break; 1654 break;
1692 } 1655 }
1693 1656
1694#if defined(CURSOR_BLINK) 1657#if defined(CURSOR_BLINK)
… …
1715 1678
1716 if (ev.type == KeyPress && hidden_pointer == 0) 1679 if (ev.type == KeyPress && hidden_pointer == 0)
1717 pointer_blank (); 1680 pointer_blank ();
1718 } 1681 }
1719#endif 1682#endif
1683
1684 refresh_check ();
1720} 1685}
1721 1686
1722void 1687void
1723rxvt_term::focus_in () 1688rxvt_term::focus_in ()
1724{ 1689{
… …
1736 XSetICFocus (Input_Context); 1701 XSetICFocus (Input_Context);
1737 } 1702 }
1738#endif 1703#endif
1739#if CURSOR_BLINK 1704#if CURSOR_BLINK
1740 if (option (Opt_cursorBlink)) 1705 if (option (Opt_cursorBlink))
1741 cursor_blink_ev.start (CURSOR_BLINK_INTERVAL, CURSOR_BLINK_INTERVAL); 1706 cursor_blink_ev.again ();
1742#endif 1707#endif
1743#if OFF_FOCUS_FADING 1708#if OFF_FOCUS_FADING
1744 if (rs[Rs_fade]) 1709 if (rs[Rs_fade])
1745 { 1710 {
1746 pix_colors = pix_colors_focused; 1711 pix_colors = pix_colors_focused;
… …
1834 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1799 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1835 { 1800 {
1836 bgPixmap.set_root_pixmap (); 1801 bgPixmap.set_root_pixmap ();
1837 update_background (); 1802 update_background ();
1838 } 1803 }
1804
1839 break; 1805 break;
1840 } 1806 }
1841# endif 1807# endif
1808
1809 refresh_check ();
1842} 1810}
1843#endif 1811#endif
1844 1812
1845void 1813void
1846rxvt_term::button_press (XButtonEvent &ev) 1814rxvt_term::button_press (XButtonEvent &ev)
… …
1901 mouse_report (ev); 1869 mouse_report (ev);
1902 } 1870 }
1903#else 1871#else
1904 MEvent.button = ev.button; 1872 MEvent.button = ev.button;
1905 mouse_report (ev); 1873 mouse_report (ev);
1906#endif /* MOUSE_REPORT_DOUBLECLICK */ 1874#endif /* MOUSE_REPORT_DOUBLECLICK */
1907 1875
1908 } 1876 }
1909 else 1877 else
1910 { 1878 {
1911 if (ev.button != MEvent.button) 1879 if (ev.button != MEvent.button)
… …
1959 } 1927 }
1960 1928
1961 /* 1929 /*
1962 * Scrollbar window processing of button press 1930 * Scrollbar window processing of button press
1963 */ 1931 */
1964 if (isScrollbarWindow (ev.window)) 1932 if (scrollBar.state && ev.window == scrollBar.win)
1965 { 1933 {
1966 scrollBar.setIdle (); 1934 page_dirn direction = NO_DIR;
1935
1936 if (scrollBar.upButton (ev.y))
1937 direction = UP; /* up */
1938 else if (scrollBar.dnButton (ev.y))
1939 direction = DN; /* down */
1940
1941 scrollBar.state = STATE_IDLE;
1967 /* 1942 /*
1968 * Rxvt-style scrollbar: 1943 * Rxvt-style scrollbar:
1969 * move up if mouse is above slider 1944 * move up if mouse is above slider
1970 * move dn if mouse is below slider 1945 * move dn if mouse is below slider
1971 * 1946 *
… …
1980 /* 1955 /*
1981 * Mouse report disabled scrollbar: 1956 * Mouse report disabled scrollbar:
1982 * arrow buttons - send up/down 1957 * arrow buttons - send up/down
1983 * click on scrollbar - send pageup/down 1958 * click on scrollbar - send pageup/down
1984 */ 1959 */
1985 if ((scrollBar.style == R_SB_NEXT 1960 if (direction == UP)
1986 && scrollbarnext_upButton (ev.y))
1987 || (scrollBar.style == R_SB_RXVT
1988 && scrollbarrxvt_upButton (ev.y)))
1989 tt_printf ("\033[A"); 1961 tt_printf ("\033[A");
1990 else if ((scrollBar.style == R_SB_NEXT 1962 else if (direction == DN)
1991 && scrollbarnext_dnButton (ev.y))
1992 || (scrollBar.style == R_SB_RXVT
1993 && scrollbarrxvt_dnButton (ev.y)))
1994 tt_printf ("\033[B"); 1963 tt_printf ("\033[B");
1995 else 1964 else
1996 switch (ev.button) 1965 switch (ev.button)
1997 { 1966 {
1998 case Button2: 1967 case Button2:
… …
2005 tt_printf ("\033[5~"); 1974 tt_printf ("\033[5~");
2006 break; 1975 break;
2007 } 1976 }
2008 } 1977 }
2009 else 1978 else
2010#endif /* NO_SCROLLBAR_REPORT */ 1979#endif /* NO_SCROLLBAR_REPORT */
2011
2012 {
2013 char upordown = 0;
2014
2015 if (scrollBar.style == R_SB_NEXT)
2016 { 1980 {
2017 if (scrollbarnext_upButton (ev.y)) 1981 if (direction != NO_DIR)
2018 upordown = -1; /* up */
2019 else if (scrollbarnext_dnButton (ev.y))
2020 upordown = 1; /* down */
2021 }
2022 else if (scrollBar.style == R_SB_RXVT)
2023 {
2024 if (scrollbarrxvt_upButton (ev.y))
2025 upordown = -1; /* up */
2026 else if (scrollbarrxvt_dnButton (ev.y))
2027 upordown = 1; /* down */
2028 }
2029 if (upordown)
2030 { 1982 {
2031#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1983#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1984 if (!cont_scroll_ev.is_active ())
2032 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 1985 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2033#endif 1986#endif
2034 if (scr_page (upordown < 0 ? UP : DN, 1)) 1987 if (scr_page (direction, 1))
2035 { 1988 {
2036 if (upordown < 0) 1989 if (direction == UP)
2037 scrollBar.setUp (); 1990 scrollBar.state = STATE_UP;
2038 else 1991 else
2039 scrollBar.setDn (); 1992 scrollBar.state = STATE_DOWN;
2040 } 1993 }
2041 } 1994 }
2042 else 1995 else
2043 switch (ev.button) 1996 switch (ev.button)
2044 { 1997 {
2045 case Button2: 1998 case Button2:
2046 switch (scrollbar_align) 1999 switch (scrollBar.align)
2047 { 2000 {
2048 case R_SB_ALIGN_TOP: 2001 case R_SB_ALIGN_TOP:
2049 csrO = 0; 2002 csrO = 0;
2050 break; 2003 break;
2051 case R_SB_ALIGN_CENTRE: 2004 case R_SB_ALIGN_CENTRE:
… …
2057 } 2010 }
2058 2011
2059 if (scrollBar.style == R_SB_XTERM 2012 if (scrollBar.style == R_SB_XTERM
2060 || scrollbar_above_slider (ev.y) 2013 || scrollbar_above_slider (ev.y)
2061 || scrollbar_below_slider (ev.y)) 2014 || scrollbar_below_slider (ev.y))
2062 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2015 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2063 2016
2064 scrollBar.setMotion (); 2017 scrollBar.state = STATE_MOTION;
2065 break; 2018 break;
2066 2019
2067 case Button1: 2020 case Button1:
2068 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2021 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2069 csrO = ev.y - scrollBar.top; 2022 csrO = ev.y - scrollBar.top;
2070 /* FALLTHROUGH */ 2023 /* FALLTHROUGH */
2071 2024
2072 case Button3: 2025 case Button3:
2073 if (scrollBar.style != R_SB_XTERM) 2026 if (scrollBar.style != R_SB_XTERM)
… …
2083 scr_page (DN, nrow - 1); 2036 scr_page (DN, nrow - 1);
2084# else 2037# else
2085 scr_page (DN, nrow / 4); 2038 scr_page (DN, nrow / 4);
2086# endif 2039# endif
2087 else 2040 else
2088 scrollBar.setMotion (); 2041 scrollBar.state = STATE_MOTION;
2089 } 2042 }
2090 else 2043 else
2091 { 2044 {
2092 scr_page ((ev.button == Button1 ? DN : UP), 2045 scr_page ((ev.button == Button1 ? DN : UP),
2093 (nrow 2046 (nrow
2094 * scrollbar_position (ev.y) 2047 * scrollbar_position (ev.y)
2095 / scrollbar_size ())); 2048 / scrollBar.size ()));
2096 } 2049 }
2097 2050
2098 break; 2051 break;
2099 } 2052 }
2100 } 2053 }
… …
2110 2063
2111 csrO = 0; /* reset csr Offset */ 2064 csrO = 0; /* reset csr Offset */
2112 if (!bypass_keystate) 2065 if (!bypass_keystate)
2113 reportmode = !! (priv_modes & PrivMode_mouse_report); 2066 reportmode = !! (priv_modes & PrivMode_mouse_report);
2114 2067
2115 if (scrollbar_isUpDn ()) 2068 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2116 { 2069 {
2117 scrollBar.setIdle (); 2070 scrollBar.state = STATE_IDLE;
2118 scrollbar_show (0); 2071 scrollBar.show (0);
2119 } 2072 }
2120 2073
2121#ifdef SELECTION_SCROLLING 2074#ifdef SELECTION_SCROLLING
2122 if (sel_scroll_ev.active)
2123 sel_scroll_ev.stop(); 2075 sel_scroll_ev.stop();
2124#endif 2076#endif
2125 2077
2126 if (ev.window == vt) 2078 if (ev.window == vt)
2127 { 2079 {
2128 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2080 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
… …
2152 mouse_report (ev); 2104 mouse_report (ev);
2153 } 2105 }
2154#else /* MOUSE_REPORT_DOUBLECLICK */ 2106#else /* MOUSE_REPORT_DOUBLECLICK */
2155 MEvent.button = AnyButton; 2107 MEvent.button = AnyButton;
2156 mouse_report (ev); 2108 mouse_report (ev);
2157#endif /* MOUSE_REPORT_DOUBLECLICK */ 2109#endif /* MOUSE_REPORT_DOUBLECLICK */
2158 return; 2110 return;
2159 } 2111 }
2160 2112
2161 /* 2113 /*
2162 * dumb hack to compensate for the failure of click-and-drag 2114 * dumb hack to compensate for the failure of click-and-drag
… …
2200 { 2152 {
2201 mouse_slip_wheel_speed += v ? -1 : 1; 2153 mouse_slip_wheel_speed += v ? -1 : 1;
2202 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2154 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2203 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2155 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2204 2156
2157 if (!slip_wheel_ev.is_active ())
2205 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2158 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2206 } 2159 }
2207 else 2160 else
2161# endif
2208 { 2162 {
2209# endif
2210 scr_page (v, i); 2163 scr_page (v, i);
2211 scrollbar_show (1); 2164 scrollBar.show (1);
2212# ifdef MOUSE_SLIP_WHEELING
2213 } 2165 }
2214# endif
2215 } 2166 }
2216 break; 2167 break;
2217#endif 2168#endif
2218 } 2169 }
2219 } 2170 }
… …
2278 2229
2279 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1) 2230 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2280 { 2231 {
2281 refresh_count = 0; 2232 refresh_count = 0;
2282 2233
2283 if (!option (Opt_skipScroll) || ev::ev_time () > ev::now () + 1. / 60.) 2234 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2284 { 2235 {
2285 refreshnow = true; 2236 refreshnow = true;
2286 ch = NOCHAR; 2237 ch = NOCHAR;
2287 break; 2238 break;
2288 } 2239 }
… …
2373 cmdbuf_ptr = cmdbuf_endp; 2324 cmdbuf_ptr = cmdbuf_endp;
2374 break; 2325 break;
2375 } 2326 }
2376 2327
2377 if (len == (size_t)-1) 2328 if (len == (size_t)-1)
2329 {
2330 mbrtowc (0, 0, 0, mbstate); // reset now undefined conversion state
2378 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2331 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2332 }
2379 2333
2380 // assume wchar == unicode 2334 // assume wchar == unicode
2381 cmdbuf_ptr += len; 2335 cmdbuf_ptr += len;
2382 return wc & UNICODE_MASK; 2336 return wc & UNICODE_MASK;
2383 } 2337 }
… …
2427/*----------------------------------------------------------------------*/ 2381/*----------------------------------------------------------------------*/
2428#ifdef PRINTPIPE 2382#ifdef PRINTPIPE
2429FILE * 2383FILE *
2430rxvt_term::popen_printer () 2384rxvt_term::popen_printer ()
2431{ 2385{
2432 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2386 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2433 2387
2434 if (stream == NULL) 2388 if (stream == NULL)
2435 rxvt_warn ("can't open printer pipe, not printing.\n"); 2389 rxvt_warn ("can't open printer pipe, not printing.\n");
2436 2390
2437 return stream; 2391 return stream;
… …
2448 * simulate attached vt100 printer 2402 * simulate attached vt100 printer
2449 */ 2403 */
2450void 2404void
2451rxvt_term::process_print_pipe () 2405rxvt_term::process_print_pipe ()
2452{ 2406{
2453 int done; 2407 FILE *fd = popen_printer ();
2454 FILE *fd;
2455 2408
2456 if ((fd = popen_printer ()) == NULL) 2409 if (!fd)
2457 return; 2410 return;
2458 2411
2459 /* 2412 /*
2460 * Send all input to the printer until either ESC[4i or ESC[?4i 2413 * Send all input to the printer until either ESC[4i or ESC[?4i
2461 * is received. 2414 * is received.
2462 */ 2415 */
2463 for (done = 0; !done;) 2416 for (int done = 0; !done; )
2464 { 2417 {
2465 unsigned char buf[8]; 2418 unsigned char buf[8];
2466 unicode_t ch; 2419 unicode_t ch;
2467 unsigned int i, len; 2420 unsigned int i, len;
2468 2421
… …
2499 } 2452 }
2500 } 2453 }
2501 2454
2502 pclose_printer (fd); 2455 pclose_printer (fd);
2503} 2456}
2504#endif /* PRINTPIPE */ 2457#endif /* PRINTPIPE */
2505/*}}} */ 2458/*}}} */
2506 2459
2507/* *INDENT-OFF* */ 2460/* *INDENT-OFF* */
2508enum { 2461enum {
2509 C1_40 = 0x40, 2462 C1_40 = 0x40,
… …
2613 break; 2566 break;
2614 case 'Z': /* identify the terminal type */ 2567 case 'Z': /* identify the terminal type */
2615 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2568 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2616 break; 2569 break;
2617 case '<': /* turn off VT52 mode */ 2570 case '<': /* turn off VT52 mode */
2618 PrivMode (0, PrivMode_vt52); 2571 set_privmode (PrivMode_vt52, 0);
2619 break; 2572 break;
2620 case 'F': /* use special graphics character set */ 2573 case 'F': /* use special graphics character set */
2621 case 'G': /* use regular character set */ 2574 case 'G': /* use regular character set */
2622 /* unimplemented */ 2575 /* unimplemented */
2623 break; 2576 break;
… …
2677 scr_forwardindex (); 2630 scr_forwardindex ();
2678 break; 2631 break;
2679#endif 2632#endif
2680 case '=': 2633 case '=':
2681 case '>': 2634 case '>':
2682 PrivMode ((ch == '='), PrivMode_aplKP); 2635 set_privmode (PrivMode_aplKP, ch == '=');
2683 break; 2636 break;
2684 2637
2685 case C1_40: 2638 case C1_40:
2686 cmd_getc (); 2639 cmd_getc ();
2687 break; 2640 break;
… …
2740 2693
2741 /* 8.3.106: RESET TO INITIAL STATE */ 2694 /* 8.3.106: RESET TO INITIAL STATE */
2742 case 'c': 2695 case 'c':
2743 mbstate.reset (); 2696 mbstate.reset ();
2744 scr_poweron (); 2697 scr_poweron ();
2745 scrollbar_show (1); 2698 scrollBar.show (1);
2746 break; 2699 break;
2747 2700
2748 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2701 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2749 case 'n': 2702 case 'n':
2750 scr_charset_choose (2); 2703 scr_charset_choose (2);
… …
2802 nargs = 0; 2755 nargs = 0;
2803 2756
2804 priv = 0; 2757 priv = 0;
2805 ch = cmd_getc (); 2758 ch = cmd_getc ();
2806 if (ch >= '<' && ch <= '?') 2759 if (ch >= '<' && ch <= '?')
2760 {
2807 { /* '<' '=' '>' '?' */ 2761 /* '<' '=' '>' '?' */
2808 priv = ch; 2762 priv = ch;
2809 ch = cmd_getc (); 2763 ch = cmd_getc ();
2810 } 2764 }
2811 2765
2812 /* read any numerical arguments */ 2766 /* read any numerical arguments */
… …
2861 // versions. 2815 // versions.
2862 // 2816 //
2863 tt_printf ("\033[>%d;95;0c", 'U'); 2817 tt_printf ("\033[>%d;95;0c", 'U');
2864 } 2818 }
2865 break; 2819 break;
2820
2866 case '?': 2821 case '?':
2867 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2822 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2868 process_terminal_mode (ch, priv, nargs, arg); 2823 process_terminal_mode (ch, priv, nargs, arg);
2869 break; 2824 break;
2870 } 2825 }
… …
3386 *buf++ = '\0'; 3341 *buf++ = '\0';
3387 3342
3388 process_color_seq (op, color, name, resp); 3343 process_color_seq (op, color, name, resp);
3389 } 3344 }
3390 break; 3345 break;
3346 case Rxvt_restoreFG:
3391 case XTerm_Color00: 3347 case XTerm_Color00:
3392 process_color_seq (op, Color_fg, str, resp); 3348 process_color_seq (op, Color_fg, str, resp);
3393 break; 3349 break;
3350 case Rxvt_restoreBG:
3394 case XTerm_Color01: 3351 case XTerm_Color01:
3395 process_color_seq (op, Color_bg, str, resp); 3352 process_color_seq (op, Color_bg, str, resp);
3396 break; 3353 break;
3397#ifndef NO_CURSORCOLOR 3354#ifndef NO_CURSORCOLOR
3398 case XTerm_Color_cursor: 3355 case XTerm_Color_cursor:
… …
3424#if ENABLE_TRANSPARENCY 3381#if ENABLE_TRANSPARENCY
3425 case URxvt_Color_tint: 3382 case URxvt_Color_tint:
3426 process_color_seq (op, Color_tint, str, resp); 3383 process_color_seq (op, Color_tint, str, resp);
3427 { 3384 {
3428 bool changed = false; 3385 bool changed = false;
3386
3429 if (ISSET_PIXCOLOR (Color_tint)) 3387 if (ISSET_PIXCOLOR (Color_tint))
3430 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3388 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3431 else 3389 else
3432 changed = bgPixmap.unset_tint (); 3390 changed = bgPixmap.unset_tint ();
3391
3433 if (changed) 3392 if (changed)
3434 update_background (); 3393 update_background ();
3435 } 3394 }
3436 3395
3437 break; 3396 break;
… …
3460 changed++; 3419 changed++;
3461 str = strchr (str, ';'); 3420 str = strchr (str, ';');
3462 if (str == NULL) 3421 if (str == NULL)
3463 bgPixmap.set_defaultGeometry (); 3422 bgPixmap.set_defaultGeometry ();
3464 } 3423 }
3424
3465 while (str) 3425 while (str)
3466 { 3426 {
3467 str++; 3427 str++;
3468 if (bgPixmap.set_geometry (str)) 3428 if (bgPixmap.set_geometry (str))
3469 changed++; 3429 changed++;
3470 str = strchr (str, ';'); 3430 str = strchr (str, ';');
3471 } 3431 }
3432
3472 if (changed) 3433 if (changed)
3473 update_background (); 3434 update_background ();
3474 } 3435 }
3475 break; 3436 break;
3476#endif 3437#endif
3477
3478 case Rxvt_restoreFG:
3479 set_window_color (Color_fg, str);
3480 break;
3481 case Rxvt_restoreBG:
3482 set_window_color (Color_bg, str);
3483 break;
3484 3438
3485 case XTerm_logfile: 3439 case XTerm_logfile:
3486 // TODO, when secure mode? 3440 // TODO, when secure mode?
3487 break; 3441 break;
3488 3442
… …
3589 { 3543 {
3590 if (mode == 'r') 3544 if (mode == 'r')
3591 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3545 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3592 else 3546 else
3593 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3547 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3594 PrivMode (state, bit); 3548 set_privmode (bit, state);
3595 } 3549 }
3596 3550
3597 return state; 3551 return state;
3598} 3552}
3599 3553
… …
3632 { 66, PrivMode_aplKP }, 3586 { 66, PrivMode_aplKP },
3633#ifndef NO_BACKSPACE_KEY 3587#ifndef NO_BACKSPACE_KEY
3634 { 67, PrivMode_BackSpace }, 3588 { 67, PrivMode_BackSpace },
3635#endif 3589#endif
3636 { 1000, PrivMode_MouseX11 }, 3590 { 1000, PrivMode_MouseX11 },
3637 // 1001 Use Hilite Mouse Tracking. NYI, TODO
3638 { 1002, PrivMode_MouseBtnEvent }, 3591 { 1002, PrivMode_MouseBtnEvent },
3639 { 1003, PrivMode_MouseAnyEvent }, 3592 { 1003, PrivMode_MouseAnyEvent },
3640 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3593 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3641 { 1011, PrivMode_Keypress }, // rxvt extension 3594 { 1011, PrivMode_Keypress }, // rxvt extension
3642 // 1035 enable modifiers for alt, numlock NYI 3595 // 1035 enable modifiers for alt, numlock NYI
… …
3644 // 1037 send DEL for keypad delete NYI 3597 // 1037 send DEL for keypad delete NYI
3645 { 1047, PrivMode_Screen }, 3598 { 1047, PrivMode_Screen },
3646 // 1048 save and restore cursor 3599 // 1048 save and restore cursor
3647 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3600 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3648 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3601 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3602 { 2004, PrivMode_BracketPaste },
3649 }; 3603 };
3650 3604
3651 if (nargs == 0) 3605 if (nargs == 0)
3652 return; 3606 return;
3653 3607
… …
3697 case 2: /* VT52 mode */ 3651 case 2: /* VT52 mode */
3698 /* oddball mode. should be set regardless of set/reset 3652 /* oddball mode. should be set regardless of set/reset
3699 * parameter. Return from VT52 mode with an ESC < from 3653 * parameter. Return from VT52 mode with an ESC < from
3700 * within VT52 mode 3654 * within VT52 mode
3701 */ 3655 */
3702 PrivMode (1, PrivMode_vt52); 3656 set_privmode (PrivMode_vt52, 1);
3703 break; 3657 break;
3704 case 3: /* 80/132 */ 3658 case 3: /* 80/132 */
3705 if (priv_modes & PrivMode_132OK) 3659 if (priv_modes & PrivMode_132OK)
3660 {
3661 scr_poweron ();
3706 set_widthheight (((state ? 132 : 80) * fwidth), height); 3662 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight);
3663 }
3707 break; 3664 break;
3708 case 4: /* smooth scrolling */ 3665 case 4: /* smooth scrolling */
3709 set_option (Opt_jumpScroll, !state); 3666 set_option (Opt_jumpScroll, !state);
3710 break; 3667 break;
3711 case 5: /* reverse video */ 3668 case 5: /* reverse video */
… …
3722 if (state) /* orthogonal */ 3679 if (state) /* orthogonal */
3723 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3680 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3724 break; 3681 break;
3725#ifdef scrollBar_esc 3682#ifdef scrollBar_esc
3726 case scrollBar_esc: 3683 case scrollBar_esc:
3727 if (scrollbar_mapping (state)) 3684 if (scrollBar.map (state))
3728 { 3685 {
3729 resize_all_windows (0, 0, 0); 3686 resize_all_windows (0, 0, 0);
3730 scr_touch (true); 3687 scr_touch (true);
3731 } 3688 }
3732 break; 3689 break;
… …
3743 /* case 67: - backspace key */ 3700 /* case 67: - backspace key */
3744 case 1000: /* X11 mouse reporting */ 3701 case 1000: /* X11 mouse reporting */
3745 if (state) /* orthogonal */ 3702 if (state) /* orthogonal */
3746 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3703 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3747 break; 3704 break;
3748#if 0
3749 case 1001:
3750 break; /* X11 mouse highlighting */
3751#endif
3752 case 1002: 3705 case 1002:
3753 case 1003: 3706 case 1003:
3754 if (state) { 3707 if (state)
3708 {
3755 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3709 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3756 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3710 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3757 vt_emask_mouse = PointerMotionMask; 3711 vt_emask_mouse = PointerMotionMask;
3712 }
3758 } else 3713 else
3759 vt_emask_mouse = NoEventMask; 3714 vt_emask_mouse = NoEventMask;
3760 vt_select_input (); 3715 vt_select_input ();
3761 break; 3716 break;
3762 case 1010: /* scroll to bottom on TTY output inhibit */ 3717 case 1010: /* scroll to bottom on TTY output inhibit */
3763 set_option (Opt_scrollTtyOutput, !state); 3718 set_option (Opt_scrollTtyOutput, !state);
… …
3943rxvt_term::process_graphics () 3898rxvt_term::process_graphics ()
3944{ 3899{
3945 unicode_t ch, cmd = cmd_getc (); 3900 unicode_t ch, cmd = cmd_getc ();
3946 3901
3947 if (cmd == 'Q') 3902 if (cmd == 'Q')
3903 {
3948 { /* query graphics */ 3904 /* query graphics */
3949 tt_printf ("\033G0\012"); /* no graphics */ 3905 tt_printf ("\033G0\012"); /* no graphics */
3950 return; 3906 return;
3951 } 3907 }
3952 /* swallow other graphics sequences until terminating ':' */ 3908 /* swallow other graphics sequences until terminating ':' */
3953 do 3909 do

Diff Legend

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