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.250 by root, Sun Jan 8 06:35:23 2006 UTC vs.
Revision 1.268 by root, Tue Jan 17 05:47:42 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 }
… …
867#endif 867#endif
868 /* nil */ ; 868 /* nil */ ;
869 } 869 }
870 } 870 }
871 871
872 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_STR_LEN, kbuf, len, DT_END))) 872 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
873 return; 873 return;
874 874
875 if (len <= 0) 875 if (len <= 0)
876 return; /* not mapped */ 876 return; /* not mapped */
877 877
… …
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;
… …
1005 break; 1003 break;
1006 } 1004 }
1007 } 1005 }
1008 while (l->is_longer () && row < end_row); 1006 while (l->is_longer () && row < end_row);
1009 } 1007 }
1010 while (++row < end_row); 1008 while (row < end_row);
1011 } 1009 }
1012 1010
1013 scr_refresh (refresh_type); 1011 scr_refresh ();
1014 scrollbar_show (1); 1012 scrollbar_show (1);
1015#ifdef USE_XIM 1013#ifdef USE_XIM
1016 IMSendSpot (); 1014 IMSendSpot ();
1017#endif 1015#endif
1018 } 1016 }
… …
1021} 1019}
1022 1020
1023void 1021void
1024rxvt_term::check_cb (check_watcher &w) 1022rxvt_term::check_cb (check_watcher &w)
1025{ 1023{
1026 SET_R (this); 1024 make_current ();
1027 SET_LOCALE (locale);
1028 1025
1029 display->flush (); 1026 display->flush ();
1030 1027
1031 if (want_refresh && !flush_ev.active) 1028 if (want_refresh && !flush_ev.active)
1032 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
1033} 1030}
1034 1031
1035void 1032void
1036rxvt_term::flush_cb (time_watcher &w) 1033rxvt_term::flush_cb (time_watcher &w)
1037{ 1034{
1038 SET_R (this); 1035 make_current ();
1039 SET_LOCALE (locale);
1040 1036
1041 refresh_limit = 1; 1037 refresh_limit = 1;
1042 refresh_count = 0; 1038 refresh_count = 0;
1043 flush (); 1039 flush ();
1044} 1040}
… …
1072rxvt_term::cont_scroll_cb (time_watcher &w) 1068rxvt_term::cont_scroll_cb (time_watcher &w)
1073{ 1069{
1074 if ((scrollbar_isUp() || scrollbar_isDn()) && 1070 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1075 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1071 scr_page (scrollbar_isUp() ? UP : DN, 1))
1076 { 1072 {
1077 refresh_type |= SMOOTH_REFRESH;
1078 want_refresh = 1; 1073 want_refresh = 1;
1079 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1074 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1080 } 1075 }
1081} 1076}
1082#endif 1077#endif
… …
1086rxvt_term::sel_scroll_cb (time_watcher &w) 1081rxvt_term::sel_scroll_cb (time_watcher &w)
1087{ 1082{
1088 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1083 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1089 { 1084 {
1090 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1085 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1091 refresh_type |= SMOOTH_REFRESH;
1092 want_refresh = 1; 1086 want_refresh = 1;
1093 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1087 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1094 } 1088 }
1095} 1089}
1096#endif 1090#endif
… …
1101{ 1095{
1102 if (mouse_slip_wheel_speed == 0 1096 if (mouse_slip_wheel_speed == 0
1103 || 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)
1104 : scr_page (UP, mouse_slip_wheel_speed)) 1098 : scr_page (UP, mouse_slip_wheel_speed))
1105 { 1099 {
1106 if (view_start == nsaved || 1100 if (view_start == top_row || view_start == 0)
1107 view_start == 0)
1108 mouse_slip_wheel_speed = 0; 1101 mouse_slip_wheel_speed = 0;
1109 1102
1110 refresh_type |= SMOOTH_REFRESH;
1111 want_refresh = 1; 1103 want_refresh = 1;
1112 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1104 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1113 } 1105 }
1114} 1106}
1115#endif 1107#endif
… …
1173} 1165}
1174 1166
1175void 1167void
1176rxvt_term::pty_cb (io_watcher &w, short revents) 1168rxvt_term::pty_cb (io_watcher &w, short revents)
1177{ 1169{
1178 SET_R (this); 1170 make_current ();
1179 SET_LOCALE (locale);
1180 1171
1181 if (revents & EVENT_READ) 1172 if (revents & EVENT_READ)
1182 // loop, but don't allow a single term to monopolize us 1173 // loop, but don't allow a single term to monopolize us
1183 while (pty_fill ()) 1174 while (pty_fill ())
1184 if (cmd_parse ()) 1175 if (cmd_parse ())
… …
1216} 1207}
1217 1208
1218void 1209void
1219rxvt_term::pointer_cb (time_watcher &w) 1210rxvt_term::pointer_cb (time_watcher &w)
1220{ 1211{
1221 SET_R (this); 1212 make_current ();
1222 SET_LOCALE (locale);
1223 1213
1224 pointer_blank (); 1214 pointer_blank ();
1225} 1215}
1226#endif 1216#endif
1227 1217
… …
1306 1296
1307/*{{{ process an X event */ 1297/*{{{ process an X event */
1308void 1298void
1309rxvt_term::x_cb (XEvent &ev) 1299rxvt_term::x_cb (XEvent &ev)
1310{ 1300{
1301 make_current ();
1302
1311 dDisp; 1303 dDisp;
1312 1304
1313 SET_R (this); 1305 if (ev.xany.window == vt
1314 SET_LOCALE (locale); 1306 && SHOULD_INVOKE (HOOK_X_EVENT)
1307 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1308 return;
1315 1309
1310 // for XQueryPointer
1316 Window unused_root, unused_child; 1311 Window unused_root, unused_child;
1317 int unused_root_x, unused_root_y; 1312 int unused_root_x, unused_root_y;
1318 unsigned int unused_mask; 1313 unsigned int unused_mask;
1319 1314
1320 switch (ev.type) 1315 switch (ev.type)
… …
1327 1322
1328 break; 1323 break;
1329 1324
1330 case KeyRelease: 1325 case KeyRelease:
1331 { 1326 {
1332#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 1327#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1333 KeySym ks; 1328 KeySym keysym;
1334 1329
1335 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ 1330 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1336#endif 1331#endif
1337 1332
1338#if ENABLE_FRILLS || ISO_14755 1333#if ENABLE_FRILLS || ISO_14755
1339 // ISO 14755 support 1334 // ISO 14755 support
1340 if (iso14755buf) 1335 if (iso14755buf)
… …
1345# endif 1340# endif
1346# if ISO_14755 1341# if ISO_14755
1347 // iso14755 part 5.2 handling: release time 1342 // iso14755 part 5.2 handling: release time
1348 // first: controls 1343 // first: controls
1349 if ((ev.xkey.state & ControlMask) 1344 if ((ev.xkey.state & ControlMask)
1350 && ((ks >= 0x40 && ks <= 0x5f) 1345 && ((keysym >= 0x40 && keysym <= 0x5f)
1351 || (ks >= 0x61 && ks <= 0x7f))) 1346 || (keysym >= 0x61 && keysym <= 0x7f)))
1352 { 1347 {
1353 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); 1348 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1354 commit_iso14755 (); 1349 commit_iso14755 ();
1355 goto skip_switch; 1350 goto skip_switch;
1356 } 1351 }
1357 1352
1358 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1353 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1359 if (i[0] == ks) 1354 if (i[0] == keysym)
1360 { 1355 {
1361 iso14755buf = ISO_14755_51 | i[1]; 1356 iso14755buf = ISO_14755_51 | i[1];
1362 commit_iso14755 (); 1357 commit_iso14755 ();
1363 goto skip_switch; 1358 goto skip_switch;
1364 } 1359 }
… …
1388 iso14755buf = 0; 1383 iso14755buf = 0;
1389 } 1384 }
1390#endif 1385#endif
1391 1386
1392 if (ev.xany.window == vt 1387 if (ev.xany.window == vt
1393 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_END))) 1388 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1394 break; 1389 break;
1395 1390
1396#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1391#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1397 if (!(ev.xkey.state & ControlMask)) 1392 if (!(ev.xkey.state & ControlMask))
1398 slip_wheel_ev.stop (); 1393 slip_wheel_ev.stop ();
1399 else if (ks == XK_Control_L || ks == XK_Control_R) 1394 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1400 mouse_slip_wheel_speed = 0; 1395 mouse_slip_wheel_speed = 0;
1401#endif 1396#endif
1402 break; 1397 break;
1403 } 1398 }
1404 1399
… …
1571 1566
1572 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1567 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1573 scr_expose (ev.xexpose.x, ev.xexpose.y, 1568 scr_expose (ev.xexpose.x, ev.xexpose.y,
1574 ev.xexpose.width, ev.xexpose.height, False); 1569 ev.xexpose.width, ev.xexpose.height, False);
1575 1570
1576 scr_refresh (refresh_type); 1571 want_refresh = 1;
1577 } 1572 }
1578 else 1573 else
1579 { 1574 {
1580 XEvent unused_event; 1575 XEvent unused_event;
1581 1576
… …
1587 if (isScrollbarWindow (ev.xany.window)) 1582 if (isScrollbarWindow (ev.xany.window))
1588 { 1583 {
1589 scrollBar.setIdle (); 1584 scrollBar.setIdle ();
1590 scrollbar_show (0); 1585 scrollbar_show (0);
1591 } 1586 }
1592#ifdef MENUBAR
1593 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1594 menubar_expose ();
1595#endif
1596 1587
1597#ifdef TRANSPARENT 1588#ifdef TRANSPARENT
1598 if (am_transparent && ev.xany.window == parent[0]) 1589 if (am_transparent && ev.xany.window == parent[0])
1599 XClearWindow (disp, ev.xany.window); 1590 XClearWindow (disp, ev.xany.window);
1600#endif 1591#endif
… …
1604 case MotionNotify: 1595 case MotionNotify:
1605#ifdef POINTER_BLANK 1596#ifdef POINTER_BLANK
1606 if (hidden_pointer) 1597 if (hidden_pointer)
1607 pointer_unblank (); 1598 pointer_unblank ();
1608#endif 1599#endif
1609#if MENUBAR
1610 if (isMenuBarWindow (ev.xany.window))
1611 {
1612 menubar_control (ev.xbutton);
1613 break;
1614 }
1615#endif
1616 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1600 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1617 break; 1601 break;
1618 1602
1619 if (ev.xany.window == vt) 1603 if (ev.xany.window == vt)
1620 { 1604 {
1605 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1621 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1606 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1622 ; // nop 1607 ; // nop
1623 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1608 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1624 { 1609 {
1625 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1610 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1626 ; 1611 ;
… …
1708 &unused_root_x, &unused_root_y, 1693 &unused_root_x, &unused_root_y,
1709 &ev.xbutton.x, &ev.xbutton.y, 1694 &ev.xbutton.x, &ev.xbutton.y,
1710 &unused_mask); 1695 &unused_mask);
1711 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1696 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1712 scrollbar_size ()); 1697 scrollbar_size ());
1713 scr_refresh (refresh_type); 1698 want_refresh = 1;
1714 refresh_limit = 0; 1699 refresh_limit = 0;
1715 scrollbar_show (1); 1700 scrollbar_show (1);
1716 } 1701 }
1717 break; 1702 break;
1718 } 1703 }
… …
1818 1803
1819#if TRANSPARENT 1804#if TRANSPARENT
1820void 1805void
1821rxvt_term::rootwin_cb (XEvent &ev) 1806rxvt_term::rootwin_cb (XEvent &ev)
1822{ 1807{
1823 SET_R (this); 1808 make_current ();
1824 SET_LOCALE (locale);
1825 1809
1826 switch (ev.type) 1810 switch (ev.type)
1827 { 1811 {
1828 case PropertyNotify: 1812 case PropertyNotify:
1829 /* 1813 /*
… …
1920#else 1904#else
1921 selection.rect = false; 1905 selection.rect = false;
1922#endif 1906#endif
1923 1907
1924 /* allow shift+left click to extend selection */ 1908 /* allow shift+left click to extend selection */
1925 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1909 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1926 { 1910 {
1927 if (MEvent.button == Button1 && clickintime) 1911 if (MEvent.button == Button1 && clickintime)
1928 selection_rotate (ev.x, ev.y); 1912 selection_rotate (ev.x, ev.y);
1929 else 1913 else
1930 selection_extend (ev.x, ev.y, 1); 1914 selection_extend (ev.x, ev.y, 1);
… …
2098 } 2082 }
2099 } 2083 }
2100 2084
2101 return; 2085 return;
2102 } 2086 }
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} 2087}
2112 2088
2113void 2089void
2114rxvt_term::button_release (XButtonEvent &ev) 2090rxvt_term::button_release (XButtonEvent &ev)
2115{ 2091{
… …
2121 2097
2122 if (scrollbar_isUpDn ()) 2098 if (scrollbar_isUpDn ())
2123 { 2099 {
2124 scrollBar.setIdle (); 2100 scrollBar.setIdle ();
2125 scrollbar_show (0); 2101 scrollbar_show (0);
2126#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2127 refresh_type &= ~SMOOTH_REFRESH;
2128#endif
2129 } 2102 }
2130 2103
2131#ifdef SELECTION_SCROLLING 2104#ifdef SELECTION_SCROLLING
2132 if (sel_scroll_ev.active) 2105 if (sel_scroll_ev.active)
2133 sel_scroll_ev.stop(); 2106 sel_scroll_ev.stop();
… …
2214 slip_wheel_ev.start (); 2187 slip_wheel_ev.start ();
2215 } 2188 }
2216 else 2189 else
2217 { 2190 {
2218# endif 2191# endif
2219# ifdef JUMP_MOUSE_WHEEL
2220 scr_page (v, i); 2192 scr_page (v, i);
2221 scr_refresh (SMOOTH_REFRESH);
2222 scrollbar_show (1); 2193 scrollbar_show (1);
2223# else
2224 while (i--)
2225 {
2226 scr_page (v, 1);
2227 scr_refresh (SMOOTH_REFRESH);
2228 scrollbar_show (1);
2229 }
2230# endif
2231# ifdef MOUSE_SLIP_WHEELING 2194# ifdef MOUSE_SLIP_WHEELING
2232 } 2195 }
2233#endif 2196# endif
2234 } 2197 }
2235 break; 2198 break;
2236#endif 2199#endif
2237 } 2200 }
2238 } 2201 }
2239#ifdef MENUBAR
2240 else if (isMenuBarWindow (ev.window))
2241 menubar_control (ev);
2242#endif
2243} 2202}
2244 2203
2245#ifdef TRANSPARENT 2204#ifdef TRANSPARENT
2246#if TINTING 2205#if TINTING
2247/* taken from aterm-0.4.2 */ 2206/* taken from aterm-0.4.2 */
… …
2790 } 2749 }
2791 2750
2792 // scr_add_lines only works for nlines <= nrow - 1. 2751 // scr_add_lines only works for nlines <= nrow - 1.
2793 if (nlines >= nrow - 1) 2752 if (nlines >= nrow - 1)
2794 { 2753 {
2754 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2795 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) 2755 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2796 scr_add_lines (buf, str - buf, nlines); 2756 scr_add_lines (buf, str - buf, nlines);
2797 2757
2798 nlines = 0; 2758 nlines = 0;
2799 str = buf; 2759 str = buf;
2800 eol = str + min (ncol, UBUFSIZ); 2760 eol = str + min (ncol, UBUFSIZ);
… …
2815 2775
2816 seq_begin = cmdbuf_ptr; 2776 seq_begin = cmdbuf_ptr;
2817 ch = next_char (); 2777 ch = next_char ();
2818 } 2778 }
2819 2779
2780 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2820 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) 2781 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2821 scr_add_lines (buf, str - buf, nlines); 2782 scr_add_lines (buf, str - buf, nlines);
2822 2783
2823 /* 2784 /*
2824 * If there have been a lot of new lines, then update the screen 2785 * If there have been a lot of new lines, then update the screen
2825 * What the heck I'll cheat and only refresh less than every page-full. 2786 * What the heck I'll cheat and only refresh less than every page-full.
… …
2831 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2792 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2832 refresh_limit++; 2793 refresh_limit++;
2833 else 2794 else
2834 { 2795 {
2835 flag = true; 2796 flag = true;
2836 scr_refresh (refresh_type); 2797 scr_refresh ();
2837 flush_ev.stop (); 2798 want_refresh = 1;
2838 } 2799 }
2839 } 2800 }
2840 2801
2841 } 2802 }
2842 else 2803 else
… …
3868 { 3829 {
3869 if ((name = strchr (buf, ';')) == NULL) 3830 if ((name = strchr (buf, ';')) == NULL)
3870 break; 3831 break;
3871 3832
3872 *name++ = '\0'; 3833 *name++ = '\0';
3873 color = atoi (buf); 3834 color = atoi (buf) + minCOLOR;
3874 3835
3875 if (color < 0 || color >= TOTAL_COLORS) 3836 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3876 break; 3837 break;
3877 3838
3878 if ((buf = strchr (name, ';')) != NULL) 3839 if ((buf = strchr (name, ';')) != NULL)
3879 *buf++ = '\0'; 3840 *buf++ = '\0';
3880 3841
3881 if (name[0] == '?' && !name[1]) 3842 if (name[0] == '?' && !name[1])
3882 { 3843 {
3883 unsigned short r, g, b; 3844 unsigned short r, g, b;
3884 pix_colors_focused[color + minCOLOR].get (display, r, g, b); 3845 pix_colors_focused[color].get (display, r, g, b);
3885 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3846 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3886 } 3847 }
3887 else 3848 else
3888 set_window_color (color + minCOLOR, name); 3849 set_window_color (color, name);
3889 } 3850 }
3890 break; 3851 break;
3891 case XTerm_Color00: 3852 case XTerm_Color00:
3892 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3853 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3893 break; 3854 break;
3894 case XTerm_Color01: 3855 case XTerm_Color01:
3895 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3856 process_color_seq (XTerm_Color01, Color_bg, str, resp);
3896 break; 3857 break;
3897#ifndef NO_CURSORCOLOR 3858#ifndef NO_CURSORCOLOR
3898 case XTerm_Color_cursor: 3859 case XTerm_Color_cursor:
3899 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3860 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3900 break; 3861 break;
… …
3904 break; 3865 break;
3905 case XTerm_Color_pointer_bg: 3866 case XTerm_Color_pointer_bg:
3906 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3867 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3907 break; 3868 break;
3908#ifndef NO_BOLD_UNDERLINE_REVERSE 3869#ifndef NO_BOLD_UNDERLINE_REVERSE
3909 case XTerm_Color_BD:
3910 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3911 break;
3912 case XTerm_Color_UL:
3913 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3914 break;
3915 case XTerm_Color_RV: 3870 case XTerm_Color_RV:
3916 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3871 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3872 break;
3873 case Rxvt_Color_BD:
3874 case URxvt_Color_BD:
3875 process_color_seq (op, Color_BD, str, resp);
3876 break;
3877 case Rxvt_Color_UL:
3878 case URxvt_Color_UL:
3879 process_color_seq (op, Color_UL, str, resp);
3917 break; 3880 break;
3918 case URxvt_Color_IT: 3881 case URxvt_Color_IT:
3919 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3882 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3920 break; 3883 break;
3921#endif 3884#endif
… …
3926 if (am_transparent) 3889 if (am_transparent)
3927 want_full_refresh = want_refresh = 1; 3890 want_full_refresh = want_refresh = 1;
3928 break; 3891 break;
3929#endif 3892#endif
3930 3893
3931 case XTerm_Pixmap: 3894 case Rxvt_Pixmap:
3932 if (*str != ';') 3895 if (*str != ';')
3933 { 3896 {
3934#if XPM_BACKGROUND 3897#if XPM_BACKGROUND
3935 scale_pixmap (""); /* reset to default scaling */ 3898 scale_pixmap (""); /* reset to default scaling */
3936 set_bgPixmap (str); /* change pixmap */ 3899 set_bgPixmap (str); /* change pixmap */
3937#endif
3938 scr_touch (true); 3900 scr_touch (true);
3901#endif
3939 } 3902 }
3903
3940 while ((str = strchr (str, ';')) != NULL) 3904 while ((str = strchr (str, ';')) != NULL)
3941 { 3905 {
3942 str++; 3906 str++;
3943#if XPM_BACKGROUND 3907#if XPM_BACKGROUND
3944 changed += scale_pixmap (str); 3908 changed += scale_pixmap (str);
… …
3947 3911
3948 if (changed) 3912 if (changed)
3949 { 3913 {
3950#ifdef XPM_BACKGROUND 3914#ifdef XPM_BACKGROUND
3951 resize_pixmap (); 3915 resize_pixmap ();
3952#endif
3953 scr_touch (true); 3916 scr_touch (true);
3917#endif
3954 } 3918 }
3955 break; 3919 break;
3956 3920
3957 case XTerm_restoreFG: 3921 case Rxvt_restoreFG:
3958 set_window_color (Color_fg, str); 3922 set_window_color (Color_fg, str);
3959 break; 3923 break;
3960 case XTerm_restoreBG: 3924 case Rxvt_restoreBG:
3961 set_window_color (Color_bg, str); 3925 set_window_color (Color_bg, str);
3962 break; 3926 break;
3963 3927
3964 case XTerm_logfile: 3928 case XTerm_logfile:
3965 // TODO, when secure mode? 3929 // TODO, when secure mode?
3966 break; 3930 break;
3967 3931
3968#ifdef MENUBAR
3969 case URxvt_Menu:
3970 if (OPTION (Opt_insecure))
3971 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3972 break;
3973#endif
3974#if 0 3932#if 0
3975 case XTerm_dumpscreen: /* no error notices */ 3933 case Rxvt_dumpscreen: /* no error notices */
3976 { 3934 {
3977 int fd; 3935 int fd;
3978 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3936 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3979 { 3937 {
3980 scr_dump (fd); 3938 scr_dump (fd);
… …
4095 { 5, PrivMode_rVideo }, 4053 { 5, PrivMode_rVideo },
4096 { 6, PrivMode_relOrigin }, 4054 { 6, PrivMode_relOrigin },
4097 { 7, PrivMode_Autowrap }, 4055 { 7, PrivMode_Autowrap },
4098 // 8, bi-directional support mode 4056 // 8, bi-directional support mode
4099 { 9, PrivMode_MouseX10 }, 4057 { 9, PrivMode_MouseX10 },
4100#ifdef menuBar_esc
4101 { menuBar_esc, PrivMode_menuBar },
4102#endif
4103 // 18, 19 printing-related 4058 // 18, 19 printing-related
4104 { 25, PrivMode_VisibleCursor }, 4059 { 25, PrivMode_VisibleCursor },
4105#ifdef scrollBar_esc 4060#ifdef scrollBar_esc
4106 { scrollBar_esc, PrivMode_scrollBar }, 4061 { scrollBar_esc, PrivMode_scrollBar },
4107#endif 4062#endif
… …
4202 /* case 8: - auto repeat, can't do on a per window basis */ 4157 /* case 8: - auto repeat, can't do on a per window basis */
4203 case 9: /* X10 mouse reporting */ 4158 case 9: /* X10 mouse reporting */
4204 if (state) /* orthogonal */ 4159 if (state) /* orthogonal */
4205 priv_modes &= ~PrivMode_MouseX11; 4160 priv_modes &= ~PrivMode_MouseX11;
4206 break; 4161 break;
4207#ifdef menuBar_esc
4208 case menuBar_esc:
4209#ifdef MENUBAR
4210 map_menuBar (state);
4211#endif
4212 break;
4213#endif
4214#ifdef scrollBar_esc 4162#ifdef scrollBar_esc
4215 case scrollBar_esc: 4163 case scrollBar_esc:
4216 if (scrollbar_mapping (state)) 4164 if (scrollbar_mapping (state))
4217 { 4165 {
4218 resize_all_windows (0, 0, 0); 4166 resize_all_windows (0, 0, 0);
… …
4460const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4408const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4461 4409
4462void 4410void
4463rxvt_term::tt_write (const char *data, unsigned int len) 4411rxvt_term::tt_write (const char *data, unsigned int len)
4464{ 4412{
4413 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4414 return;
4415
4465 if (pty.pty < 0) 4416 if (pty.pty < 0)
4466 return; 4417 return;
4467 4418
4468 if (v_buflen == 0) 4419 if (v_buflen == 0)
4469 { 4420 {

Diff Legend

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