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.490 by sf-exg, Sat Jul 9 18:23:48 2011 UTC vs.
Revision 1.509 by sf-exg, Thu May 17 10:18:32 2012 UTC

… …
54 54
55#ifdef KEYSYM_RESOURCE 55#ifdef KEYSYM_RESOURCE
56# include "keyboard.h" 56# include "keyboard.h"
57#endif 57#endif
58 58
59#include <csignal> 59#include <signal.h>
60 60
61#if LINUX_YIELD_HACK 61#if LINUX_YIELD_HACK
62# include <ctime> 62# include <time.h>
63#endif 63#endif
64 64
65/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
66 66
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
… …
776 } 776 }
777 777
778 if (newlen) 778 if (newlen)
779 len = strlen (kbuf); 779 len = strlen (kbuf);
780 780
781 if (len > 0)
782 {
781 /* 783 /*
784 * pass Shift/Control indicators for function keys ending with `~'
785 *
786 * eg,
787 * Prior = "ESC[5~"
788 * Shift+Prior = "ESC[5$"
789 * Ctrl+Prior = "ESC[5^"
790 * Ctrl+Shift+Prior = "ESC[5@"
791 */
792 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
793 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
794
795 /*
782 * Pass meta for all function keys, if 'meta' option set 796 * Pass meta for all function keys, if 'meta' option set
783 */ 797 */
784#ifdef META8_OPTION 798#ifdef META8_OPTION
785 if (meta && (meta_char == 0x80) && len > 0) 799 if (meta && (meta_char == 0x80))
786 kbuf[len - 1] |= 0x80; 800 kbuf[len - 1] |= 0x80;
787#endif 801#endif
802 }
788 803
789 } 804 }
790 else if (ctrl && keysym == XK_minus) 805 else if (ctrl && keysym == XK_minus)
791 { 806 {
792 len = 1; 807 len = 1;
… …
825 if (view_start) 840 if (view_start)
826 { 841 {
827 view_start = 0; 842 view_start = 0;
828 want_refresh = 1; 843 want_refresh = 1;
829 } 844 }
830
831 /*
832 * these modifications only affect the static keybuffer
833 * pass Shift/Control indicators for function keys ending with `~'
834 *
835 * eg,
836 * Prior = "ESC[5~"
837 * Shift+Prior = "ESC[5$"
838 * Ctrl+Prior = "ESC[5^"
839 * Ctrl+Shift+Prior = "ESC[5@"
840 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
841 */
842 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
843 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
844 845
845 /* escape prefix */ 846 /* escape prefix */
846 if (meta 847 if (meta
847#ifdef META8_OPTION 848#ifdef META8_OPTION
848 && meta_char == C0_ESC 849 && meta_char == C0_ESC
… …
1015 flush (); 1016 flush ();
1016} 1017}
1017 1018
1018#ifdef CURSOR_BLINK 1019#ifdef CURSOR_BLINK
1019void 1020void
1021rxvt_term::cursor_blink_reset ()
1022{
1023 if (hidden_cursor)
1024 {
1025 hidden_cursor = 0;
1026 want_refresh = 1;
1027 }
1028
1029 if (option (Opt_cursorBlink))
1030 cursor_blink_ev.again ();
1031 else
1032 cursor_blink_ev.stop ();
1033}
1034
1035void
1020rxvt_term::cursor_blink_cb (ev::timer &w, int revents) 1036rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1021{ 1037{
1022 hidden_cursor = !hidden_cursor; 1038 hidden_cursor = !hidden_cursor;
1023 want_refresh = 1; 1039 want_refresh = 1;
1024 refresh_check (); 1040 refresh_check ();
… …
1042 1058
1043#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1059#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1044void 1060void
1045rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1061rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1046{ 1062{
1047 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 1063 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1048 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1)) 1064 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1049 { 1065 {
1050 want_refresh = 1; 1066 want_refresh = 1;
1051 refresh_check (); 1067 refresh_check ();
1052 } 1068 }
1053 else 1069 else
… …
1473 } 1489 }
1474 else 1490 else
1475 { 1491 {
1476#ifdef HAVE_BG_PIXMAP 1492#ifdef HAVE_BG_PIXMAP
1477 if (moved) 1493 if (moved)
1478 {
1479 if (mapped)
1480 update_background (); 1494 update_background ();
1481 else
1482 bg_invalidate ();
1483 }
1484#endif 1495#endif
1485 } 1496 }
1486 1497
1487 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1498 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1488 } 1499 }
… …
1562 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1573 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1563 ; 1574 ;
1564 1575
1565 if (scrollBar.state && ev.xany.window == scrollBar.win) 1576 if (scrollBar.state && ev.xany.window == scrollBar.win)
1566 { 1577 {
1567 scrollBar.state = STATE_IDLE; 1578 scrollBar.state = SB_STATE_IDLE;
1568 scrollBar.show (0); 1579 scrollBar.show (0);
1569 } 1580 }
1570 } 1581 }
1571 break; 1582 break;
1572 1583
… …
1638 dist = int_bwidth - ev.xbutton.y; 1649 dist = int_bwidth - ev.xbutton.y;
1639 } 1650 }
1640 else 1651 else
1641 { 1652 {
1642 scroll_selection_dir = DN; 1653 scroll_selection_dir = DN;
1643 dist = ev.xbutton.y - (int_bwidth + height); 1654 dist = ev.xbutton.y - (int_bwidth + vt_height);
1644 } 1655 }
1645 1656
1646 scroll_selection_lines = Pixel2Height (dist) 1657 scroll_selection_lines = Pixel2Height (dist)
1647 / SELECTION_SCROLL_LINE_SPEEDUP 1658 / SELECTION_SCROLL_LINE_SPEEDUP
1648 + 1; 1659 + 1;
… …
1660#ifdef MOUSE_THRESHOLD 1671#ifdef MOUSE_THRESHOLD
1661 } 1672 }
1662#endif 1673#endif
1663 } 1674 }
1664 } 1675 }
1665 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win) 1676 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1666 { 1677 {
1667 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1678 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1668 MotionNotify, &ev)) 1679 MotionNotify, &ev))
1669 ; 1680 ;
1670 1681
1671 XQueryPointer (dpy, scrollBar.win, 1682 XQueryPointer (dpy, scrollBar.win,
1672 &unused_root, &unused_child, 1683 &unused_root, &unused_child,
1673 &unused_root_x, &unused_root_y, 1684 &unused_root_x, &unused_root_y,
1674 &ev.xbutton.x, &ev.xbutton.y, 1685 &ev.xbutton.x, &ev.xbutton.y,
1675 &unused_mask); 1686 &unused_mask);
1676 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1687 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1677 scrollBar.size ()); 1688 scrollBar.size ());
1678 want_refresh = 1; 1689 want_refresh = 1;
1679 scrollBar.show (1); 1690 scrollBar.show (1);
1680 } 1691 }
1681 break; 1692 break;
1682 } 1693 }
1683 1694
1684#if defined(CURSOR_BLINK) 1695#if defined(CURSOR_BLINK)
1685 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1696 if (ev.type == KeyPress)
1686 {
1687 if (hidden_cursor)
1688 {
1689 hidden_cursor = 0;
1690 want_refresh = 1;
1691 }
1692
1693 cursor_blink_ev.again (); 1697 cursor_blink_reset ();
1694 }
1695#endif 1698#endif
1696 1699
1697#if defined(POINTER_BLANK) 1700#if defined(POINTER_BLANK)
1698 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1701 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1699 { 1702 {
… …
1721 if (XWMHints *h = XGetWMHints (dpy, parent)) 1724 if (XWMHints *h = XGetWMHints (dpy, parent))
1722 { 1725 {
1723 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1726 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1724 XSetWMHints (dpy, parent, h); 1727 XSetWMHints (dpy, parent, h);
1725 urgency_hint = enable; 1728 urgency_hint = enable;
1729 XFree (h);
1726 } 1730 }
1727} 1731}
1728#endif 1732#endif
1729 1733
1730void 1734void
… …
1977 if (scrollBar.upButton (ev.y)) 1981 if (scrollBar.upButton (ev.y))
1978 direction = UP; /* up */ 1982 direction = UP; /* up */
1979 else if (scrollBar.dnButton (ev.y)) 1983 else if (scrollBar.dnButton (ev.y))
1980 direction = DN; /* down */ 1984 direction = DN; /* down */
1981 1985
1982 scrollBar.state = STATE_IDLE; 1986 scrollBar.state = SB_STATE_IDLE;
1983 /* 1987 /*
1984 * Rxvt-style scrollbar: 1988 * Rxvt-style scrollbar:
1985 * move up if mouse is above slider 1989 * move up if mouse is above slider
1986 * move dn if mouse is below slider 1990 * move dn if mouse is below slider
1987 * 1991 *
… …
2026 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2030 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2027#endif 2031#endif
2028 if (scr_page (direction, 1)) 2032 if (scr_page (direction, 1))
2029 { 2033 {
2030 if (direction == UP) 2034 if (direction == UP)
2031 scrollBar.state = STATE_UP; 2035 scrollBar.state = SB_STATE_UP;
2032 else 2036 else
2033 scrollBar.state = STATE_DOWN; 2037 scrollBar.state = SB_STATE_DOWN;
2034 } 2038 }
2035 } 2039 }
2036 else 2040 else
2037 switch (ev.button) 2041 switch (ev.button)
2038 { 2042 {
2039 case Button2: 2043 case Button2:
2040 switch (scrollBar.align) 2044 switch (scrollBar.align)
2041 { 2045 {
2042 case R_SB_ALIGN_TOP: 2046 case SB_ALIGN_TOP:
2043 csrO = 0; 2047 csrO = 0;
2044 break; 2048 break;
2045 case R_SB_ALIGN_CENTRE: 2049 case SB_ALIGN_CENTRE:
2046 csrO = (scrollBar.bot - scrollBar.top) / 2; 2050 csrO = (scrollBar.bot - scrollBar.top) / 2;
2047 break; 2051 break;
2048 case R_SB_ALIGN_BOTTOM: 2052 case SB_ALIGN_BOTTOM:
2049 csrO = scrollBar.bot - scrollBar.top; 2053 csrO = scrollBar.bot - scrollBar.top;
2050 break; 2054 break;
2051 } 2055 }
2052 2056
2053 if (scrollBar.style == R_SB_XTERM 2057 if (scrollBar.style == SB_STYLE_XTERM
2054 || scrollbar_above_slider (ev.y) 2058 || scrollBar.above_slider (ev.y)
2055 || scrollbar_below_slider (ev.y)) 2059 || scrollBar.below_slider (ev.y))
2056 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ()); 2060 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2057 2061
2058 scrollBar.state = STATE_MOTION; 2062 scrollBar.state = SB_STATE_MOTION;
2059 break; 2063 break;
2060 2064
2061 case Button1: 2065 case Button1:
2062 if (scrollBar.align == R_SB_ALIGN_CENTRE) 2066 if (scrollBar.align == SB_ALIGN_CENTRE)
2063 csrO = ev.y - scrollBar.top; 2067 csrO = ev.y - scrollBar.top;
2064 /* FALLTHROUGH */ 2068 /* FALLTHROUGH */
2065 2069
2066 case Button3: 2070 case Button3:
2067 if (scrollBar.style != R_SB_XTERM) 2071 if (scrollBar.style != SB_STYLE_XTERM)
2068 { 2072 {
2069 if (scrollbar_above_slider (ev.y)) 2073 if (scrollBar.above_slider (ev.y))
2070# ifdef RXVT_SCROLL_FULL 2074# ifdef RXVT_SCROLL_FULL
2071 scr_page (UP, nrow - 1); 2075 scr_page (UP, nrow - 1);
2072# else 2076# else
2073 scr_page (UP, nrow / 4); 2077 scr_page (UP, nrow / 4);
2074# endif 2078# endif
2075 else if (scrollbar_below_slider (ev.y)) 2079 else if (scrollBar.below_slider (ev.y))
2076# ifdef RXVT_SCROLL_FULL 2080# ifdef RXVT_SCROLL_FULL
2077 scr_page (DN, nrow - 1); 2081 scr_page (DN, nrow - 1);
2078# else 2082# else
2079 scr_page (DN, nrow / 4); 2083 scr_page (DN, nrow / 4);
2080# endif 2084# endif
2081 else 2085 else
2082 scrollBar.state = STATE_MOTION; 2086 scrollBar.state = SB_STATE_MOTION;
2083 } 2087 }
2084 else 2088 else
2085 { 2089 {
2086 scr_page ((ev.button == Button1 ? DN : UP), 2090 scr_page ((ev.button == Button1 ? DN : UP),
2087 (nrow 2091 (nrow
2088 * scrollbar_position (ev.y) 2092 * scrollBar.position (ev.y)
2089 / scrollBar.size ())); 2093 / scrollBar.size ()));
2090 } 2094 }
2091 2095
2092 break; 2096 break;
2093 } 2097 }
… …
2104 2108
2105 csrO = 0; /* reset csr Offset */ 2109 csrO = 0; /* reset csr Offset */
2106 if (!bypass_keystate) 2110 if (!bypass_keystate)
2107 reportmode = !! (priv_modes & PrivMode_mouse_report); 2111 reportmode = !! (priv_modes & PrivMode_mouse_report);
2108 2112
2109 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2113 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2110 { 2114 {
2111 scrollBar.state = STATE_IDLE; 2115 scrollBar.state = SB_STATE_IDLE;
2112 scrollBar.show (0); 2116 scrollBar.show (0);
2113 } 2117 }
2114 2118
2115#ifdef SELECTION_SCROLLING 2119#ifdef SELECTION_SCROLLING
2116 sel_scroll_ev.stop(); 2120 sel_scroll_ev.stop();
… …
2166 case Button3: 2170 case Button3:
2167 selection_make (ev.time); 2171 selection_make (ev.time);
2168 break; 2172 break;
2169 2173
2170 case Button2: 2174 case Button2:
2171 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2175 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2172 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2176 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2173 break; 2177 break;
2174 2178
2175#ifdef MOUSE_WHEEL 2179#ifdef MOUSE_WHEEL
2176 case Button4: 2180 case Button4:
… …
2595 break; 2599 break;
2596 case 'Z': /* identify the terminal type */ 2600 case 'Z': /* identify the terminal type */
2597 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2601 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2598 break; 2602 break;
2599 case '<': /* turn off VT52 mode */ 2603 case '<': /* turn off VT52 mode */
2600 set_privmode (PrivMode_vt52, 0); 2604 priv_modes &= ~PrivMode_vt52;
2601 break; 2605 break;
2602 case 'F': /* use special graphics character set */ 2606 case 'F': /* use special graphics character set */
2603 case 'G': /* use regular character set */ 2607 case 'G': /* use regular character set */
2604 /* unimplemented */ 2608 /* unimplemented */
2605 break; 2609 break;
… …
2658 scr_forwardindex (); 2662 scr_forwardindex ();
2659 break; 2663 break;
2660#endif 2664#endif
2661 // DECPAM/DECPNM 2665 // DECPAM/DECPNM
2662 case '=': 2666 case '=':
2667 priv_modes |= PrivMode_aplKP;
2668 break;
2663 case '>': 2669 case '>':
2664 set_privmode (PrivMode_aplKP, ch == '='); 2670 priv_modes &= ~PrivMode_aplKP;
2665 break; 2671 break;
2666 2672
2667 case C1_40: 2673 case C1_40:
2668 cmd_getc (); 2674 cmd_getc ();
2669 break; 2675 break;
… …
2888 } 2894 }
2889 break; 2895 break;
2890#endif 2896#endif
2891 2897
2892 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2898 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2893 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2899 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2894 arg[0] = -arg[0]; 2900 arg[0] = -arg[0];
2895 /* FALLTHROUGH */ 2901 /* FALLTHROUGH */
2896 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2902 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2897 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2903 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2898 scr_gotorc (arg[0], 0, RELATIVE); 2904 scr_gotorc (arg[0], 0, RELATIVE);
2899 break; 2905 break;
2900 2906
2901 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2907 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2902 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2908 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3135 break; 3141 break;
3136 3142
3137 //case 9: NYI, TODO, restore maximized window or maximize window 3143 //case 9: NYI, TODO, restore maximized window or maximize window
3138 default: 3144 default:
3139 if (args[0] >= 24) /* set height (chars) */ 3145 if (args[0] >= 24) /* set height (chars) */
3140 set_widthheight ((unsigned int)width, 3146 set_widthheight ((unsigned int)vt_width,
3141 (unsigned int) (args[1] * fheight)); 3147 (unsigned int) (args[1] * fheight));
3142 break; 3148 break;
3143 3149
3144 /* 3150 /*
3145 * reports - some output format copied from XTerm 3151 * reports - some output format copied from XTerm
… …
3447 if (!strcmp (str, "?")) 3453 if (!strcmp (str, "?"))
3448 { 3454 {
3449 char str[256]; 3455 char str[256];
3450 3456
3451 sprintf (str, "[%dx%d+%d+%d]", 3457 sprintf (str, "[%dx%d+%d+%d]",
3452 min (h_scale, 32767), min (v_scale, 32767), 3458 min (bg_image.h_scale, 32767), min (bg_image.v_scale, 32767),
3453 min (h_align, 32767), min (v_align, 32767)); 3459 min (bg_image.h_align, 32767), min (bg_image.v_align, 32767));
3454 process_xterm_seq (XTerm_title, str, CHAR_ST); 3460 process_xterm_seq (XTerm_title, str, CHAR_ST);
3455 } 3461 }
3456 else 3462 else
3457 { 3463 {
3458 int changed = 0; 3464 bool changed = false;
3459 3465
3460 if (*str != ';') 3466 if (*str != ';')
3461 { 3467 {
3462 if (bg_set_file (str)) /* change pixmap */ 3468 if (bg_image.set_file (str)) /* change pixmap */
3463 {
3464 changed++; 3469 changed = true;
3465 str = strchr (str, ';');
3466 if (str == NULL)
3467 bg_set_default_geometry ();
3468 else
3469 bg_set_geometry (str+1);
3470 }
3471 } 3470 }
3472 else 3471 else
3473 { 3472 {
3474 str++; 3473 str++;
3475 if (bg_set_geometry (str, true)) 3474 if (bg_image.set_geometry (str, true))
3476 changed++; 3475 changed = true;
3477 } 3476 }
3478 3477
3479 if (changed) 3478 if (changed)
3480 { 3479 {
3481 if (bg_window_position_sensitive ()) 3480 if (bg_window_position_sensitive ())
… …
3587{ 3586{
3588 int state; 3587 int state;
3589 3588
3590 if (mode == 's') 3589 if (mode == 's')
3591 { 3590 {
3592 SavedModes |= (priv_modes & bit); 3591 if (priv_modes & bit)
3592 SavedModes |= bit;
3593 else
3594 SavedModes &= ~bit;
3593 return -1; 3595 return -1;
3594 } 3596 }
3595 else 3597 else
3596 { 3598 {
3597 if (mode == 'r') 3599 if (mode == 'r')
3598 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3600 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3599 else 3601 else
3600 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3602 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3601 3603
3602 set_privmode (bit, state); 3604 if (state)
3605 priv_modes |= bit;
3606 else
3607 priv_modes &= ~bit;
3603 } 3608 }
3604 3609
3605 return state; 3610 return state;
3606} 3611}
3607 3612
… …
3712 case 2: /* VT52 mode */ 3717 case 2: /* VT52 mode */
3713 /* oddball mode. should be set regardless of set/reset 3718 /* oddball mode. should be set regardless of set/reset
3714 * parameter. Return from VT52 mode with an ESC < from 3719 * parameter. Return from VT52 mode with an ESC < from
3715 * within VT52 mode 3720 * within VT52 mode
3716 */ 3721 */
3717 set_privmode (PrivMode_vt52, 1); 3722 priv_modes |= PrivMode_vt52;
3718 break; 3723 break;
3719 case 3: /* 80/132 */ 3724 case 3: /* 80/132 */
3720 if (priv_modes & PrivMode_132OK) 3725 if (priv_modes & PrivMode_132OK)
3721 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight); 3726 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3722 break; 3727 break;
… …
3737 if (state) /* orthogonal */ 3742 if (state) /* orthogonal */
3738 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3743 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3739 break; 3744 break;
3740#ifdef scrollBar_esc 3745#ifdef scrollBar_esc
3741 case scrollBar_esc: 3746 case scrollBar_esc:
3742 if (scrollBar.map (state)) 3747 scrollBar.map (state);
3743 {
3744 resize_all_windows (0, 0, 0); 3748 resize_all_windows (0, 0, 0);
3745 scr_touch (true); 3749 scr_touch (true);
3746 }
3747 break; 3750 break;
3748#endif 3751#endif
3749 case 25: /* visible/invisible cursor */ 3752 case 25: /* visible/invisible cursor */
3750 scr_cursor_visible (state); 3753 scr_cursor_visible (state);
3751 break; 3754 break;

Diff Legend

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