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.263 by root, Sun Jan 15 16:48:17 2006 UTC vs.
Revision 1.274 by root, Fri Jan 20 10:27:08 2006 UTC

… …
64 64
65/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
66 66
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
68 68
69// exception thrown when the command parser runs out of input data
70class out_of_input { } out_of_input;
71
72#if ENABLE_FRILLS || ISO_14755 69#if ENABLE_FRILLS || ISO_14755
73 70
74#define ISO_14755_STARTED 0x80000000UL 71#define ISO_14755_STARTED 0x80000000UL
75#define ISO_14755_51 0x40000000UL // basic (section 5.1) 72#define ISO_14755_51 0x40000000UL // basic (section 5.1)
76#define ISO_14755_52 0x20000000UL // keycap (section 5.2) 73#define ISO_14755_52 0x20000000UL // keycap (section 5.2)
… …
464 { 461 {
465 switch (keysym) 462 switch (keysym)
466 { 463 {
467 /* normal XTerm key bindings */ 464 /* normal XTerm key bindings */
468 case XK_Insert: /* Shift+Insert = paste mouse selection */ 465 case XK_Insert: /* Shift+Insert = paste mouse selection */
469 selection_request (ev.time, 0, 0); 466 selection_request (ev.time, Sel_Primary);
470 return; 467 return;
471#if TODO 468#if TODO
472 /* rxvt extras */ 469 /* rxvt extras */
473 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 470 case XK_KP_Add: /* Shift+KP_Add = bigger font */
474 change_font (FONT_UP); 471 change_font (FONT_UP);
… …
919#endif /* DEBUG_CMD */ 916#endif /* DEBUG_CMD */
920 tt_write (kbuf, (unsigned int)len); 917 tt_write (kbuf, (unsigned int)len);
921} 918}
922/*}}} */ 919/*}}} */
923 920
924#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 921#if defined (KEYSYM_RESOURCE)
925/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
926/* attempt to `write' count to the input buffer */
927unsigned int 922unsigned int
928rxvt_term::cmd_write (const char *str, unsigned int count) 923rxvt_term::cmd_write (const char *str, unsigned int count)
929{ 924{
930 unsigned int n, s; 925 unsigned int n, s;
931 926
… …
1008 while (l->is_longer () && row < end_row); 1003 while (l->is_longer () && row < end_row);
1009 } 1004 }
1010 while (row < end_row); 1005 while (row < end_row);
1011 } 1006 }
1012 1007
1013 scr_refresh (refresh_type); 1008 scr_refresh ();
1014 scrollbar_show (1); 1009 scrollbar_show (1);
1015#ifdef USE_XIM 1010#ifdef USE_XIM
1016 IMSendSpot (); 1011 IMSendSpot ();
1017#endif 1012#endif
1018 } 1013 }
… …
1021} 1016}
1022 1017
1023void 1018void
1024rxvt_term::check_cb (check_watcher &w) 1019rxvt_term::check_cb (check_watcher &w)
1025{ 1020{
1026 SET_R (this); 1021 make_current ();
1027 SET_LOCALE (locale);
1028 1022
1029 display->flush (); 1023 display->flush ();
1030 1024
1031 if (want_refresh && !flush_ev.active) 1025 if (want_refresh && !flush_ev.active)
1032 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally 1026 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1033} 1027}
1034 1028
1035void 1029void
1036rxvt_term::flush_cb (time_watcher &w) 1030rxvt_term::flush_cb (time_watcher &w)
1037{ 1031{
1038 SET_R (this); 1032 make_current ();
1039 SET_LOCALE (locale);
1040 1033
1041 refresh_limit = 1; 1034 refresh_limit = 1;
1042 refresh_count = 0; 1035 refresh_count = 0;
1043 flush (); 1036 flush ();
1044} 1037}
… …
1048rxvt_term::cursor_blink_cb (time_watcher &w) 1041rxvt_term::cursor_blink_cb (time_watcher &w)
1049{ 1042{
1050 hidden_cursor = !hidden_cursor; 1043 hidden_cursor = !hidden_cursor;
1051 want_refresh = 1; 1044 want_refresh = 1;
1052 1045
1053 w.start (w.at + BLINK_INTERVAL); 1046 w.start (w.at + CURSOR_BLINK_INTERVAL);
1054} 1047}
1055#endif 1048#endif
1056 1049
1057#ifdef TEXT_BLINK 1050#ifdef TEXT_BLINK
1058void 1051void
… …
1072rxvt_term::cont_scroll_cb (time_watcher &w) 1065rxvt_term::cont_scroll_cb (time_watcher &w)
1073{ 1066{
1074 if ((scrollbar_isUp() || scrollbar_isDn()) && 1067 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1075 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1068 scr_page (scrollbar_isUp() ? UP : DN, 1))
1076 { 1069 {
1077 refresh_type |= SMOOTH_REFRESH;
1078 want_refresh = 1; 1070 want_refresh = 1;
1079 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1071 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1080 } 1072 }
1081} 1073}
1082#endif 1074#endif
… …
1086rxvt_term::sel_scroll_cb (time_watcher &w) 1078rxvt_term::sel_scroll_cb (time_watcher &w)
1087{ 1079{
1088 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1080 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1089 { 1081 {
1090 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1082 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1091 refresh_type |= SMOOTH_REFRESH;
1092 want_refresh = 1; 1083 want_refresh = 1;
1093 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1084 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1094 } 1085 }
1095} 1086}
1096#endif 1087#endif
… …
1104 : scr_page (UP, mouse_slip_wheel_speed)) 1095 : scr_page (UP, mouse_slip_wheel_speed))
1105 { 1096 {
1106 if (view_start == top_row || view_start == 0) 1097 if (view_start == top_row || view_start == 0)
1107 mouse_slip_wheel_speed = 0; 1098 mouse_slip_wheel_speed = 0;
1108 1099
1109 refresh_type |= SMOOTH_REFRESH;
1110 want_refresh = 1; 1100 want_refresh = 1;
1111 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1101 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1112 } 1102 }
1113} 1103}
1114#endif 1104#endif
… …
1144 1134
1145 memmove (cmdbuf_base, cmdbuf_ptr, n); 1135 memmove (cmdbuf_base, cmdbuf_ptr, n);
1146 cmdbuf_ptr = cmdbuf_base; 1136 cmdbuf_ptr = cmdbuf_base;
1147 cmdbuf_endp = cmdbuf_ptr + n; 1137 cmdbuf_endp = cmdbuf_ptr + n;
1148 1138
1149 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1139 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1150 1140
1151 if (r > 0) 1141 if (r > 0)
1152 { 1142 {
1153 cmdbuf_endp += r; 1143 cmdbuf_endp += r;
1154 return true; 1144 return true;
… …
1172} 1162}
1173 1163
1174void 1164void
1175rxvt_term::pty_cb (io_watcher &w, short revents) 1165rxvt_term::pty_cb (io_watcher &w, short revents)
1176{ 1166{
1177 SET_R (this); 1167 make_current ();
1178 SET_LOCALE (locale);
1179 1168
1180 if (revents & EVENT_READ) 1169 if (revents & EVENT_READ)
1181 // loop, but don't allow a single term to monopolize us 1170 // loop, but don't allow a single term to monopolize us
1182 while (pty_fill ()) 1171 while (pty_fill ())
1183 if (cmd_parse ()) 1172 if (cmd_parse ())
… …
1215} 1204}
1216 1205
1217void 1206void
1218rxvt_term::pointer_cb (time_watcher &w) 1207rxvt_term::pointer_cb (time_watcher &w)
1219{ 1208{
1220 SET_R (this); 1209 make_current ();
1221 SET_LOCALE (locale);
1222 1210
1223 pointer_blank (); 1211 pointer_blank ();
1224} 1212}
1225#endif 1213#endif
1226 1214
… …
1305 1293
1306/*{{{ process an X event */ 1294/*{{{ process an X event */
1307void 1295void
1308rxvt_term::x_cb (XEvent &ev) 1296rxvt_term::x_cb (XEvent &ev)
1309{ 1297{
1298 make_current ();
1299
1310 dDisp; 1300 dDisp;
1311 1301
1312 SET_R (this);
1313 SET_LOCALE (locale);
1314
1315 if (ev.xany.window == vt 1302 if (ev.xany.window == vt
1303 && SHOULD_INVOKE (HOOK_X_EVENT)
1316 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1304 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1317 return; 1305 return;
1318 1306
1319 // for XQueryPointer 1307 // for XQueryPointer
1320 Window unused_root, unused_child; 1308 Window unused_root, unused_child;
… …
1511 { 1499 {
1512 seen_resize = 1; 1500 seen_resize = 1;
1513 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1501 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1514 } 1502 }
1515 1503
1504 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1505
1516#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1506#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1517 if (OPTION (Opt_transparent)) 1507 if (OPTION (Opt_transparent))
1518 check_our_parents (); 1508 check_our_parents ();
1519#endif 1509#endif
1520 } 1510 }
… …
1591 if (isScrollbarWindow (ev.xany.window)) 1581 if (isScrollbarWindow (ev.xany.window))
1592 { 1582 {
1593 scrollBar.setIdle (); 1583 scrollBar.setIdle ();
1594 scrollbar_show (0); 1584 scrollbar_show (0);
1595 } 1585 }
1596#ifdef MENUBAR
1597 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1598 menubar_expose ();
1599#endif
1600 1586
1601#ifdef TRANSPARENT 1587#ifdef TRANSPARENT
1602 if (am_transparent && ev.xany.window == parent[0]) 1588 if (am_transparent && ev.xany.window == parent[0])
1603 XClearWindow (disp, ev.xany.window); 1589 XClearWindow (disp, ev.xany.window);
1604#endif 1590#endif
… …
1608 case MotionNotify: 1594 case MotionNotify:
1609#ifdef POINTER_BLANK 1595#ifdef POINTER_BLANK
1610 if (hidden_pointer) 1596 if (hidden_pointer)
1611 pointer_unblank (); 1597 pointer_unblank ();
1612#endif 1598#endif
1613#if MENUBAR
1614 if (isMenuBarWindow (ev.xany.window))
1615 {
1616 menubar_control (ev.xbutton);
1617 break;
1618 }
1619#endif
1620 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1599 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1621 break; 1600 break;
1622 1601
1623 if (ev.xany.window == vt) 1602 if (ev.xany.window == vt)
1624 { 1603 {
1604 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1625 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1605 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1626 ; // nop 1606 ; // nop
1627 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1607 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1628 { 1608 {
1629 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1609 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1630 ; 1610 ;
… …
1730 { 1710 {
1731 hidden_cursor = 0; 1711 hidden_cursor = 0;
1732 want_refresh = 1; 1712 want_refresh = 1;
1733 } 1713 }
1734 1714
1735 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1715 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1736 } 1716 }
1737#endif 1717#endif
1738 1718
1739#if defined(POINTER_BLANK) 1719#if defined(POINTER_BLANK)
1740 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1720 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
… …
1768 XSetICFocus (Input_Context); 1748 XSetICFocus (Input_Context);
1769 } 1749 }
1770#endif 1750#endif
1771#if CURSOR_BLINK 1751#if CURSOR_BLINK
1772 if (OPTION (Opt_cursorBlink)) 1752 if (OPTION (Opt_cursorBlink))
1773 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1753 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1774#endif 1754#endif
1775#if OFF_FOCUS_FADING 1755#if OFF_FOCUS_FADING
1776 if (rs[Rs_fade]) 1756 if (rs[Rs_fade])
1777 { 1757 {
1778 pix_colors = pix_colors_focused; 1758 pix_colors = pix_colors_focused;
… …
1822 1802
1823#if TRANSPARENT 1803#if TRANSPARENT
1824void 1804void
1825rxvt_term::rootwin_cb (XEvent &ev) 1805rxvt_term::rootwin_cb (XEvent &ev)
1826{ 1806{
1827 SET_R (this); 1807 make_current ();
1828 SET_LOCALE (locale);
1829 1808
1830 switch (ev.type) 1809 switch (ev.type)
1831 { 1810 {
1832 case PropertyNotify: 1811 case PropertyNotify:
1833 /* 1812 /*
… …
2102 } 2081 }
2103 } 2082 }
2104 2083
2105 return; 2084 return;
2106 } 2085 }
2107
2108#if MENUBAR
2109 /*
2110 * Menubar window processing of button press
2111 */
2112 if (isMenuBarWindow (ev.window))
2113 menubar_control (ev);
2114#endif
2115} 2086}
2116 2087
2117void 2088void
2118rxvt_term::button_release (XButtonEvent &ev) 2089rxvt_term::button_release (XButtonEvent &ev)
2119{ 2090{
… …
2125 2096
2126 if (scrollbar_isUpDn ()) 2097 if (scrollbar_isUpDn ())
2127 { 2098 {
2128 scrollBar.setIdle (); 2099 scrollBar.setIdle ();
2129 scrollbar_show (0); 2100 scrollbar_show (0);
2130#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2131 refresh_type &= ~SMOOTH_REFRESH;
2132#endif
2133 } 2101 }
2134 2102
2135#ifdef SELECTION_SCROLLING 2103#ifdef SELECTION_SCROLLING
2136 if (sel_scroll_ev.active) 2104 if (sel_scroll_ev.active)
2137 sel_scroll_ev.stop(); 2105 sel_scroll_ev.stop();
… …
2184 { 2152 {
2185 case Button1: 2153 case Button1:
2186 case Button3: 2154 case Button3:
2187 selection_make (ev.time); 2155 selection_make (ev.time);
2188 break; 2156 break;
2157
2189 case Button2: 2158 case Button2:
2190 selection_request (ev.time, ev.x, ev.y); 2159 if (IN_RANGE_EXC (ev.x, 0, width)
2160 && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2161 {
2162 if (ev.state & ShiftMask)
2163 selection_request (ev.time, Sel_Clipboard);
2164 else
2165 selection_request (ev.time, Sel_Primary);
2166 }
2191 break; 2167 break;
2168
2192#ifdef MOUSE_WHEEL 2169#ifdef MOUSE_WHEEL
2193 case Button4: 2170 case Button4:
2194 case Button5: 2171 case Button5:
2195 { 2172 {
2196 int i; 2173 int i;
… …
2228 } 2205 }
2229 break; 2206 break;
2230#endif 2207#endif
2231 } 2208 }
2232 } 2209 }
2233#ifdef MENUBAR
2234 else if (isMenuBarWindow (ev.window))
2235 menubar_control (ev);
2236#endif
2237} 2210}
2238 2211
2239#ifdef TRANSPARENT 2212#ifdef TRANSPARENT
2240#if TINTING 2213#if TINTING
2241/* taken from aterm-0.4.2 */ 2214/* taken from aterm-0.4.2 */
… …
2784 } 2757 }
2785 2758
2786 // scr_add_lines only works for nlines <= nrow - 1. 2759 // scr_add_lines only works for nlines <= nrow - 1.
2787 if (nlines >= nrow - 1) 2760 if (nlines >= nrow - 1)
2788 { 2761 {
2762 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2789 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) 2763 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2790 scr_add_lines (buf, str - buf, nlines); 2764 scr_add_lines (buf, str - buf, nlines);
2791 2765
2792 nlines = 0; 2766 nlines = 0;
2793 str = buf; 2767 str = buf;
2794 eol = str + min (ncol, UBUFSIZ); 2768 eol = str + min (ncol, UBUFSIZ);
… …
2809 2783
2810 seq_begin = cmdbuf_ptr; 2784 seq_begin = cmdbuf_ptr;
2811 ch = next_char (); 2785 ch = next_char ();
2812 } 2786 }
2813 2787
2788 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2814 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) 2789 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2815 scr_add_lines (buf, str - buf, nlines); 2790 scr_add_lines (buf, str - buf, nlines);
2816 2791
2817 /* 2792 /*
2818 * If there have been a lot of new lines, then update the screen 2793 * If there have been a lot of new lines, then update the screen
2819 * What the heck I'll cheat and only refresh less than every page-full. 2794 * What the heck I'll cheat and only refresh less than every page-full.
… …
2825 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2800 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2826 refresh_limit++; 2801 refresh_limit++;
2827 else 2802 else
2828 { 2803 {
2829 flag = true; 2804 flag = true;
2830 scr_refresh (refresh_type); 2805 scr_refresh ();
2831 want_refresh = 1; 2806 want_refresh = 1;
2832 } 2807 }
2833 } 2808 }
2834 2809
2835 } 2810 }
… …
2853 return flag; 2828 return flag;
2854} 2829}
2855 2830
2856// read the next character 2831// read the next character
2857wchar_t 2832wchar_t
2858rxvt_term::next_char () 2833rxvt_term::next_char () NOTHROW
2859{ 2834{
2860 while (cmdbuf_ptr < cmdbuf_endp) 2835 while (cmdbuf_ptr < cmdbuf_endp)
2861 { 2836 {
2862 // assume 7-bit to be ascii ALWAYS 2837 // assume 7-bit to be ascii ALWAYS
2863 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2838 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
… …
2884 return NOCHAR; 2859 return NOCHAR;
2885} 2860}
2886 2861
2887// read the next octet 2862// read the next octet
2888uint32_t 2863uint32_t
2889rxvt_term::next_octet () 2864rxvt_term::next_octet () NOTHROW
2890{ 2865{
2891 return cmdbuf_ptr < cmdbuf_endp 2866 return cmdbuf_ptr < cmdbuf_endp
2892 ? (unsigned char)*cmdbuf_ptr++ 2867 ? (unsigned char)*cmdbuf_ptr++
2893 : NOCHAR; 2868 : NOCHAR;
2894} 2869}
2870
2871static class out_of_input out_of_input;
2895 2872
2896/* rxvt_cmd_getc () - Return next input character */ 2873/* rxvt_cmd_getc () - Return next input character */
2897/* 2874/*
2898 * Return the next input character after first passing any keyboard input 2875 * Return the next input character after first passing any keyboard input
2899 * to the command. 2876 * to the command.
2900 */ 2877 */
2901wchar_t 2878wchar_t
2902rxvt_term::cmd_getc () 2879rxvt_term::cmd_getc () THROW ((class out_of_input))
2903{ 2880{
2904 wchar_t c = next_char (); 2881 wchar_t c = next_char ();
2905 2882
2906 if (c == NOCHAR) 2883 if (c == NOCHAR)
2907 throw out_of_input; 2884 throw out_of_input;
2908 2885
2909 return c; 2886 return c;
2910} 2887}
2911 2888
2912uint32_t 2889uint32_t
2913rxvt_term::cmd_get8 () 2890rxvt_term::cmd_get8 () THROW ((class out_of_input))
2914{ 2891{
2915 uint32_t c = next_octet (); 2892 uint32_t c = next_octet ();
2916 2893
2917 if (c == NOCHAR) 2894 if (c == NOCHAR)
2918 throw out_of_input; 2895 throw out_of_input;
… …
3797 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3774 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3798 */ 3775 */
3799void 3776void
3800rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3777rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3801{ 3778{
3802 int changed = 0;
3803 int color; 3779 int color;
3804 char *buf, *name; 3780 char *buf, *name;
3805 bool query = str[0] == '?' && !str[1]; 3781 bool query = str[0] == '?' && !str[1];
3806 int saveop = op; 3782 int saveop = op;
3807 dDisp; 3783 dDisp;
… …
3923 want_full_refresh = want_refresh = 1; 3899 want_full_refresh = want_refresh = 1;
3924 break; 3900 break;
3925#endif 3901#endif
3926 3902
3927 case Rxvt_Pixmap: 3903 case Rxvt_Pixmap:
3904 {
3928 if (*str != ';') 3905 if (*str != ';')
3929 { 3906 {
3930#if XPM_BACKGROUND 3907#if XPM_BACKGROUND
3931 scale_pixmap (""); /* reset to default scaling */ 3908 scale_pixmap (""); /* reset to default scaling */
3932 set_bgPixmap (str); /* change pixmap */ 3909 set_bgPixmap (str); /* change pixmap */
3933 scr_touch (true); 3910 scr_touch (true);
3934#endif 3911#endif
3935 } 3912 }
3936 3913
3914 int changed = 0;
3915
3937 while ((str = strchr (str, ';')) != NULL) 3916 while ((str = strchr (str, ';')) != NULL)
3938 { 3917 {
3939 str++; 3918 str++;
3940#if XPM_BACKGROUND 3919#if XPM_BACKGROUND
3941 changed += scale_pixmap (str); 3920 changed += scale_pixmap (str);
3942#endif 3921#endif
3943 } 3922 }
3944 3923
3945 if (changed) 3924 if (changed)
3946 { 3925 {
3947#ifdef XPM_BACKGROUND 3926#ifdef XPM_BACKGROUND
3948 resize_pixmap (); 3927 resize_pixmap ();
3949 scr_touch (true); 3928 scr_touch (true);
3950#endif 3929#endif
3951 } 3930 }
3931 }
3952 break; 3932 break;
3953 3933
3954 case Rxvt_restoreFG: 3934 case Rxvt_restoreFG:
3955 set_window_color (Color_fg, str); 3935 set_window_color (Color_fg, str);
3956 break; 3936 break;
… …
3960 3940
3961 case XTerm_logfile: 3941 case XTerm_logfile:
3962 // TODO, when secure mode? 3942 // TODO, when secure mode?
3963 break; 3943 break;
3964 3944
3965#ifdef MENUBAR
3966 case URxvt_Menu:
3967 if (OPTION (Opt_insecure))
3968 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3969 break;
3970#endif
3971#if 0 3945#if 0
3972 case Rxvt_dumpscreen: /* no error notices */ 3946 case Rxvt_dumpscreen: /* no error notices */
3973 { 3947 {
3974 int fd; 3948 int fd;
3975 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3949 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
… …
4008 if (query) 3982 if (query)
4009 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3983 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
4010 else 3984 else
4011 { 3985 {
4012 set_locale (str); 3986 set_locale (str);
4013 pty.set_utf8_mode (enc_utf8); 3987 pty->set_utf8_mode (enc_utf8);
4014 init_xlocale (); 3988 init_xlocale ();
4015 } 3989 }
4016 break; 3990 break;
4017 3991
4018 case URxvt_view_up: 3992 case URxvt_view_up:
… …
4071 return state; 4045 return state;
4072} 4046}
4073 4047
4074/* we're not using priv _yet_ */ 4048/* we're not using priv _yet_ */
4075void 4049void
4076rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4050rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4077{ 4051{
4078 unsigned int i, j; 4052 unsigned int i, j;
4079 int state; 4053 int state;
4080 4054
4081 static const struct 4055 static const struct
… …
4092 { 5, PrivMode_rVideo }, 4066 { 5, PrivMode_rVideo },
4093 { 6, PrivMode_relOrigin }, 4067 { 6, PrivMode_relOrigin },
4094 { 7, PrivMode_Autowrap }, 4068 { 7, PrivMode_Autowrap },
4095 // 8, bi-directional support mode 4069 // 8, bi-directional support mode
4096 { 9, PrivMode_MouseX10 }, 4070 { 9, PrivMode_MouseX10 },
4097#ifdef menuBar_esc
4098 { menuBar_esc, PrivMode_menuBar },
4099#endif
4100 // 18, 19 printing-related 4071 // 18, 19 printing-related
4101 { 25, PrivMode_VisibleCursor }, 4072 { 25, PrivMode_VisibleCursor },
4102#ifdef scrollBar_esc 4073#ifdef scrollBar_esc
4103 { scrollBar_esc, PrivMode_scrollBar }, 4074 { scrollBar_esc, PrivMode_scrollBar },
4104#endif 4075#endif
… …
4199 /* case 8: - auto repeat, can't do on a per window basis */ 4170 /* case 8: - auto repeat, can't do on a per window basis */
4200 case 9: /* X10 mouse reporting */ 4171 case 9: /* X10 mouse reporting */
4201 if (state) /* orthogonal */ 4172 if (state) /* orthogonal */
4202 priv_modes &= ~PrivMode_MouseX11; 4173 priv_modes &= ~PrivMode_MouseX11;
4203 break; 4174 break;
4204#ifdef menuBar_esc
4205 case menuBar_esc:
4206#ifdef MENUBAR
4207 map_menuBar (state);
4208#endif
4209 break;
4210#endif
4211#ifdef scrollBar_esc 4175#ifdef scrollBar_esc
4212 case scrollBar_esc: 4176 case scrollBar_esc:
4213 if (scrollbar_mapping (state)) 4177 if (scrollbar_mapping (state))
4214 { 4178 {
4215 resize_all_windows (0, 0, 0); 4179 resize_all_windows (0, 0, 0);
… …
4460rxvt_term::tt_write (const char *data, unsigned int len) 4424rxvt_term::tt_write (const char *data, unsigned int len)
4461{ 4425{
4462 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4426 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4463 return; 4427 return;
4464 4428
4465 if (pty.pty < 0) 4429 if (pty->pty < 0)
4466 return; 4430 return;
4467 4431
4468 if (v_buflen == 0) 4432 if (v_buflen == 0)
4469 { 4433 {
4470 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4434 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4471 4435
4472 if ((unsigned int)written == len) 4436 if ((unsigned int)written == len)
4473 return; 4437 return;
4474 4438
4475 data += written; 4439 data += written;
… …
4484 pty_ev.set (EVENT_READ | EVENT_WRITE); 4448 pty_ev.set (EVENT_READ | EVENT_WRITE);
4485} 4449}
4486 4450
4487void rxvt_term::pty_write () 4451void rxvt_term::pty_write ()
4488{ 4452{
4489 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4453 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4490 4454
4491 if (written > 0) 4455 if (written > 0)
4492 { 4456 {
4493 v_buflen -= written; 4457 v_buflen -= written;
4494 4458

Diff Legend

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