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.254 by root, Wed Jan 11 02:13:56 2006 UTC vs.
Revision 1.275 by root, Fri Jan 20 10:35:25 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)
… …
147 || !IN_RANGE_EXC (y, 0, nrow)) 144 || !IN_RANGE_EXC (y, 0, nrow))
148 return; 145 return;
149 146
150 for (;;) 147 for (;;)
151 { 148 {
152 const line_t &l = ROW(y - view_start); 149 const line_t &l = ROW(y + view_start);
153 150
154 text_t t = l.t[x]; 151 text_t t = l.t[x];
155 152
156 if (t != NOCHAR || !x) 153 if (t != NOCHAR || !x)
157 { 154 {
… …
443 scr_move_to (0, 1); 440 scr_move_to (0, 1);
444 return; 441 return;
445 } 442 }
446 else if (keysym == XK_End) 443 else if (keysym == XK_End)
447 { 444 {
448 scr_move_to (1, 0); 445 scr_move_to (1, 1);
449 return; 446 return;
450 } 447 }
451 } 448 }
452#endif 449#endif
453 } 450 }
… …
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
… …
972 967
973 if (want_refresh) 968 if (want_refresh)
974 { 969 {
975 if (SHOULD_INVOKE (HOOK_LINE_UPDATE)) 970 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
976 { 971 {
977 int row = -view_start; 972 int row = view_start;
978 int end_row = row + nrow; 973 int end_row = row + nrow;
979 974
980 while (row > -nsaved && ROW (row - 1).is_longer ()) 975 while (row > top_row && ROW (row - 1).is_longer ())
981 --row; 976 --row;
982 977
983 do 978 do
984 { 979 {
985 int start_row = row; 980 int start_row = row;
986 line_t *l; 981 line_t *l;
987 982
988 do 983 do
989 { 984 {
990 l = &ROW (row); 985 l = &ROW (row++);
991 986
992 if (l->f & LINE_FILTERED) 987 if (!(l->f & LINE_FILTERED))
993 row++;
994 else
995 { 988 {
996 // line not filtered, mark it as filtered 989 // line not filtered, mark it as filtered
997 l->f |= LINE_FILTERED; 990 l->f |= LINE_FILTERED;
998 while (l->is_longer ()) 991 while (l->is_longer ())
999 { 992 {
1000 l = &ROW (++row); 993 l = &ROW (row++);
1001 l->f |= LINE_FILTERED; 994 l->f |= LINE_FILTERED;
1002 } 995 }
1003 996
1004 // and filter it 997 // and filter it
1005 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END)); 998 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
… …
1007 break; 1000 break;
1008 } 1001 }
1009 } 1002 }
1010 while (l->is_longer () && row < end_row); 1003 while (l->is_longer () && row < end_row);
1011 } 1004 }
1012 while (++row < end_row); 1005 while (row < end_row);
1013 } 1006 }
1014 1007
1015 scr_refresh (refresh_type); 1008 scr_refresh ();
1016 scrollbar_show (1); 1009 scrollbar_show (1);
1017#ifdef USE_XIM 1010#ifdef USE_XIM
1018 IMSendSpot (); 1011 IMSendSpot ();
1019#endif 1012#endif
1020 } 1013 }
… …
1023} 1016}
1024 1017
1025void 1018void
1026rxvt_term::check_cb (check_watcher &w) 1019rxvt_term::check_cb (check_watcher &w)
1027{ 1020{
1028 SET_R (this); 1021 make_current ();
1029 SET_LOCALE (locale);
1030 1022
1031 display->flush (); 1023 display->flush ();
1032 1024
1033 if (want_refresh && !flush_ev.active) 1025 if (want_refresh && !flush_ev.active)
1034 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
1035} 1027}
1036 1028
1037void 1029void
1038rxvt_term::flush_cb (time_watcher &w) 1030rxvt_term::flush_cb (time_watcher &w)
1039{ 1031{
1040 SET_R (this); 1032 make_current ();
1041 SET_LOCALE (locale);
1042 1033
1043 refresh_limit = 1; 1034 refresh_limit = 1;
1044 refresh_count = 0; 1035 refresh_count = 0;
1045 flush (); 1036 flush ();
1046} 1037}
… …
1050rxvt_term::cursor_blink_cb (time_watcher &w) 1041rxvt_term::cursor_blink_cb (time_watcher &w)
1051{ 1042{
1052 hidden_cursor = !hidden_cursor; 1043 hidden_cursor = !hidden_cursor;
1053 want_refresh = 1; 1044 want_refresh = 1;
1054 1045
1055 w.start (w.at + BLINK_INTERVAL); 1046 w.start (w.at + CURSOR_BLINK_INTERVAL);
1056} 1047}
1057#endif 1048#endif
1058 1049
1059#ifdef TEXT_BLINK 1050#ifdef TEXT_BLINK
1060void 1051void
… …
1074rxvt_term::cont_scroll_cb (time_watcher &w) 1065rxvt_term::cont_scroll_cb (time_watcher &w)
1075{ 1066{
1076 if ((scrollbar_isUp() || scrollbar_isDn()) && 1067 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1077 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1068 scr_page (scrollbar_isUp() ? UP : DN, 1))
1078 { 1069 {
1079 refresh_type |= SMOOTH_REFRESH;
1080 want_refresh = 1; 1070 want_refresh = 1;
1081 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1071 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1082 } 1072 }
1083} 1073}
1084#endif 1074#endif
… …
1088rxvt_term::sel_scroll_cb (time_watcher &w) 1078rxvt_term::sel_scroll_cb (time_watcher &w)
1089{ 1079{
1090 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1080 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1091 { 1081 {
1092 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1082 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1093 refresh_type |= SMOOTH_REFRESH;
1094 want_refresh = 1; 1083 want_refresh = 1;
1095 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1084 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1096 } 1085 }
1097} 1086}
1098#endif 1087#endif
… …
1103{ 1092{
1104 if (mouse_slip_wheel_speed == 0 1093 if (mouse_slip_wheel_speed == 0
1105 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1094 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1106 : scr_page (UP, mouse_slip_wheel_speed)) 1095 : scr_page (UP, mouse_slip_wheel_speed))
1107 { 1096 {
1108 if (view_start == nsaved || 1097 if (view_start == top_row || view_start == 0)
1109 view_start == 0)
1110 mouse_slip_wheel_speed = 0; 1098 mouse_slip_wheel_speed = 0;
1111 1099
1112 refresh_type |= SMOOTH_REFRESH;
1113 want_refresh = 1; 1100 want_refresh = 1;
1114 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1101 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1115 } 1102 }
1116} 1103}
1117#endif 1104#endif
… …
1147 1134
1148 memmove (cmdbuf_base, cmdbuf_ptr, n); 1135 memmove (cmdbuf_base, cmdbuf_ptr, n);
1149 cmdbuf_ptr = cmdbuf_base; 1136 cmdbuf_ptr = cmdbuf_base;
1150 cmdbuf_endp = cmdbuf_ptr + n; 1137 cmdbuf_endp = cmdbuf_ptr + n;
1151 1138
1152 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1139 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1153 1140
1154 if (r > 0) 1141 if (r > 0)
1155 { 1142 {
1156 cmdbuf_endp += r; 1143 cmdbuf_endp += r;
1157 return true; 1144 return true;
… …
1175} 1162}
1176 1163
1177void 1164void
1178rxvt_term::pty_cb (io_watcher &w, short revents) 1165rxvt_term::pty_cb (io_watcher &w, short revents)
1179{ 1166{
1180 SET_R (this); 1167 make_current ();
1181 SET_LOCALE (locale);
1182 1168
1183 if (revents & EVENT_READ) 1169 if (revents & EVENT_READ)
1184 // loop, but don't allow a single term to monopolize us 1170 // loop, but don't allow a single term to monopolize us
1185 while (pty_fill ()) 1171 while (pty_fill ())
1186 if (cmd_parse ()) 1172 if (cmd_parse ())
… …
1218} 1204}
1219 1205
1220void 1206void
1221rxvt_term::pointer_cb (time_watcher &w) 1207rxvt_term::pointer_cb (time_watcher &w)
1222{ 1208{
1223 SET_R (this); 1209 make_current ();
1224 SET_LOCALE (locale);
1225 1210
1226 pointer_blank (); 1211 pointer_blank ();
1227} 1212}
1228#endif 1213#endif
1229 1214
… …
1308 1293
1309/*{{{ process an X event */ 1294/*{{{ process an X event */
1310void 1295void
1311rxvt_term::x_cb (XEvent &ev) 1296rxvt_term::x_cb (XEvent &ev)
1312{ 1297{
1298 make_current ();
1299
1313 dDisp; 1300 dDisp;
1314 1301
1315 SET_R (this); 1302 if (ev.xany.window == vt
1316 SET_LOCALE (locale); 1303 && SHOULD_INVOKE (HOOK_X_EVENT)
1304 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1305 return;
1317 1306
1307 // for XQueryPointer
1318 Window unused_root, unused_child; 1308 Window unused_root, unused_child;
1319 int unused_root_x, unused_root_y; 1309 int unused_root_x, unused_root_y;
1320 unsigned int unused_mask; 1310 unsigned int unused_mask;
1321 1311
1322 switch (ev.type) 1312 switch (ev.type)
… …
1509 { 1499 {
1510 seen_resize = 1; 1500 seen_resize = 1;
1511 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1501 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1512 } 1502 }
1513 1503
1504 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1505
1514#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1506#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1515 if (OPTION (Opt_transparent)) 1507 if (OPTION (Opt_transparent))
1516 check_our_parents (); 1508 check_our_parents ();
1517#endif 1509#endif
1518 } 1510 }
… …
1589 if (isScrollbarWindow (ev.xany.window)) 1581 if (isScrollbarWindow (ev.xany.window))
1590 { 1582 {
1591 scrollBar.setIdle (); 1583 scrollBar.setIdle ();
1592 scrollbar_show (0); 1584 scrollbar_show (0);
1593 } 1585 }
1594#ifdef MENUBAR
1595 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1596 menubar_expose ();
1597#endif
1598 1586
1599#ifdef TRANSPARENT 1587#ifdef TRANSPARENT
1600 if (am_transparent && ev.xany.window == parent[0]) 1588 if (am_transparent && ev.xany.window == parent[0])
1601 XClearWindow (disp, ev.xany.window); 1589 XClearWindow (disp, ev.xany.window);
1602#endif 1590#endif
… …
1606 case MotionNotify: 1594 case MotionNotify:
1607#ifdef POINTER_BLANK 1595#ifdef POINTER_BLANK
1608 if (hidden_pointer) 1596 if (hidden_pointer)
1609 pointer_unblank (); 1597 pointer_unblank ();
1610#endif 1598#endif
1611#if MENUBAR
1612 if (isMenuBarWindow (ev.xany.window))
1613 {
1614 menubar_control (ev.xbutton);
1615 break;
1616 }
1617#endif
1618 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1599 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1619 break; 1600 break;
1620 1601
1621 if (ev.xany.window == vt) 1602 if (ev.xany.window == vt)
1622 { 1603 {
1604 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1623 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1605 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1624 ; // nop 1606 ; // nop
1625 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1607 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1626 { 1608 {
1627 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1609 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1628 ; 1610 ;
… …
1728 { 1710 {
1729 hidden_cursor = 0; 1711 hidden_cursor = 0;
1730 want_refresh = 1; 1712 want_refresh = 1;
1731 } 1713 }
1732 1714
1733 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1715 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1734 } 1716 }
1735#endif 1717#endif
1736 1718
1737#if defined(POINTER_BLANK) 1719#if defined(POINTER_BLANK)
1738 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1720 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
… …
1766 XSetICFocus (Input_Context); 1748 XSetICFocus (Input_Context);
1767 } 1749 }
1768#endif 1750#endif
1769#if CURSOR_BLINK 1751#if CURSOR_BLINK
1770 if (OPTION (Opt_cursorBlink)) 1752 if (OPTION (Opt_cursorBlink))
1771 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1753 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1772#endif 1754#endif
1773#if OFF_FOCUS_FADING 1755#if OFF_FOCUS_FADING
1774 if (rs[Rs_fade]) 1756 if (rs[Rs_fade])
1775 { 1757 {
1776 pix_colors = pix_colors_focused; 1758 pix_colors = pix_colors_focused;
… …
1820 1802
1821#if TRANSPARENT 1803#if TRANSPARENT
1822void 1804void
1823rxvt_term::rootwin_cb (XEvent &ev) 1805rxvt_term::rootwin_cb (XEvent &ev)
1824{ 1806{
1825 SET_R (this); 1807 make_current ();
1826 SET_LOCALE (locale);
1827 1808
1828 switch (ev.type) 1809 switch (ev.type)
1829 { 1810 {
1830 case PropertyNotify: 1811 case PropertyNotify:
1831 /* 1812 /*
… …
1922#else 1903#else
1923 selection.rect = false; 1904 selection.rect = false;
1924#endif 1905#endif
1925 1906
1926 /* allow shift+left click to extend selection */ 1907 /* allow shift+left click to extend selection */
1927 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1908 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1928 { 1909 {
1929 if (MEvent.button == Button1 && clickintime) 1910 if (MEvent.button == Button1 && clickintime)
1930 selection_rotate (ev.x, ev.y); 1911 selection_rotate (ev.x, ev.y);
1931 else 1912 else
1932 selection_extend (ev.x, ev.y, 1); 1913 selection_extend (ev.x, ev.y, 1);
… …
2100 } 2081 }
2101 } 2082 }
2102 2083
2103 return; 2084 return;
2104 } 2085 }
2105
2106#if MENUBAR
2107 /*
2108 * Menubar window processing of button press
2109 */
2110 if (isMenuBarWindow (ev.window))
2111 menubar_control (ev);
2112#endif
2113} 2086}
2114 2087
2115void 2088void
2116rxvt_term::button_release (XButtonEvent &ev) 2089rxvt_term::button_release (XButtonEvent &ev)
2117{ 2090{
… …
2123 2096
2124 if (scrollbar_isUpDn ()) 2097 if (scrollbar_isUpDn ())
2125 { 2098 {
2126 scrollBar.setIdle (); 2099 scrollBar.setIdle ();
2127 scrollbar_show (0); 2100 scrollbar_show (0);
2128#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2129 refresh_type &= ~SMOOTH_REFRESH;
2130#endif
2131 } 2101 }
2132 2102
2133#ifdef SELECTION_SCROLLING 2103#ifdef SELECTION_SCROLLING
2134 if (sel_scroll_ev.active) 2104 if (sel_scroll_ev.active)
2135 sel_scroll_ev.stop(); 2105 sel_scroll_ev.stop();
… …
2182 { 2152 {
2183 case Button1: 2153 case Button1:
2184 case Button3: 2154 case Button3:
2185 selection_make (ev.time); 2155 selection_make (ev.time);
2186 break; 2156 break;
2157
2187 case Button2: 2158 case Button2:
2188 selection_request (ev.time, ev.x, ev.y); 2159 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2160 selection_request (ev.time, ev.state & ShiftMask ? Sel_Clipboard : Sel_Primary);
2189 break; 2161 break;
2162
2190#ifdef MOUSE_WHEEL 2163#ifdef MOUSE_WHEEL
2191 case Button4: 2164 case Button4:
2192 case Button5: 2165 case Button5:
2193 { 2166 {
2194 int i; 2167 int i;
… …
2226 } 2199 }
2227 break; 2200 break;
2228#endif 2201#endif
2229 } 2202 }
2230 } 2203 }
2231#ifdef MENUBAR
2232 else if (isMenuBarWindow (ev.window))
2233 menubar_control (ev);
2234#endif
2235} 2204}
2236 2205
2237#ifdef TRANSPARENT 2206#ifdef TRANSPARENT
2238#if TINTING 2207#if TINTING
2239/* taken from aterm-0.4.2 */ 2208/* taken from aterm-0.4.2 */
… …
2782 } 2751 }
2783 2752
2784 // scr_add_lines only works for nlines <= nrow - 1. 2753 // scr_add_lines only works for nlines <= nrow - 1.
2785 if (nlines >= nrow - 1) 2754 if (nlines >= nrow - 1)
2786 { 2755 {
2756 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2787 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) 2757 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2788 scr_add_lines (buf, str - buf, nlines); 2758 scr_add_lines (buf, str - buf, nlines);
2789 2759
2790 nlines = 0; 2760 nlines = 0;
2791 str = buf; 2761 str = buf;
2792 eol = str + min (ncol, UBUFSIZ); 2762 eol = str + min (ncol, UBUFSIZ);
… …
2807 2777
2808 seq_begin = cmdbuf_ptr; 2778 seq_begin = cmdbuf_ptr;
2809 ch = next_char (); 2779 ch = next_char ();
2810 } 2780 }
2811 2781
2782 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2812 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) 2783 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2813 scr_add_lines (buf, str - buf, nlines); 2784 scr_add_lines (buf, str - buf, nlines);
2814 2785
2815 /* 2786 /*
2816 * If there have been a lot of new lines, then update the screen 2787 * If there have been a lot of new lines, then update the screen
2817 * What the heck I'll cheat and only refresh less than every page-full. 2788 * What the heck I'll cheat and only refresh less than every page-full.
… …
2823 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2794 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2824 refresh_limit++; 2795 refresh_limit++;
2825 else 2796 else
2826 { 2797 {
2827 flag = true; 2798 flag = true;
2828 scr_refresh (refresh_type); 2799 scr_refresh ();
2829 want_refresh = 1; 2800 want_refresh = 1;
2830 } 2801 }
2831 } 2802 }
2832 2803
2833 } 2804 }
… …
2851 return flag; 2822 return flag;
2852} 2823}
2853 2824
2854// read the next character 2825// read the next character
2855wchar_t 2826wchar_t
2856rxvt_term::next_char () 2827rxvt_term::next_char () NOTHROW
2857{ 2828{
2858 while (cmdbuf_ptr < cmdbuf_endp) 2829 while (cmdbuf_ptr < cmdbuf_endp)
2859 { 2830 {
2860 // assume 7-bit to be ascii ALWAYS 2831 // assume 7-bit to be ascii ALWAYS
2861 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2832 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
… …
2882 return NOCHAR; 2853 return NOCHAR;
2883} 2854}
2884 2855
2885// read the next octet 2856// read the next octet
2886uint32_t 2857uint32_t
2887rxvt_term::next_octet () 2858rxvt_term::next_octet () NOTHROW
2888{ 2859{
2889 return cmdbuf_ptr < cmdbuf_endp 2860 return cmdbuf_ptr < cmdbuf_endp
2890 ? (unsigned char)*cmdbuf_ptr++ 2861 ? (unsigned char)*cmdbuf_ptr++
2891 : NOCHAR; 2862 : NOCHAR;
2892} 2863}
2864
2865static class out_of_input out_of_input;
2893 2866
2894/* rxvt_cmd_getc () - Return next input character */ 2867/* rxvt_cmd_getc () - Return next input character */
2895/* 2868/*
2896 * Return the next input character after first passing any keyboard input 2869 * Return the next input character after first passing any keyboard input
2897 * to the command. 2870 * to the command.
2898 */ 2871 */
2899wchar_t 2872wchar_t
2900rxvt_term::cmd_getc () 2873rxvt_term::cmd_getc () THROW ((class out_of_input))
2901{ 2874{
2902 wchar_t c = next_char (); 2875 wchar_t c = next_char ();
2903 2876
2904 if (c == NOCHAR) 2877 if (c == NOCHAR)
2905 throw out_of_input; 2878 throw out_of_input;
2906 2879
2907 return c; 2880 return c;
2908} 2881}
2909 2882
2910uint32_t 2883uint32_t
2911rxvt_term::cmd_get8 () 2884rxvt_term::cmd_get8 () THROW ((class out_of_input))
2912{ 2885{
2913 uint32_t c = next_octet (); 2886 uint32_t c = next_octet ();
2914 2887
2915 if (c == NOCHAR) 2888 if (c == NOCHAR)
2916 throw out_of_input; 2889 throw out_of_input;
… …
3795 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3768 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3796 */ 3769 */
3797void 3770void
3798rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3771rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3799{ 3772{
3800 int changed = 0;
3801 int color; 3773 int color;
3802 char *buf, *name; 3774 char *buf, *name;
3803 bool query = str[0] == '?' && !str[1]; 3775 bool query = str[0] == '?' && !str[1];
3804 int saveop = op; 3776 int saveop = op;
3805 dDisp; 3777 dDisp;
… …
3860 { 3832 {
3861 if ((name = strchr (buf, ';')) == NULL) 3833 if ((name = strchr (buf, ';')) == NULL)
3862 break; 3834 break;
3863 3835
3864 *name++ = '\0'; 3836 *name++ = '\0';
3865 color = atoi (buf); 3837 color = atoi (buf) + minCOLOR;
3866 3838
3867 if (color < 0 || color >= TOTAL_COLORS) 3839 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3868 break; 3840 break;
3869 3841
3870 if ((buf = strchr (name, ';')) != NULL) 3842 if ((buf = strchr (name, ';')) != NULL)
3871 *buf++ = '\0'; 3843 *buf++ = '\0';
3872 3844
3873 if (name[0] == '?' && !name[1]) 3845 if (name[0] == '?' && !name[1])
3874 { 3846 {
3875 unsigned short r, g, b; 3847 unsigned short r, g, b;
3876 pix_colors_focused[color + minCOLOR].get (display, r, g, b); 3848 pix_colors_focused[color].get (display, r, g, b);
3877 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3849 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3878 } 3850 }
3879 else 3851 else
3880 set_window_color (color + minCOLOR, name); 3852 set_window_color (color, name);
3881 } 3853 }
3882 break; 3854 break;
3883 case XTerm_Color00: 3855 case XTerm_Color00:
3884 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3856 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3885 break; 3857 break;
3886 case XTerm_Color01: 3858 case XTerm_Color01:
3887 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3859 process_color_seq (XTerm_Color01, Color_bg, str, resp);
3888 break; 3860 break;
3889#ifndef NO_CURSORCOLOR 3861#ifndef NO_CURSORCOLOR
3890 case XTerm_Color_cursor: 3862 case XTerm_Color_cursor:
3891 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3863 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3892 break; 3864 break;
… …
3896 break; 3868 break;
3897 case XTerm_Color_pointer_bg: 3869 case XTerm_Color_pointer_bg:
3898 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3870 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3899 break; 3871 break;
3900#ifndef NO_BOLD_UNDERLINE_REVERSE 3872#ifndef NO_BOLD_UNDERLINE_REVERSE
3901 case XTerm_Color_BD:
3902 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3903 break;
3904 case XTerm_Color_UL:
3905 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3906 break;
3907 case XTerm_Color_RV: 3873 case XTerm_Color_RV:
3908 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3874 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3875 break;
3876 case Rxvt_Color_BD:
3877 case URxvt_Color_BD:
3878 process_color_seq (op, Color_BD, str, resp);
3879 break;
3880 case Rxvt_Color_UL:
3881 case URxvt_Color_UL:
3882 process_color_seq (op, Color_UL, str, resp);
3909 break; 3883 break;
3910 case URxvt_Color_IT: 3884 case URxvt_Color_IT:
3911 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3885 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3912 break; 3886 break;
3913#endif 3887#endif
… …
3918 if (am_transparent) 3892 if (am_transparent)
3919 want_full_refresh = want_refresh = 1; 3893 want_full_refresh = want_refresh = 1;
3920 break; 3894 break;
3921#endif 3895#endif
3922 3896
3923 case XTerm_Pixmap: 3897 case Rxvt_Pixmap:
3898 {
3924 if (*str != ';') 3899 if (*str != ';')
3925 { 3900 {
3926#if XPM_BACKGROUND 3901#if XPM_BACKGROUND
3927 scale_pixmap (""); /* reset to default scaling */ 3902 scale_pixmap (""); /* reset to default scaling */
3928 set_bgPixmap (str); /* change pixmap */ 3903 set_bgPixmap (str); /* change pixmap */
3929#endif
3930 scr_touch (true); 3904 scr_touch (true);
3905#endif
3931 } 3906 }
3907
3908 int changed = 0;
3909
3932 while ((str = strchr (str, ';')) != NULL) 3910 while ((str = strchr (str, ';')) != NULL)
3933 { 3911 {
3934 str++; 3912 str++;
3935#if XPM_BACKGROUND 3913#if XPM_BACKGROUND
3936 changed += scale_pixmap (str); 3914 changed += scale_pixmap (str);
3937#endif 3915#endif
3938 } 3916 }
3939 3917
3940 if (changed) 3918 if (changed)
3941 { 3919 {
3942#ifdef XPM_BACKGROUND 3920#ifdef XPM_BACKGROUND
3943 resize_pixmap (); 3921 resize_pixmap ();
3944#endif
3945 scr_touch (true); 3922 scr_touch (true);
3923#endif
3946 } 3924 }
3925 }
3947 break; 3926 break;
3948 3927
3949 case XTerm_restoreFG: 3928 case Rxvt_restoreFG:
3950 set_window_color (Color_fg, str); 3929 set_window_color (Color_fg, str);
3951 break; 3930 break;
3952 case XTerm_restoreBG: 3931 case Rxvt_restoreBG:
3953 set_window_color (Color_bg, str); 3932 set_window_color (Color_bg, str);
3954 break; 3933 break;
3955 3934
3956 case XTerm_logfile: 3935 case XTerm_logfile:
3957 // TODO, when secure mode? 3936 // TODO, when secure mode?
3958 break; 3937 break;
3959 3938
3960#ifdef MENUBAR
3961 case URxvt_Menu:
3962 if (OPTION (Opt_insecure))
3963 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3964 break;
3965#endif
3966#if 0 3939#if 0
3967 case XTerm_dumpscreen: /* no error notices */ 3940 case Rxvt_dumpscreen: /* no error notices */
3968 { 3941 {
3969 int fd; 3942 int fd;
3970 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3943 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3971 { 3944 {
3972 scr_dump (fd); 3945 scr_dump (fd);
… …
4003 if (query) 3976 if (query)
4004 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3977 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
4005 else 3978 else
4006 { 3979 {
4007 set_locale (str); 3980 set_locale (str);
4008 pty.set_utf8_mode (enc_utf8); 3981 pty->set_utf8_mode (enc_utf8);
4009 init_xlocale (); 3982 init_xlocale ();
4010 } 3983 }
4011 break; 3984 break;
4012 3985
4013 case URxvt_view_up: 3986 case URxvt_view_up:
… …
4066 return state; 4039 return state;
4067} 4040}
4068 4041
4069/* we're not using priv _yet_ */ 4042/* we're not using priv _yet_ */
4070void 4043void
4071rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4044rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4072{ 4045{
4073 unsigned int i, j; 4046 unsigned int i, j;
4074 int state; 4047 int state;
4075 4048
4076 static const struct 4049 static const struct
… …
4087 { 5, PrivMode_rVideo }, 4060 { 5, PrivMode_rVideo },
4088 { 6, PrivMode_relOrigin }, 4061 { 6, PrivMode_relOrigin },
4089 { 7, PrivMode_Autowrap }, 4062 { 7, PrivMode_Autowrap },
4090 // 8, bi-directional support mode 4063 // 8, bi-directional support mode
4091 { 9, PrivMode_MouseX10 }, 4064 { 9, PrivMode_MouseX10 },
4092#ifdef menuBar_esc
4093 { menuBar_esc, PrivMode_menuBar },
4094#endif
4095 // 18, 19 printing-related 4065 // 18, 19 printing-related
4096 { 25, PrivMode_VisibleCursor }, 4066 { 25, PrivMode_VisibleCursor },
4097#ifdef scrollBar_esc 4067#ifdef scrollBar_esc
4098 { scrollBar_esc, PrivMode_scrollBar }, 4068 { scrollBar_esc, PrivMode_scrollBar },
4099#endif 4069#endif
… …
4194 /* case 8: - auto repeat, can't do on a per window basis */ 4164 /* case 8: - auto repeat, can't do on a per window basis */
4195 case 9: /* X10 mouse reporting */ 4165 case 9: /* X10 mouse reporting */
4196 if (state) /* orthogonal */ 4166 if (state) /* orthogonal */
4197 priv_modes &= ~PrivMode_MouseX11; 4167 priv_modes &= ~PrivMode_MouseX11;
4198 break; 4168 break;
4199#ifdef menuBar_esc
4200 case menuBar_esc:
4201#ifdef MENUBAR
4202 map_menuBar (state);
4203#endif
4204 break;
4205#endif
4206#ifdef scrollBar_esc 4169#ifdef scrollBar_esc
4207 case scrollBar_esc: 4170 case scrollBar_esc:
4208 if (scrollbar_mapping (state)) 4171 if (scrollbar_mapping (state))
4209 { 4172 {
4210 resize_all_windows (0, 0, 0); 4173 resize_all_windows (0, 0, 0);
… …
4455rxvt_term::tt_write (const char *data, unsigned int len) 4418rxvt_term::tt_write (const char *data, unsigned int len)
4456{ 4419{
4457 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4420 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4458 return; 4421 return;
4459 4422
4460 if (pty.pty < 0) 4423 if (pty->pty < 0)
4461 return; 4424 return;
4462 4425
4463 if (v_buflen == 0) 4426 if (v_buflen == 0)
4464 { 4427 {
4465 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4428 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4466 4429
4467 if ((unsigned int)written == len) 4430 if ((unsigned int)written == len)
4468 return; 4431 return;
4469 4432
4470 data += written; 4433 data += written;
… …
4479 pty_ev.set (EVENT_READ | EVENT_WRITE); 4442 pty_ev.set (EVENT_READ | EVENT_WRITE);
4480} 4443}
4481 4444
4482void rxvt_term::pty_write () 4445void rxvt_term::pty_write ()
4483{ 4446{
4484 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4447 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4485 4448
4486 if (written > 0) 4449 if (written > 0)
4487 { 4450 {
4488 v_buflen -= written; 4451 v_buflen -= written;
4489 4452

Diff Legend

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