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.378 by root, Fri Dec 14 02:27:54 2007 UTC vs.
Revision 1.414 by ayin, Tue Feb 19 10:47:03 2008 UTC

… …
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-2007 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 ();
1050
1051 display->flush ();
1052
1053 if (want_refresh && !flush_ev.is_active ()) 1033 if (want_refresh && !flush_ev.is_active ())
1054 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally 1034 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1035
1036 display->flush ();
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 else 1068 else
1085 w.stop (); 1069 w.stop ();
1086} 1070}
1087#endif 1071#endif
1088 1072
1089#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1073#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1090void 1074void
1091rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1075rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1092{ 1076{
1093 if ((scrollbar_isUp() || scrollbar_isDn()) && 1077 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1094 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1078 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1079 {
1095 want_refresh = 1; 1080 want_refresh = 1;
1081 refresh_check ();
1082 }
1096 else 1083 else
1097 w.stop (); 1084 w.stop ();
1098} 1085}
1099#endif 1086#endif
1100 1087
… …
1104{ 1091{
1105 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1092 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1106 { 1093 {
1107 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1094 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1108 want_refresh = 1; 1095 want_refresh = 1;
1096 refresh_check ();
1109 } 1097 }
1110 else 1098 else
1111 w.stop (); 1099 w.stop ();
1112} 1100}
1113#endif 1101#endif
1114 1102
1115#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1103#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1116void 1104void
1117rxvt_term::slip_wheel_cb (ev::timer &w, int revents) 1105rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1118{ 1106{
1119 if (mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1107 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1120 : scr_page (UP, mouse_slip_wheel_speed)) 1108 {
1121 want_refresh = 1; 1109 want_refresh = 1;
1110 refresh_check ();
1111 }
1122 1112
1123 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0) 1113 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1124 { 1114 {
1125 mouse_slip_wheel_speed = 0; 1115 mouse_slip_wheel_speed = 0;
1126 w.stop (); 1116 w.stop ();
… …
1204 if (cmd_parse ()) 1194 if (cmd_parse ())
1205 break; 1195 break;
1206 1196
1207 if (revents & ev::WRITE) 1197 if (revents & ev::WRITE)
1208 pty_write (); 1198 pty_write ();
1199
1200 refresh_check ();
1209} 1201}
1210 1202
1211void 1203void
1212rxvt_term::pointer_unblank () 1204rxvt_term::pointer_unblank ()
1213{ 1205{
… …
1428 && ev.xfocus.mode != NotifyGrab) 1420 && ev.xfocus.mode != NotifyGrab)
1429 focus_out (); 1421 focus_out ();
1430 break; 1422 break;
1431 1423
1432 case ConfigureNotify: 1424 case ConfigureNotify:
1433 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n", 1425 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1434 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y, 1426 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1435 szHint.width, szHint.height); */ 1427 szHint.width, szHint.height);*/
1436 if (ev.xconfigure.window == parent[0]) 1428 if (ev.xconfigure.window == parent[0])
1437 { 1429 {
1438 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1430 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1439 ; 1431 ;
1440 1432
… …
1445 } 1437 }
1446 else 1438 else
1447 { 1439 {
1448#ifdef HAVE_BG_PIXMAP 1440#ifdef HAVE_BG_PIXMAP
1449 if (bgPixmap.window_position_sensitive ()) 1441 if (bgPixmap.window_position_sensitive ())
1442 {
1443 if (mapped)
1450 update_background (); 1444 update_background ();
1445 else
1446 bgPixmap.invalidate ();
1447 }
1451#endif 1448#endif
1452 } 1449 }
1450
1453 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1451 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1454 } 1452 }
1455 break; 1453 break;
1456 1454
1457 case PropertyNotify: 1455 case PropertyNotify:
… …
1474 case SelectionRequest: 1472 case SelectionRequest:
1475 selection_send (ev.xselectionrequest); 1473 selection_send (ev.xselectionrequest);
1476 break; 1474 break;
1477 1475
1478 case MapNotify: 1476 case MapNotify:
1477#ifdef HAVE_BG_PIXMAP
1478 /* This is needed spcifically to fix the case of no window manager or a
1479 * non-reparenting window manager. In those cases we never get first
1480 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1481 * care of multiplicity of ConfigureNotify events arriwing while WM does
1482 * reparenting.
1483 * We should not render background immidiately, as there could be several
1484 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1485 * by scheduling background redraw as soon as we can, but giving a short
1486 * bit of time for ConfigureNotifies to arrive.
1487 * We should render background PRIOR to drawing any text, but AFTER all
1488 * of ConfigureNotifys for the best results.
1489 */
1490 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1491 update_background_ev.start (0.025);
1492#endif
1479 mapped = 1; 1493 mapped = 1;
1480#ifdef TEXT_BLINK 1494#ifdef TEXT_BLINK
1481 text_blink_ev.start (); 1495 text_blink_ev.start ();
1482#endif 1496#endif
1483 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1497 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
… …
1507 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1521 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1508 { 1522 {
1509 scr_expose (ev.xexpose.x, ev.xexpose.y, 1523 scr_expose (ev.xexpose.x, ev.xexpose.y,
1510 ev.xexpose.width, ev.xexpose.height, False); 1524 ev.xexpose.width, ev.xexpose.height, False);
1511 } 1525 }
1526
1512 want_refresh = 1; 1527 want_refresh = 1;
1513 } 1528 }
1514 else 1529 else
1515 { 1530 {
1516 XEvent unused_event; 1531 XEvent unused_event;
… …
1518 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) 1533 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1519 ; 1534 ;
1520 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1535 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1521 ; 1536 ;
1522 1537
1523 if (isScrollbarWindow (ev.xany.window)) 1538 if (scrollBar.state && ev.xany.window == scrollBar.win)
1524 { 1539 {
1525 scrollBar.setIdle (); 1540 scrollBar.state = STATE_IDLE;
1526 scrollbar_show (0); 1541 scrollBar.show (0);
1527 } 1542 }
1528 } 1543 }
1529 break; 1544 break;
1530 1545
1531 case MotionNotify: 1546 case MotionNotify:
… …
1618#ifdef MOUSE_THRESHOLD 1633#ifdef MOUSE_THRESHOLD
1619 } 1634 }
1620#endif 1635#endif
1621 } 1636 }
1622 } 1637 }
1623 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1638 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1624 { 1639 {
1625 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1640 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1626 MotionNotify, &ev)) 1641 MotionNotify, &ev))
1627 ; 1642 ;
1628 1643
… …
1630 &unused_root, &unused_child, 1645 &unused_root, &unused_child,
1631 &unused_root_x, &unused_root_y, 1646 &unused_root_x, &unused_root_y,
1632 &ev.xbutton.x, &ev.xbutton.y, 1647 &ev.xbutton.x, &ev.xbutton.y,
1633 &unused_mask); 1648 &unused_mask);
1634 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1649 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1635 scrollbar_size ()); 1650 scrollBar.size ());
1636 want_refresh = 1; 1651 want_refresh = 1;
1637 scrollbar_show (1); 1652 scrollBar.show (1);
1638 } 1653 }
1639 break; 1654 break;
1640 } 1655 }
1641 1656
1642#if defined(CURSOR_BLINK) 1657#if defined(CURSOR_BLINK)
… …
1663 1678
1664 if (ev.type == KeyPress && hidden_pointer == 0) 1679 if (ev.type == KeyPress && hidden_pointer == 0)
1665 pointer_blank (); 1680 pointer_blank ();
1666 } 1681 }
1667#endif 1682#endif
1683
1684 refresh_check ();
1668} 1685}
1669 1686
1670void 1687void
1671rxvt_term::focus_in () 1688rxvt_term::focus_in ()
1672{ 1689{
… …
1782 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1799 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1783 { 1800 {
1784 bgPixmap.set_root_pixmap (); 1801 bgPixmap.set_root_pixmap ();
1785 update_background (); 1802 update_background ();
1786 } 1803 }
1804
1787 break; 1805 break;
1788 } 1806 }
1789# endif 1807# endif
1808
1809 refresh_check ();
1790} 1810}
1791#endif 1811#endif
1792 1812
1793void 1813void
1794rxvt_term::button_press (XButtonEvent &ev) 1814rxvt_term::button_press (XButtonEvent &ev)
… …
1907 } 1927 }
1908 1928
1909 /* 1929 /*
1910 * Scrollbar window processing of button press 1930 * Scrollbar window processing of button press
1911 */ 1931 */
1912 if (isScrollbarWindow (ev.window)) 1932 if (scrollBar.state && ev.window == scrollBar.win)
1913 { 1933 {
1914 scrollBar.setIdle (); 1934 page_dirn direction = NO_DIR;
1935
1936 if (scrollBar.upButton (ev.y))
1937 direction = UP; /* up */
1938 else if (scrollBar.dnButton (ev.y))
1939 direction = DN; /* down */
1940
1941 scrollBar.state = STATE_IDLE;
1915 /* 1942 /*
1916 * Rxvt-style scrollbar: 1943 * Rxvt-style scrollbar:
1917 * move up if mouse is above slider 1944 * move up if mouse is above slider
1918 * move dn if mouse is below slider 1945 * move dn if mouse is below slider
1919 * 1946 *
… …
1928 /* 1955 /*
1929 * Mouse report disabled scrollbar: 1956 * Mouse report disabled scrollbar:
1930 * arrow buttons - send up/down 1957 * arrow buttons - send up/down
1931 * click on scrollbar - send pageup/down 1958 * click on scrollbar - send pageup/down
1932 */ 1959 */
1933 if ((scrollBar.style == R_SB_NEXT 1960 if (direction == UP)
1934 && scrollbarnext_upButton (ev.y))
1935 || (scrollBar.style == R_SB_RXVT
1936 && scrollbarrxvt_upButton (ev.y)))
1937 tt_printf ("\033[A"); 1961 tt_printf ("\033[A");
1938 else if ((scrollBar.style == R_SB_NEXT 1962 else if (direction == DN)
1939 && scrollbarnext_dnButton (ev.y))
1940 || (scrollBar.style == R_SB_RXVT
1941 && scrollbarrxvt_dnButton (ev.y)))
1942 tt_printf ("\033[B"); 1963 tt_printf ("\033[B");
1943 else 1964 else
1944 switch (ev.button) 1965 switch (ev.button)
1945 { 1966 {
1946 case Button2: 1967 case Button2:
… …
1954 break; 1975 break;
1955 } 1976 }
1956 } 1977 }
1957 else 1978 else
1958#endif /* NO_SCROLLBAR_REPORT */ 1979#endif /* NO_SCROLLBAR_REPORT */
1959
1960 {
1961 char upordown = 0;
1962
1963 if (scrollBar.style == R_SB_NEXT)
1964 { 1980 {
1965 if (scrollbarnext_upButton (ev.y)) 1981 if (direction != NO_DIR)
1966 upordown = -1; /* up */
1967 else if (scrollbarnext_dnButton (ev.y))
1968 upordown = 1; /* down */
1969 }
1970 else if (scrollBar.style == R_SB_RXVT)
1971 {
1972 if (scrollbarrxvt_upButton (ev.y))
1973 upordown = -1; /* up */
1974 else if (scrollbarrxvt_dnButton (ev.y))
1975 upordown = 1; /* down */
1976 }
1977
1978 if (upordown)
1979 { 1982 {
1980#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1983#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1981 if (!cont_scroll_ev.is_active ()) 1984 if (!cont_scroll_ev.is_active ())
1982 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 1985 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1983#endif 1986#endif
1984 if (scr_page (upordown < 0 ? UP : DN, 1)) 1987 if (scr_page (direction, 1))
1985 { 1988 {
1986 if (upordown < 0) 1989 if (direction == UP)
1987 scrollBar.setUp (); 1990 scrollBar.state = STATE_UP;
1988 else 1991 else
1989 scrollBar.setDn (); 1992 scrollBar.state = STATE_DOWN;
1990 } 1993 }
1991 } 1994 }
1992 else 1995 else
1993 switch (ev.button) 1996 switch (ev.button)
1994 { 1997 {
1995 case Button2: 1998 case Button2:
1996 switch (scrollbar_align) 1999 switch (scrollBar.align)
1997 { 2000 {
1998 case R_SB_ALIGN_TOP: 2001 case R_SB_ALIGN_TOP:
1999 csrO = 0; 2002 csrO = 0;
2000 break; 2003 break;
2001 case R_SB_ALIGN_CENTRE: 2004 case R_SB_ALIGN_CENTRE:
… …
2007 } 2010 }
2008 2011
2009 if (scrollBar.style == R_SB_XTERM 2012 if (scrollBar.style == R_SB_XTERM
2010 || scrollbar_above_slider (ev.y) 2013 || scrollbar_above_slider (ev.y)
2011 || scrollbar_below_slider (ev.y)) 2014 || scrollbar_below_slider (ev.y))
2012 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2015 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2013 2016
2014 scrollBar.setMotion (); 2017 scrollBar.state = STATE_MOTION;
2015 break; 2018 break;
2016 2019
2017 case Button1: 2020 case Button1:
2018 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2021 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2019 csrO = ev.y - scrollBar.top; 2022 csrO = ev.y - scrollBar.top;
2020 /* FALLTHROUGH */ 2023 /* FALLTHROUGH */
2021 2024
2022 case Button3: 2025 case Button3:
2023 if (scrollBar.style != R_SB_XTERM) 2026 if (scrollBar.style != R_SB_XTERM)
… …
2033 scr_page (DN, nrow - 1); 2036 scr_page (DN, nrow - 1);
2034# else 2037# else
2035 scr_page (DN, nrow / 4); 2038 scr_page (DN, nrow / 4);
2036# endif 2039# endif
2037 else 2040 else
2038 scrollBar.setMotion (); 2041 scrollBar.state = STATE_MOTION;
2039 } 2042 }
2040 else 2043 else
2041 { 2044 {
2042 scr_page ((ev.button == Button1 ? DN : UP), 2045 scr_page ((ev.button == Button1 ? DN : UP),
2043 (nrow 2046 (nrow
2044 * scrollbar_position (ev.y) 2047 * scrollbar_position (ev.y)
2045 / scrollbar_size ())); 2048 / scrollBar.size ()));
2046 } 2049 }
2047 2050
2048 break; 2051 break;
2049 } 2052 }
2050 } 2053 }
… …
2060 2063
2061 csrO = 0; /* reset csr Offset */ 2064 csrO = 0; /* reset csr Offset */
2062 if (!bypass_keystate) 2065 if (!bypass_keystate)
2063 reportmode = !! (priv_modes & PrivMode_mouse_report); 2066 reportmode = !! (priv_modes & PrivMode_mouse_report);
2064 2067
2065 if (scrollbar_isUpDn ()) 2068 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2066 { 2069 {
2067 scrollBar.setIdle (); 2070 scrollBar.state = STATE_IDLE;
2068 scrollbar_show (0); 2071 scrollBar.show (0);
2069 } 2072 }
2070 2073
2071#ifdef SELECTION_SCROLLING 2074#ifdef SELECTION_SCROLLING
2072 sel_scroll_ev.stop(); 2075 sel_scroll_ev.stop();
2073#endif 2076#endif
… …
2153 2156
2154 if (!slip_wheel_ev.is_active ()) 2157 if (!slip_wheel_ev.is_active ())
2155 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2158 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2156 } 2159 }
2157 else 2160 else
2161# endif
2158 { 2162 {
2159# endif
2160 scr_page (v, i); 2163 scr_page (v, i);
2161 scrollbar_show (1); 2164 scrollBar.show (1);
2162# ifdef MOUSE_SLIP_WHEELING
2163 } 2165 }
2164# endif
2165 } 2166 }
2166 break; 2167 break;
2167#endif 2168#endif
2168 } 2169 }
2169 } 2170 }
… …
2563 break; 2564 break;
2564 case 'Z': /* identify the terminal type */ 2565 case 'Z': /* identify the terminal type */
2565 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2566 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2566 break; 2567 break;
2567 case '<': /* turn off VT52 mode */ 2568 case '<': /* turn off VT52 mode */
2568 PrivMode (0, PrivMode_vt52); 2569 set_privmode (PrivMode_vt52, 0);
2569 break; 2570 break;
2570 case 'F': /* use special graphics character set */ 2571 case 'F': /* use special graphics character set */
2571 case 'G': /* use regular character set */ 2572 case 'G': /* use regular character set */
2572 /* unimplemented */ 2573 /* unimplemented */
2573 break; 2574 break;
… …
2627 scr_forwardindex (); 2628 scr_forwardindex ();
2628 break; 2629 break;
2629#endif 2630#endif
2630 case '=': 2631 case '=':
2631 case '>': 2632 case '>':
2632 PrivMode ((ch == '='), PrivMode_aplKP); 2633 set_privmode (PrivMode_aplKP, ch == '=');
2633 break; 2634 break;
2634 2635
2635 case C1_40: 2636 case C1_40:
2636 cmd_getc (); 2637 cmd_getc ();
2637 break; 2638 break;
… …
2690 2691
2691 /* 8.3.106: RESET TO INITIAL STATE */ 2692 /* 8.3.106: RESET TO INITIAL STATE */
2692 case 'c': 2693 case 'c':
2693 mbstate.reset (); 2694 mbstate.reset ();
2694 scr_poweron (); 2695 scr_poweron ();
2695 scrollbar_show (1); 2696 scrollBar.show (1);
2696 break; 2697 break;
2697 2698
2698 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2699 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2699 case 'n': 2700 case 'n':
2700 scr_charset_choose (2); 2701 scr_charset_choose (2);
… …
2812 // versions. 2813 // versions.
2813 // 2814 //
2814 tt_printf ("\033[>%d;95;0c", 'U'); 2815 tt_printf ("\033[>%d;95;0c", 'U');
2815 } 2816 }
2816 break; 2817 break;
2818
2817 case '?': 2819 case '?':
2818 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2820 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2819 process_terminal_mode (ch, priv, nargs, arg); 2821 process_terminal_mode (ch, priv, nargs, arg);
2820 break; 2822 break;
2821 } 2823 }
… …
3337 *buf++ = '\0'; 3339 *buf++ = '\0';
3338 3340
3339 process_color_seq (op, color, name, resp); 3341 process_color_seq (op, color, name, resp);
3340 } 3342 }
3341 break; 3343 break;
3344 case Rxvt_restoreFG:
3342 case XTerm_Color00: 3345 case XTerm_Color00:
3343 process_color_seq (op, Color_fg, str, resp); 3346 process_color_seq (op, Color_fg, str, resp);
3344 break; 3347 break;
3348 case Rxvt_restoreBG:
3345 case XTerm_Color01: 3349 case XTerm_Color01:
3346 process_color_seq (op, Color_bg, str, resp); 3350 process_color_seq (op, Color_bg, str, resp);
3347 break; 3351 break;
3348#ifndef NO_CURSORCOLOR 3352#ifndef NO_CURSORCOLOR
3349 case XTerm_Color_cursor: 3353 case XTerm_Color_cursor:
… …
3375#if ENABLE_TRANSPARENCY 3379#if ENABLE_TRANSPARENCY
3376 case URxvt_Color_tint: 3380 case URxvt_Color_tint:
3377 process_color_seq (op, Color_tint, str, resp); 3381 process_color_seq (op, Color_tint, str, resp);
3378 { 3382 {
3379 bool changed = false; 3383 bool changed = false;
3384
3380 if (ISSET_PIXCOLOR (Color_tint)) 3385 if (ISSET_PIXCOLOR (Color_tint))
3381 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3386 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3382 else 3387 else
3383 changed = bgPixmap.unset_tint (); 3388 changed = bgPixmap.unset_tint ();
3389
3384 if (changed) 3390 if (changed)
3385 update_background (); 3391 update_background ();
3386 } 3392 }
3387 3393
3388 break; 3394 break;
… …
3411 changed++; 3417 changed++;
3412 str = strchr (str, ';'); 3418 str = strchr (str, ';');
3413 if (str == NULL) 3419 if (str == NULL)
3414 bgPixmap.set_defaultGeometry (); 3420 bgPixmap.set_defaultGeometry ();
3415 } 3421 }
3422
3416 while (str) 3423 while (str)
3417 { 3424 {
3418 str++; 3425 str++;
3419 if (bgPixmap.set_geometry (str)) 3426 if (bgPixmap.set_geometry (str))
3420 changed++; 3427 changed++;
3421 str = strchr (str, ';'); 3428 str = strchr (str, ';');
3422 } 3429 }
3430
3423 if (changed) 3431 if (changed)
3424 update_background (); 3432 update_background ();
3425 } 3433 }
3426 break; 3434 break;
3427#endif 3435#endif
3428
3429 case Rxvt_restoreFG:
3430 set_window_color (Color_fg, str);
3431 break;
3432 case Rxvt_restoreBG:
3433 set_window_color (Color_bg, str);
3434 break;
3435 3436
3436 case XTerm_logfile: 3437 case XTerm_logfile:
3437 // TODO, when secure mode? 3438 // TODO, when secure mode?
3438 break; 3439 break;
3439 3440
… …
3540 { 3541 {
3541 if (mode == 'r') 3542 if (mode == 'r')
3542 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3543 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3543 else 3544 else
3544 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3545 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3545 PrivMode (state, bit); 3546 set_privmode (bit, state);
3546 } 3547 }
3547 3548
3548 return state; 3549 return state;
3549} 3550}
3550 3551
… …
3594 // 1037 send DEL for keypad delete NYI 3595 // 1037 send DEL for keypad delete NYI
3595 { 1047, PrivMode_Screen }, 3596 { 1047, PrivMode_Screen },
3596 // 1048 save and restore cursor 3597 // 1048 save and restore cursor
3597 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3598 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3598 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3599 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3600 { 2004, PrivMode_BracketPaste },
3599 }; 3601 };
3600 3602
3601 if (nargs == 0) 3603 if (nargs == 0)
3602 return; 3604 return;
3603 3605
… …
3647 case 2: /* VT52 mode */ 3649 case 2: /* VT52 mode */
3648 /* oddball mode. should be set regardless of set/reset 3650 /* oddball mode. should be set regardless of set/reset
3649 * parameter. Return from VT52 mode with an ESC < from 3651 * parameter. Return from VT52 mode with an ESC < from
3650 * within VT52 mode 3652 * within VT52 mode
3651 */ 3653 */
3652 PrivMode (1, PrivMode_vt52); 3654 set_privmode (PrivMode_vt52, 1);
3653 break; 3655 break;
3654 case 3: /* 80/132 */ 3656 case 3: /* 80/132 */
3655 if (priv_modes & PrivMode_132OK) 3657 if (priv_modes & PrivMode_132OK)
3658 {
3659 scr_poweron ();
3656 set_widthheight (((state ? 132 : 80) * fwidth), height); 3660 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight);
3661 }
3657 break; 3662 break;
3658 case 4: /* smooth scrolling */ 3663 case 4: /* smooth scrolling */
3659 set_option (Opt_jumpScroll, !state); 3664 set_option (Opt_jumpScroll, !state);
3660 break; 3665 break;
3661 case 5: /* reverse video */ 3666 case 5: /* reverse video */
… …
3672 if (state) /* orthogonal */ 3677 if (state) /* orthogonal */
3673 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3678 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3674 break; 3679 break;
3675#ifdef scrollBar_esc 3680#ifdef scrollBar_esc
3676 case scrollBar_esc: 3681 case scrollBar_esc:
3677 if (scrollbar_mapping (state)) 3682 if (scrollBar.map (state))
3678 { 3683 {
3679 resize_all_windows (0, 0, 0); 3684 resize_all_windows (0, 0, 0);
3680 scr_touch (true); 3685 scr_touch (true);
3681 } 3686 }
3682 break; 3687 break;

Diff Legend

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