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.375 by root, Tue Dec 11 21:10:46 2007 UTC vs.
Revision 1.435 by sf-exg, Wed Jan 6 12:10:44 2010 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
484 } 579 }
485 } 580 }
486 581
487#if ENABLE_FRILLS || ISO_14755 582#if ENABLE_FRILLS || ISO_14755
488 // ISO 14755 support 583 // ISO 14755 support
489 if (shft && ctrl) 584 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
490 { 585 {
491 int hv; 586 int hv;
492 587
493 if (iso14755buf & ISO_14755_51 588 if (iso14755buf & ISO_14755_51
494 && (keysym == XK_space || keysym == XK_KP_Space 589 && (keysym == XK_space || keysym == XK_KP_Space
524 scr_overlay_off (); 619 scr_overlay_off ();
525# endif 620# endif
526 iso14755buf = 0; 621 iso14755buf = 0;
527 } 622 }
528 } 623 }
624 else if (option (Opt_iso14755) &&
529 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 625 ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
530 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 626 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
531 if (!(iso14755buf & ISO_14755_STARTED)) 627 if (!(iso14755buf & ISO_14755_STARTED))
532 { 628 {
533 iso14755buf |= ISO_14755_STARTED; 629 iso14755buf |= ISO_14755_STARTED;
534# if ISO_14755 630# if ISO_14755
535 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 631 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
546 } 642 }
547#endif 643#endif
548 644
549 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 645 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
550 { 646 {
647 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
648 unsigned int newlen = 1;
649
650 switch (translate_keypad (keysym, kp))
551 { 651 {
552 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft; 652#ifndef NO_BACKSPACE_KEY
553 newlen = 1; 653 case XK_BackSpace:
554#ifdef XK_KP_Home 654 if (priv_modes & PrivMode_HaveBackSpace)
555 static const KeySym keypadtrans[] = { 655 {
556 XK_KP_7, // XK_KP_Home 656 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
557 XK_KP_4, // XK_KP_Left 657 ^ !!ctrl) ? '\b' : '\177';
558 XK_KP_8, // XK_KP_Up 658 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 }; 659 }
660 else
661 strcpy (kbuf, rs[Rs_backspace_key]);
662 break;
663#endif
664#ifndef NO_DELETE_KEY
665 case XK_Delete:
666 strcpy (kbuf, rs[Rs_delete_key]);
667 break;
668#endif
669 case XK_Tab:
670 if (shft)
671 strcpy (kbuf, "\033[Z");
672 else
673 {
674#ifdef CTRL_TAB_MAKES_META
675 if (ctrl)
676 meta = 1;
677#endif
678#ifdef MOD4_TAB_MAKES_META
679 if (ev.state & Mod4Mask)
680 meta = 1;
681#endif
682 newlen = 0;
683 }
684 break;
571 685
572 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin)) 686 case XK_Up: /* "\033[A" */
687 case XK_Down: /* "\033[B" */
688 case XK_Right: /* "\033[C" */
689 case XK_Left: /* "\033[D" */
690 strcpy (kbuf, "\033[Z");
691 kbuf[2] = "DACB"[keysym - XK_Left];
692 /* do Shift first */
693 if (shft)
694 kbuf[2] = "dacb"[keysym - XK_Left];
695 else if (ctrl)
696 {
697 kbuf[1] = 'O';
698 kbuf[2] = "dacb"[keysym - XK_Left];
699 }
700 else if (priv_modes & PrivMode_aplCUR)
701 kbuf[1] = 'O';
702 break;
703
704 case XK_KP_Enter:
705 /* allow shift to override */
706 if (kp)
707 {
708 strcpy (kbuf, "\033OM");
709 break;
710 }
711
712 /* FALLTHROUGH */
713
714 case XK_Return:
715 if (priv_modes & PrivMode_LFNL)
716 {
717 kbuf[0] = '\015';
718 kbuf[1] = '\012';
719 kbuf[2] = '\0';
720 }
721 else
722 {
723 kbuf[0] = '\015';
724 kbuf[1] = '\0';
725 }
726 break;
727
728 case XK_KP_F1: /* "\033OP" */
729 case XK_KP_F2: /* "\033OQ" */
730 case XK_KP_F3: /* "\033OR" */
731 case XK_KP_F4: /* "\033OS" */
732 strcpy (kbuf, "\033OP");
733 kbuf[2] += (keysym - XK_KP_F1);
734 break;
735
736 case XK_KP_Multiply: /* "\033Oj" : "*" */
737 case XK_KP_Add: /* "\033Ok" : "+" */
738 case XK_KP_Separator: /* "\033Ol" : "," */
739 case XK_KP_Subtract: /* "\033Om" : "-" */
740 case XK_KP_Decimal: /* "\033On" : "." */
741 case XK_KP_Divide: /* "\033Oo" : "/" */
742 case XK_KP_0: /* "\033Op" : "0" */
743 case XK_KP_1: /* "\033Oq" : "1" */
744 case XK_KP_2: /* "\033Or" : "2" */
745 case XK_KP_3: /* "\033Os" : "3" */
746 case XK_KP_4: /* "\033Ot" : "4" */
747 case XK_KP_5: /* "\033Ou" : "5" */
748 case XK_KP_6: /* "\033Ov" : "6" */
749 case XK_KP_7: /* "\033Ow" : "7" */
750 case XK_KP_8: /* "\033Ox" : "8" */
751 case XK_KP_9: /* "\033Oy" : "9" */
752 /* allow shift to override */
753 if (kp)
754 {
755 strcpy (kbuf, "\033Oj");
756 kbuf[2] += (keysym - XK_KP_Multiply);
757 }
758 else
759 {
760 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
761 kbuf[1] = '\0';
762 }
763 break;
764
765 default:
573 { 766 {
574 unsigned int index = keysym - XK_KP_Home; 767 int param = map_function_key (keysym);
575 keysym = kp ? keypadtrans[index] : XK_Home + index; 768 if (param > 0)
769 sprintf (kbuf,"\033[%d~", param);
770 else
771 newlen = 0;
576 } 772 }
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; 773 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 } 774 }
775
776 if (newlen)
777 len = strlen (kbuf);
794 778
795 /* 779 /*
796 * Pass meta for all function keys, if 'meta' option set 780 * Pass meta for all function keys, if 'meta' option set
797 */ 781 */
798#ifdef META8_OPTION 782#ifdef META8_OPTION
1032 } 1016 }
1033 while (row < end_row); 1017 while (row < end_row);
1034 } 1018 }
1035 1019
1036 scr_refresh (); 1020 scr_refresh ();
1037 scrollbar_show (1); 1021 scrollBar.show (1);
1038#ifdef USE_XIM 1022#ifdef USE_XIM
1039 IMSendSpot (); 1023 IMSendSpot ();
1040#endif 1024#endif
1041 } 1025 }
1042 1026
1043 display->flush (); 1027 display->flush ();
1044} 1028}
1045 1029
1030/* checks wether a refresh is requested and starts the refresh timer */
1046void 1031void
1047rxvt_term::prepare_cb (ev::prepare &w, int revents) 1032rxvt_term::refresh_check ()
1048{ 1033{
1049 make_current (); 1034 if (want_refresh && !flush_ev.is_active ())
1035 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1050 1036
1051 display->flush (); 1037 display->flush ();
1052
1053 if (want_refresh && !ev_is_active (&flush_ev))
1054 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1055} 1038}
1056 1039
1057void 1040void
1058rxvt_term::flush_cb (ev::timer &w, int revents) 1041rxvt_term::flush_cb (ev::timer &w, int revents)
1059{ 1042{
1067void 1050void
1068rxvt_term::cursor_blink_cb (ev::timer &w, int revents) 1051rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1069{ 1052{
1070 hidden_cursor = !hidden_cursor; 1053 hidden_cursor = !hidden_cursor;
1071 want_refresh = 1; 1054 want_refresh = 1;
1055 refresh_check ();
1072} 1056}
1073#endif 1057#endif
1074 1058
1075#ifdef TEXT_BLINK 1059#ifdef TEXT_BLINK
1076void 1060void
1078{ 1062{
1079 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1063 if (scr_refresh_rend (RS_Blink, RS_Blink))
1080 { 1064 {
1081 hidden_text = !hidden_text; 1065 hidden_text = !hidden_text;
1082 want_refresh = 1; 1066 want_refresh = 1;
1067 refresh_check ();
1083 } 1068 }
1084 else 1069 else
1085 w.stop (); 1070 w.stop ();
1086} 1071}
1087#endif 1072#endif
1088 1073
1089#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1074#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1090void 1075void
1091rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1076rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1092{ 1077{
1093 if ((scrollbar_isUp() || scrollbar_isDn()) && 1078 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1094 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1079 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1080 {
1095 want_refresh = 1; 1081 want_refresh = 1;
1082 refresh_check ();
1083 }
1096 else 1084 else
1097 w.stop (); 1085 w.stop ();
1098} 1086}
1099#endif 1087#endif
1100 1088
1104{ 1092{
1105 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1093 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1106 { 1094 {
1107 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1095 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1108 want_refresh = 1; 1096 want_refresh = 1;
1097 refresh_check ();
1109 } 1098 }
1110 else 1099 else
1111 w.stop (); 1100 w.stop ();
1112} 1101}
1113#endif 1102#endif
1114 1103
1115#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1104#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1116void 1105void
1117rxvt_term::slip_wheel_cb (ev::timer &w, int revents) 1106rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1118{ 1107{
1119 if (mouse_slip_wheel_speed == 0 1108 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1120 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1121 : scr_page (UP, mouse_slip_wheel_speed))
1122 { 1109 {
1123 if (view_start == top_row || view_start == 0)
1124 mouse_slip_wheel_speed = 0;
1125
1126 want_refresh = 1; 1110 want_refresh = 1;
1111 refresh_check ();
1112 }
1113
1114 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1127 } 1115 {
1128 else 1116 mouse_slip_wheel_speed = 0;
1129 w.stop (); 1117 w.stop ();
1118 }
1130} 1119}
1131#endif 1120#endif
1132 1121
1133#if LINUX_YIELD_HACK 1122#if LINUX_YIELD_HACK
1134static struct event_handler 1123static struct event_handler
1139 { 1128 {
1140 // this should really be sched_yield(), but the linux guys thought 1129 // this should really be sched_yield(), but the linux guys thought
1141 // that giving a process calling sched_yield () less cpu time than 1130 // that giving a process calling sched_yield () less cpu time than
1142 // ones with high nice levels is a useful thing to do. It surely is is 1131 // ones with high nice levels is a useful thing to do. It surely is is
1143 // allowed by the sus... as is returning ENOSYS. 1132 // allowed by the sus... as is returning ENOSYS.
1133 // since the linux guys additionally thought that breaking the only
1134 // known workaroudn against their unusable sched_yield hack is cool,
1135 // we just nanosleep a bit and hope for the best.
1144 1136
1145 struct timespec ts = { 0, 0 }; 1137 struct timespec ts = { 0, 1000 };
1146 nanosleep (&ts, 0); 1138 nanosleep (&ts, 0);
1147 1139
1148 w.stop (); 1140 w.stop ();
1149 } 1141 }
1150 1142
1200{ 1192{
1201 make_current (); 1193 make_current ();
1202 1194
1203 if (revents & ev::READ) 1195 if (revents & ev::READ)
1204 // loop, but don't allow a single term to monopolize us 1196 // loop, but don't allow a single term to monopolize us
1205 while (pty_fill ()) 1197 for (int i = CBUFCNT; i-- && pty_fill (); )
1206 if (cmd_parse ()) 1198 cmd_parse ();
1207 break;
1208 1199
1209 if (revents & ev::WRITE) 1200 if (revents & ev::WRITE)
1210 pty_write (); 1201 pty_write ();
1202
1203 refresh_check ();
1211} 1204}
1212 1205
1213void 1206void
1214rxvt_term::pointer_unblank () 1207rxvt_term::pointer_unblank ()
1215{ 1208{
1430 && ev.xfocus.mode != NotifyGrab) 1423 && ev.xfocus.mode != NotifyGrab)
1431 focus_out (); 1424 focus_out ();
1432 break; 1425 break;
1433 1426
1434 case ConfigureNotify: 1427 case ConfigureNotify:
1435 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n", 1428 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1436 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y, 1429 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1437 szHint.width, szHint.height); */ 1430 szHint.width, szHint.height);*/
1438 if (ev.xconfigure.window == parent[0]) 1431 if (ev.xconfigure.window == parent[0])
1439 { 1432 {
1440 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1433 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1441 ; 1434 ;
1442 1435
1447 } 1440 }
1448 else 1441 else
1449 { 1442 {
1450#ifdef HAVE_BG_PIXMAP 1443#ifdef HAVE_BG_PIXMAP
1451 if (bgPixmap.window_position_sensitive ()) 1444 if (bgPixmap.window_position_sensitive ())
1445 {
1446 if (mapped)
1452 update_background (); 1447 update_background ();
1448 else
1449 bgPixmap.invalidate ();
1450 }
1453#endif 1451#endif
1454 } 1452 }
1453
1455 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1454 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1456 } 1455 }
1457 break; 1456 break;
1458 1457
1459 case PropertyNotify: 1458 case PropertyNotify:
1476 case SelectionRequest: 1475 case SelectionRequest:
1477 selection_send (ev.xselectionrequest); 1476 selection_send (ev.xselectionrequest);
1478 break; 1477 break;
1479 1478
1480 case MapNotify: 1479 case MapNotify:
1480#ifdef HAVE_BG_PIXMAP
1481 /* This is needed spcifically to fix the case of no window manager or a
1482 * non-reparenting window manager. In those cases we never get first
1483 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1484 * care of multiplicity of ConfigureNotify events arriwing while WM does
1485 * reparenting.
1486 * We should not render background immidiately, as there could be several
1487 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1488 * by scheduling background redraw as soon as we can, but giving a short
1489 * bit of time for ConfigureNotifies to arrive.
1490 * We should render background PRIOR to drawing any text, but AFTER all
1491 * of ConfigureNotifys for the best results.
1492 */
1493 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1494 update_background_ev.start (0.025);
1495#endif
1481 mapped = 1; 1496 mapped = 1;
1482#ifdef TEXT_BLINK 1497#ifdef TEXT_BLINK
1483 text_blink_ev.start (); 1498 text_blink_ev.start ();
1484#endif 1499#endif
1485 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1500 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1509 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1524 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1510 { 1525 {
1511 scr_expose (ev.xexpose.x, ev.xexpose.y, 1526 scr_expose (ev.xexpose.x, ev.xexpose.y,
1512 ev.xexpose.width, ev.xexpose.height, False); 1527 ev.xexpose.width, ev.xexpose.height, False);
1513 } 1528 }
1529
1514 want_refresh = 1; 1530 want_refresh = 1;
1515 } 1531 }
1516 else 1532 else
1517 { 1533 {
1518 XEvent unused_event; 1534 XEvent unused_event;
1520 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1536 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1521 ; 1537 ;
1522 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1538 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1523 ; 1539 ;
1524 1540
1525 if (isScrollbarWindow (ev.xany.window)) 1541 if (scrollBar.state && ev.xany.window == scrollBar.win)
1526 { 1542 {
1527 scrollBar.setIdle (); 1543 scrollBar.state = STATE_IDLE;
1528 scrollbar_show (0); 1544 scrollBar.show (0);
1529 } 1545 }
1530 } 1546 }
1531 break; 1547 break;
1532 1548
1533 case MotionNotify: 1549 case MotionNotify:
1579 int dist; 1595 int dist;
1580 1596
1581 /* don't clobber the current delay if we are 1597 /* don't clobber the current delay if we are
1582 * already in the middle of scrolling. 1598 * already in the middle of scrolling.
1583 */ 1599 */
1584 if (!ev_is_active (&sel_scroll_ev)) 1600 if (!sel_scroll_ev.is_active ())
1585 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 1601 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1586 1602
1587 /* save the event params so we can highlight 1603 /* save the event params so we can highlight
1588 * the selection in the pending-scroll loop 1604 * the selection in the pending-scroll loop
1589 */ 1605 */
1612 else 1628 else
1613 { 1629 {
1614 /* we are within the text window, so we 1630 /* we are within the text window, so we
1615 * shouldn't be scrolling 1631 * shouldn't be scrolling
1616 */ 1632 */
1617 if (ev_is_active (&sel_scroll_ev))
1618 sel_scroll_ev.stop(); 1633 sel_scroll_ev.stop();
1619 } 1634 }
1620#endif 1635#endif
1621#ifdef MOUSE_THRESHOLD 1636#ifdef MOUSE_THRESHOLD
1622 } 1637 }
1623#endif 1638#endif
1624 } 1639 }
1625 } 1640 }
1626 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1641 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1627 { 1642 {
1628 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1643 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1629 MotionNotify, &ev)) 1644 MotionNotify, &ev))
1630 ; 1645 ;
1631 1646
1633 &unused_root, &unused_child, 1648 &unused_root, &unused_child,
1634 &unused_root_x, &unused_root_y, 1649 &unused_root_x, &unused_root_y,
1635 &ev.xbutton.x, &ev.xbutton.y, 1650 &ev.xbutton.x, &ev.xbutton.y,
1636 &unused_mask); 1651 &unused_mask);
1637 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1652 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1638 scrollbar_size ()); 1653 scrollBar.size ());
1639 want_refresh = 1; 1654 want_refresh = 1;
1640 scrollbar_show (1); 1655 scrollBar.show (1);
1641 } 1656 }
1642 break; 1657 break;
1643 } 1658 }
1644 1659
1645#if defined(CURSOR_BLINK) 1660#if defined(CURSOR_BLINK)
1666 1681
1667 if (ev.type == KeyPress && hidden_pointer == 0) 1682 if (ev.type == KeyPress && hidden_pointer == 0)
1668 pointer_blank (); 1683 pointer_blank ();
1669 } 1684 }
1670#endif 1685#endif
1686
1687 refresh_check ();
1671} 1688}
1689
1690#if ENABLE_FRILLS
1691void
1692rxvt_term::set_urgency (bool enable)
1693{
1694 if (enable == urgency_hint)
1695 return;
1696
1697 if (XWMHints *h = XGetWMHints (dpy, parent[0]))
1698 {
1699 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1700 XSetWMHints (dpy, parent[0], h);
1701 urgency_hint = enable;
1702 }
1703}
1704#endif
1672 1705
1673void 1706void
1674rxvt_term::focus_in () 1707rxvt_term::focus_in ()
1675{ 1708{
1676 if (!focus) 1709 if (!focus)
1677 { 1710 {
1678 focus = 1; 1711 focus = 1;
1679 want_refresh = 1; 1712 want_refresh = 1;
1680
1681 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1682 1713
1683#if USE_XIM 1714#if USE_XIM
1684 if (Input_Context != NULL) 1715 if (Input_Context != NULL)
1685 { 1716 {
1686 IMSetPosition (); 1717 IMSetPosition ();
1698 scr_recolour (); 1729 scr_recolour ();
1699 } 1730 }
1700#endif 1731#endif
1701#if ENABLE_FRILLS 1732#if ENABLE_FRILLS
1702 if (option (Opt_urgentOnBell)) 1733 if (option (Opt_urgentOnBell))
1703 { 1734 set_urgency (0);
1704 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1705 {
1706 h->flags &= ~XUrgencyHint;
1707 XSetWMHints (dpy, parent[0], h);
1708 }
1709 }
1710#endif 1735#endif
1736
1737 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1711 } 1738 }
1712} 1739}
1713 1740
1714void 1741void
1715rxvt_term::focus_out () 1742rxvt_term::focus_out ()
1717 if (focus) 1744 if (focus)
1718 { 1745 {
1719 focus = 0; 1746 focus = 0;
1720 want_refresh = 1; 1747 want_refresh = 1;
1721 1748
1722 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1749#if ENABLE_FRILLS
1723 1750 if (option (Opt_urgentOnBell))
1751 set_urgency (0);
1752#endif
1724#if ENABLE_FRILLS || ISO_14755 1753#if ENABLE_FRILLS || ISO_14755
1725 if (iso14755buf) 1754 if (iso14755buf)
1726 { 1755 {
1727 iso14755buf = 0; 1756 iso14755buf = 0;
1728# if ISO_14755 1757# if ISO_14755
1745 { 1774 {
1746 pix_colors = pix_colors_unfocused; 1775 pix_colors = pix_colors_unfocused;
1747 scr_recolour (); 1776 scr_recolour ();
1748 } 1777 }
1749#endif 1778#endif
1779
1780 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1750 } 1781 }
1751} 1782}
1752 1783
1753void 1784void
1754rxvt_term::update_fade_color (unsigned int idx) 1785rxvt_term::update_fade_color (unsigned int idx)
1785 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1816 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1786 { 1817 {
1787 bgPixmap.set_root_pixmap (); 1818 bgPixmap.set_root_pixmap ();
1788 update_background (); 1819 update_background ();
1789 } 1820 }
1821
1790 break; 1822 break;
1791 } 1823 }
1792# endif 1824# endif
1825
1826 refresh_check ();
1793} 1827}
1794#endif 1828#endif
1795 1829
1796void 1830void
1797rxvt_term::button_press (XButtonEvent &ev) 1831rxvt_term::button_press (XButtonEvent &ev)
1910 } 1944 }
1911 1945
1912 /* 1946 /*
1913 * Scrollbar window processing of button press 1947 * Scrollbar window processing of button press
1914 */ 1948 */
1915 if (isScrollbarWindow (ev.window)) 1949 if (scrollBar.state && ev.window == scrollBar.win)
1916 { 1950 {
1917 scrollBar.setIdle (); 1951 page_dirn direction = NO_DIR;
1952
1953 if (scrollBar.upButton (ev.y))
1954 direction = UP; /* up */
1955 else if (scrollBar.dnButton (ev.y))
1956 direction = DN; /* down */
1957
1958 scrollBar.state = STATE_IDLE;
1918 /* 1959 /*
1919 * Rxvt-style scrollbar: 1960 * Rxvt-style scrollbar:
1920 * move up if mouse is above slider 1961 * move up if mouse is above slider
1921 * move dn if mouse is below slider 1962 * move dn if mouse is below slider
1922 * 1963 *
1931 /* 1972 /*
1932 * Mouse report disabled scrollbar: 1973 * Mouse report disabled scrollbar:
1933 * arrow buttons - send up/down 1974 * arrow buttons - send up/down
1934 * click on scrollbar - send pageup/down 1975 * click on scrollbar - send pageup/down
1935 */ 1976 */
1936 if ((scrollBar.style == R_SB_NEXT 1977 if (direction == UP)
1937 && scrollbarnext_upButton (ev.y))
1938 || (scrollBar.style == R_SB_RXVT
1939 && scrollbarrxvt_upButton (ev.y)))
1940 tt_printf ("\033[A"); 1978 tt_printf ("\033[A");
1941 else if ((scrollBar.style == R_SB_NEXT 1979 else if (direction == DN)
1942 && scrollbarnext_dnButton (ev.y))
1943 || (scrollBar.style == R_SB_RXVT
1944 && scrollbarrxvt_dnButton (ev.y)))
1945 tt_printf ("\033[B"); 1980 tt_printf ("\033[B");
1946 else 1981 else
1947 switch (ev.button) 1982 switch (ev.button)
1948 { 1983 {
1949 case Button2: 1984 case Button2:
1957 break; 1992 break;
1958 } 1993 }
1959 } 1994 }
1960 else 1995 else
1961#endif /* NO_SCROLLBAR_REPORT */ 1996#endif /* NO_SCROLLBAR_REPORT */
1962
1963 {
1964 char upordown = 0;
1965
1966 if (scrollBar.style == R_SB_NEXT)
1967 { 1997 {
1968 if (scrollbarnext_upButton (ev.y)) 1998 if (direction != NO_DIR)
1969 upordown = -1; /* up */
1970 else if (scrollbarnext_dnButton (ev.y))
1971 upordown = 1; /* down */
1972 }
1973 else if (scrollBar.style == R_SB_RXVT)
1974 {
1975 if (scrollbarrxvt_upButton (ev.y))
1976 upordown = -1; /* up */
1977 else if (scrollbarrxvt_dnButton (ev.y))
1978 upordown = 1; /* down */
1979 }
1980 if (upordown)
1981 { 1999 {
1982#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2000#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2001 if (!cont_scroll_ev.is_active ())
1983 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2002 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1984#endif 2003#endif
1985 if (scr_page (upordown < 0 ? UP : DN, 1)) 2004 if (scr_page (direction, 1))
1986 { 2005 {
1987 if (upordown < 0) 2006 if (direction == UP)
1988 scrollBar.setUp (); 2007 scrollBar.state = STATE_UP;
1989 else 2008 else
1990 scrollBar.setDn (); 2009 scrollBar.state = STATE_DOWN;
1991 } 2010 }
1992 } 2011 }
1993 else 2012 else
1994 switch (ev.button) 2013 switch (ev.button)
1995 { 2014 {
1996 case Button2: 2015 case Button2:
1997 switch (scrollbar_align) 2016 switch (scrollBar.align)
1998 { 2017 {
1999 case R_SB_ALIGN_TOP: 2018 case R_SB_ALIGN_TOP:
2000 csrO = 0; 2019 csrO = 0;
2001 break; 2020 break;
2002 case R_SB_ALIGN_CENTRE: 2021 case R_SB_ALIGN_CENTRE:
2008 } 2027 }
2009 2028
2010 if (scrollBar.style == R_SB_XTERM 2029 if (scrollBar.style == R_SB_XTERM
2011 || scrollbar_above_slider (ev.y) 2030 || scrollbar_above_slider (ev.y)
2012 || scrollbar_below_slider (ev.y)) 2031 || scrollbar_below_slider (ev.y))
2013 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2032 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2014 2033
2015 scrollBar.setMotion (); 2034 scrollBar.state = STATE_MOTION;
2016 break; 2035 break;
2017 2036
2018 case Button1: 2037 case Button1:
2019 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2038 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2020 csrO = ev.y - scrollBar.top; 2039 csrO = ev.y - scrollBar.top;
2021 /* FALLTHROUGH */ 2040 /* FALLTHROUGH */
2022 2041
2023 case Button3: 2042 case Button3:
2024 if (scrollBar.style != R_SB_XTERM) 2043 if (scrollBar.style != R_SB_XTERM)
2034 scr_page (DN, nrow - 1); 2053 scr_page (DN, nrow - 1);
2035# else 2054# else
2036 scr_page (DN, nrow / 4); 2055 scr_page (DN, nrow / 4);
2037# endif 2056# endif
2038 else 2057 else
2039 scrollBar.setMotion (); 2058 scrollBar.state = STATE_MOTION;
2040 } 2059 }
2041 else 2060 else
2042 { 2061 {
2043 scr_page ((ev.button == Button1 ? DN : UP), 2062 scr_page ((ev.button == Button1 ? DN : UP),
2044 (nrow 2063 (nrow
2045 * scrollbar_position (ev.y) 2064 * scrollbar_position (ev.y)
2046 / scrollbar_size ())); 2065 / scrollBar.size ()));
2047 } 2066 }
2048 2067
2049 break; 2068 break;
2050 } 2069 }
2051 } 2070 }
2061 2080
2062 csrO = 0; /* reset csr Offset */ 2081 csrO = 0; /* reset csr Offset */
2063 if (!bypass_keystate) 2082 if (!bypass_keystate)
2064 reportmode = !! (priv_modes & PrivMode_mouse_report); 2083 reportmode = !! (priv_modes & PrivMode_mouse_report);
2065 2084
2066 if (scrollbar_isUpDn ()) 2085 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2067 { 2086 {
2068 scrollBar.setIdle (); 2087 scrollBar.state = STATE_IDLE;
2069 scrollbar_show (0); 2088 scrollBar.show (0);
2070 } 2089 }
2071 2090
2072#ifdef SELECTION_SCROLLING 2091#ifdef SELECTION_SCROLLING
2073 if (ev_is_active (&sel_scroll_ev))
2074 sel_scroll_ev.stop(); 2092 sel_scroll_ev.stop();
2075#endif 2093#endif
2076 2094
2077 if (ev.window == vt) 2095 if (ev.window == vt)
2078 { 2096 {
2079 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2097 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2151 { 2169 {
2152 mouse_slip_wheel_speed += v ? -1 : 1; 2170 mouse_slip_wheel_speed += v ? -1 : 1;
2153 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2171 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2154 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2172 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2155 2173
2174 if (!slip_wheel_ev.is_active ())
2156 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2175 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2157 } 2176 }
2158 else 2177 else
2178# endif
2159 { 2179 {
2160# endif
2161 scr_page (v, i); 2180 scr_page (v, i);
2162 scrollbar_show (1); 2181 scrollBar.show (1);
2163# ifdef MOUSE_SLIP_WHEELING
2164 } 2182 }
2165# endif
2166 } 2183 }
2167 break; 2184 break;
2168#endif 2185#endif
2169 } 2186 }
2170 } 2187 }
2171} 2188}
2172 2189
2173/*}}} */ 2190/*}}} */
2174 2191
2175bool 2192void
2176rxvt_term::cmd_parse () 2193rxvt_term::cmd_parse ()
2177{ 2194{
2178 bool flag = false;
2179 wchar_t ch = NOCHAR; 2195 wchar_t ch = NOCHAR;
2180 char *seq_begin; // remember start of esc-sequence here 2196 char *seq_begin; // remember start of esc-sequence here
2181 2197
2182 for (;;) 2198 for (;;)
2183 { 2199 {
2184 if (ch == NOCHAR) 2200 if (expect_false (ch == NOCHAR))
2185 { 2201 {
2186 seq_begin = cmdbuf_ptr; 2202 seq_begin = cmdbuf_ptr;
2187 ch = next_char (); 2203 ch = next_char ();
2188 2204
2189 if (ch == NOCHAR) 2205 if (ch == NOCHAR)
2190 break; 2206 break;
2191 } 2207 }
2192 2208
2193 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2209 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2194 { 2210 {
2195 if (!seen_input) 2211 if (expect_false (!seen_input))
2196 { 2212 {
2197 seen_input = 1; 2213 seen_input = 1;
2198 // many badly-written programs (e.g. jed) contain a race condition: 2214 // many badly-written programs (e.g. jed) contain a race condition:
2199 // they first read the screensize and then install a SIGWINCH handler. 2215 // they first read the screensize and then install a SIGWINCH handler.
2200 // some window managers resize the window early, and these programs 2216 // some window managers resize the window early, and these programs
2213 wchar_t *str = buf; 2229 wchar_t *str = buf;
2214 wchar_t *eol = str + min (ncol, UBUFSIZ); 2230 wchar_t *eol = str + min (ncol, UBUFSIZ);
2215 2231
2216 for (;;) 2232 for (;;)
2217 { 2233 {
2218 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2234 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2219 break; 2235 break;
2220 2236
2221 *str++ = ch; 2237 *str++ = ch;
2222 2238
2223 if (ch == C0_LF || str >= eol) 2239 if (expect_false (ch == C0_LF || str >= eol))
2224 { 2240 {
2225 if (ch == C0_LF) 2241 if (ch == C0_LF)
2226 nlines++; 2242 nlines++;
2227 2243
2228 refresh_count++; 2244 refresh_count++;
2277 * What the heck we'll cheat and only refresh less than every page-full. 2293 * What the heck we'll cheat and only refresh less than every page-full.
2278 * if skipScroll is enabled. 2294 * if skipScroll is enabled.
2279 */ 2295 */
2280 if (refreshnow) 2296 if (refreshnow)
2281 { 2297 {
2282 flag = true;
2283 scr_refresh (); 2298 scr_refresh ();
2284 want_refresh = 1; 2299 want_refresh = 1;
2285 } 2300 }
2286
2287 } 2301 }
2288 else 2302 else
2289 { 2303 {
2290 try 2304 try
2291 { 2305 {
2299 } 2313 }
2300 2314
2301 ch = NOCHAR; 2315 ch = NOCHAR;
2302 } 2316 }
2303 } 2317 }
2304
2305 return flag;
2306} 2318}
2307 2319
2308// read the next character 2320// read the next character
2309wchar_t 2321wchar_t
2310rxvt_term::next_char () NOTHROW 2322rxvt_term::next_char () NOTHROW
2311{ 2323{
2312 while (cmdbuf_ptr < cmdbuf_endp) 2324 while (cmdbuf_ptr < cmdbuf_endp)
2313 { 2325 {
2314 // assume 7-bit to be ascii ALWAYS 2326 // assume 7-bit to be ascii ALWAYS
2315 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2327 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2316 return *cmdbuf_ptr++; 2328 return *cmdbuf_ptr++;
2317 2329
2318 wchar_t wc; 2330 wchar_t wc;
2319 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2331 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2320 2332
2324 cmdbuf_ptr = cmdbuf_endp; 2336 cmdbuf_ptr = cmdbuf_endp;
2325 break; 2337 break;
2326 } 2338 }
2327 2339
2328 if (len == (size_t)-1) 2340 if (len == (size_t)-1)
2341 {
2342 mbstate.reset (); // reset now undefined conversion state
2329 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2343 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2344 }
2330 2345
2331 // assume wchar == unicode 2346 // assume wchar == unicode
2332 cmdbuf_ptr += len; 2347 cmdbuf_ptr += len;
2333 return wc & UNICODE_MASK; 2348 return wc & UNICODE_MASK;
2334 } 2349 }
2378/*----------------------------------------------------------------------*/ 2393/*----------------------------------------------------------------------*/
2379#ifdef PRINTPIPE 2394#ifdef PRINTPIPE
2380FILE * 2395FILE *
2381rxvt_term::popen_printer () 2396rxvt_term::popen_printer ()
2382{ 2397{
2383 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2398 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2384 2399
2385 if (stream == NULL) 2400 if (stream == NULL)
2386 rxvt_warn ("can't open printer pipe, not printing.\n"); 2401 rxvt_warn ("can't open printer pipe, not printing.\n");
2387 2402
2388 return stream; 2403 return stream;
2399 * simulate attached vt100 printer 2414 * simulate attached vt100 printer
2400 */ 2415 */
2401void 2416void
2402rxvt_term::process_print_pipe () 2417rxvt_term::process_print_pipe ()
2403{ 2418{
2404 int done; 2419 FILE *fd = popen_printer ();
2405 FILE *fd;
2406 2420
2407 if ((fd = popen_printer ()) == NULL) 2421 if (!fd)
2408 return; 2422 return;
2409 2423
2410 /* 2424 /*
2411 * Send all input to the printer until either ESC[4i or ESC[?4i 2425 * Send all input to the printer until either ESC[4i or ESC[?4i
2412 * is received. 2426 * is received.
2413 */ 2427 */
2414 for (done = 0; !done;) 2428 for (int done = 0; !done; )
2415 { 2429 {
2416 unsigned char buf[8]; 2430 unsigned char buf[8];
2417 unicode_t ch; 2431 unicode_t ch;
2418 unsigned int i, len; 2432 unsigned int i, len;
2419 2433
2564 break; 2578 break;
2565 case 'Z': /* identify the terminal type */ 2579 case 'Z': /* identify the terminal type */
2566 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2580 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2567 break; 2581 break;
2568 case '<': /* turn off VT52 mode */ 2582 case '<': /* turn off VT52 mode */
2569 PrivMode (0, PrivMode_vt52); 2583 set_privmode (PrivMode_vt52, 0);
2570 break; 2584 break;
2571 case 'F': /* use special graphics character set */ 2585 case 'F': /* use special graphics character set */
2572 case 'G': /* use regular character set */ 2586 case 'G': /* use regular character set */
2573 /* unimplemented */ 2587 /* unimplemented */
2574 break; 2588 break;
2628 scr_forwardindex (); 2642 scr_forwardindex ();
2629 break; 2643 break;
2630#endif 2644#endif
2631 case '=': 2645 case '=':
2632 case '>': 2646 case '>':
2633 PrivMode ((ch == '='), PrivMode_aplKP); 2647 set_privmode (PrivMode_aplKP, ch == '=');
2634 break; 2648 break;
2635 2649
2636 case C1_40: 2650 case C1_40:
2637 cmd_getc (); 2651 cmd_getc ();
2638 break; 2652 break;
2677 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 2691 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
2678 case C1_SCI: /* ESC Z */ 2692 case C1_SCI: /* ESC Z */
2679 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); 2693 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
2680 break; /* steal obsolete ESC [ c */ 2694 break; /* steal obsolete ESC [ c */
2681 2695
2682 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 2696 /* 8.3.16: CONTROL SEQUENCE INTRODUCER (CSI) */
2683 case C1_CSI: /* ESC [ */ 2697 case C1_CSI: /* ESC [ */
2684 process_csi_seq (); 2698 process_csi_seq ();
2685 break; 2699 break;
2686 2700
2687 /* 8.3.90: OPERATING SYSTEM COMMAND */ 2701 /* 8.3.90: OPERATING SYSTEM COMMAND (OSC) */
2688 case C1_OSC: /* ESC ] */ 2702 case C1_OSC: /* ESC ] */
2689 process_osc_seq (); 2703 process_osc_seq ();
2690 break; 2704 break;
2691 2705
2692 /* 8.3.106: RESET TO INITIAL STATE */ 2706 /* 8.3.106: RESET TO INITIAL STATE (RIS) */
2693 case 'c': 2707 case 'c':
2694 mbstate.reset (); 2708 mbstate.reset ();
2695 scr_poweron (); 2709 scr_poweron ();
2696 scrollbar_show (1); 2710 scrollBar.show (1);
2697 break; 2711 break;
2698 2712
2699 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2713 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2700 case 'n': 2714 case 'n':
2701 scr_charset_choose (2); 2715 scr_charset_choose (2);
2752 2766
2753 nargs = 0; 2767 nargs = 0;
2754 2768
2755 priv = 0; 2769 priv = 0;
2756 ch = cmd_getc (); 2770 ch = cmd_getc ();
2757 if (ch >= '<' && ch <= '?') 2771 if ((ch >= '<' && ch <= '?') || ch == '!')
2758 { 2772 {
2759 /* '<' '=' '>' '?' */ 2773 /* '<' '=' '>' '?' '!' */
2760 priv = ch; 2774 priv = ch;
2761 ch = cmd_getc (); 2775 ch = cmd_getc ();
2762 } 2776 }
2763 2777
2764 /* read any numerical arguments */ 2778 /* read any numerical arguments */
2813 // versions. 2827 // versions.
2814 // 2828 //
2815 tt_printf ("\033[>%d;95;0c", 'U'); 2829 tt_printf ("\033[>%d;95;0c", 'U');
2816 } 2830 }
2817 break; 2831 break;
2832
2818 case '?': 2833 case '?':
2819 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2834 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2820 process_terminal_mode (ch, priv, nargs, arg); 2835 process_terminal_mode (ch, priv, nargs, arg);
2821 break; 2836 break;
2837
2838 case '!':
2839 if (ch == CSI_70)
2840 {
2841 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2842 scr_soft_reset ();
2843
2844 static const int pm_h[] = { 7, 25 };
2845 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 };
2846
2847 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h);
2848 process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l);
2822 } 2849 }
2850 break;
2851 }
2852
2823 return; 2853 return;
2824 } 2854 }
2825 2855
2826 switch (ch) 2856 switch (ch)
2827 { 2857 {
3256 3286
3257/* 3287/*
3258 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3288 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3259 */ 3289 */
3260void 3290void
3261rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3291rxvt_term::process_xterm_seq (int op, char *str, char resp)
3262{ 3292{
3263 int color; 3293 int color;
3264 char *buf, *name; 3294 char *buf, *name;
3265 bool query = str[0] == '?' && !str[1]; 3295 bool query = str[0] == '?' && !str[1];
3266 int saveop = op; 3296 int saveop = op;
3307 3337
3308 XFree (value); 3338 XFree (value);
3309 } 3339 }
3310 else 3340 else
3311 { 3341 {
3312 char *eq = strchr (str, '='); // constness lost, but verified to be ok 3342 char *eq = strchr (str, '=');
3313 3343
3314 if (eq) 3344 if (eq)
3315 { 3345 {
3316 *eq = 0; 3346 *eq = 0;
3317 set_utf8_property (display->atom (str), eq + 1); 3347 set_utf8_property (display->atom (str), eq + 1);
3338 *buf++ = '\0'; 3368 *buf++ = '\0';
3339 3369
3340 process_color_seq (op, color, name, resp); 3370 process_color_seq (op, color, name, resp);
3341 } 3371 }
3342 break; 3372 break;
3373 case Rxvt_restoreFG:
3343 case XTerm_Color00: 3374 case XTerm_Color00:
3344 process_color_seq (op, Color_fg, str, resp); 3375 process_color_seq (op, Color_fg, str, resp);
3345 break; 3376 break;
3377 case Rxvt_restoreBG:
3346 case XTerm_Color01: 3378 case XTerm_Color01:
3347 process_color_seq (op, Color_bg, str, resp); 3379 process_color_seq (op, Color_bg, str, resp);
3348 break; 3380 break;
3349#ifndef NO_CURSORCOLOR 3381#ifndef NO_CURSORCOLOR
3350 case XTerm_Color_cursor: 3382 case XTerm_Color_cursor:
3371 break; 3403 break;
3372 case URxvt_Color_IT: 3404 case URxvt_Color_IT:
3373 process_color_seq (op, Color_IT, str, resp); 3405 process_color_seq (op, Color_IT, str, resp);
3374 break; 3406 break;
3375#endif 3407#endif
3408 case URxvt_Color_border:
3409 process_color_seq (op, Color_border, str, resp);
3410 break;
3376#if ENABLE_TRANSPARENCY 3411#if ENABLE_TRANSPARENCY
3377 case URxvt_Color_tint: 3412 case URxvt_Color_tint:
3378 process_color_seq (op, Color_tint, str, resp); 3413 process_color_seq (op, Color_tint, str, resp);
3379 { 3414 {
3380 bool changed = false; 3415 bool changed = false;
3416
3381 if (ISSET_PIXCOLOR (Color_tint)) 3417 if (ISSET_PIXCOLOR (Color_tint))
3382 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3418 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3383 else 3419 else
3384 changed = bgPixmap.unset_tint (); 3420 changed = bgPixmap.unset_tint ();
3421
3385 if (changed) 3422 if (changed)
3386 update_background (); 3423 update_background ();
3387 } 3424 }
3388 3425
3389 break; 3426 break;
3412 changed++; 3449 changed++;
3413 str = strchr (str, ';'); 3450 str = strchr (str, ';');
3414 if (str == NULL) 3451 if (str == NULL)
3415 bgPixmap.set_defaultGeometry (); 3452 bgPixmap.set_defaultGeometry ();
3416 } 3453 }
3454
3417 while (str) 3455 while (str)
3418 { 3456 {
3419 str++; 3457 str++;
3420 if (bgPixmap.set_geometry (str)) 3458 if (bgPixmap.set_geometry (str))
3421 changed++; 3459 changed++;
3422 str = strchr (str, ';'); 3460 str = strchr (str, ';');
3423 } 3461 }
3462
3424 if (changed) 3463 if (changed)
3425 update_background (); 3464 update_background ();
3426 } 3465 }
3427 break; 3466 break;
3428#endif 3467#endif
3429
3430 case Rxvt_restoreFG:
3431 set_window_color (Color_fg, str);
3432 break;
3433 case Rxvt_restoreBG:
3434 set_window_color (Color_bg, str);
3435 break;
3436 3468
3437 case XTerm_logfile: 3469 case XTerm_logfile:
3438 // TODO, when secure mode? 3470 // TODO, when secure mode?
3439 break; 3471 break;
3440 3472
3507 break; 3539 break;
3508#endif 3540#endif
3509 3541
3510#if ENABLE_PERL 3542#if ENABLE_PERL
3511 case URxvt_perl: 3543 case URxvt_perl:
3512 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3544 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3513 ; // no responses yet
3514 break; 3545 break;
3515#endif 3546#endif
3516 } 3547 }
3517} 3548}
3518/*----------------------------------------------------------------------*/ 3549/*----------------------------------------------------------------------*/
3541 { 3572 {
3542 if (mode == 'r') 3573 if (mode == 'r')
3543 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3574 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3544 else 3575 else
3545 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3576 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3546 PrivMode (state, bit); 3577 set_privmode (bit, state);
3547 } 3578 }
3548 3579
3549 return state; 3580 return state;
3550} 3581}
3551 3582
3559 static const struct 3590 static const struct
3560 { 3591 {
3561 const int argval; 3592 const int argval;
3562 const unsigned long bit; 3593 const unsigned long bit;
3563 } argtopriv[] = { 3594 } argtopriv[] = {
3564 { 1, PrivMode_aplCUR }, 3595 { 1, PrivMode_aplCUR }, // DECCKM
3565 { 2, PrivMode_vt52 }, 3596 { 2, PrivMode_vt52 },
3566 { 3, PrivMode_132 }, 3597 { 3, PrivMode_132 }, // DECCOLM
3567 { 4, PrivMode_smoothScroll }, 3598 { 4, PrivMode_smoothScroll }, // DECSCLM
3568 { 5, PrivMode_rVideo }, 3599 { 5, PrivMode_rVideo }, // DECSCNM
3569 { 6, PrivMode_relOrigin }, 3600 { 6, PrivMode_relOrigin }, // DECOM
3570 { 7, PrivMode_Autowrap }, 3601 { 7, PrivMode_Autowrap }, // DECAWM
3571 // 8, bi-directional support mode 3602 // 8, auto-repeat keys // DECARM
3572 { 9, PrivMode_MouseX10 }, 3603 { 9, PrivMode_MouseX10 },
3573 // 18, 19 printing-related 3604 // 18 end FF to printer after print screen
3605 // 19 Print screen prints full screen/scorll region
3574 { 25, PrivMode_VisibleCursor }, 3606 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
3575#ifdef scrollBar_esc 3607#ifdef scrollBar_esc
3576 { scrollBar_esc, PrivMode_scrollBar }, 3608 { scrollBar_esc, PrivMode_scrollBar },
3577#endif 3609#endif
3578 { 35, PrivMode_ShiftKeys }, // rxvt extension 3610 { 35, PrivMode_ShiftKeys }, // rxvt extension
3611 // 38, tektronix mode // DECTEK
3579 { 40, PrivMode_132OK }, 3612 { 40, PrivMode_132OK },
3580 // 41 xterm more fixes NYI 3613 // 41 xterm more fixes NYI
3581 // 45 margin bell NYI 3614 // 45 margin bell NYI
3582 // 46 start logging 3615 // 46 start logging
3583 { 47, PrivMode_Screen }, 3616 { 47, PrivMode_Screen },
3584 { 66, PrivMode_aplKP }, 3617 { 66, PrivMode_aplKP }, // DECPAM/DECPNM
3585#ifndef NO_BACKSPACE_KEY 3618#ifndef NO_BACKSPACE_KEY
3586 { 67, PrivMode_BackSpace }, 3619 { 67, PrivMode_BackSpace }, // DECBKM
3587#endif 3620#endif
3588 { 1000, PrivMode_MouseX11 }, 3621 { 1000, PrivMode_MouseX11 },
3589 { 1002, PrivMode_MouseBtnEvent }, 3622 { 1002, PrivMode_MouseBtnEvent },
3590 { 1003, PrivMode_MouseAnyEvent }, 3623 { 1003, PrivMode_MouseAnyEvent },
3591 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3624 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3595 // 1037 send DEL for keypad delete NYI 3628 // 1037 send DEL for keypad delete NYI
3596 { 1047, PrivMode_Screen }, 3629 { 1047, PrivMode_Screen },
3597 // 1048 save and restore cursor 3630 // 1048 save and restore cursor
3598 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3631 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3599 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3632 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3633 { 2004, PrivMode_BracketPaste },
3600 }; 3634 };
3601 3635
3602 if (nargs == 0) 3636 if (nargs == 0)
3603 return; 3637 return;
3604 3638
3629 3663
3630 scr_touch (true); 3664 scr_touch (true);
3631 break; 3665 break;
3632#endif 3666#endif
3633 case 1048: /* alternative cursor save */ 3667 case 1048: /* alternative cursor save */
3634 case 1049:
3635 if (option (Opt_secondaryScreen)) 3668 if (option (Opt_secondaryScreen))
3636 if (mode == 0) 3669 if (mode == 0)
3637 scr_cursor (RESTORE); 3670 scr_cursor (RESTORE);
3638 else if (mode == 1) 3671 else if (mode == 1)
3639 scr_cursor (SAVE); 3672 scr_cursor (SAVE);
3648 case 2: /* VT52 mode */ 3681 case 2: /* VT52 mode */
3649 /* oddball mode. should be set regardless of set/reset 3682 /* oddball mode. should be set regardless of set/reset
3650 * parameter. Return from VT52 mode with an ESC < from 3683 * parameter. Return from VT52 mode with an ESC < from
3651 * within VT52 mode 3684 * within VT52 mode
3652 */ 3685 */
3653 PrivMode (1, PrivMode_vt52); 3686 set_privmode (PrivMode_vt52, 1);
3654 break; 3687 break;
3655 case 3: /* 80/132 */ 3688 case 3: /* 80/132 */
3656 if (priv_modes & PrivMode_132OK) 3689 if (priv_modes & PrivMode_132OK)
3657 set_widthheight (((state ? 132 : 80) * fwidth), height); 3690 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3658 break; 3691 break;
3659 case 4: /* smooth scrolling */ 3692 case 4: /* smooth scrolling */
3660 set_option (Opt_jumpScroll, !state); 3693 set_option (Opt_jumpScroll, !state);
3661 break; 3694 break;
3662 case 5: /* reverse video */ 3695 case 5: /* reverse video */
3673 if (state) /* orthogonal */ 3706 if (state) /* orthogonal */
3674 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3707 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3675 break; 3708 break;
3676#ifdef scrollBar_esc 3709#ifdef scrollBar_esc
3677 case scrollBar_esc: 3710 case scrollBar_esc:
3678 if (scrollbar_mapping (state)) 3711 if (scrollBar.map (state))
3679 { 3712 {
3680 resize_all_windows (0, 0, 0); 3713 resize_all_windows (0, 0, 0);
3681 scr_touch (true); 3714 scr_touch (true);
3682 } 3715 }
3683 break; 3716 break;
3704 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3737 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3705 vt_emask_mouse = PointerMotionMask; 3738 vt_emask_mouse = PointerMotionMask;
3706 } 3739 }
3707 else 3740 else
3708 vt_emask_mouse = NoEventMask; 3741 vt_emask_mouse = NoEventMask;
3742
3709 vt_select_input (); 3743 vt_select_input ();
3710 break; 3744 break;
3711 case 1010: /* scroll to bottom on TTY output inhibit */ 3745 case 1010: /* scroll to bottom on TTY output inhibit */
3712 set_option (Opt_scrollTtyOutput, !state); 3746 set_option (Opt_scrollTtyOutput, !state);
3713 break; 3747 break;
3714 case 1011: /* scroll to bottom on key press */ 3748 case 1011: /* scroll to bottom on key press */
3715 set_option (Opt_scrollTtyKeypress, state); 3749 set_option (Opt_scrollTtyKeypress, state);
3716 break; 3750 break;
3717 case 1047: /* secondary screen w/ clearing last */ 3751 case 1047: /* secondary screen w/ clearing last */
3718 if (option (Opt_secondaryScreen)) 3752 if (option (Opt_secondaryScreen))
3719 if (current_screen != PRIMARY) 3753 if (!state)
3720 scr_erase_screen (2); 3754 scr_erase_screen (2);
3755
3721 scr_change_screen (state); 3756 scr_change_screen (state);
3722 break; 3757 break;
3723 case 1049: /* secondary screen w/ clearing first */ 3758 case 1049: /* secondary screen w/ clearing first */
3759 if (option (Opt_secondaryScreen))
3760 if (state)
3761 scr_cursor (SAVE);
3762
3724 scr_change_screen (state); 3763 scr_change_screen (state);
3764
3725 if (option (Opt_secondaryScreen)) 3765 if (option (Opt_secondaryScreen))
3726 if (current_screen != PRIMARY) 3766 if (state)
3727 scr_erase_screen (2); 3767 scr_erase_screen (2);
3768 else
3769 scr_cursor (RESTORE);
3728 break; 3770 break;
3729 default: 3771 default:
3730 break; 3772 break;
3731 } 3773 }
3732 } 3774 }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines