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.253 by root, Mon Jan 9 23:30:01 2006 UTC vs.
Revision 1.273 by ayin, Thu Jan 19 23:13:19 2006 UTC

… …
147 || !IN_RANGE_EXC (y, 0, nrow)) 147 || !IN_RANGE_EXC (y, 0, nrow))
148 return; 148 return;
149 149
150 for (;;) 150 for (;;)
151 { 151 {
152 const line_t &l = ROW(y - view_start); 152 const line_t &l = ROW(y + view_start);
153 153
154 text_t t = l.t[x]; 154 text_t t = l.t[x];
155 155
156 if (t != NOCHAR || !x) 156 if (t != NOCHAR || !x)
157 { 157 {
… …
443 scr_move_to (0, 1); 443 scr_move_to (0, 1);
444 return; 444 return;
445 } 445 }
446 else if (keysym == XK_End) 446 else if (keysym == XK_End)
447 { 447 {
448 scr_move_to (1, 0); 448 scr_move_to (1, 1);
449 return; 449 return;
450 } 450 }
451 } 451 }
452#endif 452#endif
453 } 453 }
… …
464 { 464 {
465 switch (keysym) 465 switch (keysym)
466 { 466 {
467 /* normal XTerm key bindings */ 467 /* normal XTerm key bindings */
468 case XK_Insert: /* Shift+Insert = paste mouse selection */ 468 case XK_Insert: /* Shift+Insert = paste mouse selection */
469 selection_request (ev.time, 0, 0); 469 selection_request (ev.time, Sel_Primary);
470 return; 470 return;
471#if TODO 471#if TODO
472 /* rxvt extras */ 472 /* rxvt extras */
473 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 473 case XK_KP_Add: /* Shift+KP_Add = bigger font */
474 change_font (FONT_UP); 474 change_font (FONT_UP);
… …
919#endif /* DEBUG_CMD */ 919#endif /* DEBUG_CMD */
920 tt_write (kbuf, (unsigned int)len); 920 tt_write (kbuf, (unsigned int)len);
921} 921}
922/*}}} */ 922/*}}} */
923 923
924#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 924#if defined (KEYSYM_RESOURCE)
925/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
926/* attempt to `write' count to the input buffer */
927unsigned int 925unsigned int
928rxvt_term::cmd_write (const char *str, unsigned int count) 926rxvt_term::cmd_write (const char *str, unsigned int count)
929{ 927{
930 unsigned int n, s; 928 unsigned int n, s;
931 929
… …
972 970
973 if (want_refresh) 971 if (want_refresh)
974 { 972 {
975 if (SHOULD_INVOKE (HOOK_LINE_UPDATE)) 973 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
976 { 974 {
977 int row = -view_start; 975 int row = view_start;
978 int end_row = row + nrow; 976 int end_row = row + nrow;
979 977
980 while (row > -nsaved && ROW (row - 1).is_longer ()) 978 while (row > top_row && ROW (row - 1).is_longer ())
981 --row; 979 --row;
982 980
983 do 981 do
984 { 982 {
985 int start_row = row; 983 int start_row = row;
… …
987 985
988 do 986 do
989 { 987 {
990 l = &ROW (row++); 988 l = &ROW (row++);
991 989
992 if (l->f & LINE_FILTERED) 990 if (!(l->f & LINE_FILTERED))
993 row++;
994 else
995 { 991 {
996 // line not filtered, mark it as filtered 992 // line not filtered, mark it as filtered
997 l->f |= LINE_FILTERED; 993 l->f |= LINE_FILTERED;
998 while (l->is_longer ()) 994 while (l->is_longer ())
999 { 995 {
1000 l = &ROW (++row); 996 l = &ROW (row++);
1001 l->f |= LINE_FILTERED; 997 l->f |= LINE_FILTERED;
1002 } 998 }
1003 999
1004 // and filter it 1000 // and filter it
1005 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END)); 1001 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
… …
1007 break; 1003 break;
1008 } 1004 }
1009 } 1005 }
1010 while (l->is_longer () && row < end_row); 1006 while (l->is_longer () && row < end_row);
1011 } 1007 }
1012 while (++row < end_row); 1008 while (row < end_row);
1013 } 1009 }
1014 1010
1015 scr_refresh (refresh_type); 1011 scr_refresh ();
1016 scrollbar_show (1); 1012 scrollbar_show (1);
1017#ifdef USE_XIM 1013#ifdef USE_XIM
1018 IMSendSpot (); 1014 IMSendSpot ();
1019#endif 1015#endif
1020 } 1016 }
… …
1023} 1019}
1024 1020
1025void 1021void
1026rxvt_term::check_cb (check_watcher &w) 1022rxvt_term::check_cb (check_watcher &w)
1027{ 1023{
1028 SET_R (this); 1024 make_current ();
1029 SET_LOCALE (locale);
1030 1025
1031 display->flush (); 1026 display->flush ();
1032 1027
1033 if (want_refresh && !flush_ev.active) 1028 if (want_refresh && !flush_ev.active)
1034 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally 1029 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1035} 1030}
1036 1031
1037void 1032void
1038rxvt_term::flush_cb (time_watcher &w) 1033rxvt_term::flush_cb (time_watcher &w)
1039{ 1034{
1040 SET_R (this); 1035 make_current ();
1041 SET_LOCALE (locale);
1042 1036
1043 refresh_limit = 1; 1037 refresh_limit = 1;
1044 refresh_count = 0; 1038 refresh_count = 0;
1045 flush (); 1039 flush ();
1046} 1040}
… …
1074rxvt_term::cont_scroll_cb (time_watcher &w) 1068rxvt_term::cont_scroll_cb (time_watcher &w)
1075{ 1069{
1076 if ((scrollbar_isUp() || scrollbar_isDn()) && 1070 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1077 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1071 scr_page (scrollbar_isUp() ? UP : DN, 1))
1078 { 1072 {
1079 refresh_type |= SMOOTH_REFRESH;
1080 want_refresh = 1; 1073 want_refresh = 1;
1081 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1074 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1082 } 1075 }
1083} 1076}
1084#endif 1077#endif
… …
1088rxvt_term::sel_scroll_cb (time_watcher &w) 1081rxvt_term::sel_scroll_cb (time_watcher &w)
1089{ 1082{
1090 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1083 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1091 { 1084 {
1092 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1085 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1093 refresh_type |= SMOOTH_REFRESH;
1094 want_refresh = 1; 1086 want_refresh = 1;
1095 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1087 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1096 } 1088 }
1097} 1089}
1098#endif 1090#endif
… …
1103{ 1095{
1104 if (mouse_slip_wheel_speed == 0 1096 if (mouse_slip_wheel_speed == 0
1105 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1097 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1106 : scr_page (UP, mouse_slip_wheel_speed)) 1098 : scr_page (UP, mouse_slip_wheel_speed))
1107 { 1099 {
1108 if (view_start == nsaved || 1100 if (view_start == top_row || view_start == 0)
1109 view_start == 0)
1110 mouse_slip_wheel_speed = 0; 1101 mouse_slip_wheel_speed = 0;
1111 1102
1112 refresh_type |= SMOOTH_REFRESH;
1113 want_refresh = 1; 1103 want_refresh = 1;
1114 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1104 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1115 } 1105 }
1116} 1106}
1117#endif 1107#endif
… …
1147 1137
1148 memmove (cmdbuf_base, cmdbuf_ptr, n); 1138 memmove (cmdbuf_base, cmdbuf_ptr, n);
1149 cmdbuf_ptr = cmdbuf_base; 1139 cmdbuf_ptr = cmdbuf_base;
1150 cmdbuf_endp = cmdbuf_ptr + n; 1140 cmdbuf_endp = cmdbuf_ptr + n;
1151 1141
1152 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1142 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1153 1143
1154 if (r > 0) 1144 if (r > 0)
1155 { 1145 {
1156 cmdbuf_endp += r; 1146 cmdbuf_endp += r;
1157 return true; 1147 return true;
… …
1175} 1165}
1176 1166
1177void 1167void
1178rxvt_term::pty_cb (io_watcher &w, short revents) 1168rxvt_term::pty_cb (io_watcher &w, short revents)
1179{ 1169{
1180 SET_R (this); 1170 make_current ();
1181 SET_LOCALE (locale);
1182 1171
1183 if (revents & EVENT_READ) 1172 if (revents & EVENT_READ)
1184 // loop, but don't allow a single term to monopolize us 1173 // loop, but don't allow a single term to monopolize us
1185 while (pty_fill ()) 1174 while (pty_fill ())
1186 if (cmd_parse ()) 1175 if (cmd_parse ())
… …
1218} 1207}
1219 1208
1220void 1209void
1221rxvt_term::pointer_cb (time_watcher &w) 1210rxvt_term::pointer_cb (time_watcher &w)
1222{ 1211{
1223 SET_R (this); 1212 make_current ();
1224 SET_LOCALE (locale);
1225 1213
1226 pointer_blank (); 1214 pointer_blank ();
1227} 1215}
1228#endif 1216#endif
1229 1217
… …
1308 1296
1309/*{{{ process an X event */ 1297/*{{{ process an X event */
1310void 1298void
1311rxvt_term::x_cb (XEvent &ev) 1299rxvt_term::x_cb (XEvent &ev)
1312{ 1300{
1301 make_current ();
1302
1313 dDisp; 1303 dDisp;
1314 1304
1315 SET_R (this); 1305 if (ev.xany.window == vt
1316 SET_LOCALE (locale); 1306 && SHOULD_INVOKE (HOOK_X_EVENT)
1307 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1308 return;
1317 1309
1310 // for XQueryPointer
1318 Window unused_root, unused_child; 1311 Window unused_root, unused_child;
1319 int unused_root_x, unused_root_y; 1312 int unused_root_x, unused_root_y;
1320 unsigned int unused_mask; 1313 unsigned int unused_mask;
1321 1314
1322 switch (ev.type) 1315 switch (ev.type)
… …
1509 { 1502 {
1510 seen_resize = 1; 1503 seen_resize = 1;
1511 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1504 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1512 } 1505 }
1513 1506
1507 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1508
1514#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1509#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1515 if (OPTION (Opt_transparent)) 1510 if (OPTION (Opt_transparent))
1516 check_our_parents (); 1511 check_our_parents ();
1517#endif 1512#endif
1518 } 1513 }
… …
1573 1568
1574 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1569 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1575 scr_expose (ev.xexpose.x, ev.xexpose.y, 1570 scr_expose (ev.xexpose.x, ev.xexpose.y,
1576 ev.xexpose.width, ev.xexpose.height, False); 1571 ev.xexpose.width, ev.xexpose.height, False);
1577 1572
1578 scr_refresh (refresh_type); 1573 want_refresh = 1;
1579 } 1574 }
1580 else 1575 else
1581 { 1576 {
1582 XEvent unused_event; 1577 XEvent unused_event;
1583 1578
… …
1589 if (isScrollbarWindow (ev.xany.window)) 1584 if (isScrollbarWindow (ev.xany.window))
1590 { 1585 {
1591 scrollBar.setIdle (); 1586 scrollBar.setIdle ();
1592 scrollbar_show (0); 1587 scrollbar_show (0);
1593 } 1588 }
1594#ifdef MENUBAR
1595 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1596 menubar_expose ();
1597#endif
1598 1589
1599#ifdef TRANSPARENT 1590#ifdef TRANSPARENT
1600 if (am_transparent && ev.xany.window == parent[0]) 1591 if (am_transparent && ev.xany.window == parent[0])
1601 XClearWindow (disp, ev.xany.window); 1592 XClearWindow (disp, ev.xany.window);
1602#endif 1593#endif
… …
1606 case MotionNotify: 1597 case MotionNotify:
1607#ifdef POINTER_BLANK 1598#ifdef POINTER_BLANK
1608 if (hidden_pointer) 1599 if (hidden_pointer)
1609 pointer_unblank (); 1600 pointer_unblank ();
1610#endif 1601#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) 1602 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1619 break; 1603 break;
1620 1604
1621 if (ev.xany.window == vt) 1605 if (ev.xany.window == vt)
1622 { 1606 {
1607 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1623 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1608 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1624 ; // nop 1609 ; // nop
1625 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1610 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1626 { 1611 {
1627 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1612 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1628 ; 1613 ;
… …
1710 &unused_root_x, &unused_root_y, 1695 &unused_root_x, &unused_root_y,
1711 &ev.xbutton.x, &ev.xbutton.y, 1696 &ev.xbutton.x, &ev.xbutton.y,
1712 &unused_mask); 1697 &unused_mask);
1713 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1698 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1714 scrollbar_size ()); 1699 scrollbar_size ());
1715 scr_refresh (refresh_type); 1700 want_refresh = 1;
1716 refresh_limit = 0; 1701 refresh_limit = 0;
1717 scrollbar_show (1); 1702 scrollbar_show (1);
1718 } 1703 }
1719 break; 1704 break;
1720 } 1705 }
… …
1820 1805
1821#if TRANSPARENT 1806#if TRANSPARENT
1822void 1807void
1823rxvt_term::rootwin_cb (XEvent &ev) 1808rxvt_term::rootwin_cb (XEvent &ev)
1824{ 1809{
1825 SET_R (this); 1810 make_current ();
1826 SET_LOCALE (locale);
1827 1811
1828 switch (ev.type) 1812 switch (ev.type)
1829 { 1813 {
1830 case PropertyNotify: 1814 case PropertyNotify:
1831 /* 1815 /*
… …
1922#else 1906#else
1923 selection.rect = false; 1907 selection.rect = false;
1924#endif 1908#endif
1925 1909
1926 /* allow shift+left click to extend selection */ 1910 /* allow shift+left click to extend selection */
1927 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1911 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1928 { 1912 {
1929 if (MEvent.button == Button1 && clickintime) 1913 if (MEvent.button == Button1 && clickintime)
1930 selection_rotate (ev.x, ev.y); 1914 selection_rotate (ev.x, ev.y);
1931 else 1915 else
1932 selection_extend (ev.x, ev.y, 1); 1916 selection_extend (ev.x, ev.y, 1);
… …
2100 } 2084 }
2101 } 2085 }
2102 2086
2103 return; 2087 return;
2104 } 2088 }
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} 2089}
2114 2090
2115void 2091void
2116rxvt_term::button_release (XButtonEvent &ev) 2092rxvt_term::button_release (XButtonEvent &ev)
2117{ 2093{
… …
2123 2099
2124 if (scrollbar_isUpDn ()) 2100 if (scrollbar_isUpDn ())
2125 { 2101 {
2126 scrollBar.setIdle (); 2102 scrollBar.setIdle ();
2127 scrollbar_show (0); 2103 scrollbar_show (0);
2128#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2129 refresh_type &= ~SMOOTH_REFRESH;
2130#endif
2131 } 2104 }
2132 2105
2133#ifdef SELECTION_SCROLLING 2106#ifdef SELECTION_SCROLLING
2134 if (sel_scroll_ev.active) 2107 if (sel_scroll_ev.active)
2135 sel_scroll_ev.stop(); 2108 sel_scroll_ev.stop();
… …
2182 { 2155 {
2183 case Button1: 2156 case Button1:
2184 case Button3: 2157 case Button3:
2185 selection_make (ev.time); 2158 selection_make (ev.time);
2186 break; 2159 break;
2160
2187 case Button2: 2161 case Button2:
2188 selection_request (ev.time, ev.x, ev.y); 2162 if (IN_RANGE_EXC (ev.x, 0, width)
2163 && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2164 {
2165 if (ev.state & ShiftMask)
2166 selection_request (ev.time, Sel_Clipboard);
2167 else
2168 selection_request (ev.time, Sel_Primary);
2169 }
2189 break; 2170 break;
2171
2190#ifdef MOUSE_WHEEL 2172#ifdef MOUSE_WHEEL
2191 case Button4: 2173 case Button4:
2192 case Button5: 2174 case Button5:
2193 { 2175 {
2194 int i; 2176 int i;
… …
2216 slip_wheel_ev.start (); 2198 slip_wheel_ev.start ();
2217 } 2199 }
2218 else 2200 else
2219 { 2201 {
2220# endif 2202# endif
2221# ifdef JUMP_MOUSE_WHEEL
2222 scr_page (v, i); 2203 scr_page (v, i);
2223 scr_refresh (SMOOTH_REFRESH);
2224 scrollbar_show (1); 2204 scrollbar_show (1);
2225# else
2226 while (i--)
2227 {
2228 scr_page (v, 1);
2229 scr_refresh (SMOOTH_REFRESH);
2230 scrollbar_show (1);
2231 }
2232# endif
2233# ifdef MOUSE_SLIP_WHEELING 2205# ifdef MOUSE_SLIP_WHEELING
2234 } 2206 }
2235#endif 2207# endif
2236 } 2208 }
2237 break; 2209 break;
2238#endif 2210#endif
2239 } 2211 }
2240 } 2212 }
2241#ifdef MENUBAR
2242 else if (isMenuBarWindow (ev.window))
2243 menubar_control (ev);
2244#endif
2245} 2213}
2246 2214
2247#ifdef TRANSPARENT 2215#ifdef TRANSPARENT
2248#if TINTING 2216#if TINTING
2249/* taken from aterm-0.4.2 */ 2217/* taken from aterm-0.4.2 */
… …
2792 } 2760 }
2793 2761
2794 // scr_add_lines only works for nlines <= nrow - 1. 2762 // scr_add_lines only works for nlines <= nrow - 1.
2795 if (nlines >= nrow - 1) 2763 if (nlines >= nrow - 1)
2796 { 2764 {
2765 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2797 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) 2766 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2798 scr_add_lines (buf, str - buf, nlines); 2767 scr_add_lines (buf, str - buf, nlines);
2799 2768
2800 nlines = 0; 2769 nlines = 0;
2801 str = buf; 2770 str = buf;
2802 eol = str + min (ncol, UBUFSIZ); 2771 eol = str + min (ncol, UBUFSIZ);
… …
2817 2786
2818 seq_begin = cmdbuf_ptr; 2787 seq_begin = cmdbuf_ptr;
2819 ch = next_char (); 2788 ch = next_char ();
2820 } 2789 }
2821 2790
2791 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2822 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) 2792 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2823 scr_add_lines (buf, str - buf, nlines); 2793 scr_add_lines (buf, str - buf, nlines);
2824 2794
2825 /* 2795 /*
2826 * If there have been a lot of new lines, then update the screen 2796 * If there have been a lot of new lines, then update the screen
2827 * What the heck I'll cheat and only refresh less than every page-full. 2797 * What the heck I'll cheat and only refresh less than every page-full.
… …
2833 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2803 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2834 refresh_limit++; 2804 refresh_limit++;
2835 else 2805 else
2836 { 2806 {
2837 flag = true; 2807 flag = true;
2838 scr_refresh (refresh_type); 2808 scr_refresh ();
2839 flush_ev.stop (); 2809 want_refresh = 1;
2840 } 2810 }
2841 } 2811 }
2842 2812
2843 } 2813 }
2844 else 2814 else
… …
3805 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3775 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3806 */ 3776 */
3807void 3777void
3808rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3778rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3809{ 3779{
3810 int changed = 0;
3811 int color; 3780 int color;
3812 char *buf, *name; 3781 char *buf, *name;
3813 bool query = str[0] == '?' && !str[1]; 3782 bool query = str[0] == '?' && !str[1];
3814 int saveop = op; 3783 int saveop = op;
3815 dDisp; 3784 dDisp;
… …
3870 { 3839 {
3871 if ((name = strchr (buf, ';')) == NULL) 3840 if ((name = strchr (buf, ';')) == NULL)
3872 break; 3841 break;
3873 3842
3874 *name++ = '\0'; 3843 *name++ = '\0';
3875 color = atoi (buf); 3844 color = atoi (buf) + minCOLOR;
3876 3845
3877 if (color < 0 || color >= TOTAL_COLORS) 3846 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3878 break; 3847 break;
3879 3848
3880 if ((buf = strchr (name, ';')) != NULL) 3849 if ((buf = strchr (name, ';')) != NULL)
3881 *buf++ = '\0'; 3850 *buf++ = '\0';
3882 3851
3883 if (name[0] == '?' && !name[1]) 3852 if (name[0] == '?' && !name[1])
3884 { 3853 {
3885 unsigned short r, g, b; 3854 unsigned short r, g, b;
3886 pix_colors_focused[color + minCOLOR].get (display, r, g, b); 3855 pix_colors_focused[color].get (display, r, g, b);
3887 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3856 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3888 } 3857 }
3889 else 3858 else
3890 set_window_color (color + minCOLOR, name); 3859 set_window_color (color, name);
3891 } 3860 }
3892 break; 3861 break;
3893 case XTerm_Color00: 3862 case XTerm_Color00:
3894 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3863 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3895 break; 3864 break;
3896 case XTerm_Color01: 3865 case XTerm_Color01:
3897 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3866 process_color_seq (XTerm_Color01, Color_bg, str, resp);
3898 break; 3867 break;
3899#ifndef NO_CURSORCOLOR 3868#ifndef NO_CURSORCOLOR
3900 case XTerm_Color_cursor: 3869 case XTerm_Color_cursor:
3901 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3870 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3902 break; 3871 break;
… …
3906 break; 3875 break;
3907 case XTerm_Color_pointer_bg: 3876 case XTerm_Color_pointer_bg:
3908 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3877 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3909 break; 3878 break;
3910#ifndef NO_BOLD_UNDERLINE_REVERSE 3879#ifndef NO_BOLD_UNDERLINE_REVERSE
3911 case XTerm_Color_BD:
3912 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3913 break;
3914 case XTerm_Color_UL:
3915 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3916 break;
3917 case XTerm_Color_RV: 3880 case XTerm_Color_RV:
3918 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3881 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3882 break;
3883 case Rxvt_Color_BD:
3884 case URxvt_Color_BD:
3885 process_color_seq (op, Color_BD, str, resp);
3886 break;
3887 case Rxvt_Color_UL:
3888 case URxvt_Color_UL:
3889 process_color_seq (op, Color_UL, str, resp);
3919 break; 3890 break;
3920 case URxvt_Color_IT: 3891 case URxvt_Color_IT:
3921 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3892 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3922 break; 3893 break;
3923#endif 3894#endif
… …
3928 if (am_transparent) 3899 if (am_transparent)
3929 want_full_refresh = want_refresh = 1; 3900 want_full_refresh = want_refresh = 1;
3930 break; 3901 break;
3931#endif 3902#endif
3932 3903
3933 case XTerm_Pixmap: 3904 case Rxvt_Pixmap:
3905 {
3934 if (*str != ';') 3906 if (*str != ';')
3935 { 3907 {
3936#if XPM_BACKGROUND 3908#if XPM_BACKGROUND
3937 scale_pixmap (""); /* reset to default scaling */ 3909 scale_pixmap (""); /* reset to default scaling */
3938 set_bgPixmap (str); /* change pixmap */ 3910 set_bgPixmap (str); /* change pixmap */
3939#endif
3940 scr_touch (true); 3911 scr_touch (true);
3912#endif
3941 } 3913 }
3914
3915 int changed = 0;
3916
3942 while ((str = strchr (str, ';')) != NULL) 3917 while ((str = strchr (str, ';')) != NULL)
3943 { 3918 {
3944 str++; 3919 str++;
3945#if XPM_BACKGROUND 3920#if XPM_BACKGROUND
3946 changed += scale_pixmap (str); 3921 changed += scale_pixmap (str);
3947#endif 3922#endif
3948 } 3923 }
3949 3924
3950 if (changed) 3925 if (changed)
3951 { 3926 {
3952#ifdef XPM_BACKGROUND 3927#ifdef XPM_BACKGROUND
3953 resize_pixmap (); 3928 resize_pixmap ();
3954#endif
3955 scr_touch (true); 3929 scr_touch (true);
3930#endif
3956 } 3931 }
3932 }
3957 break; 3933 break;
3958 3934
3959 case XTerm_restoreFG: 3935 case Rxvt_restoreFG:
3960 set_window_color (Color_fg, str); 3936 set_window_color (Color_fg, str);
3961 break; 3937 break;
3962 case XTerm_restoreBG: 3938 case Rxvt_restoreBG:
3963 set_window_color (Color_bg, str); 3939 set_window_color (Color_bg, str);
3964 break; 3940 break;
3965 3941
3966 case XTerm_logfile: 3942 case XTerm_logfile:
3967 // TODO, when secure mode? 3943 // TODO, when secure mode?
3968 break; 3944 break;
3969 3945
3970#ifdef MENUBAR
3971 case URxvt_Menu:
3972 if (OPTION (Opt_insecure))
3973 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3974 break;
3975#endif
3976#if 0 3946#if 0
3977 case XTerm_dumpscreen: /* no error notices */ 3947 case Rxvt_dumpscreen: /* no error notices */
3978 { 3948 {
3979 int fd; 3949 int fd;
3980 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3950 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3981 { 3951 {
3982 scr_dump (fd); 3952 scr_dump (fd);
… …
4013 if (query) 3983 if (query)
4014 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3984 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
4015 else 3985 else
4016 { 3986 {
4017 set_locale (str); 3987 set_locale (str);
4018 pty.set_utf8_mode (enc_utf8); 3988 pty->set_utf8_mode (enc_utf8);
4019 init_xlocale (); 3989 init_xlocale ();
4020 } 3990 }
4021 break; 3991 break;
4022 3992
4023 case URxvt_view_up: 3993 case URxvt_view_up:
… …
4097 { 5, PrivMode_rVideo }, 4067 { 5, PrivMode_rVideo },
4098 { 6, PrivMode_relOrigin }, 4068 { 6, PrivMode_relOrigin },
4099 { 7, PrivMode_Autowrap }, 4069 { 7, PrivMode_Autowrap },
4100 // 8, bi-directional support mode 4070 // 8, bi-directional support mode
4101 { 9, PrivMode_MouseX10 }, 4071 { 9, PrivMode_MouseX10 },
4102#ifdef menuBar_esc
4103 { menuBar_esc, PrivMode_menuBar },
4104#endif
4105 // 18, 19 printing-related 4072 // 18, 19 printing-related
4106 { 25, PrivMode_VisibleCursor }, 4073 { 25, PrivMode_VisibleCursor },
4107#ifdef scrollBar_esc 4074#ifdef scrollBar_esc
4108 { scrollBar_esc, PrivMode_scrollBar }, 4075 { scrollBar_esc, PrivMode_scrollBar },
4109#endif 4076#endif
… …
4204 /* case 8: - auto repeat, can't do on a per window basis */ 4171 /* case 8: - auto repeat, can't do on a per window basis */
4205 case 9: /* X10 mouse reporting */ 4172 case 9: /* X10 mouse reporting */
4206 if (state) /* orthogonal */ 4173 if (state) /* orthogonal */
4207 priv_modes &= ~PrivMode_MouseX11; 4174 priv_modes &= ~PrivMode_MouseX11;
4208 break; 4175 break;
4209#ifdef menuBar_esc
4210 case menuBar_esc:
4211#ifdef MENUBAR
4212 map_menuBar (state);
4213#endif
4214 break;
4215#endif
4216#ifdef scrollBar_esc 4176#ifdef scrollBar_esc
4217 case scrollBar_esc: 4177 case scrollBar_esc:
4218 if (scrollbar_mapping (state)) 4178 if (scrollbar_mapping (state))
4219 { 4179 {
4220 resize_all_windows (0, 0, 0); 4180 resize_all_windows (0, 0, 0);
… …
4465rxvt_term::tt_write (const char *data, unsigned int len) 4425rxvt_term::tt_write (const char *data, unsigned int len)
4466{ 4426{
4467 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4427 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4468 return; 4428 return;
4469 4429
4470 if (pty.pty < 0) 4430 if (pty->pty < 0)
4471 return; 4431 return;
4472 4432
4473 if (v_buflen == 0) 4433 if (v_buflen == 0)
4474 { 4434 {
4475 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4435 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4476 4436
4477 if ((unsigned int)written == len) 4437 if ((unsigned int)written == len)
4478 return; 4438 return;
4479 4439
4480 data += written; 4440 data += written;
… …
4489 pty_ev.set (EVENT_READ | EVENT_WRITE); 4449 pty_ev.set (EVENT_READ | EVENT_WRITE);
4490} 4450}
4491 4451
4492void rxvt_term::pty_write () 4452void rxvt_term::pty_write ()
4493{ 4453{
4494 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4454 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4495 4455
4496 if (written > 0) 4456 if (written > 0)
4497 { 4457 {
4498 v_buflen -= written; 4458 v_buflen -= written;
4499 4459

Diff Legend

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