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.409 by ayin, Sat Feb 16 15:39:20 2008 UTC vs.
Revision 1.418 by root, Fri Oct 10 00:11:44 2008 UTC

… …
376 param = 5; 376 param = 5;
377 break; 377 break;
378 case XK_Next: 378 case XK_Next:
379 param = 6; 379 param = 6;
380 break; 380 break;
381 case XK_Home:
382 param = 7;
383 break;
384 case XK_End:
385 param = 8;
386 break;
381#endif 387#endif
382 case XK_Help: 388 case XK_Help:
383 param = 28; 389 param = 28;
384 break; 390 break;
385 case XK_Menu: 391 case XK_Menu:
… …
413 meta = ev.state & ModMetaMask; 419 meta = ev.state & ModMetaMask;
414 420
415 if (numlock_state || (ev.state & ModNumLockMask)) 421 if (numlock_state || (ev.state & ModNumLockMask))
416 { 422 {
417 numlock_state = (ev.state & ModNumLockMask); 423 numlock_state = (ev.state & ModNumLockMask);
418 PrivMode ((!numlock_state), PrivMode_aplKP); 424 set_privmode (PrivMode_aplKP, !numlock_state);
419 } 425 }
420 426
421 kbuf[0] = 0; 427 kbuf[0] = 0;
422 428
423#ifdef USE_XIM 429#ifdef USE_XIM
… …
635 } 641 }
636#endif 642#endif
637 643
638 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 644 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
639 { 645 {
640 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft; 646 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
641 unsigned int newlen = 1; 647 unsigned int newlen = 1;
642 648
643 switch (translate_keypad (keysym, kp)) 649 switch (translate_keypad (keysym, kp))
650 {
651#ifndef NO_BACKSPACE_KEY
652 case XK_BackSpace:
653 if (priv_modes & PrivMode_HaveBackSpace)
654 {
655 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
656 ^ !!ctrl) ? '\b' : '\177';
657 kbuf[1] = '\0';
658 }
659 else
660 strcpy (kbuf, rs[Rs_backspace_key]);
661 break;
662#endif
663#ifndef NO_DELETE_KEY
664 case XK_Delete:
665 strcpy (kbuf, rs[Rs_delete_key]);
666 break;
667#endif
668 case XK_Tab:
669 if (shft)
670 strcpy (kbuf, "\033[Z");
671 else
672 {
673#ifdef CTRL_TAB_MAKES_META
674 if (ctrl)
675 meta = 1;
676#endif
677#ifdef MOD4_TAB_MAKES_META
678 if (ev.state & Mod4Mask)
679 meta = 1;
680#endif
681 newlen = 0;
682 }
683 break;
684
685 case XK_Up: /* "\033[A" */
686 case XK_Down: /* "\033[B" */
687 case XK_Right: /* "\033[C" */
688 case XK_Left: /* "\033[D" */
689 strcpy (kbuf, "\033[Z");
690 kbuf[2] = "DACB"[keysym - XK_Left];
691 /* do Shift first */
692 if (shft)
693 kbuf[2] = "dacb"[keysym - XK_Left];
694 else if (ctrl)
695 {
696 kbuf[1] = 'O';
697 kbuf[2] = "dacb"[keysym - XK_Left];
698 }
699 else if (priv_modes & PrivMode_aplCUR)
700 kbuf[1] = 'O';
701 break;
702
703 case XK_KP_Enter:
704 /* allow shift to override */
705 if (kp)
706 {
707 strcpy (kbuf, "\033OM");
708 break;
709 }
710
711 /* FALLTHROUGH */
712
713 case XK_Return:
714 if (priv_modes & PrivMode_LFNL)
715 {
716 kbuf[0] = '\015';
717 kbuf[1] = '\012';
718 kbuf[2] = '\0';
719 }
720 else
721 {
722 kbuf[0] = '\015';
723 kbuf[1] = '\0';
724 }
725 break;
726
727 case XK_KP_F1: /* "\033OP" */
728 case XK_KP_F2: /* "\033OQ" */
729 case XK_KP_F3: /* "\033OR" */
730 case XK_KP_F4: /* "\033OS" */
731 strcpy (kbuf, "\033OP");
732 kbuf[2] += (keysym - XK_KP_F1);
733 break;
734
735 case XK_KP_Multiply: /* "\033Oj" : "*" */
736 case XK_KP_Add: /* "\033Ok" : "+" */
737 case XK_KP_Separator: /* "\033Ol" : "," */
738 case XK_KP_Subtract: /* "\033Om" : "-" */
739 case XK_KP_Decimal: /* "\033On" : "." */
740 case XK_KP_Divide: /* "\033Oo" : "/" */
741 case XK_KP_0: /* "\033Op" : "0" */
742 case XK_KP_1: /* "\033Oq" : "1" */
743 case XK_KP_2: /* "\033Or" : "2" */
744 case XK_KP_3: /* "\033Os" : "3" */
745 case XK_KP_4: /* "\033Ot" : "4" */
746 case XK_KP_5: /* "\033Ou" : "5" */
747 case XK_KP_6: /* "\033Ov" : "6" */
748 case XK_KP_7: /* "\033Ow" : "7" */
749 case XK_KP_8: /* "\033Ox" : "8" */
750 case XK_KP_9: /* "\033Oy" : "9" */
751 /* allow shift to override */
752 if (kp)
753 {
754 strcpy (kbuf, "\033Oj");
755 kbuf[2] += (keysym - XK_KP_Multiply);
756 }
757 else
758 {
759 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
760 kbuf[1] = '\0';
761 }
762 break;
763
764 default:
644 { 765 {
645#ifndef NO_BACKSPACE_KEY
646 case XK_BackSpace:
647 if (priv_modes & PrivMode_HaveBackSpace)
648 {
649 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
650 ^ !!ctrl) ? '\b' : '\177';
651 kbuf[1] = '\0';
652 }
653 else
654 strcpy (kbuf, rs[Rs_backspace_key]);
655 break;
656#endif
657#ifndef NO_DELETE_KEY
658 case XK_Delete:
659 strcpy (kbuf, rs[Rs_delete_key]);
660 break;
661#endif
662 case XK_Tab:
663 if (shft)
664 strcpy (kbuf, "\033[Z");
665 else
666 {
667#ifdef CTRL_TAB_MAKES_META
668 if (ctrl)
669 meta = 1;
670#endif
671#ifdef MOD4_TAB_MAKES_META
672 if (ev.state & Mod4Mask)
673 meta = 1;
674#endif
675 newlen = 0;
676 }
677 break;
678
679 case XK_Up: /* "\033[A" */
680 case XK_Down: /* "\033[B" */
681 case XK_Right: /* "\033[C" */
682 case XK_Left: /* "\033[D" */
683 strcpy (kbuf, "\033[Z");
684 kbuf[2] = "DACB"[keysym - XK_Left];
685 /* do Shift first */
686 if (shft)
687 kbuf[2] = "dacb"[keysym - XK_Left];
688 else if (ctrl)
689 {
690 kbuf[1] = 'O';
691 kbuf[2] = "dacb"[keysym - XK_Left];
692 }
693 else if (priv_modes & PrivMode_aplCUR)
694 kbuf[1] = 'O';
695 break;
696
697 case XK_KP_Enter:
698 /* allow shift to override */
699 if (kp)
700 {
701 strcpy (kbuf, "\033OM");
702 break;
703 }
704
705 /* FALLTHROUGH */
706
707 case XK_Return:
708 if (priv_modes & PrivMode_LFNL)
709 {
710 kbuf[0] = '\015';
711 kbuf[1] = '\012';
712 kbuf[2] = '\0';
713 }
714 else
715 {
716 kbuf[0] = '\015';
717 kbuf[1] = '\0';
718 }
719 break;
720
721 case XK_KP_F1: /* "\033OP" */
722 case XK_KP_F2: /* "\033OQ" */
723 case XK_KP_F3: /* "\033OR" */
724 case XK_KP_F4: /* "\033OS" */
725 strcpy (kbuf, "\033OP");
726 kbuf[2] += (keysym - XK_KP_F1);
727 break;
728
729 case XK_KP_Multiply: /* "\033Oj" : "*" */
730 case XK_KP_Add: /* "\033Ok" : "+" */
731 case XK_KP_Separator: /* "\033Ol" : "," */
732 case XK_KP_Subtract: /* "\033Om" : "-" */
733 case XK_KP_Decimal: /* "\033On" : "." */
734 case XK_KP_Divide: /* "\033Oo" : "/" */
735 case XK_KP_0: /* "\033Op" : "0" */
736 case XK_KP_1: /* "\033Oq" : "1" */
737 case XK_KP_2: /* "\033Or" : "2" */
738 case XK_KP_3: /* "\033Os" : "3" */
739 case XK_KP_4: /* "\033Ot" : "4" */
740 case XK_KP_5: /* "\033Ou" : "5" */
741 case XK_KP_6: /* "\033Ov" : "6" */
742 case XK_KP_7: /* "\033Ow" : "7" */
743 case XK_KP_8: /* "\033Ox" : "8" */
744 case XK_KP_9: /* "\033Oy" : "9" */
745 /* allow shift to override */
746 if (kp)
747 {
748 strcpy (kbuf, "\033Oj");
749 kbuf[2] += (keysym - XK_KP_Multiply);
750 }
751 else
752 {
753 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
754 kbuf[1] = '\0';
755 }
756 break;
757
758 case XK_End:
759 strcpy (kbuf, KS_END);
760 break;
761 case XK_Home:
762 strcpy (kbuf, KS_HOME);
763 break;
764
765 default:
766 {
767 int param = map_function_key (keysym); 766 int param = map_function_key (keysym);
768 if (param > 0) 767 if (param > 0)
769 sprintf (kbuf,"\033[%d~", param); 768 sprintf (kbuf,"\033[%d~", param);
770 else 769 else
771 newlen = 0; 770 newlen = 0;
772 }
773 break;
774 } 771 }
772 break;
773 }
775 774
776 if (newlen) 775 if (newlen)
777 len = strlen (kbuf); 776 len = strlen (kbuf);
778 777
779 /* 778 /*
780 * Pass meta for all function keys, if 'meta' option set 779 * Pass meta for all function keys, if 'meta' option set
781 */ 780 */
782#ifdef META8_OPTION 781#ifdef META8_OPTION
… …
1016 } 1015 }
1017 while (row < end_row); 1016 while (row < end_row);
1018 } 1017 }
1019 1018
1020 scr_refresh (); 1019 scr_refresh ();
1021 scrollbar_show (1); 1020 scrollBar.show (1);
1022#ifdef USE_XIM 1021#ifdef USE_XIM
1023 IMSendSpot (); 1022 IMSendSpot ();
1024#endif 1023#endif
1025 } 1024 }
1026 1025
… …
1537 ; 1536 ;
1538 1537
1539 if (scrollBar.state && ev.xany.window == scrollBar.win) 1538 if (scrollBar.state && ev.xany.window == scrollBar.win)
1540 { 1539 {
1541 scrollBar.state = STATE_IDLE; 1540 scrollBar.state = STATE_IDLE;
1542 scrollbar_show (0); 1541 scrollBar.show (0);
1543 } 1542 }
1544 } 1543 }
1545 break; 1544 break;
1546 1545
1547 case MotionNotify: 1546 case MotionNotify:
… …
1646 &unused_root, &unused_child, 1645 &unused_root, &unused_child,
1647 &unused_root_x, &unused_root_y, 1646 &unused_root_x, &unused_root_y,
1648 &ev.xbutton.x, &ev.xbutton.y, 1647 &ev.xbutton.x, &ev.xbutton.y,
1649 &unused_mask); 1648 &unused_mask);
1650 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1649 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1651 scrollbar_size ()); 1650 scrollBar.size ());
1652 want_refresh = 1; 1651 want_refresh = 1;
1653 scrollbar_show (1); 1652 scrollBar.show (1);
1654 } 1653 }
1655 break; 1654 break;
1656 } 1655 }
1657 1656
1658#if defined(CURSOR_BLINK) 1657#if defined(CURSOR_BLINK)
… …
2011 } 2010 }
2012 2011
2013 if (scrollBar.style == R_SB_XTERM 2012 if (scrollBar.style == R_SB_XTERM
2014 || scrollbar_above_slider (ev.y) 2013 || scrollbar_above_slider (ev.y)
2015 || scrollbar_below_slider (ev.y)) 2014 || scrollbar_below_slider (ev.y))
2016 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2015 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2017 2016
2018 scrollBar.state = STATE_MOTION; 2017 scrollBar.state = STATE_MOTION;
2019 break; 2018 break;
2020 2019
2021 case Button1: 2020 case Button1:
… …
2044 else 2043 else
2045 { 2044 {
2046 scr_page ((ev.button == Button1 ? DN : UP), 2045 scr_page ((ev.button == Button1 ? DN : UP),
2047 (nrow 2046 (nrow
2048 * scrollbar_position (ev.y) 2047 * scrollbar_position (ev.y)
2049 / scrollbar_size ())); 2048 / scrollBar.size ()));
2050 } 2049 }
2051 2050
2052 break; 2051 break;
2053 } 2052 }
2054 } 2053 }
… …
2067 reportmode = !! (priv_modes & PrivMode_mouse_report); 2066 reportmode = !! (priv_modes & PrivMode_mouse_report);
2068 2067
2069 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2068 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2070 { 2069 {
2071 scrollBar.state = STATE_IDLE; 2070 scrollBar.state = STATE_IDLE;
2072 scrollbar_show (0); 2071 scrollBar.show (0);
2073 } 2072 }
2074 2073
2075#ifdef SELECTION_SCROLLING 2074#ifdef SELECTION_SCROLLING
2076 sel_scroll_ev.stop(); 2075 sel_scroll_ev.stop();
2077#endif 2076#endif
… …
2160 } 2159 }
2161 else 2160 else
2162# endif 2161# endif
2163 { 2162 {
2164 scr_page (v, i); 2163 scr_page (v, i);
2165 scrollbar_show (1); 2164 scrollBar.show (1);
2166 } 2165 }
2167 } 2166 }
2168 break; 2167 break;
2169#endif 2168#endif
2170 } 2169 }
… …
2180 wchar_t ch = NOCHAR; 2179 wchar_t ch = NOCHAR;
2181 char *seq_begin; // remember start of esc-sequence here 2180 char *seq_begin; // remember start of esc-sequence here
2182 2181
2183 for (;;) 2182 for (;;)
2184 { 2183 {
2185 if (ch == NOCHAR) 2184 if (expect_false (ch == NOCHAR))
2186 { 2185 {
2187 seq_begin = cmdbuf_ptr; 2186 seq_begin = cmdbuf_ptr;
2188 ch = next_char (); 2187 ch = next_char ();
2189 2188
2190 if (ch == NOCHAR) 2189 if (ch == NOCHAR)
2191 break; 2190 break;
2192 } 2191 }
2193 2192
2194 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2193 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2195 { 2194 {
2196 if (!seen_input) 2195 if (expect_false (!seen_input))
2197 { 2196 {
2198 seen_input = 1; 2197 seen_input = 1;
2199 // many badly-written programs (e.g. jed) contain a race condition: 2198 // many badly-written programs (e.g. jed) contain a race condition:
2200 // they first read the screensize and then install a SIGWINCH handler. 2199 // they first read the screensize and then install a SIGWINCH handler.
2201 // some window managers resize the window early, and these programs 2200 // some window managers resize the window early, and these programs
… …
2214 wchar_t *str = buf; 2213 wchar_t *str = buf;
2215 wchar_t *eol = str + min (ncol, UBUFSIZ); 2214 wchar_t *eol = str + min (ncol, UBUFSIZ);
2216 2215
2217 for (;;) 2216 for (;;)
2218 { 2217 {
2219 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2218 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2220 break; 2219 break;
2221 2220
2222 *str++ = ch; 2221 *str++ = ch;
2223 2222
2224 if (ch == C0_LF || str >= eol) 2223 if (expect_false (ch == C0_LF || str >= eol))
2225 { 2224 {
2226 if (ch == C0_LF) 2225 if (ch == C0_LF)
2227 nlines++; 2226 nlines++;
2228 2227
2229 refresh_count++; 2228 refresh_count++;
… …
2311rxvt_term::next_char () NOTHROW 2310rxvt_term::next_char () NOTHROW
2312{ 2311{
2313 while (cmdbuf_ptr < cmdbuf_endp) 2312 while (cmdbuf_ptr < cmdbuf_endp)
2314 { 2313 {
2315 // assume 7-bit to be ascii ALWAYS 2314 // assume 7-bit to be ascii ALWAYS
2316 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2315 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2317 return *cmdbuf_ptr++; 2316 return *cmdbuf_ptr++;
2318 2317
2319 wchar_t wc; 2318 wchar_t wc;
2320 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2319 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2321 2320
… …
2325 cmdbuf_ptr = cmdbuf_endp; 2324 cmdbuf_ptr = cmdbuf_endp;
2326 break; 2325 break;
2327 } 2326 }
2328 2327
2329 if (len == (size_t)-1) 2328 if (len == (size_t)-1)
2329 {
2330 mbrtowc (0, 0, 0, mbstate); // reset now undefined conversion state
2330 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2331 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2332 }
2331 2333
2332 // assume wchar == unicode 2334 // assume wchar == unicode
2333 cmdbuf_ptr += len; 2335 cmdbuf_ptr += len;
2334 return wc & UNICODE_MASK; 2336 return wc & UNICODE_MASK;
2335 } 2337 }
… …
2379/*----------------------------------------------------------------------*/ 2381/*----------------------------------------------------------------------*/
2380#ifdef PRINTPIPE 2382#ifdef PRINTPIPE
2381FILE * 2383FILE *
2382rxvt_term::popen_printer () 2384rxvt_term::popen_printer ()
2383{ 2385{
2384 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2386 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2385 2387
2386 if (stream == NULL) 2388 if (stream == NULL)
2387 rxvt_warn ("can't open printer pipe, not printing.\n"); 2389 rxvt_warn ("can't open printer pipe, not printing.\n");
2388 2390
2389 return stream; 2391 return stream;
… …
2400 * simulate attached vt100 printer 2402 * simulate attached vt100 printer
2401 */ 2403 */
2402void 2404void
2403rxvt_term::process_print_pipe () 2405rxvt_term::process_print_pipe ()
2404{ 2406{
2405 int done; 2407 FILE *fd = popen_printer ();
2406 FILE *fd;
2407 2408
2408 if ((fd = popen_printer ()) == NULL) 2409 if (!fd)
2409 return; 2410 return;
2410 2411
2411 /* 2412 /*
2412 * Send all input to the printer until either ESC[4i or ESC[?4i 2413 * Send all input to the printer until either ESC[4i or ESC[?4i
2413 * is received. 2414 * is received.
2414 */ 2415 */
2415 for (done = 0; !done;) 2416 for (int done = 0; !done; )
2416 { 2417 {
2417 unsigned char buf[8]; 2418 unsigned char buf[8];
2418 unicode_t ch; 2419 unicode_t ch;
2419 unsigned int i, len; 2420 unsigned int i, len;
2420 2421
… …
2565 break; 2566 break;
2566 case 'Z': /* identify the terminal type */ 2567 case 'Z': /* identify the terminal type */
2567 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2568 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2568 break; 2569 break;
2569 case '<': /* turn off VT52 mode */ 2570 case '<': /* turn off VT52 mode */
2570 PrivMode (0, PrivMode_vt52); 2571 set_privmode (PrivMode_vt52, 0);
2571 break; 2572 break;
2572 case 'F': /* use special graphics character set */ 2573 case 'F': /* use special graphics character set */
2573 case 'G': /* use regular character set */ 2574 case 'G': /* use regular character set */
2574 /* unimplemented */ 2575 /* unimplemented */
2575 break; 2576 break;
… …
2629 scr_forwardindex (); 2630 scr_forwardindex ();
2630 break; 2631 break;
2631#endif 2632#endif
2632 case '=': 2633 case '=':
2633 case '>': 2634 case '>':
2634 PrivMode ((ch == '='), PrivMode_aplKP); 2635 set_privmode (PrivMode_aplKP, ch == '=');
2635 break; 2636 break;
2636 2637
2637 case C1_40: 2638 case C1_40:
2638 cmd_getc (); 2639 cmd_getc ();
2639 break; 2640 break;
… …
2692 2693
2693 /* 8.3.106: RESET TO INITIAL STATE */ 2694 /* 8.3.106: RESET TO INITIAL STATE */
2694 case 'c': 2695 case 'c':
2695 mbstate.reset (); 2696 mbstate.reset ();
2696 scr_poweron (); 2697 scr_poweron ();
2697 scrollbar_show (1); 2698 scrollBar.show (1);
2698 break; 2699 break;
2699 2700
2700 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2701 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2701 case 'n': 2702 case 'n':
2702 scr_charset_choose (2); 2703 scr_charset_choose (2);
… …
3271 3272
3272 assert (str != NULL); 3273 assert (str != NULL);
3273 3274
3274 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END))) 3275 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3275 return; 3276 return;
3277 fprintf (stderr, "op %d<%s>\n", op, str);//D
3276 3278
3277 switch (op) 3279 switch (op)
3278 { 3280 {
3279 case XTerm_name: 3281 case XTerm_name:
3280 set_title (str); 3282 set_title (str);
… …
3508 break; 3510 break;
3509#endif 3511#endif
3510 3512
3511#if ENABLE_PERL 3513#if ENABLE_PERL
3512 case URxvt_perl: 3514 case URxvt_perl:
3513 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3515 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3514 ; // no responses yet
3515 break; 3516 break;
3516#endif 3517#endif
3517 } 3518 }
3518} 3519}
3519/*----------------------------------------------------------------------*/ 3520/*----------------------------------------------------------------------*/
… …
3542 { 3543 {
3543 if (mode == 'r') 3544 if (mode == 'r')
3544 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3545 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3545 else 3546 else
3546 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3547 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3547 PrivMode (state, bit); 3548 set_privmode (bit, state);
3548 } 3549 }
3549 3550
3550 return state; 3551 return state;
3551} 3552}
3552 3553
… …
3650 case 2: /* VT52 mode */ 3651 case 2: /* VT52 mode */
3651 /* oddball mode. should be set regardless of set/reset 3652 /* oddball mode. should be set regardless of set/reset
3652 * parameter. Return from VT52 mode with an ESC < from 3653 * parameter. Return from VT52 mode with an ESC < from
3653 * within VT52 mode 3654 * within VT52 mode
3654 */ 3655 */
3655 PrivMode (1, PrivMode_vt52); 3656 set_privmode (PrivMode_vt52, 1);
3656 break; 3657 break;
3657 case 3: /* 80/132 */ 3658 case 3: /* 80/132 */
3658 if (priv_modes & PrivMode_132OK) 3659 if (priv_modes & PrivMode_132OK)
3659 { 3660 {
3660 scr_poweron (); 3661 scr_poweron ();
… …
3678 if (state) /* orthogonal */ 3679 if (state) /* orthogonal */
3679 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3680 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3680 break; 3681 break;
3681#ifdef scrollBar_esc 3682#ifdef scrollBar_esc
3682 case scrollBar_esc: 3683 case scrollBar_esc:
3683 if (scrollbar_mapping (state)) 3684 if (scrollBar.map (state))
3684 { 3685 {
3685 resize_all_windows (0, 0, 0); 3686 resize_all_windows (0, 0, 0);
3686 scr_touch (true); 3687 scr_touch (true);
3687 } 3688 }
3688 break; 3689 break;

Diff Legend

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