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.421 by root, Wed Oct 15 17:16:47 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
… …
1127 { 1127 {
1128 // this should really be sched_yield(), but the linux guys thought 1128 // this should really be sched_yield(), but the linux guys thought
1129 // that giving a process calling sched_yield () less cpu time than 1129 // that giving a process calling sched_yield () less cpu time than
1130 // ones with high nice levels is a useful thing to do. It surely is is 1130 // ones with high nice levels is a useful thing to do. It surely is is
1131 // allowed by the sus... as is returning ENOSYS. 1131 // allowed by the sus... as is returning ENOSYS.
1132 // since the linux guys additionally thought that breaking the only
1133 // known workaroudn against their unusable sched_yield hack is cool,
1134 // we just nanosleep a bit and hope for the best.
1132 1135
1133 struct timespec ts = { 0, 0 }; 1136 struct timespec ts = { 0, 1000 };
1134 nanosleep (&ts, 0); 1137 nanosleep (&ts, 0);
1135 1138
1136 w.stop (); 1139 w.stop ();
1137 } 1140 }
1138 1141
… …
1536 ; 1539 ;
1537 1540
1538 if (scrollBar.state && ev.xany.window == scrollBar.win) 1541 if (scrollBar.state && ev.xany.window == scrollBar.win)
1539 { 1542 {
1540 scrollBar.state = STATE_IDLE; 1543 scrollBar.state = STATE_IDLE;
1541 scrollbar_show (0); 1544 scrollBar.show (0);
1542 } 1545 }
1543 } 1546 }
1544 break; 1547 break;
1545 1548
1546 case MotionNotify: 1549 case MotionNotify:
… …
1645 &unused_root, &unused_child, 1648 &unused_root, &unused_child,
1646 &unused_root_x, &unused_root_y, 1649 &unused_root_x, &unused_root_y,
1647 &ev.xbutton.x, &ev.xbutton.y, 1650 &ev.xbutton.x, &ev.xbutton.y,
1648 &unused_mask); 1651 &unused_mask);
1649 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1652 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1650 scrollbar_size ()); 1653 scrollBar.size ());
1651 want_refresh = 1; 1654 want_refresh = 1;
1652 scrollbar_show (1); 1655 scrollBar.show (1);
1653 } 1656 }
1654 break; 1657 break;
1655 } 1658 }
1656 1659
1657#if defined(CURSOR_BLINK) 1660#if defined(CURSOR_BLINK)
… …
1683 1686
1684 refresh_check (); 1687 refresh_check ();
1685} 1688}
1686 1689
1687void 1690void
1691rxvt_term::set_urgency (bool enable)
1692{
1693 if (enable == urgency_hint)
1694 return;
1695
1696 if (XWMHints *h = XGetWMHints (dpy, parent[0]))
1697 {
1698 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1699 XSetWMHints (dpy, parent[0], h);
1700 urgency_hint = enable;
1701 }
1702}
1703
1704void
1688rxvt_term::focus_in () 1705rxvt_term::focus_in ()
1689{ 1706{
1690 if (!focus) 1707 if (!focus)
1691 { 1708 {
1692 focus = 1; 1709 focus = 1;
1693 want_refresh = 1; 1710 want_refresh = 1;
1694
1695 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1696 1711
1697#if USE_XIM 1712#if USE_XIM
1698 if (Input_Context != NULL) 1713 if (Input_Context != NULL)
1699 { 1714 {
1700 IMSetPosition (); 1715 IMSetPosition ();
… …
1712 scr_recolour (); 1727 scr_recolour ();
1713 } 1728 }
1714#endif 1729#endif
1715#if ENABLE_FRILLS 1730#if ENABLE_FRILLS
1716 if (option (Opt_urgentOnBell)) 1731 if (option (Opt_urgentOnBell))
1717 { 1732 set_urgency (0);
1718 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1719 {
1720 h->flags &= ~XUrgencyHint;
1721 XSetWMHints (dpy, parent[0], h);
1722 }
1723 }
1724#endif 1733#endif
1734
1735 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1725 } 1736 }
1726} 1737}
1727 1738
1728void 1739void
1729rxvt_term::focus_out () 1740rxvt_term::focus_out ()
… …
1731 if (focus) 1742 if (focus)
1732 { 1743 {
1733 focus = 0; 1744 focus = 0;
1734 want_refresh = 1; 1745 want_refresh = 1;
1735 1746
1736 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1747#if ENABLE_FRILLS
1737 1748 if (option (Opt_urgentOnBell))
1749 set_urgency (0);
1750#endif
1738#if ENABLE_FRILLS || ISO_14755 1751#if ENABLE_FRILLS || ISO_14755
1739 if (iso14755buf) 1752 if (iso14755buf)
1740 { 1753 {
1741 iso14755buf = 0; 1754 iso14755buf = 0;
1742# if ISO_14755 1755# if ISO_14755
… …
1759 { 1772 {
1760 pix_colors = pix_colors_unfocused; 1773 pix_colors = pix_colors_unfocused;
1761 scr_recolour (); 1774 scr_recolour ();
1762 } 1775 }
1763#endif 1776#endif
1777
1778 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1764 } 1779 }
1765} 1780}
1766 1781
1767void 1782void
1768rxvt_term::update_fade_color (unsigned int idx) 1783rxvt_term::update_fade_color (unsigned int idx)
… …
2010 } 2025 }
2011 2026
2012 if (scrollBar.style == R_SB_XTERM 2027 if (scrollBar.style == R_SB_XTERM
2013 || scrollbar_above_slider (ev.y) 2028 || scrollbar_above_slider (ev.y)
2014 || scrollbar_below_slider (ev.y)) 2029 || scrollbar_below_slider (ev.y))
2015 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2030 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2016 2031
2017 scrollBar.state = STATE_MOTION; 2032 scrollBar.state = STATE_MOTION;
2018 break; 2033 break;
2019 2034
2020 case Button1: 2035 case Button1:
… …
2043 else 2058 else
2044 { 2059 {
2045 scr_page ((ev.button == Button1 ? DN : UP), 2060 scr_page ((ev.button == Button1 ? DN : UP),
2046 (nrow 2061 (nrow
2047 * scrollbar_position (ev.y) 2062 * scrollbar_position (ev.y)
2048 / scrollbar_size ())); 2063 / scrollBar.size ()));
2049 } 2064 }
2050 2065
2051 break; 2066 break;
2052 } 2067 }
2053 } 2068 }
… …
2066 reportmode = !! (priv_modes & PrivMode_mouse_report); 2081 reportmode = !! (priv_modes & PrivMode_mouse_report);
2067 2082
2068 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2083 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2069 { 2084 {
2070 scrollBar.state = STATE_IDLE; 2085 scrollBar.state = STATE_IDLE;
2071 scrollbar_show (0); 2086 scrollBar.show (0);
2072 } 2087 }
2073 2088
2074#ifdef SELECTION_SCROLLING 2089#ifdef SELECTION_SCROLLING
2075 sel_scroll_ev.stop(); 2090 sel_scroll_ev.stop();
2076#endif 2091#endif
… …
2159 } 2174 }
2160 else 2175 else
2161# endif 2176# endif
2162 { 2177 {
2163 scr_page (v, i); 2178 scr_page (v, i);
2164 scrollbar_show (1); 2179 scrollBar.show (1);
2165 } 2180 }
2166 } 2181 }
2167 break; 2182 break;
2168#endif 2183#endif
2169 } 2184 }
… …
2179 wchar_t ch = NOCHAR; 2194 wchar_t ch = NOCHAR;
2180 char *seq_begin; // remember start of esc-sequence here 2195 char *seq_begin; // remember start of esc-sequence here
2181 2196
2182 for (;;) 2197 for (;;)
2183 { 2198 {
2184 if (ch == NOCHAR) 2199 if (expect_false (ch == NOCHAR))
2185 { 2200 {
2186 seq_begin = cmdbuf_ptr; 2201 seq_begin = cmdbuf_ptr;
2187 ch = next_char (); 2202 ch = next_char ();
2188 2203
2189 if (ch == NOCHAR) 2204 if (ch == NOCHAR)
2190 break; 2205 break;
2191 } 2206 }
2192 2207
2193 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2208 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2194 { 2209 {
2195 if (!seen_input) 2210 if (expect_false (!seen_input))
2196 { 2211 {
2197 seen_input = 1; 2212 seen_input = 1;
2198 // many badly-written programs (e.g. jed) contain a race condition: 2213 // many badly-written programs (e.g. jed) contain a race condition:
2199 // they first read the screensize and then install a SIGWINCH handler. 2214 // they first read the screensize and then install a SIGWINCH handler.
2200 // some window managers resize the window early, and these programs 2215 // some window managers resize the window early, and these programs
… …
2213 wchar_t *str = buf; 2228 wchar_t *str = buf;
2214 wchar_t *eol = str + min (ncol, UBUFSIZ); 2229 wchar_t *eol = str + min (ncol, UBUFSIZ);
2215 2230
2216 for (;;) 2231 for (;;)
2217 { 2232 {
2218 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2233 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2219 break; 2234 break;
2220 2235
2221 *str++ = ch; 2236 *str++ = ch;
2222 2237
2223 if (ch == C0_LF || str >= eol) 2238 if (expect_false (ch == C0_LF || str >= eol))
2224 { 2239 {
2225 if (ch == C0_LF) 2240 if (ch == C0_LF)
2226 nlines++; 2241 nlines++;
2227 2242
2228 refresh_count++; 2243 refresh_count++;
… …
2310rxvt_term::next_char () NOTHROW 2325rxvt_term::next_char () NOTHROW
2311{ 2326{
2312 while (cmdbuf_ptr < cmdbuf_endp) 2327 while (cmdbuf_ptr < cmdbuf_endp)
2313 { 2328 {
2314 // assume 7-bit to be ascii ALWAYS 2329 // assume 7-bit to be ascii ALWAYS
2315 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2330 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2316 return *cmdbuf_ptr++; 2331 return *cmdbuf_ptr++;
2317 2332
2318 wchar_t wc; 2333 wchar_t wc;
2319 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2334 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2320 2335
… …
2324 cmdbuf_ptr = cmdbuf_endp; 2339 cmdbuf_ptr = cmdbuf_endp;
2325 break; 2340 break;
2326 } 2341 }
2327 2342
2328 if (len == (size_t)-1) 2343 if (len == (size_t)-1)
2344 {
2345 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 2346 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2347 }
2330 2348
2331 // assume wchar == unicode 2349 // assume wchar == unicode
2332 cmdbuf_ptr += len; 2350 cmdbuf_ptr += len;
2333 return wc & UNICODE_MASK; 2351 return wc & UNICODE_MASK;
2334 } 2352 }
… …
2378/*----------------------------------------------------------------------*/ 2396/*----------------------------------------------------------------------*/
2379#ifdef PRINTPIPE 2397#ifdef PRINTPIPE
2380FILE * 2398FILE *
2381rxvt_term::popen_printer () 2399rxvt_term::popen_printer ()
2382{ 2400{
2383 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2401 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2384 2402
2385 if (stream == NULL) 2403 if (stream == NULL)
2386 rxvt_warn ("can't open printer pipe, not printing.\n"); 2404 rxvt_warn ("can't open printer pipe, not printing.\n");
2387 2405
2388 return stream; 2406 return stream;
… …
2399 * simulate attached vt100 printer 2417 * simulate attached vt100 printer
2400 */ 2418 */
2401void 2419void
2402rxvt_term::process_print_pipe () 2420rxvt_term::process_print_pipe ()
2403{ 2421{
2404 int done; 2422 FILE *fd = popen_printer ();
2405 FILE *fd;
2406 2423
2407 if ((fd = popen_printer ()) == NULL) 2424 if (!fd)
2408 return; 2425 return;
2409 2426
2410 /* 2427 /*
2411 * Send all input to the printer until either ESC[4i or ESC[?4i 2428 * Send all input to the printer until either ESC[4i or ESC[?4i
2412 * is received. 2429 * is received.
2413 */ 2430 */
2414 for (done = 0; !done;) 2431 for (int done = 0; !done; )
2415 { 2432 {
2416 unsigned char buf[8]; 2433 unsigned char buf[8];
2417 unicode_t ch; 2434 unicode_t ch;
2418 unsigned int i, len; 2435 unsigned int i, len;
2419 2436
… …
2564 break; 2581 break;
2565 case 'Z': /* identify the terminal type */ 2582 case 'Z': /* identify the terminal type */
2566 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2583 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2567 break; 2584 break;
2568 case '<': /* turn off VT52 mode */ 2585 case '<': /* turn off VT52 mode */
2569 PrivMode (0, PrivMode_vt52); 2586 set_privmode (PrivMode_vt52, 0);
2570 break; 2587 break;
2571 case 'F': /* use special graphics character set */ 2588 case 'F': /* use special graphics character set */
2572 case 'G': /* use regular character set */ 2589 case 'G': /* use regular character set */
2573 /* unimplemented */ 2590 /* unimplemented */
2574 break; 2591 break;
… …
2628 scr_forwardindex (); 2645 scr_forwardindex ();
2629 break; 2646 break;
2630#endif 2647#endif
2631 case '=': 2648 case '=':
2632 case '>': 2649 case '>':
2633 PrivMode ((ch == '='), PrivMode_aplKP); 2650 set_privmode (PrivMode_aplKP, ch == '=');
2634 break; 2651 break;
2635 2652
2636 case C1_40: 2653 case C1_40:
2637 cmd_getc (); 2654 cmd_getc ();
2638 break; 2655 break;
… …
2691 2708
2692 /* 8.3.106: RESET TO INITIAL STATE */ 2709 /* 8.3.106: RESET TO INITIAL STATE */
2693 case 'c': 2710 case 'c':
2694 mbstate.reset (); 2711 mbstate.reset ();
2695 scr_poweron (); 2712 scr_poweron ();
2696 scrollbar_show (1); 2713 scrollBar.show (1);
2697 break; 2714 break;
2698 2715
2699 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2716 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
2700 case 'n': 2717 case 'n':
2701 scr_charset_choose (2); 2718 scr_charset_choose (2);
… …
3507 break; 3524 break;
3508#endif 3525#endif
3509 3526
3510#if ENABLE_PERL 3527#if ENABLE_PERL
3511 case URxvt_perl: 3528 case URxvt_perl:
3512 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) 3529 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3513 ; // no responses yet
3514 break; 3530 break;
3515#endif 3531#endif
3516 } 3532 }
3517} 3533}
3518/*----------------------------------------------------------------------*/ 3534/*----------------------------------------------------------------------*/
… …
3541 { 3557 {
3542 if (mode == 'r') 3558 if (mode == 'r')
3543 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3559 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3544 else 3560 else
3545 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3561 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3546 PrivMode (state, bit); 3562 set_privmode (bit, state);
3547 } 3563 }
3548 3564
3549 return state; 3565 return state;
3550} 3566}
3551 3567
… …
3649 case 2: /* VT52 mode */ 3665 case 2: /* VT52 mode */
3650 /* oddball mode. should be set regardless of set/reset 3666 /* oddball mode. should be set regardless of set/reset
3651 * parameter. Return from VT52 mode with an ESC < from 3667 * parameter. Return from VT52 mode with an ESC < from
3652 * within VT52 mode 3668 * within VT52 mode
3653 */ 3669 */
3654 PrivMode (1, PrivMode_vt52); 3670 set_privmode (PrivMode_vt52, 1);
3655 break; 3671 break;
3656 case 3: /* 80/132 */ 3672 case 3: /* 80/132 */
3657 if (priv_modes & PrivMode_132OK) 3673 if (priv_modes & PrivMode_132OK)
3658 { 3674 {
3659 scr_poweron (); 3675 scr_poweron ();
… …
3677 if (state) /* orthogonal */ 3693 if (state) /* orthogonal */
3678 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3694 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3679 break; 3695 break;
3680#ifdef scrollBar_esc 3696#ifdef scrollBar_esc
3681 case scrollBar_esc: 3697 case scrollBar_esc:
3682 if (scrollbar_mapping (state)) 3698 if (scrollBar.map (state))
3683 { 3699 {
3684 resize_all_windows (0, 0, 0); 3700 resize_all_windows (0, 0, 0);
3685 scr_touch (true); 3701 scr_touch (true);
3686 } 3702 }
3687 break; 3703 break;

Diff Legend

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