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.373 by root, Tue Dec 11 15:42:51 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
553 newlen = 1; 652 case XK_BackSpace:
554#ifdef XK_KP_Home 653 if (priv_modes & PrivMode_HaveBackSpace)
555 static const KeySym keypadtrans[] = { 654 {
556 XK_KP_7, // XK_KP_Home 655 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
557 XK_KP_4, // XK_KP_Left 656 ^ !!ctrl) ? '\b' : '\177';
558 XK_KP_8, // XK_KP_Up 657 kbuf[1] = '\0';
559 XK_KP_6, // XK_KP_Right
560 XK_KP_2, // XK_KP_Down
561#ifndef UNSHIFTED_SCROLLKEYS
562 XK_KP_9, // XK_KP_Prior
563 XK_KP_3, // XK_KP_Next
564#else
565 XK_Prior,
566 XK_Next,
567#endif
568 XK_KP_1, // XK_KP_End
569 XK_KP_5, // XK_KP_Begin
570 }; 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
681 newlen = 0;
682 }
683 break;
571 684
572 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin)) 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:
573 { 765 {
574 unsigned int index = keysym - XK_KP_Home; 766 int param = map_function_key (keysym);
575 keysym = kp ? keypadtrans[index] : XK_Home + index; 767 if (param > 0)
768 sprintf (kbuf,"\033[%d~", param);
769 else
770 newlen = 0;
576 } 771 }
577 else if (keysym == XK_KP_Insert)
578 keysym = kp ? XK_KP_0 : XK_Insert;
579#ifndef NO_DELETE_KEY
580 else if (keysym == XK_KP_Delete)
581 keysym = kp ? XK_KP_Decimal : XK_Delete;
582#endif
583#endif
584 switch (keysym)
585 {
586#ifndef NO_BACKSPACE_KEY
587 case XK_BackSpace:
588 if (priv_modes & PrivMode_HaveBackSpace)
589 {
590 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
591 ^ !!ctrl) ? '\b' : '\177';
592 kbuf[1] = '\0';
593 }
594 else
595 strcpy (kbuf, rs[Rs_backspace_key]);
596 break; 772 break;
597#endif
598#ifndef NO_DELETE_KEY
599 case XK_Delete:
600 strcpy (kbuf, rs[Rs_delete_key]);
601 break;
602#endif
603 case XK_Tab:
604 if (shft)
605 strcpy (kbuf, "\033[Z");
606 else
607 {
608#ifdef CTRL_TAB_MAKES_META
609 if (ctrl)
610 meta = 1;
611#endif
612#ifdef MOD4_TAB_MAKES_META
613 if (ev.state & Mod4Mask)
614 meta = 1;
615#endif
616 newlen = 0;
617 }
618 break;
619
620 case XK_Up: /* "\033[A" */
621 case XK_Down: /* "\033[B" */
622 case XK_Right: /* "\033[C" */
623 case XK_Left: /* "\033[D" */
624 strcpy (kbuf, "\033[Z");
625 kbuf[2] = "DACB"[keysym - XK_Left];
626 /* do Shift first */
627 if (shft)
628 kbuf[2] = "dacb"[keysym - XK_Left];
629 else if (ctrl)
630 {
631 kbuf[1] = 'O';
632 kbuf[2] = "dacb"[keysym - XK_Left];
633 }
634 else if (priv_modes & PrivMode_aplCUR)
635 kbuf[1] = 'O';
636 break;
637
638#ifndef UNSHIFTED_SCROLLKEYS
639 case XK_Prior:
640 strcpy (kbuf, "\033[5~");
641 break;
642 case XK_Next:
643 strcpy (kbuf, "\033[6~");
644 break;
645#endif
646 case XK_KP_Enter:
647 /* allow shift to override */
648 if (kp)
649 {
650 strcpy (kbuf, "\033OM");
651 break;
652 }
653
654 /* FALLTHROUGH */
655
656 case XK_Return:
657 if (priv_modes & PrivMode_LFNL)
658 {
659 kbuf[0] = '\015';
660 kbuf[1] = '\012';
661 kbuf[2] = '\0';
662 }
663 else
664 {
665 kbuf[0] = '\015';
666 kbuf[1] = '\0';
667 }
668 break;
669
670 case XK_KP_F1: /* "\033OP" */
671 case XK_KP_F2: /* "\033OQ" */
672 case XK_KP_F3: /* "\033OR" */
673 case XK_KP_F4: /* "\033OS" */
674 strcpy (kbuf, "\033OP");
675 kbuf[2] += (keysym - XK_KP_F1);
676 break;
677
678 case XK_KP_Multiply: /* "\033Oj" : "*" */
679 case XK_KP_Add: /* "\033Ok" : "+" */
680 case XK_KP_Separator: /* "\033Ol" : "," */
681 case XK_KP_Subtract: /* "\033Om" : "-" */
682 case XK_KP_Decimal: /* "\033On" : "." */
683 case XK_KP_Divide: /* "\033Oo" : "/" */
684 case XK_KP_0: /* "\033Op" : "0" */
685 case XK_KP_1: /* "\033Oq" : "1" */
686 case XK_KP_2: /* "\033Or" : "2" */
687 case XK_KP_3: /* "\033Os" : "3" */
688 case XK_KP_4: /* "\033Ot" : "4" */
689 case XK_KP_5: /* "\033Ou" : "5" */
690 case XK_KP_6: /* "\033Ov" : "6" */
691 case XK_KP_7: /* "\033Ow" : "7" */
692 case XK_KP_8: /* "\033Ox" : "8" */
693 case XK_KP_9: /* "\033Oy" : "9" */
694 /* allow shift to override */
695 if (kp)
696 {
697 strcpy (kbuf, "\033Oj");
698 kbuf[2] += (keysym - XK_KP_Multiply);
699 }
700 else
701 {
702 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
703 kbuf[1] = '\0';
704 }
705 break;
706
707 case XK_Find:
708 strcpy (kbuf, "\033[1~");
709 break;
710
711 case XK_Insert:
712 strcpy (kbuf, "\033[2~");
713 break;
714#ifdef DXK_Remove /* support for DEC remove like key */
715 case DXK_Remove:
716 /* FALLTHROUGH */
717#endif
718 case XK_Execute:
719 strcpy (kbuf, "\033[3~");
720 break;
721 case XK_Select:
722 strcpy (kbuf, "\033[4~");
723 break;
724 case XK_End:
725 strcpy (kbuf, KS_END);
726 break;
727 case XK_Home:
728 strcpy (kbuf, KS_HOME);
729 break;
730
731#define FKEY(n, fkey) \
732 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
733
734 case XK_F1: /* "\033[11~" */
735 case XK_F2: /* "\033[12~" */
736 case XK_F3: /* "\033[13~" */
737 case XK_F4: /* "\033[14~" */
738 case XK_F5: /* "\033[15~" */
739 FKEY (11, XK_F1);
740 break;
741 case XK_F6: /* "\033[17~" */
742 case XK_F7: /* "\033[18~" */
743 case XK_F8: /* "\033[19~" */
744 case XK_F9: /* "\033[20~" */
745 case XK_F10: /* "\033[21~" */
746 FKEY (17, XK_F6);
747 break;
748 case XK_F11: /* "\033[23~" */
749 case XK_F12: /* "\033[24~" */
750 case XK_F13: /* "\033[25~" */
751 case XK_F14: /* "\033[26~" */
752 FKEY (23, XK_F11);
753 break;
754 case XK_F15: /* "\033[28~" */
755 case XK_F16: /* "\033[29~" */
756 FKEY (28, XK_F15);
757 break;
758 case XK_Help: /* "\033[28~" */
759 FKEY (28, XK_Help);
760 break;
761 case XK_Menu: /* "\033[29~" */
762 FKEY (29, XK_Menu);
763 break;
764 case XK_F17: /* "\033[31~" */
765 case XK_F18: /* "\033[32~" */
766 case XK_F19: /* "\033[33~" */
767 case XK_F20: /* "\033[34~" */
768 case XK_F21: /* "\033[35~" */
769 case XK_F22: /* "\033[36~" */
770 case XK_F23: /* "\033[37~" */
771 case XK_F24: /* "\033[38~" */
772 case XK_F25: /* "\033[39~" */
773 case XK_F26: /* "\033[40~" */
774 case XK_F27: /* "\033[41~" */
775 case XK_F28: /* "\033[42~" */
776 case XK_F29: /* "\033[43~" */
777 case XK_F30: /* "\033[44~" */
778 case XK_F31: /* "\033[45~" */
779 case XK_F32: /* "\033[46~" */
780 case XK_F33: /* "\033[47~" */
781 case XK_F34: /* "\033[48~" */
782 case XK_F35: /* "\033[49~" */
783 FKEY (31, XK_F17);
784 break;
785#undef FKEY
786 default:
787 newlen = 0;
788 break;
789 }
790
791 if (newlen)
792 len = strlen (kbuf);
793 } 773 }
774
775 if (newlen)
776 len = strlen (kbuf);
794 777
795 /* 778 /*
796 * Pass meta for all function keys, if 'meta' option set 779 * Pass meta for all function keys, if 'meta' option set
797 */ 780 */
798#ifdef META8_OPTION 781#ifdef META8_OPTION
1032 } 1015 }
1033 while (row < end_row); 1016 while (row < end_row);
1034 } 1017 }
1035 1018
1036 scr_refresh (); 1019 scr_refresh ();
1037 scrollbar_show (1); 1020 scrollBar.show (1);
1038#ifdef USE_XIM 1021#ifdef USE_XIM
1039 IMSendSpot (); 1022 IMSendSpot ();
1040#endif 1023#endif
1041 } 1024 }
1042 1025
1043 display->flush (); 1026 display->flush ();
1044} 1027}
1045 1028
1029/* checks wether a refresh is requested and starts the refresh timer */
1046void 1030void
1047rxvt_term::prepare_cb (ev::prepare &w, int revents) 1031rxvt_term::refresh_check ()
1048{ 1032{
1049 make_current (); 1033 if (want_refresh && !flush_ev.is_active ())
1034 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1050 1035
1051 display->flush (); 1036 display->flush ();
1052
1053 if (want_refresh && !ev_is_active (&flush_ev))
1054 flush_ev.again ();
1055} 1037}
1056 1038
1057void 1039void
1058rxvt_term::flush_cb (ev::timer &w, int revents) 1040rxvt_term::flush_cb (ev::timer &w, int revents)
1059{ 1041{
1067void 1049void
1068rxvt_term::cursor_blink_cb (ev::timer &w, int revents) 1050rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1069{ 1051{
1070 hidden_cursor = !hidden_cursor; 1052 hidden_cursor = !hidden_cursor;
1071 want_refresh = 1; 1053 want_refresh = 1;
1054 refresh_check ();
1072} 1055}
1073#endif 1056#endif
1074 1057
1075#ifdef TEXT_BLINK 1058#ifdef TEXT_BLINK
1076void 1059void
1078{ 1061{
1079 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1062 if (scr_refresh_rend (RS_Blink, RS_Blink))
1080 { 1063 {
1081 hidden_text = !hidden_text; 1064 hidden_text = !hidden_text;
1082 want_refresh = 1; 1065 want_refresh = 1;
1066 refresh_check ();
1083 } 1067 }
1084}
1085#endif
1086
1087#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1088void
1089rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1090{
1091 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1092 scr_page (scrollbar_isUp() ? UP : DN, 1))
1093 want_refresh = 1;
1094 else 1068 else
1095 w.stop (); 1069 w.stop ();
1096} 1070}
1097#endif 1071#endif
1098 1072
1073#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1074void
1075rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1076{
1077 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1078 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1079 {
1080 want_refresh = 1;
1081 refresh_check ();
1082 }
1083 else
1084 w.stop ();
1085}
1086#endif
1087
1099#ifdef SELECTION_SCROLLING 1088#ifdef SELECTION_SCROLLING
1100void 1089void
1101rxvt_term::sel_scroll_cb (ev::timer &w, int revents) 1090rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1102{ 1091{
1103 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1092 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1104 { 1093 {
1105 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1094 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1106 want_refresh = 1; 1095 want_refresh = 1;
1096 refresh_check ();
1107 } 1097 }
1108 else 1098 else
1109 w.stop (); 1099 w.stop ();
1110} 1100}
1111#endif 1101#endif
1112 1102
1113#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1103#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1114void 1104void
1115rxvt_term::slip_wheel_cb (ev::timer &w, int revents) 1105rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1116{ 1106{
1117 if (mouse_slip_wheel_speed == 0 1107 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1118 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1119 : scr_page (UP, mouse_slip_wheel_speed))
1120 { 1108 {
1121 if (view_start == top_row || view_start == 0)
1122 mouse_slip_wheel_speed = 0;
1123
1124 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)
1125 } 1114 {
1126 else 1115 mouse_slip_wheel_speed = 0;
1127 w.stop (); 1116 w.stop ();
1117 }
1128} 1118}
1129#endif 1119#endif
1130 1120
1131#if LINUX_YIELD_HACK 1121#if LINUX_YIELD_HACK
1132static struct event_handler 1122static struct event_handler
1137 { 1127 {
1138 // this should really be sched_yield(), but the linux guys thought 1128 // this should really be sched_yield(), but the linux guys thought
1139 // that giving a process calling sched_yield () less cpu time than 1129 // that giving a process calling sched_yield () less cpu time than
1140 // 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
1141 // 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.
1142 1135
1143 struct timespec ts = { 0, 0 }; 1136 struct timespec ts = { 0, 1000 };
1144 nanosleep (&ts, 0); 1137 nanosleep (&ts, 0);
1145 1138
1146 w.stop (); 1139 w.stop ();
1147 } 1140 }
1148 1141
1198{ 1191{
1199 make_current (); 1192 make_current ();
1200 1193
1201 if (revents & ev::READ) 1194 if (revents & ev::READ)
1202 // loop, but don't allow a single term to monopolize us 1195 // loop, but don't allow a single term to monopolize us
1203 while (pty_fill ()) 1196 for (int i = CBUFCNT; i-- && pty_fill (); )
1204 if (cmd_parse ()) 1197 cmd_parse ();
1205 break;
1206 1198
1207 if (revents & ev::WRITE) 1199 if (revents & ev::WRITE)
1208 pty_write (); 1200 pty_write ();
1201
1202 refresh_check ();
1209} 1203}
1210 1204
1211void 1205void
1212rxvt_term::pointer_unblank () 1206rxvt_term::pointer_unblank ()
1213{ 1207{
1428 && ev.xfocus.mode != NotifyGrab) 1422 && ev.xfocus.mode != NotifyGrab)
1429 focus_out (); 1423 focus_out ();
1430 break; 1424 break;
1431 1425
1432 case ConfigureNotify: 1426 case ConfigureNotify:
1433 /* 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",
1434 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,
1435 szHint.width, szHint.height); */ 1429 szHint.width, szHint.height);*/
1436 if (ev.xconfigure.window == parent[0]) 1430 if (ev.xconfigure.window == parent[0])
1437 { 1431 {
1438 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1432 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1439 ; 1433 ;
1440 1434
1445 } 1439 }
1446 else 1440 else
1447 { 1441 {
1448#ifdef HAVE_BG_PIXMAP 1442#ifdef HAVE_BG_PIXMAP
1449 if (bgPixmap.window_position_sensitive ()) 1443 if (bgPixmap.window_position_sensitive ())
1444 {
1445 if (mapped)
1450 update_background (); 1446 update_background ();
1447 else
1448 bgPixmap.invalidate ();
1449 }
1451#endif 1450#endif
1452 } 1451 }
1452
1453 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1453 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1454 } 1454 }
1455 break; 1455 break;
1456 1456
1457 case PropertyNotify: 1457 case PropertyNotify:
1474 case SelectionRequest: 1474 case SelectionRequest:
1475 selection_send (ev.xselectionrequest); 1475 selection_send (ev.xselectionrequest);
1476 break; 1476 break;
1477 1477
1478 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
1479 mapped = 1; 1495 mapped = 1;
1480#ifdef TEXT_BLINK 1496#ifdef TEXT_BLINK
1481 text_blink_ev.again (); 1497 text_blink_ev.start ();
1482#endif 1498#endif
1483 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1499 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1484 break; 1500 break;
1485 1501
1486 case UnmapNotify: 1502 case UnmapNotify:
1507 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1523 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1508 { 1524 {
1509 scr_expose (ev.xexpose.x, ev.xexpose.y, 1525 scr_expose (ev.xexpose.x, ev.xexpose.y,
1510 ev.xexpose.width, ev.xexpose.height, False); 1526 ev.xexpose.width, ev.xexpose.height, False);
1511 } 1527 }
1528
1512 want_refresh = 1; 1529 want_refresh = 1;
1513 } 1530 }
1514 else 1531 else
1515 { 1532 {
1516 XEvent unused_event; 1533 XEvent unused_event;
1518 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1535 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1519 ; 1536 ;
1520 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1537 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1521 ; 1538 ;
1522 1539
1523 if (isScrollbarWindow (ev.xany.window)) 1540 if (scrollBar.state && ev.xany.window == scrollBar.win)
1524 { 1541 {
1525 scrollBar.setIdle (); 1542 scrollBar.state = STATE_IDLE;
1526 scrollbar_show (0); 1543 scrollBar.show (0);
1527 } 1544 }
1528 } 1545 }
1529 break; 1546 break;
1530 1547
1531 case MotionNotify: 1548 case MotionNotify:
1577 int dist; 1594 int dist;
1578 1595
1579 /* don't clobber the current delay if we are 1596 /* don't clobber the current delay if we are
1580 * already in the middle of scrolling. 1597 * already in the middle of scrolling.
1581 */ 1598 */
1582 if (!ev_is_active (&sel_scroll_ev)) 1599 if (!sel_scroll_ev.is_active ())
1583 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 1600 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1584 1601
1585 /* save the event params so we can highlight 1602 /* save the event params so we can highlight
1586 * the selection in the pending-scroll loop 1603 * the selection in the pending-scroll loop
1587 */ 1604 */
1610 else 1627 else
1611 { 1628 {
1612 /* we are within the text window, so we 1629 /* we are within the text window, so we
1613 * shouldn't be scrolling 1630 * shouldn't be scrolling
1614 */ 1631 */
1615 if (ev_is_active (&sel_scroll_ev))
1616 sel_scroll_ev.stop(); 1632 sel_scroll_ev.stop();
1617 } 1633 }
1618#endif 1634#endif
1619#ifdef MOUSE_THRESHOLD 1635#ifdef MOUSE_THRESHOLD
1620 } 1636 }
1621#endif 1637#endif
1622 } 1638 }
1623 } 1639 }
1624 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1640 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1625 { 1641 {
1626 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1642 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1627 MotionNotify, &ev)) 1643 MotionNotify, &ev))
1628 ; 1644 ;
1629 1645
1631 &unused_root, &unused_child, 1647 &unused_root, &unused_child,
1632 &unused_root_x, &unused_root_y, 1648 &unused_root_x, &unused_root_y,
1633 &ev.xbutton.x, &ev.xbutton.y, 1649 &ev.xbutton.x, &ev.xbutton.y,
1634 &unused_mask); 1650 &unused_mask);
1635 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1651 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1636 scrollbar_size ()); 1652 scrollBar.size ());
1637 want_refresh = 1; 1653 want_refresh = 1;
1638 scrollbar_show (1); 1654 scrollBar.show (1);
1639 } 1655 }
1640 break; 1656 break;
1641 } 1657 }
1642 1658
1643#if defined(CURSOR_BLINK) 1659#if defined(CURSOR_BLINK)
1664 1680
1665 if (ev.type == KeyPress && hidden_pointer == 0) 1681 if (ev.type == KeyPress && hidden_pointer == 0)
1666 pointer_blank (); 1682 pointer_blank ();
1667 } 1683 }
1668#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 }
1669} 1701}
1670 1702
1671void 1703void
1672rxvt_term::focus_in () 1704rxvt_term::focus_in ()
1673{ 1705{
1674 if (!focus) 1706 if (!focus)
1675 { 1707 {
1676 focus = 1; 1708 focus = 1;
1677 want_refresh = 1; 1709 want_refresh = 1;
1678 1710
1679 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1680
1681#if USE_XIM 1711#if USE_XIM
1682 if (Input_Context != NULL) 1712 if (Input_Context != NULL)
1683 { 1713 {
1684 IMSetPosition (); 1714 IMSetPosition ();
1685 XSetICFocus (Input_Context); 1715 XSetICFocus (Input_Context);
1686 } 1716 }
1687#endif 1717#endif
1688#if CURSOR_BLINK 1718#if CURSOR_BLINK
1689 if (option (Opt_cursorBlink)) 1719 if (option (Opt_cursorBlink))
1690 cursor_blink_ev.start (CURSOR_BLINK_INTERVAL, CURSOR_BLINK_INTERVAL); 1720 cursor_blink_ev.again ();
1691#endif 1721#endif
1692#if OFF_FOCUS_FADING 1722#if OFF_FOCUS_FADING
1693 if (rs[Rs_fade]) 1723 if (rs[Rs_fade])
1694 { 1724 {
1695 pix_colors = pix_colors_focused; 1725 pix_colors = pix_colors_focused;
1696 scr_recolour (); 1726 scr_recolour ();
1697 } 1727 }
1698#endif 1728#endif
1699#if ENABLE_FRILLS 1729#if ENABLE_FRILLS
1700 if (option (Opt_urgentOnBell)) 1730 if (option (Opt_urgentOnBell))
1701 { 1731 set_urgency (0);
1702 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1703 {
1704 h->flags &= ~XUrgencyHint;
1705 XSetWMHints (dpy, parent[0], h);
1706 }
1707 }
1708#endif 1732#endif
1733
1734 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1709 } 1735 }
1710} 1736}
1711 1737
1712void 1738void
1713rxvt_term::focus_out () 1739rxvt_term::focus_out ()
1715 if (focus) 1741 if (focus)
1716 { 1742 {
1717 focus = 0; 1743 focus = 0;
1718 want_refresh = 1; 1744 want_refresh = 1;
1719 1745
1720 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1746#if ENABLE_FRILLS
1721 1747 if (option (Opt_urgentOnBell))
1748 set_urgency (0);
1749#endif
1722#if ENABLE_FRILLS || ISO_14755 1750#if ENABLE_FRILLS || ISO_14755
1723 if (iso14755buf) 1751 if (iso14755buf)
1724 { 1752 {
1725 iso14755buf = 0; 1753 iso14755buf = 0;
1726# if ISO_14755 1754# if ISO_14755
1743 { 1771 {
1744 pix_colors = pix_colors_unfocused; 1772 pix_colors = pix_colors_unfocused;
1745 scr_recolour (); 1773 scr_recolour ();
1746 } 1774 }
1747#endif 1775#endif
1776
1777 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1748 } 1778 }
1749} 1779}
1750 1780
1751void 1781void
1752rxvt_term::update_fade_color (unsigned int idx) 1782rxvt_term::update_fade_color (unsigned int idx)
1783 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1813 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1784 { 1814 {
1785 bgPixmap.set_root_pixmap (); 1815 bgPixmap.set_root_pixmap ();
1786 update_background (); 1816 update_background ();
1787 } 1817 }
1818
1788 break; 1819 break;
1789 } 1820 }
1790# endif 1821# endif
1822
1823 refresh_check ();
1791} 1824}
1792#endif 1825#endif
1793 1826
1794void 1827void
1795rxvt_term::button_press (XButtonEvent &ev) 1828rxvt_term::button_press (XButtonEvent &ev)
1908 } 1941 }
1909 1942
1910 /* 1943 /*
1911 * Scrollbar window processing of button press 1944 * Scrollbar window processing of button press
1912 */ 1945 */
1913 if (isScrollbarWindow (ev.window)) 1946 if (scrollBar.state && ev.window == scrollBar.win)
1914 { 1947 {
1915 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;
1916 /* 1956 /*
1917 * Rxvt-style scrollbar: 1957 * Rxvt-style scrollbar:
1918 * move up if mouse is above slider 1958 * move up if mouse is above slider
1919 * move dn if mouse is below slider 1959 * move dn if mouse is below slider
1920 * 1960 *
1929 /* 1969 /*
1930 * Mouse report disabled scrollbar: 1970 * Mouse report disabled scrollbar:
1931 * arrow buttons - send up/down 1971 * arrow buttons - send up/down
1932 * click on scrollbar - send pageup/down 1972 * click on scrollbar - send pageup/down
1933 */ 1973 */
1934 if ((scrollBar.style == R_SB_NEXT 1974 if (direction == UP)
1935 && scrollbarnext_upButton (ev.y))
1936 || (scrollBar.style == R_SB_RXVT
1937 && scrollbarrxvt_upButton (ev.y)))
1938 tt_printf ("\033[A"); 1975 tt_printf ("\033[A");
1939 else if ((scrollBar.style == R_SB_NEXT 1976 else if (direction == DN)
1940 && scrollbarnext_dnButton (ev.y))
1941 || (scrollBar.style == R_SB_RXVT
1942 && scrollbarrxvt_dnButton (ev.y)))
1943 tt_printf ("\033[B"); 1977 tt_printf ("\033[B");
1944 else 1978 else
1945 switch (ev.button) 1979 switch (ev.button)
1946 { 1980 {
1947 case Button2: 1981 case Button2:
1955 break; 1989 break;
1956 } 1990 }
1957 } 1991 }
1958 else 1992 else
1959#endif /* NO_SCROLLBAR_REPORT */ 1993#endif /* NO_SCROLLBAR_REPORT */
1960
1961 {
1962 char upordown = 0;
1963
1964 if (scrollBar.style == R_SB_NEXT)
1965 { 1994 {
1966 if (scrollbarnext_upButton (ev.y)) 1995 if (direction != NO_DIR)
1967 upordown = -1; /* up */
1968 else if (scrollbarnext_dnButton (ev.y))
1969 upordown = 1; /* down */
1970 }
1971 else if (scrollBar.style == R_SB_RXVT)
1972 {
1973 if (scrollbarrxvt_upButton (ev.y))
1974 upordown = -1; /* up */
1975 else if (scrollbarrxvt_dnButton (ev.y))
1976 upordown = 1; /* down */
1977 }
1978 if (upordown)
1979 { 1996 {
1980#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1997#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1998 if (!cont_scroll_ev.is_active ())
1981 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 1999 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1982#endif 2000#endif
1983 if (scr_page (upordown < 0 ? UP : DN, 1)) 2001 if (scr_page (direction, 1))
1984 { 2002 {
1985 if (upordown < 0) 2003 if (direction == UP)
1986 scrollBar.setUp (); 2004 scrollBar.state = STATE_UP;
1987 else 2005 else
1988 scrollBar.setDn (); 2006 scrollBar.state = STATE_DOWN;
1989 } 2007 }
1990 } 2008 }
1991 else 2009 else
1992 switch (ev.button) 2010 switch (ev.button)
1993 { 2011 {
1994 case Button2: 2012 case Button2:
1995 switch (scrollbar_align) 2013 switch (scrollBar.align)
1996 { 2014 {
1997 case R_SB_ALIGN_TOP: 2015 case R_SB_ALIGN_TOP:
1998 csrO = 0; 2016 csrO = 0;
1999 break; 2017 break;
2000 case R_SB_ALIGN_CENTRE: 2018 case R_SB_ALIGN_CENTRE:
2006 } 2024 }
2007 2025
2008 if (scrollBar.style == R_SB_XTERM 2026 if (scrollBar.style == R_SB_XTERM
2009 || scrollbar_above_slider (ev.y) 2027 || scrollbar_above_slider (ev.y)
2010 || scrollbar_below_slider (ev.y)) 2028 || scrollbar_below_slider (ev.y))
2011 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2029 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2012 2030
2013 scrollBar.setMotion (); 2031 scrollBar.state = STATE_MOTION;
2014 break; 2032 break;
2015 2033
2016 case Button1: 2034 case Button1:
2017 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2035 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2018 csrO = ev.y - scrollBar.top; 2036 csrO = ev.y - scrollBar.top;
2019 /* FALLTHROUGH */ 2037 /* FALLTHROUGH */
2020 2038
2021 case Button3: 2039 case Button3:
2022 if (scrollBar.style != R_SB_XTERM) 2040 if (scrollBar.style != R_SB_XTERM)
2032 scr_page (DN, nrow - 1); 2050 scr_page (DN, nrow - 1);
2033# else 2051# else
2034 scr_page (DN, nrow / 4); 2052 scr_page (DN, nrow / 4);
2035# endif 2053# endif
2036 else 2054 else
2037 scrollBar.setMotion (); 2055 scrollBar.state = STATE_MOTION;
2038 } 2056 }
2039 else 2057 else
2040 { 2058 {
2041 scr_page ((ev.button == Button1 ? DN : UP), 2059 scr_page ((ev.button == Button1 ? DN : UP),
2042 (nrow 2060 (nrow
2043 * scrollbar_position (ev.y) 2061 * scrollbar_position (ev.y)
2044 / scrollbar_size ())); 2062 / scrollBar.size ()));
2045 } 2063 }
2046 2064
2047 break; 2065 break;
2048 } 2066 }
2049 } 2067 }
2059 2077
2060 csrO = 0; /* reset csr Offset */ 2078 csrO = 0; /* reset csr Offset */
2061 if (!bypass_keystate) 2079 if (!bypass_keystate)
2062 reportmode = !! (priv_modes & PrivMode_mouse_report); 2080 reportmode = !! (priv_modes & PrivMode_mouse_report);
2063 2081
2064 if (scrollbar_isUpDn ()) 2082 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2065 { 2083 {
2066 scrollBar.setIdle (); 2084 scrollBar.state = STATE_IDLE;
2067 scrollbar_show (0); 2085 scrollBar.show (0);
2068 } 2086 }
2069 2087
2070#ifdef SELECTION_SCROLLING 2088#ifdef SELECTION_SCROLLING
2071 if (ev_is_active (&sel_scroll_ev))
2072 sel_scroll_ev.stop(); 2089 sel_scroll_ev.stop();
2073#endif 2090#endif
2074 2091
2075 if (ev.window == vt) 2092 if (ev.window == vt)
2076 { 2093 {
2077 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)))
2149 { 2166 {
2150 mouse_slip_wheel_speed += v ? -1 : 1; 2167 mouse_slip_wheel_speed += v ? -1 : 1;
2151 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2168 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2152 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2169 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2153 2170
2171 if (!slip_wheel_ev.is_active ())
2154 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2172 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2155 } 2173 }
2156 else 2174 else
2175# endif
2157 { 2176 {
2158# endif
2159 scr_page (v, i); 2177 scr_page (v, i);
2160 scrollbar_show (1); 2178 scrollBar.show (1);
2161# ifdef MOUSE_SLIP_WHEELING
2162 } 2179 }
2163# endif
2164 } 2180 }
2165 break; 2181 break;
2166#endif 2182#endif
2167 } 2183 }
2168 } 2184 }
2169} 2185}
2170 2186
2171/*}}} */ 2187/*}}} */
2172 2188
2173bool 2189void
2174rxvt_term::cmd_parse () 2190rxvt_term::cmd_parse ()
2175{ 2191{
2176 bool flag = false;
2177 wchar_t ch = NOCHAR; 2192 wchar_t ch = NOCHAR;
2178 char *seq_begin; // remember start of esc-sequence here 2193 char *seq_begin; // remember start of esc-sequence here
2179 2194
2180 for (;;) 2195 for (;;)
2181 { 2196 {
2182 if (ch == NOCHAR) 2197 if (expect_false (ch == NOCHAR))
2183 { 2198 {
2184 seq_begin = cmdbuf_ptr; 2199 seq_begin = cmdbuf_ptr;
2185 ch = next_char (); 2200 ch = next_char ();
2186 2201
2187 if (ch == NOCHAR) 2202 if (ch == NOCHAR)
2188 break; 2203 break;
2189 } 2204 }
2190 2205
2191 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))
2192 { 2207 {
2193 if (!seen_input) 2208 if (expect_false (!seen_input))
2194 { 2209 {
2195 seen_input = 1; 2210 seen_input = 1;
2196 // many badly-written programs (e.g. jed) contain a race condition: 2211 // many badly-written programs (e.g. jed) contain a race condition:
2197 // they first read the screensize and then install a SIGWINCH handler. 2212 // they first read the screensize and then install a SIGWINCH handler.
2198 // some window managers resize the window early, and these programs 2213 // some window managers resize the window early, and these programs
2211 wchar_t *str = buf; 2226 wchar_t *str = buf;
2212 wchar_t *eol = str + min (ncol, UBUFSIZ); 2227 wchar_t *eol = str + min (ncol, UBUFSIZ);
2213 2228
2214 for (;;) 2229 for (;;)
2215 { 2230 {
2216 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)))
2217 break; 2232 break;
2218 2233
2219 *str++ = ch; 2234 *str++ = ch;
2220 2235
2221 if (ch == C0_LF || str >= eol) 2236 if (expect_false (ch == C0_LF || str >= eol))
2222 { 2237 {
2223 if (ch == C0_LF) 2238 if (ch == C0_LF)
2224 nlines++; 2239 nlines++;
2225 2240
2226 refresh_count++; 2241 refresh_count++;
2275 * 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.
2276 * if skipScroll is enabled. 2291 * if skipScroll is enabled.
2277 */ 2292 */
2278 if (refreshnow) 2293 if (refreshnow)
2279 { 2294 {
2280 flag = true;
2281 scr_refresh (); 2295 scr_refresh ();
2282 want_refresh = 1; 2296 want_refresh = 1;
2283 } 2297 }
2284
2285 } 2298 }
2286 else 2299 else
2287 { 2300 {
2288 try 2301 try
2289 { 2302 {
2297 } 2310 }
2298 2311
2299 ch = NOCHAR; 2312 ch = NOCHAR;
2300 } 2313 }
2301 } 2314 }
2302
2303 return flag;
2304} 2315}
2305 2316
2306// read the next character 2317// read the next character
2307wchar_t 2318wchar_t
2308rxvt_term::next_char () NOTHROW 2319rxvt_term::next_char () NOTHROW
2309{ 2320{
2310 while (cmdbuf_ptr < cmdbuf_endp) 2321 while (cmdbuf_ptr < cmdbuf_endp)
2311 { 2322 {
2312 // assume 7-bit to be ascii ALWAYS 2323 // assume 7-bit to be ascii ALWAYS
2313 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2324 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2314 return *cmdbuf_ptr++; 2325 return *cmdbuf_ptr++;
2315 2326
2316 wchar_t wc; 2327 wchar_t wc;
2317 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);
2318 2329
2322 cmdbuf_ptr = cmdbuf_endp; 2333 cmdbuf_ptr = cmdbuf_endp;
2323 break; 2334 break;
2324 } 2335 }
2325 2336
2326 if (len == (size_t)-1) 2337 if (len == (size_t)-1)
2338 {
2339 mbrtowc (0, 0, 0, mbstate); // reset now undefined conversion state
2327 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 }
2328 2342
2329 // assume wchar == unicode 2343 // assume wchar == unicode
2330 cmdbuf_ptr += len; 2344 cmdbuf_ptr += len;
2331 return wc & UNICODE_MASK; 2345 return wc & UNICODE_MASK;
2332 } 2346 }
2376/*----------------------------------------------------------------------*/ 2390/*----------------------------------------------------------------------*/
2377#ifdef PRINTPIPE 2391#ifdef PRINTPIPE
2378FILE * 2392FILE *
2379rxvt_term::popen_printer () 2393rxvt_term::popen_printer ()
2380{ 2394{
2381 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2395 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2382 2396
2383 if (stream == NULL) 2397 if (stream == NULL)
2384 rxvt_warn ("can't open printer pipe, not printing.\n"); 2398 rxvt_warn ("can't open printer pipe, not printing.\n");
2385 2399
2386 return stream; 2400 return stream;
2397 * simulate attached vt100 printer 2411 * simulate attached vt100 printer
2398 */ 2412 */
2399void 2413void
2400rxvt_term::process_print_pipe () 2414rxvt_term::process_print_pipe ()
2401{ 2415{
2402 int done; 2416 FILE *fd = popen_printer ();
2403 FILE *fd;
2404 2417
2405 if ((fd = popen_printer ()) == NULL) 2418 if (!fd)
2406 return; 2419 return;
2407 2420
2408 /* 2421 /*
2409 * 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
2410 * is received. 2423 * is received.
2411 */ 2424 */
2412 for (done = 0; !done;) 2425 for (int done = 0; !done; )
2413 { 2426 {
2414 unsigned char buf[8]; 2427 unsigned char buf[8];
2415 unicode_t ch; 2428 unicode_t ch;
2416 unsigned int i, len; 2429 unsigned int i, len;
2417 2430
2562 break; 2575 break;
2563 case 'Z': /* identify the terminal type */ 2576 case 'Z': /* identify the terminal type */
2564 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2577 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2565 break; 2578 break;
2566 case '<': /* turn off VT52 mode */ 2579 case '<': /* turn off VT52 mode */
2567 PrivMode (0, PrivMode_vt52); 2580 set_privmode (PrivMode_vt52, 0);
2568 break; 2581 break;
2569 case 'F': /* use special graphics character set */ 2582 case 'F': /* use special graphics character set */
2570 case 'G': /* use regular character set */ 2583 case 'G': /* use regular character set */
2571 /* unimplemented */ 2584 /* unimplemented */
2572 break; 2585 break;
2626 scr_forwardindex (); 2639 scr_forwardindex ();
2627 break; 2640 break;
2628#endif 2641#endif
2629 case '=': 2642 case '=':
2630 case '>': 2643 case '>':
2631 PrivMode ((ch == '='), PrivMode_aplKP); 2644 set_privmode (PrivMode_aplKP, ch == '=');
2632 break; 2645 break;
2633 2646
2634 case C1_40: 2647 case C1_40:
2635 cmd_getc (); 2648 cmd_getc ();
2636 break; 2649 break;
2675 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2688 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2676 case C1_SCI: /* ESC Z */ 2689 case C1_SCI: /* ESC Z */
2677 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2690 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2678 break; /* steal obsolete ESC [ c */ 2691 break; /* steal obsolete ESC [ c */
2679 2692
2680 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2693 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2681 case C1_CSI: /* ESC [ */ 2694 case C1_CSI: /* ESC [ */
2682 process_csi_seq (); 2695 process_csi_seq ();
2683 break; 2696 break;
2684 2697
2685 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2698 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2686 case C1_OSC: /* ESC ] */ 2699 case C1_OSC: /* ESC ] */
2687 process_osc_seq (); 2700 process_osc_seq ();
2688 break; 2701 break;
2689 2702
2690 /* 8.3.106: RESET TO INITIAL STATE */ 2703 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2691 case 'c': 2704 case 'c':
2692 mbstate.reset (); 2705 mbstate.reset ();
2693 scr_poweron (); 2706 scr_poweron ();
2694 scrollbar_show (1); 2707 scrollBar.show (1);
2695 break; 2708 break;
2696 2709
2697 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2710 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2698 case 'n': 2711 case 'n':
2699 scr_charset_choose (2); 2712 scr_charset_choose (2);
2750 2763
2751 nargs = 0; 2764 nargs = 0;
2752 2765
2753 priv = 0; 2766 priv = 0;
2754 ch = cmd_getc (); 2767 ch = cmd_getc ();
2755 if (ch >= '<' && ch <= '?') 2768 if ((ch >= '<' && ch <= '?') || ch == '!')
2756 { 2769 {
2757 /* '<' '=' '>' '?' */ 2770 /* '<' '=' '>' '?' '!' */
2758 priv = ch; 2771 priv = ch;
2759 ch = cmd_getc (); 2772 ch = cmd_getc ();
2760 } 2773 }
2761 2774
2762 /* read any numerical arguments */ 2775 /* read any numerical arguments */
2811 // versions. 2824 // versions.
2812 // 2825 //
2813 tt_printf ("\033[>%d;95;0c", 'U'); 2826 tt_printf ("\033[>%d;95;0c", 'U');
2814 } 2827 }
2815 break; 2828 break;
2829
2816 case '?': 2830 case '?':
2817 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2831 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2818 process_terminal_mode (ch, priv, nargs, arg); 2832 process_terminal_mode (ch, priv, nargs, arg);
2819 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);
2820 } 2846 }
2847 break;
2848 }
2849
2821 return; 2850 return;
2822 } 2851 }
2823 2852
2824 switch (ch) 2853 switch (ch)
2825 { 2854 {
3336 *buf++ = '\0'; 3365 *buf++ = '\0';
3337 3366
3338 process_color_seq (op, color, name, resp); 3367 process_color_seq (op, color, name, resp);
3339 } 3368 }
3340 break; 3369 break;
3370 case Rxvt_restoreFG:
3341 case XTerm_Color00: 3371 case XTerm_Color00:
3342 process_color_seq (op, Color_fg, str, resp); 3372 process_color_seq (op, Color_fg, str, resp);
3343 break; 3373 break;
3374 case Rxvt_restoreBG:
3344 case XTerm_Color01: 3375 case XTerm_Color01:
3345 process_color_seq (op, Color_bg, str, resp); 3376 process_color_seq (op, Color_bg, str, resp);
3346 break; 3377 break;
3347#ifndef NO_CURSORCOLOR 3378#ifndef NO_CURSORCOLOR
3348 case XTerm_Color_cursor: 3379 case XTerm_Color_cursor:
3369 break; 3400 break;
3370 case URxvt_Color_IT: 3401 case URxvt_Color_IT:
3371 process_color_seq (op, Color_IT, str, resp); 3402 process_color_seq (op, Color_IT, str, resp);
3372 break; 3403 break;
3373#endif 3404#endif
3405 case URxvt_Color_border:
3406 process_color_seq (op, Color_border, str, resp);
3407 break;
3374#if ENABLE_TRANSPARENCY 3408#if ENABLE_TRANSPARENCY
3375 case URxvt_Color_tint: 3409 case URxvt_Color_tint:
3376 process_color_seq (op, Color_tint, str, resp); 3410 process_color_seq (op, Color_tint, str, resp);
3377 { 3411 {
3378 bool changed = false; 3412 bool changed = false;
3413
3379 if (ISSET_PIXCOLOR (Color_tint)) 3414 if (ISSET_PIXCOLOR (Color_tint))
3380 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3415 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3381 else 3416 else
3382 changed = bgPixmap.unset_tint (); 3417 changed = bgPixmap.unset_tint ();
3418
3383 if (changed) 3419 if (changed)
3384 update_background (); 3420 update_background ();
3385 } 3421 }
3386 3422
3387 break; 3423 break;
3410 changed++; 3446 changed++;
3411 str = strchr (str, ';'); 3447 str = strchr (str, ';');
3412 if (str == NULL) 3448 if (str == NULL)
3413 bgPixmap.set_defaultGeometry (); 3449 bgPixmap.set_defaultGeometry ();
3414 } 3450 }
3451
3415 while (str) 3452 while (str)
3416 { 3453 {
3417 str++; 3454 str++;
3418 if (bgPixmap.set_geometry (str)) 3455 if (bgPixmap.set_geometry (str))
3419 changed++; 3456 changed++;
3420 str = strchr (str, ';'); 3457 str = strchr (str, ';');
3421 } 3458 }
3459
3422 if (changed) 3460 if (changed)
3423 update_background (); 3461 update_background ();
3424 } 3462 }
3425 break; 3463 break;
3426#endif 3464#endif
3427
3428 case Rxvt_restoreFG:
3429 set_window_color (Color_fg, str);
3430 break;
3431 case Rxvt_restoreBG:
3432 set_window_color (Color_bg, str);
3433 break;
3434 3465
3435 case XTerm_logfile: 3466 case XTerm_logfile:
3436 // TODO, when secure mode? 3467 // TODO, when secure mode?
3437 break; 3468 break;
3438 3469
3505 break; 3536 break;
3506#endif 3537#endif
3507 3538
3508#if ENABLE_PERL 3539#if ENABLE_PERL
3509 case URxvt_perl: 3540 case URxvt_perl:
3510 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));
3511 ; // no responses yet
3512 break; 3542 break;
3513#endif 3543#endif
3514 } 3544 }
3515} 3545}
3516/*----------------------------------------------------------------------*/ 3546/*----------------------------------------------------------------------*/
3539 { 3569 {
3540 if (mode == 'r') 3570 if (mode == 'r')
3541 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3571 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3542 else 3572 else
3543 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3573 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3544 PrivMode (state, bit); 3574 set_privmode (bit, state);
3545 } 3575 }
3546 3576
3547 return state; 3577 return state;
3548} 3578}
3549 3579
3557 static const struct 3587 static const struct
3558 { 3588 {
3559 const int argval; 3589 const int argval;
3560 const unsigned long bit; 3590 const unsigned long bit;
3561 } argtopriv[] = { 3591 } argtopriv[] = {
3562 { 1, PrivMode_aplCUR }, 3592 { 1, PrivMode_aplCUR }, // DECCKM
3563 { 2, PrivMode_vt52 }, 3593 { 2, PrivMode_vt52 },
3564 { 3, PrivMode_132 }, 3594 { 3, PrivMode_132 }, // DECCOLM
3565 { 4, PrivMode_smoothScroll }, 3595 { 4, PrivMode_smoothScroll }, // DECSCLM
3566 { 5, PrivMode_rVideo }, 3596 { 5, PrivMode_rVideo }, // DECSCNM
3567 { 6, PrivMode_relOrigin }, 3597 { 6, PrivMode_relOrigin }, // DECOM
3568 { 7, PrivMode_Autowrap }, 3598 { 7, PrivMode_Autowrap }, // DECAWM
3569 // 8, bi-directional support mode 3599 // 8, auto-repeat keys // DECARM
3570 { 9, PrivMode_MouseX10 }, 3600 { 9, PrivMode_MouseX10 },
3571 // 18, 19 printing-related 3601 // 18 end FF to printer after print screen
3602 // 19 Print screen prints full screen/scorll region
3572 { 25, PrivMode_VisibleCursor }, 3603 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3573#ifdef scrollBar_esc 3604#ifdef scrollBar_esc
3574 { scrollBar_esc, PrivMode_scrollBar }, 3605 { scrollBar_esc, PrivMode_scrollBar },
3575#endif 3606#endif
3576 { 35, PrivMode_ShiftKeys }, // rxvt extension 3607 { 35, PrivMode_ShiftKeys }, // rxvt extension
3608 // 38, tektronix mode // DECTEK
3577 { 40, PrivMode_132OK }, 3609 { 40, PrivMode_132OK },
3578 // 41 xterm more fixes NYI 3610 // 41 xterm more fixes NYI
3579 // 45 margin bell NYI 3611 // 45 margin bell NYI
3580 // 46 start logging 3612 // 46 start logging
3581 { 47, PrivMode_Screen }, 3613 { 47, PrivMode_Screen },
3582 { 66, PrivMode_aplKP }, 3614 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
3583#ifndef NO_BACKSPACE_KEY 3615#ifndef NO_BACKSPACE_KEY
3584 { 67, PrivMode_BackSpace }, 3616 { 67, PrivMode_BackSpace }, // DECBKM
3585#endif 3617#endif
3586 { 1000, PrivMode_MouseX11 }, 3618 { 1000, PrivMode_MouseX11 },
3587 { 1002, PrivMode_MouseBtnEvent }, 3619 { 1002, PrivMode_MouseBtnEvent },
3588 { 1003, PrivMode_MouseAnyEvent }, 3620 { 1003, PrivMode_MouseAnyEvent },
3589 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3621 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3593 // 1037 send DEL for keypad delete NYI 3625 // 1037 send DEL for keypad delete NYI
3594 { 1047, PrivMode_Screen }, 3626 { 1047, PrivMode_Screen },
3595 // 1048 save and restore cursor 3627 // 1048 save and restore cursor
3596 { 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 */
3597 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3629 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3630 { 2004, PrivMode_BracketPaste },
3598 }; 3631 };
3599 3632
3600 if (nargs == 0) 3633 if (nargs == 0)
3601 return; 3634 return;
3602 3635
3627 3660
3628 scr_touch (true); 3661 scr_touch (true);
3629 break; 3662 break;
3630#endif 3663#endif
3631 case 1048: /* alternative cursor save */ 3664 case 1048: /* alternative cursor save */
3632 case 1049:
3633 if (option (Opt_secondaryScreen)) 3665 if (option (Opt_secondaryScreen))
3634 if (mode == 0) 3666 if (mode == 0)
3635 scr_cursor (RESTORE); 3667 scr_cursor (RESTORE);
3636 else if (mode == 1) 3668 else if (mode == 1)
3637 scr_cursor (SAVE); 3669 scr_cursor (SAVE);
3646 case 2: /* VT52 mode */ 3678 case 2: /* VT52 mode */
3647 /* oddball mode. should be set regardless of set/reset 3679 /* oddball mode. should be set regardless of set/reset
3648 * parameter. Return from VT52 mode with an ESC < from 3680 * parameter. Return from VT52 mode with an ESC < from
3649 * within VT52 mode 3681 * within VT52 mode
3650 */ 3682 */
3651 PrivMode (1, PrivMode_vt52); 3683 set_privmode (PrivMode_vt52, 1);
3652 break; 3684 break;
3653 case 3: /* 80/132 */ 3685 case 3: /* 80/132 */
3654 if (priv_modes & PrivMode_132OK) 3686 if (priv_modes & PrivMode_132OK)
3655 set_widthheight (((state ? 132 : 80) * fwidth), height); 3687 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3656 break; 3688 break;
3657 case 4: /* smooth scrolling */ 3689 case 4: /* smooth scrolling */
3658 set_option (Opt_jumpScroll, !state); 3690 set_option (Opt_jumpScroll, !state);
3659 break; 3691 break;
3660 case 5: /* reverse video */ 3692 case 5: /* reverse video */
3671 if (state) /* orthogonal */ 3703 if (state) /* orthogonal */
3672 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3704 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3673 break; 3705 break;
3674#ifdef scrollBar_esc 3706#ifdef scrollBar_esc
3675 case scrollBar_esc: 3707 case scrollBar_esc:
3676 if (scrollbar_mapping (state)) 3708 if (scrollBar.map (state))
3677 { 3709 {
3678 resize_all_windows (0, 0, 0); 3710 resize_all_windows (0, 0, 0);
3679 scr_touch (true); 3711 scr_touch (true);
3680 } 3712 }
3681 break; 3713 break;
3702 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3734 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3703 vt_emask_mouse = PointerMotionMask; 3735 vt_emask_mouse = PointerMotionMask;
3704 } 3736 }
3705 else 3737 else
3706 vt_emask_mouse = NoEventMask; 3738 vt_emask_mouse = NoEventMask;
3739
3707 vt_select_input (); 3740 vt_select_input ();
3708 break; 3741 break;
3709 case 1010: /* scroll to bottom on TTY output inhibit */ 3742 case 1010: /* scroll to bottom on TTY output inhibit */
3710 set_option (Opt_scrollTtyOutput, !state); 3743 set_option (Opt_scrollTtyOutput, !state);
3711 break; 3744 break;
3712 case 1011: /* scroll to bottom on key press */ 3745 case 1011: /* scroll to bottom on key press */
3713 set_option (Opt_scrollTtyKeypress, state); 3746 set_option (Opt_scrollTtyKeypress, state);
3714 break; 3747 break;
3715 case 1047: /* secondary screen w/ clearing last */ 3748 case 1047: /* secondary screen w/ clearing last */
3716 if (option (Opt_secondaryScreen)) 3749 if (option (Opt_secondaryScreen))
3717 if (current_screen != PRIMARY) 3750 if (!state)
3718 scr_erase_screen (2); 3751 scr_erase_screen (2);
3752
3719 scr_change_screen (state); 3753 scr_change_screen (state);
3720 break; 3754 break;
3721 case 1049: /* secondary screen w/ clearing first */ 3755 case 1049: /* secondary screen w/ clearing first */
3756 if (state)
3757 scr_cursor (SAVE);
3758
3722 scr_change_screen (state); 3759 scr_change_screen (state);
3723 if (option (Opt_secondaryScreen)) 3760
3724 if (current_screen != PRIMARY) 3761 if (state)
3725 scr_erase_screen (2); 3762 scr_erase_screen (2);
3763 else
3764 scr_cursor (RESTORE);
3726 break; 3765 break;
3727 default: 3766 default:
3728 break; 3767 break;
3729 } 3768 }
3730 } 3769 }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines