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.266 by root, Mon Jan 16 08:57:02 2006 UTC vs.
Revision 1.276 by root, Fri Jan 20 11:02:46 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);
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 }
… …
1046rxvt_term::cursor_blink_cb (time_watcher &w) 1041rxvt_term::cursor_blink_cb (time_watcher &w)
1047{ 1042{
1048 hidden_cursor = !hidden_cursor; 1043 hidden_cursor = !hidden_cursor;
1049 want_refresh = 1; 1044 want_refresh = 1;
1050 1045
1051 w.start (w.at + BLINK_INTERVAL); 1046 w.start (w.at + CURSOR_BLINK_INTERVAL);
1052} 1047}
1053#endif 1048#endif
1054 1049
1055#ifdef TEXT_BLINK 1050#ifdef TEXT_BLINK
1056void 1051void
… …
1070rxvt_term::cont_scroll_cb (time_watcher &w) 1065rxvt_term::cont_scroll_cb (time_watcher &w)
1071{ 1066{
1072 if ((scrollbar_isUp() || scrollbar_isDn()) && 1067 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1073 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1068 scr_page (scrollbar_isUp() ? UP : DN, 1))
1074 { 1069 {
1075 refresh_type |= SMOOTH_REFRESH;
1076 want_refresh = 1; 1070 want_refresh = 1;
1077 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1071 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1078 } 1072 }
1079} 1073}
1080#endif 1074#endif
… …
1084rxvt_term::sel_scroll_cb (time_watcher &w) 1078rxvt_term::sel_scroll_cb (time_watcher &w)
1085{ 1079{
1086 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1080 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1087 { 1081 {
1088 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1082 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1089 refresh_type |= SMOOTH_REFRESH;
1090 want_refresh = 1; 1083 want_refresh = 1;
1091 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1084 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1092 } 1085 }
1093} 1086}
1094#endif 1087#endif
… …
1102 : scr_page (UP, mouse_slip_wheel_speed)) 1095 : scr_page (UP, mouse_slip_wheel_speed))
1103 { 1096 {
1104 if (view_start == top_row || view_start == 0) 1097 if (view_start == top_row || view_start == 0)
1105 mouse_slip_wheel_speed = 0; 1098 mouse_slip_wheel_speed = 0;
1106 1099
1107 refresh_type |= SMOOTH_REFRESH;
1108 want_refresh = 1; 1100 want_refresh = 1;
1109 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1101 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1110 } 1102 }
1111} 1103}
1112#endif 1104#endif
… …
1142 1134
1143 memmove (cmdbuf_base, cmdbuf_ptr, n); 1135 memmove (cmdbuf_base, cmdbuf_ptr, n);
1144 cmdbuf_ptr = cmdbuf_base; 1136 cmdbuf_ptr = cmdbuf_base;
1145 cmdbuf_endp = cmdbuf_ptr + n; 1137 cmdbuf_endp = cmdbuf_ptr + n;
1146 1138
1147 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1139 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1148 1140
1149 if (r > 0) 1141 if (r > 0)
1150 { 1142 {
1151 cmdbuf_endp += r; 1143 cmdbuf_endp += r;
1152 return true; 1144 return true;
… …
1409 case ButtonRelease: 1401 case ButtonRelease:
1410 button_release (ev.xbutton); 1402 button_release (ev.xbutton);
1411 break; 1403 break;
1412 1404
1413 case ClientMessage: 1405 case ClientMessage:
1414 if (ev.xclient.format == 32 1406 if (ev.xclient.format == 32)
1415 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1416 { 1407 {
1408 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1409 {
1417 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1410 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1411 {
1412 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, ev, DT_END)))
1418 destroy (); 1413 destroy ();
1414 }
1419#if ENABLE_EWMH 1415#if ENABLE_EWMH
1420 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1416 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1421 XSendEvent (disp, ev.xclient.window = display->root, 1417 XSendEvent (disp, ev.xclient.window = display->root,
1422 False, SubstructureRedirectMask | SubstructureNotifyMask, 1418 False, SubstructureRedirectMask | SubstructureNotifyMask,
1423 &ev); 1419 &ev);
1420#endif
1421 }
1422#if ENABLE_XEMBED
1423 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1424 {
1425 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1426 focus_in ();
1427 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1428 focus_out ();
1429 }
1424#endif 1430#endif
1425 } 1431 }
1426#if ENABLE_XEMBED
1427 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1428 {
1429 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1430 focus_in ();
1431 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1432 focus_out ();
1433 }
1434#endif
1435#ifdef OFFIX_DND
1436 /* OffiX Dnd (drag 'n' drop) protocol */
1437 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1438 && (ev.xclient.data.l[0] == DndFile
1439 || ev.xclient.data.l[0] == DndDir
1440 || ev.xclient.data.l[0] == DndLink))
1441 {
1442 /* Get Dnd data */
1443 Atom ActualType;
1444 int ActualFormat;
1445 unsigned char *data;
1446 unsigned long Size, RemainingBytes;
1447
1448 XGetWindowProperty (disp, display->root,
1449 xa[XA_DNDSELECTION],
1450 0L, 1000000L,
1451 False, AnyPropertyType,
1452 &ActualType, &ActualFormat,
1453 &Size, &RemainingBytes,
1454 &data);
1455 set_string_property (XA_CUT_BUFFER0, data);
1456 XFree (data);
1457 selection_paste (display->root, XA_CUT_BUFFER0, true);
1458 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1459 }
1460#endif /* OFFIX_DND */
1461 break; 1432 break;
1462 1433
1463 case MappingNotify: 1434 case MappingNotify:
1464 XRefreshKeyboardMapping (&ev.xmapping); 1435 XRefreshKeyboardMapping (&ev.xmapping);
1465 break; 1436 break;
… …
1507 { 1478 {
1508 seen_resize = 1; 1479 seen_resize = 1;
1509 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1480 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1510 } 1481 }
1511 1482
1483 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1484
1512#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1485#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1513 if (OPTION (Opt_transparent)) 1486 if (OPTION (Opt_transparent))
1514 check_our_parents (); 1487 check_our_parents ();
1515#endif 1488#endif
1516 } 1489 }
… …
1587 if (isScrollbarWindow (ev.xany.window)) 1560 if (isScrollbarWindow (ev.xany.window))
1588 { 1561 {
1589 scrollBar.setIdle (); 1562 scrollBar.setIdle ();
1590 scrollbar_show (0); 1563 scrollbar_show (0);
1591 } 1564 }
1592#ifdef MENUBAR
1593 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1594 menubar_expose ();
1595#endif
1596 1565
1597#ifdef TRANSPARENT 1566#ifdef TRANSPARENT
1598 if (am_transparent && ev.xany.window == parent[0]) 1567 if (am_transparent && ev.xany.window == parent[0])
1599 XClearWindow (disp, ev.xany.window); 1568 XClearWindow (disp, ev.xany.window);
1600#endif 1569#endif
… …
1603 1572
1604 case MotionNotify: 1573 case MotionNotify:
1605#ifdef POINTER_BLANK 1574#ifdef POINTER_BLANK
1606 if (hidden_pointer) 1575 if (hidden_pointer)
1607 pointer_unblank (); 1576 pointer_unblank ();
1608#endif
1609#if MENUBAR
1610 if (isMenuBarWindow (ev.xany.window))
1611 {
1612 menubar_control (ev.xbutton);
1613 break;
1614 }
1615#endif 1577#endif
1616 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1578 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1617 break; 1579 break;
1618 1580
1619 if (ev.xany.window == vt) 1581 if (ev.xany.window == vt)
… …
1727 { 1689 {
1728 hidden_cursor = 0; 1690 hidden_cursor = 0;
1729 want_refresh = 1; 1691 want_refresh = 1;
1730 } 1692 }
1731 1693
1732 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1694 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1733 } 1695 }
1734#endif 1696#endif
1735 1697
1736#if defined(POINTER_BLANK) 1698#if defined(POINTER_BLANK)
1737 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1699 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
… …
1765 XSetICFocus (Input_Context); 1727 XSetICFocus (Input_Context);
1766 } 1728 }
1767#endif 1729#endif
1768#if CURSOR_BLINK 1730#if CURSOR_BLINK
1769 if (OPTION (Opt_cursorBlink)) 1731 if (OPTION (Opt_cursorBlink))
1770 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1732 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1771#endif 1733#endif
1772#if OFF_FOCUS_FADING 1734#if OFF_FOCUS_FADING
1773 if (rs[Rs_fade]) 1735 if (rs[Rs_fade])
1774 { 1736 {
1775 pix_colors = pix_colors_focused; 1737 pix_colors = pix_colors_focused;
… …
2098 } 2060 }
2099 } 2061 }
2100 2062
2101 return; 2063 return;
2102 } 2064 }
2103
2104#if MENUBAR
2105 /*
2106 * Menubar window processing of button press
2107 */
2108 if (isMenuBarWindow (ev.window))
2109 menubar_control (ev);
2110#endif
2111} 2065}
2112 2066
2113void 2067void
2114rxvt_term::button_release (XButtonEvent &ev) 2068rxvt_term::button_release (XButtonEvent &ev)
2115{ 2069{
… …
2121 2075
2122 if (scrollbar_isUpDn ()) 2076 if (scrollbar_isUpDn ())
2123 { 2077 {
2124 scrollBar.setIdle (); 2078 scrollBar.setIdle ();
2125 scrollbar_show (0); 2079 scrollbar_show (0);
2126#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2127 refresh_type &= ~SMOOTH_REFRESH;
2128#endif
2129 } 2080 }
2130 2081
2131#ifdef SELECTION_SCROLLING 2082#ifdef SELECTION_SCROLLING
2132 if (sel_scroll_ev.active) 2083 if (sel_scroll_ev.active)
2133 sel_scroll_ev.stop(); 2084 sel_scroll_ev.stop();
… …
2180 { 2131 {
2181 case Button1: 2132 case Button1:
2182 case Button3: 2133 case Button3:
2183 selection_make (ev.time); 2134 selection_make (ev.time);
2184 break; 2135 break;
2136
2185 case Button2: 2137 case Button2:
2186 selection_request (ev.time, ev.x, ev.y); 2138 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2139 selection_request (ev.time, ev.state & ShiftMask ? Sel_Clipboard : Sel_Primary);
2187 break; 2140 break;
2141
2188#ifdef MOUSE_WHEEL 2142#ifdef MOUSE_WHEEL
2189 case Button4: 2143 case Button4:
2190 case Button5: 2144 case Button5:
2191 { 2145 {
2192 int i; 2146 int i;
… …
2224 } 2178 }
2225 break; 2179 break;
2226#endif 2180#endif
2227 } 2181 }
2228 } 2182 }
2229#ifdef MENUBAR
2230 else if (isMenuBarWindow (ev.window))
2231 menubar_control (ev);
2232#endif
2233} 2183}
2234 2184
2235#ifdef TRANSPARENT 2185#ifdef TRANSPARENT
2236#if TINTING 2186#if TINTING
2237/* taken from aterm-0.4.2 */ 2187/* taken from aterm-0.4.2 */
… …
2823 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2773 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2824 refresh_limit++; 2774 refresh_limit++;
2825 else 2775 else
2826 { 2776 {
2827 flag = true; 2777 flag = true;
2828 scr_refresh (refresh_type); 2778 scr_refresh ();
2829 want_refresh = 1; 2779 want_refresh = 1;
2830 } 2780 }
2831 } 2781 }
2832 2782
2833 } 2783 }
… …
2851 return flag; 2801 return flag;
2852} 2802}
2853 2803
2854// read the next character 2804// read the next character
2855wchar_t 2805wchar_t
2856rxvt_term::next_char () 2806rxvt_term::next_char () NOTHROW
2857{ 2807{
2858 while (cmdbuf_ptr < cmdbuf_endp) 2808 while (cmdbuf_ptr < cmdbuf_endp)
2859 { 2809 {
2860 // assume 7-bit to be ascii ALWAYS 2810 // assume 7-bit to be ascii ALWAYS
2861 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2811 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
… …
2882 return NOCHAR; 2832 return NOCHAR;
2883} 2833}
2884 2834
2885// read the next octet 2835// read the next octet
2886uint32_t 2836uint32_t
2887rxvt_term::next_octet () 2837rxvt_term::next_octet () NOTHROW
2888{ 2838{
2889 return cmdbuf_ptr < cmdbuf_endp 2839 return cmdbuf_ptr < cmdbuf_endp
2890 ? (unsigned char)*cmdbuf_ptr++ 2840 ? (unsigned char)*cmdbuf_ptr++
2891 : NOCHAR; 2841 : NOCHAR;
2892} 2842}
2843
2844static class out_of_input out_of_input;
2893 2845
2894/* rxvt_cmd_getc () - Return next input character */ 2846/* rxvt_cmd_getc () - Return next input character */
2895/* 2847/*
2896 * Return the next input character after first passing any keyboard input 2848 * Return the next input character after first passing any keyboard input
2897 * to the command. 2849 * to the command.
2898 */ 2850 */
2899wchar_t 2851wchar_t
2900rxvt_term::cmd_getc () 2852rxvt_term::cmd_getc () THROW ((class out_of_input))
2901{ 2853{
2902 wchar_t c = next_char (); 2854 wchar_t c = next_char ();
2903 2855
2904 if (c == NOCHAR) 2856 if (c == NOCHAR)
2905 throw out_of_input; 2857 throw out_of_input;
2906 2858
2907 return c; 2859 return c;
2908} 2860}
2909 2861
2910uint32_t 2862uint32_t
2911rxvt_term::cmd_get8 () 2863rxvt_term::cmd_get8 () THROW ((class out_of_input))
2912{ 2864{
2913 uint32_t c = next_octet (); 2865 uint32_t c = next_octet ();
2914 2866
2915 if (c == NOCHAR) 2867 if (c == NOCHAR)
2916 throw out_of_input; 2868 throw out_of_input;
… …
3795 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3747 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3796 */ 3748 */
3797void 3749void
3798rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3750rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3799{ 3751{
3800 int changed = 0;
3801 int color; 3752 int color;
3802 char *buf, *name; 3753 char *buf, *name;
3803 bool query = str[0] == '?' && !str[1]; 3754 bool query = str[0] == '?' && !str[1];
3804 int saveop = op; 3755 int saveop = op;
3805 dDisp; 3756 dDisp;
… …
3921 want_full_refresh = want_refresh = 1; 3872 want_full_refresh = want_refresh = 1;
3922 break; 3873 break;
3923#endif 3874#endif
3924 3875
3925 case Rxvt_Pixmap: 3876 case Rxvt_Pixmap:
3877 {
3926 if (*str != ';') 3878 if (*str != ';')
3927 { 3879 {
3928#if XPM_BACKGROUND 3880#if XPM_BACKGROUND
3929 scale_pixmap (""); /* reset to default scaling */ 3881 scale_pixmap (""); /* reset to default scaling */
3930 set_bgPixmap (str); /* change pixmap */ 3882 set_bgPixmap (str); /* change pixmap */
3931 scr_touch (true); 3883 scr_touch (true);
3932#endif 3884#endif
3933 } 3885 }
3934 3886
3887 int changed = 0;
3888
3935 while ((str = strchr (str, ';')) != NULL) 3889 while ((str = strchr (str, ';')) != NULL)
3936 { 3890 {
3937 str++; 3891 str++;
3938#if XPM_BACKGROUND 3892#if XPM_BACKGROUND
3939 changed += scale_pixmap (str); 3893 changed += scale_pixmap (str);
3940#endif 3894#endif
3941 } 3895 }
3942 3896
3943 if (changed) 3897 if (changed)
3944 { 3898 {
3945#ifdef XPM_BACKGROUND 3899#ifdef XPM_BACKGROUND
3946 resize_pixmap (); 3900 resize_pixmap ();
3947 scr_touch (true); 3901 scr_touch (true);
3948#endif 3902#endif
3949 } 3903 }
3904 }
3950 break; 3905 break;
3951 3906
3952 case Rxvt_restoreFG: 3907 case Rxvt_restoreFG:
3953 set_window_color (Color_fg, str); 3908 set_window_color (Color_fg, str);
3954 break; 3909 break;
… …
3958 3913
3959 case XTerm_logfile: 3914 case XTerm_logfile:
3960 // TODO, when secure mode? 3915 // TODO, when secure mode?
3961 break; 3916 break;
3962 3917
3963#ifdef MENUBAR
3964 case URxvt_Menu:
3965 if (OPTION (Opt_insecure))
3966 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3967 break;
3968#endif
3969#if 0 3918#if 0
3970 case Rxvt_dumpscreen: /* no error notices */ 3919 case Rxvt_dumpscreen: /* no error notices */
3971 { 3920 {
3972 int fd; 3921 int fd;
3973 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3922 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
… …
4006 if (query) 3955 if (query)
4007 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3956 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
4008 else 3957 else
4009 { 3958 {
4010 set_locale (str); 3959 set_locale (str);
4011 pty.set_utf8_mode (enc_utf8); 3960 pty->set_utf8_mode (enc_utf8);
4012 init_xlocale (); 3961 init_xlocale ();
4013 } 3962 }
4014 break; 3963 break;
4015 3964
4016 case URxvt_view_up: 3965 case URxvt_view_up:
… …
4069 return state; 4018 return state;
4070} 4019}
4071 4020
4072/* we're not using priv _yet_ */ 4021/* we're not using priv _yet_ */
4073void 4022void
4074rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4023rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4075{ 4024{
4076 unsigned int i, j; 4025 unsigned int i, j;
4077 int state; 4026 int state;
4078 4027
4079 static const struct 4028 static const struct
… …
4090 { 5, PrivMode_rVideo }, 4039 { 5, PrivMode_rVideo },
4091 { 6, PrivMode_relOrigin }, 4040 { 6, PrivMode_relOrigin },
4092 { 7, PrivMode_Autowrap }, 4041 { 7, PrivMode_Autowrap },
4093 // 8, bi-directional support mode 4042 // 8, bi-directional support mode
4094 { 9, PrivMode_MouseX10 }, 4043 { 9, PrivMode_MouseX10 },
4095#ifdef menuBar_esc
4096 { menuBar_esc, PrivMode_menuBar },
4097#endif
4098 // 18, 19 printing-related 4044 // 18, 19 printing-related
4099 { 25, PrivMode_VisibleCursor }, 4045 { 25, PrivMode_VisibleCursor },
4100#ifdef scrollBar_esc 4046#ifdef scrollBar_esc
4101 { scrollBar_esc, PrivMode_scrollBar }, 4047 { scrollBar_esc, PrivMode_scrollBar },
4102#endif 4048#endif
… …
4197 /* case 8: - auto repeat, can't do on a per window basis */ 4143 /* case 8: - auto repeat, can't do on a per window basis */
4198 case 9: /* X10 mouse reporting */ 4144 case 9: /* X10 mouse reporting */
4199 if (state) /* orthogonal */ 4145 if (state) /* orthogonal */
4200 priv_modes &= ~PrivMode_MouseX11; 4146 priv_modes &= ~PrivMode_MouseX11;
4201 break; 4147 break;
4202#ifdef menuBar_esc
4203 case menuBar_esc:
4204#ifdef MENUBAR
4205 map_menuBar (state);
4206#endif
4207 break;
4208#endif
4209#ifdef scrollBar_esc 4148#ifdef scrollBar_esc
4210 case scrollBar_esc: 4149 case scrollBar_esc:
4211 if (scrollbar_mapping (state)) 4150 if (scrollbar_mapping (state))
4212 { 4151 {
4213 resize_all_windows (0, 0, 0); 4152 resize_all_windows (0, 0, 0);
… …
4458rxvt_term::tt_write (const char *data, unsigned int len) 4397rxvt_term::tt_write (const char *data, unsigned int len)
4459{ 4398{
4460 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4399 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4461 return; 4400 return;
4462 4401
4463 if (pty.pty < 0) 4402 if (pty->pty < 0)
4464 return; 4403 return;
4465 4404
4466 if (v_buflen == 0) 4405 if (v_buflen == 0)
4467 { 4406 {
4468 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4407 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4469 4408
4470 if ((unsigned int)written == len) 4409 if ((unsigned int)written == len)
4471 return; 4410 return;
4472 4411
4473 data += written; 4412 data += written;
… …
4482 pty_ev.set (EVENT_READ | EVENT_WRITE); 4421 pty_ev.set (EVENT_READ | EVENT_WRITE);
4483} 4422}
4484 4423
4485void rxvt_term::pty_write () 4424void rxvt_term::pty_write ()
4486{ 4425{
4487 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4426 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4488 4427
4489 if (written > 0) 4428 if (written > 0)
4490 { 4429 {
4491 v_buflen -= written; 4430 v_buflen -= written;
4492 4431

Diff Legend

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