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.410 by ayin, Sat Feb 16 15:48:36 2008 UTC vs.
Revision 1.417 by root, Mon Jul 21 16:51:31 2008 UTC

… …
419 meta = ev.state & ModMetaMask; 419 meta = ev.state & ModMetaMask;
420 420
421 if (numlock_state || (ev.state & ModNumLockMask)) 421 if (numlock_state || (ev.state & ModNumLockMask))
422 { 422 {
423 numlock_state = (ev.state & ModNumLockMask); 423 numlock_state = (ev.state & ModNumLockMask);
424 PrivMode ((!numlock_state), PrivMode_aplKP); 424 set_privmode (PrivMode_aplKP, !numlock_state);
425 } 425 }
426 426
427 kbuf[0] = 0; 427 kbuf[0] = 0;
428 428
429#ifdef USE_XIM 429#ifdef USE_XIM
… …
641 } 641 }
642#endif 642#endif
643 643
644 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 644 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
645 { 645 {
646 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft; 646 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
647 unsigned int newlen = 1; 647 unsigned int newlen = 1;
648 648
649 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:
650 { 765 {
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:
765 {
766 int param = map_function_key (keysym); 766 int param = map_function_key (keysym);
767 if (param > 0) 767 if (param > 0)
768 sprintf (kbuf,"\033[%d~", param); 768 sprintf (kbuf,"\033[%d~", param);
769 else 769 else
770 newlen = 0; 770 newlen = 0;
771 }
772 break;
773 } 771 }
772 break;
773 }
774 774
775 if (newlen) 775 if (newlen)
776 len = strlen (kbuf); 776 len = strlen (kbuf);
777 777
778 /* 778 /*
779 * Pass meta for all function keys, if 'meta' option set 779 * Pass meta for all function keys, if 'meta' option set
780 */ 780 */
781#ifdef META8_OPTION 781#ifdef META8_OPTION
… …
1015 } 1015 }
1016 while (row < end_row); 1016 while (row < end_row);
1017 } 1017 }
1018 1018
1019 scr_refresh (); 1019 scr_refresh ();
1020 scrollbar_show (1); 1020 scrollBar.show (1);
1021#ifdef USE_XIM 1021#ifdef USE_XIM
1022 IMSendSpot (); 1022 IMSendSpot ();
1023#endif 1023#endif
1024 } 1024 }
1025 1025
… …
1536 ; 1536 ;
1537 1537
1538 if (scrollBar.state && ev.xany.window == scrollBar.win) 1538 if (scrollBar.state && ev.xany.window == scrollBar.win)
1539 { 1539 {
1540 scrollBar.state = STATE_IDLE; 1540 scrollBar.state = STATE_IDLE;
1541 scrollbar_show (0); 1541 scrollBar.show (0);
1542 } 1542 }
1543 } 1543 }
1544 break; 1544 break;
1545 1545
1546 case MotionNotify: 1546 case MotionNotify:
… …
1645 &unused_root, &unused_child, 1645 &unused_root, &unused_child,
1646 &unused_root_x, &unused_root_y, 1646 &unused_root_x, &unused_root_y,
1647 &ev.xbutton.x, &ev.xbutton.y, 1647 &ev.xbutton.x, &ev.xbutton.y,
1648 &unused_mask); 1648 &unused_mask);
1649 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1649 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1650 scrollbar_size ()); 1650 scrollBar.size ());
1651 want_refresh = 1; 1651 want_refresh = 1;
1652 scrollbar_show (1); 1652 scrollBar.show (1);
1653 } 1653 }
1654 break; 1654 break;
1655 } 1655 }
1656 1656
1657#if defined(CURSOR_BLINK) 1657#if defined(CURSOR_BLINK)
… …
2010 } 2010 }
2011 2011
2012 if (scrollBar.style == R_SB_XTERM 2012 if (scrollBar.style == R_SB_XTERM
2013 || scrollbar_above_slider (ev.y) 2013 || scrollbar_above_slider (ev.y)
2014 || scrollbar_below_slider (ev.y)) 2014 || scrollbar_below_slider (ev.y))
2015 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2015 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2016 2016
2017 scrollBar.state = STATE_MOTION; 2017 scrollBar.state = STATE_MOTION;
2018 break; 2018 break;
2019 2019
2020 case Button1: 2020 case Button1:
… …
2043 else 2043 else
2044 { 2044 {
2045 scr_page ((ev.button == Button1 ? DN : UP), 2045 scr_page ((ev.button == Button1 ? DN : UP),
2046 (nrow 2046 (nrow
2047 * scrollbar_position (ev.y) 2047 * scrollbar_position (ev.y)
2048 / scrollbar_size ())); 2048 / scrollBar.size ()));
2049 } 2049 }
2050 2050
2051 break; 2051 break;
2052 } 2052 }
2053 } 2053 }
… …
2066 reportmode = !! (priv_modes & PrivMode_mouse_report); 2066 reportmode = !! (priv_modes & PrivMode_mouse_report);
2067 2067
2068 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2068 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2069 { 2069 {
2070 scrollBar.state = STATE_IDLE; 2070 scrollBar.state = STATE_IDLE;
2071 scrollbar_show (0); 2071 scrollBar.show (0);
2072 } 2072 }
2073 2073
2074#ifdef SELECTION_SCROLLING 2074#ifdef SELECTION_SCROLLING
2075 sel_scroll_ev.stop(); 2075 sel_scroll_ev.stop();
2076#endif 2076#endif
… …
2159 } 2159 }
2160 else 2160 else
2161# endif 2161# endif
2162 { 2162 {
2163 scr_page (v, i); 2163 scr_page (v, i);
2164 scrollbar_show (1); 2164 scrollBar.show (1);
2165 } 2165 }
2166 } 2166 }
2167 break; 2167 break;
2168#endif 2168#endif
2169 } 2169 }
… …
2179 wchar_t ch = NOCHAR; 2179 wchar_t ch = NOCHAR;
2180 char *seq_begin; // remember start of esc-sequence here 2180 char *seq_begin; // remember start of esc-sequence here
2181 2181
2182 for (;;) 2182 for (;;)
2183 { 2183 {
2184 if (ch == NOCHAR) 2184 if (expect_false (ch == NOCHAR))
2185 { 2185 {
2186 seq_begin = cmdbuf_ptr; 2186 seq_begin = cmdbuf_ptr;
2187 ch = next_char (); 2187 ch = next_char ();
2188 2188
2189 if (ch == NOCHAR) 2189 if (ch == NOCHAR)
2190 break; 2190 break;
2191 } 2191 }
2192 2192
2193 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))
2194 { 2194 {
2195 if (!seen_input) 2195 if (expect_false (!seen_input))
2196 { 2196 {
2197 seen_input = 1; 2197 seen_input = 1;
2198 // many badly-written programs (e.g. jed) contain a race condition: 2198 // many badly-written programs (e.g. jed) contain a race condition:
2199 // they first read the screensize and then install a SIGWINCH handler. 2199 // they first read the screensize and then install a SIGWINCH handler.
2200 // some window managers resize the window early, and these programs 2200 // some window managers resize the window early, and these programs
… …
2213 wchar_t *str = buf; 2213 wchar_t *str = buf;
2214 wchar_t *eol = str + min (ncol, UBUFSIZ); 2214 wchar_t *eol = str + min (ncol, UBUFSIZ);
2215 2215
2216 for (;;) 2216 for (;;)
2217 { 2217 {
2218 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)))
2219 break; 2219 break;
2220 2220
2221 *str++ = ch; 2221 *str++ = ch;
2222 2222
2223 if (ch == C0_LF || str >= eol) 2223 if (expect_false (ch == C0_LF || str >= eol))
2224 { 2224 {
2225 if (ch == C0_LF) 2225 if (ch == C0_LF)
2226 nlines++; 2226 nlines++;
2227 2227
2228 refresh_count++; 2228 refresh_count++;
… …
2310rxvt_term::next_char () NOTHROW 2310rxvt_term::next_char () NOTHROW
2311{ 2311{
2312 while (cmdbuf_ptr < cmdbuf_endp) 2312 while (cmdbuf_ptr < cmdbuf_endp)
2313 { 2313 {
2314 // assume 7-bit to be ascii ALWAYS 2314 // assume 7-bit to be ascii ALWAYS
2315 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2315 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2316 return *cmdbuf_ptr++; 2316 return *cmdbuf_ptr++;
2317 2317
2318 wchar_t wc; 2318 wchar_t wc;
2319 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);
2320 2320
… …
2324 cmdbuf_ptr = cmdbuf_endp; 2324 cmdbuf_ptr = cmdbuf_endp;
2325 break; 2325 break;
2326 } 2326 }
2327 2327
2328 if (len == (size_t)-1) 2328 if (len == (size_t)-1)
2329 {
2330 mbrtowc (0, 0, 0, mbstate); // reset now undefined conversion state
2329 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 }
2330 2333
2331 // assume wchar == unicode 2334 // assume wchar == unicode
2332 cmdbuf_ptr += len; 2335 cmdbuf_ptr += len;
2333 return wc & UNICODE_MASK; 2336 return wc & UNICODE_MASK;
2334 } 2337 }
… …
2378/*----------------------------------------------------------------------*/ 2381/*----------------------------------------------------------------------*/
2379#ifdef PRINTPIPE 2382#ifdef PRINTPIPE
2380FILE * 2383FILE *
2381rxvt_term::popen_printer () 2384rxvt_term::popen_printer ()
2382{ 2385{
2383 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2386 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2384 2387
2385 if (stream == NULL) 2388 if (stream == NULL)
2386 rxvt_warn ("can't open printer pipe, not printing.\n"); 2389 rxvt_warn ("can't open printer pipe, not printing.\n");
2387 2390
2388 return stream; 2391 return stream;
… …
2399 * simulate attached vt100 printer 2402 * simulate attached vt100 printer
2400 */ 2403 */
2401void 2404void
2402rxvt_term::process_print_pipe () 2405rxvt_term::process_print_pipe ()
2403{ 2406{
2404 int done; 2407 FILE *fd = popen_printer ();
2405 FILE *fd;
2406 2408
2407 if ((fd = popen_printer ()) == NULL) 2409 if (!fd)
2408 return; 2410 return;
2409 2411
2410 /* 2412 /*
2411 * 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
2412 * is received. 2414 * is received.
2413 */ 2415 */
2414 for (done = 0; !done;) 2416 for (int done = 0; !done; )
2415 { 2417 {
2416 unsigned char buf[8]; 2418 unsigned char buf[8];
2417 unicode_t ch; 2419 unicode_t ch;
2418 unsigned int i, len; 2420 unsigned int i, len;
2419 2421
… …
2564 break; 2566 break;
2565 case 'Z': /* identify the terminal type */ 2567 case 'Z': /* identify the terminal type */
2566 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2568 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2567 break; 2569 break;
2568 case '<': /* turn off VT52 mode */ 2570 case '<': /* turn off VT52 mode */
2569 PrivMode (0, PrivMode_vt52); 2571 set_privmode (PrivMode_vt52, 0);
2570 break; 2572 break;
2571 case 'F': /* use special graphics character set */ 2573 case 'F': /* use special graphics character set */
2572 case 'G': /* use regular character set */ 2574 case 'G': /* use regular character set */
2573 /* unimplemented */ 2575 /* unimplemented */
2574 break; 2576 break;
… …
2628 scr_forwardindex (); 2630 scr_forwardindex ();
2629 break; 2631 break;
2630#endif 2632#endif
2631 case '=': 2633 case '=':
2632 case '>': 2634 case '>':
2633 PrivMode ((ch == '='), PrivMode_aplKP); 2635 set_privmode (PrivMode_aplKP, ch == '=');
2634 break; 2636 break;
2635 2637
2636 case C1_40: 2638 case C1_40:
2637 cmd_getc (); 2639 cmd_getc ();
2638 break; 2640 break;
… …
2691 2693
2692 /* 8.3.106: RESET TO INITIAL STATE */ 2694 /* 8.3.106: RESET TO INITIAL STATE */
2693 case 'c': 2695 case 'c':
2694 mbstate.reset (); 2696 mbstate.reset ();
2695 scr_poweron (); 2697 scr_poweron ();
2696 scrollbar_show (1); 2698 scrollBar.show (1);
2697 break; 2699 break;
2698 2700
2699 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2701 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2700 case 'n': 2702 case 'n':
2701 scr_charset_choose (2); 2703 scr_charset_choose (2);
… …
3541 { 3543 {
3542 if (mode == 'r') 3544 if (mode == 'r')
3543 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3545 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3544 else 3546 else
3545 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3547 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3546 PrivMode (state, bit); 3548 set_privmode (bit, state);
3547 } 3549 }
3548 3550
3549 return state; 3551 return state;
3550} 3552}
3551 3553
… …
3649 case 2: /* VT52 mode */ 3651 case 2: /* VT52 mode */
3650 /* oddball mode. should be set regardless of set/reset 3652 /* oddball mode. should be set regardless of set/reset
3651 * parameter. Return from VT52 mode with an ESC < from 3653 * parameter. Return from VT52 mode with an ESC < from
3652 * within VT52 mode 3654 * within VT52 mode
3653 */ 3655 */
3654 PrivMode (1, PrivMode_vt52); 3656 set_privmode (PrivMode_vt52, 1);
3655 break; 3657 break;
3656 case 3: /* 80/132 */ 3658 case 3: /* 80/132 */
3657 if (priv_modes & PrivMode_132OK) 3659 if (priv_modes & PrivMode_132OK)
3658 { 3660 {
3659 scr_poweron (); 3661 scr_poweron ();
… …
3677 if (state) /* orthogonal */ 3679 if (state) /* orthogonal */
3678 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3680 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3679 break; 3681 break;
3680#ifdef scrollBar_esc 3682#ifdef scrollBar_esc
3681 case scrollBar_esc: 3683 case scrollBar_esc:
3682 if (scrollbar_mapping (state)) 3684 if (scrollBar.map (state))
3683 { 3685 {
3684 resize_all_windows (0, 0, 0); 3686 resize_all_windows (0, 0, 0);
3685 scr_touch (true); 3687 scr_touch (true);
3686 } 3688 }
3687 break; 3689 break;

Diff Legend

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