ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.263 by root, Sun Jan 15 16:48:17 2006 UTC vs.
Revision 1.268 by root, Tue Jan 17 05:47:42 2006 UTC

… …
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
… …
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
… …
1104 : scr_page (UP, mouse_slip_wheel_speed)) 1098 : scr_page (UP, mouse_slip_wheel_speed))
1105 { 1099 {
1106 if (view_start == top_row || view_start == 0) 1100 if (view_start == top_row || view_start == 0)
1107 mouse_slip_wheel_speed = 0; 1101 mouse_slip_wheel_speed = 0;
1108 1102
1109 refresh_type |= SMOOTH_REFRESH;
1110 want_refresh = 1; 1103 want_refresh = 1;
1111 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1104 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1112 } 1105 }
1113} 1106}
1114#endif 1107#endif
… …
1172} 1165}
1173 1166
1174void 1167void
1175rxvt_term::pty_cb (io_watcher &w, short revents) 1168rxvt_term::pty_cb (io_watcher &w, short revents)
1176{ 1169{
1177 SET_R (this); 1170 make_current ();
1178 SET_LOCALE (locale);
1179 1171
1180 if (revents & EVENT_READ) 1172 if (revents & EVENT_READ)
1181 // loop, but don't allow a single term to monopolize us 1173 // loop, but don't allow a single term to monopolize us
1182 while (pty_fill ()) 1174 while (pty_fill ())
1183 if (cmd_parse ()) 1175 if (cmd_parse ())
… …
1215} 1207}
1216 1208
1217void 1209void
1218rxvt_term::pointer_cb (time_watcher &w) 1210rxvt_term::pointer_cb (time_watcher &w)
1219{ 1211{
1220 SET_R (this); 1212 make_current ();
1221 SET_LOCALE (locale);
1222 1213
1223 pointer_blank (); 1214 pointer_blank ();
1224} 1215}
1225#endif 1216#endif
1226 1217
… …
1305 1296
1306/*{{{ process an X event */ 1297/*{{{ process an X event */
1307void 1298void
1308rxvt_term::x_cb (XEvent &ev) 1299rxvt_term::x_cb (XEvent &ev)
1309{ 1300{
1301 make_current ();
1302
1310 dDisp; 1303 dDisp;
1311 1304
1312 SET_R (this);
1313 SET_LOCALE (locale);
1314
1315 if (ev.xany.window == vt 1305 if (ev.xany.window == vt
1306 && SHOULD_INVOKE (HOOK_X_EVENT)
1316 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1307 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1317 return; 1308 return;
1318 1309
1319 // for XQueryPointer 1310 // for XQueryPointer
1320 Window unused_root, unused_child; 1311 Window unused_root, unused_child;
… …
1591 if (isScrollbarWindow (ev.xany.window)) 1582 if (isScrollbarWindow (ev.xany.window))
1592 { 1583 {
1593 scrollBar.setIdle (); 1584 scrollBar.setIdle ();
1594 scrollbar_show (0); 1585 scrollbar_show (0);
1595 } 1586 }
1596#ifdef MENUBAR
1597 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1598 menubar_expose ();
1599#endif
1600 1587
1601#ifdef TRANSPARENT 1588#ifdef TRANSPARENT
1602 if (am_transparent && ev.xany.window == parent[0]) 1589 if (am_transparent && ev.xany.window == parent[0])
1603 XClearWindow (disp, ev.xany.window); 1590 XClearWindow (disp, ev.xany.window);
1604#endif 1591#endif
… …
1608 case MotionNotify: 1595 case MotionNotify:
1609#ifdef POINTER_BLANK 1596#ifdef POINTER_BLANK
1610 if (hidden_pointer) 1597 if (hidden_pointer)
1611 pointer_unblank (); 1598 pointer_unblank ();
1612#endif 1599#endif
1613#if MENUBAR
1614 if (isMenuBarWindow (ev.xany.window))
1615 {
1616 menubar_control (ev.xbutton);
1617 break;
1618 }
1619#endif
1620 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1600 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1621 break; 1601 break;
1622 1602
1623 if (ev.xany.window == vt) 1603 if (ev.xany.window == vt)
1624 { 1604 {
1605 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1625 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1606 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1626 ; // nop 1607 ; // nop
1627 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1608 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1628 { 1609 {
1629 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1610 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1630 ; 1611 ;
… …
1822 1803
1823#if TRANSPARENT 1804#if TRANSPARENT
1824void 1805void
1825rxvt_term::rootwin_cb (XEvent &ev) 1806rxvt_term::rootwin_cb (XEvent &ev)
1826{ 1807{
1827 SET_R (this); 1808 make_current ();
1828 SET_LOCALE (locale);
1829 1809
1830 switch (ev.type) 1810 switch (ev.type)
1831 { 1811 {
1832 case PropertyNotify: 1812 case PropertyNotify:
1833 /* 1813 /*
… …
2102 } 2082 }
2103 } 2083 }
2104 2084
2105 return; 2085 return;
2106 } 2086 }
2107
2108#if MENUBAR
2109 /*
2110 * Menubar window processing of button press
2111 */
2112 if (isMenuBarWindow (ev.window))
2113 menubar_control (ev);
2114#endif
2115} 2087}
2116 2088
2117void 2089void
2118rxvt_term::button_release (XButtonEvent &ev) 2090rxvt_term::button_release (XButtonEvent &ev)
2119{ 2091{
… …
2125 2097
2126 if (scrollbar_isUpDn ()) 2098 if (scrollbar_isUpDn ())
2127 { 2099 {
2128 scrollBar.setIdle (); 2100 scrollBar.setIdle ();
2129 scrollbar_show (0); 2101 scrollbar_show (0);
2130#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2131 refresh_type &= ~SMOOTH_REFRESH;
2132#endif
2133 } 2102 }
2134 2103
2135#ifdef SELECTION_SCROLLING 2104#ifdef SELECTION_SCROLLING
2136 if (sel_scroll_ev.active) 2105 if (sel_scroll_ev.active)
2137 sel_scroll_ev.stop(); 2106 sel_scroll_ev.stop();
… …
2228 } 2197 }
2229 break; 2198 break;
2230#endif 2199#endif
2231 } 2200 }
2232 } 2201 }
2233#ifdef MENUBAR
2234 else if (isMenuBarWindow (ev.window))
2235 menubar_control (ev);
2236#endif
2237} 2202}
2238 2203
2239#ifdef TRANSPARENT 2204#ifdef TRANSPARENT
2240#if TINTING 2205#if TINTING
2241/* taken from aterm-0.4.2 */ 2206/* taken from aterm-0.4.2 */
… …
2784 } 2749 }
2785 2750
2786 // scr_add_lines only works for nlines <= nrow - 1. 2751 // scr_add_lines only works for nlines <= nrow - 1.
2787 if (nlines >= nrow - 1) 2752 if (nlines >= nrow - 1)
2788 { 2753 {
2754 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2789 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))))
2790 scr_add_lines (buf, str - buf, nlines); 2756 scr_add_lines (buf, str - buf, nlines);
2791 2757
2792 nlines = 0; 2758 nlines = 0;
2793 str = buf; 2759 str = buf;
2794 eol = str + min (ncol, UBUFSIZ); 2760 eol = str + min (ncol, UBUFSIZ);
… …
2809 2775
2810 seq_begin = cmdbuf_ptr; 2776 seq_begin = cmdbuf_ptr;
2811 ch = next_char (); 2777 ch = next_char ();
2812 } 2778 }
2813 2779
2780 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2814 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))))
2815 scr_add_lines (buf, str - buf, nlines); 2782 scr_add_lines (buf, str - buf, nlines);
2816 2783
2817 /* 2784 /*
2818 * 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
2819 * 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.
… …
2825 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2792 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2826 refresh_limit++; 2793 refresh_limit++;
2827 else 2794 else
2828 { 2795 {
2829 flag = true; 2796 flag = true;
2830 scr_refresh (refresh_type); 2797 scr_refresh ();
2831 want_refresh = 1; 2798 want_refresh = 1;
2832 } 2799 }
2833 } 2800 }
2834 2801
2835 } 2802 }
… …
3960 3927
3961 case XTerm_logfile: 3928 case XTerm_logfile:
3962 // TODO, when secure mode? 3929 // TODO, when secure mode?
3963 break; 3930 break;
3964 3931
3965#ifdef MENUBAR
3966 case URxvt_Menu:
3967 if (OPTION (Opt_insecure))
3968 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3969 break;
3970#endif
3971#if 0 3932#if 0
3972 case Rxvt_dumpscreen: /* no error notices */ 3933 case Rxvt_dumpscreen: /* no error notices */
3973 { 3934 {
3974 int fd; 3935 int fd;
3975 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)
… …
4092 { 5, PrivMode_rVideo }, 4053 { 5, PrivMode_rVideo },
4093 { 6, PrivMode_relOrigin }, 4054 { 6, PrivMode_relOrigin },
4094 { 7, PrivMode_Autowrap }, 4055 { 7, PrivMode_Autowrap },
4095 // 8, bi-directional support mode 4056 // 8, bi-directional support mode
4096 { 9, PrivMode_MouseX10 }, 4057 { 9, PrivMode_MouseX10 },
4097#ifdef menuBar_esc
4098 { menuBar_esc, PrivMode_menuBar },
4099#endif
4100 // 18, 19 printing-related 4058 // 18, 19 printing-related
4101 { 25, PrivMode_VisibleCursor }, 4059 { 25, PrivMode_VisibleCursor },
4102#ifdef scrollBar_esc 4060#ifdef scrollBar_esc
4103 { scrollBar_esc, PrivMode_scrollBar }, 4061 { scrollBar_esc, PrivMode_scrollBar },
4104#endif 4062#endif
… …
4199 /* 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 */
4200 case 9: /* X10 mouse reporting */ 4158 case 9: /* X10 mouse reporting */
4201 if (state) /* orthogonal */ 4159 if (state) /* orthogonal */
4202 priv_modes &= ~PrivMode_MouseX11; 4160 priv_modes &= ~PrivMode_MouseX11;
4203 break; 4161 break;
4204#ifdef menuBar_esc
4205 case menuBar_esc:
4206#ifdef MENUBAR
4207 map_menuBar (state);
4208#endif
4209 break;
4210#endif
4211#ifdef scrollBar_esc 4162#ifdef scrollBar_esc
4212 case scrollBar_esc: 4163 case scrollBar_esc:
4213 if (scrollbar_mapping (state)) 4164 if (scrollbar_mapping (state))
4214 { 4165 {
4215 resize_all_windows (0, 0, 0); 4166 resize_all_windows (0, 0, 0);

Diff Legend

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