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.260 by root, Fri Jan 13 05:04:33 2006 UTC vs.
Revision 1.267 by root, Mon Jan 16 15:00:20 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 }
… …
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;
… …
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}
… …
1101{ 1097{
1102 if (mouse_slip_wheel_speed == 0 1098 if (mouse_slip_wheel_speed == 0
1103 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1099 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1104 : scr_page (UP, mouse_slip_wheel_speed)) 1100 : scr_page (UP, mouse_slip_wheel_speed))
1105 { 1101 {
1106 if (view_start == nsaved || 1102 if (view_start == top_row || view_start == 0)
1107 view_start == 0)
1108 mouse_slip_wheel_speed = 0; 1103 mouse_slip_wheel_speed = 0;
1109 1104
1110 refresh_type |= SMOOTH_REFRESH; 1105 refresh_type |= SMOOTH_REFRESH;
1111 want_refresh = 1; 1106 want_refresh = 1;
1112 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1107 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
… …
1173} 1168}
1174 1169
1175void 1170void
1176rxvt_term::pty_cb (io_watcher &w, short revents) 1171rxvt_term::pty_cb (io_watcher &w, short revents)
1177{ 1172{
1178 SET_R (this); 1173 make_current ();
1179 SET_LOCALE (locale);
1180 1174
1181 if (revents & EVENT_READ) 1175 if (revents & EVENT_READ)
1182 // loop, but don't allow a single term to monopolize us 1176 // loop, but don't allow a single term to monopolize us
1183 while (pty_fill ()) 1177 while (pty_fill ())
1184 if (cmd_parse ()) 1178 if (cmd_parse ())
… …
1216} 1210}
1217 1211
1218void 1212void
1219rxvt_term::pointer_cb (time_watcher &w) 1213rxvt_term::pointer_cb (time_watcher &w)
1220{ 1214{
1221 SET_R (this); 1215 make_current ();
1222 SET_LOCALE (locale);
1223 1216
1224 pointer_blank (); 1217 pointer_blank ();
1225} 1218}
1226#endif 1219#endif
1227 1220
… …
1306 1299
1307/*{{{ process an X event */ 1300/*{{{ process an X event */
1308void 1301void
1309rxvt_term::x_cb (XEvent &ev) 1302rxvt_term::x_cb (XEvent &ev)
1310{ 1303{
1304 make_current ();
1305
1311 dDisp; 1306 dDisp;
1312 1307
1313 SET_R (this);
1314 SET_LOCALE (locale);
1315
1316 if (ev.xany.window == vt 1308 if (ev.xany.window == vt
1309 && SHOULD_INVOKE (HOOK_X_EVENT)
1317 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1310 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1318 return; 1311 return;
1319 1312
1320 // for XQueryPointer 1313 // for XQueryPointer
1321 Window unused_root, unused_child; 1314 Window unused_root, unused_child;
… …
1592 if (isScrollbarWindow (ev.xany.window)) 1585 if (isScrollbarWindow (ev.xany.window))
1593 { 1586 {
1594 scrollBar.setIdle (); 1587 scrollBar.setIdle ();
1595 scrollbar_show (0); 1588 scrollbar_show (0);
1596 } 1589 }
1597#ifdef MENUBAR
1598 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1599 menubar_expose ();
1600#endif
1601 1590
1602#ifdef TRANSPARENT 1591#ifdef TRANSPARENT
1603 if (am_transparent && ev.xany.window == parent[0]) 1592 if (am_transparent && ev.xany.window == parent[0])
1604 XClearWindow (disp, ev.xany.window); 1593 XClearWindow (disp, ev.xany.window);
1605#endif 1594#endif
1606 } 1595 }
1607 break; 1596 break;
1608 1597
1609 case MotionNotify: 1598 case MotionNotify:
1610 printf ("motion notify\n");//D
1611#ifdef POINTER_BLANK 1599#ifdef POINTER_BLANK
1612 if (hidden_pointer) 1600 if (hidden_pointer)
1613 pointer_unblank (); 1601 pointer_unblank ();
1614#endif 1602#endif
1615#if MENUBAR
1616 if (isMenuBarWindow (ev.xany.window))
1617 {
1618 menubar_control (ev.xbutton);
1619 break;
1620 }
1621#endif
1622 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1603 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1623 break; 1604 break;
1624 1605
1625 if (ev.xany.window == vt) 1606 if (ev.xany.window == vt)
1626 { 1607 {
1608 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1627 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1609 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1628 ; // nop 1610 ; // nop
1629 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1611 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1630 { 1612 {
1631 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1613 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1632 ; 1614 ;
… …
1824 1806
1825#if TRANSPARENT 1807#if TRANSPARENT
1826void 1808void
1827rxvt_term::rootwin_cb (XEvent &ev) 1809rxvt_term::rootwin_cb (XEvent &ev)
1828{ 1810{
1829 SET_R (this); 1811 make_current ();
1830 SET_LOCALE (locale);
1831 1812
1832 switch (ev.type) 1813 switch (ev.type)
1833 { 1814 {
1834 case PropertyNotify: 1815 case PropertyNotify:
1835 /* 1816 /*
… …
2104 } 2085 }
2105 } 2086 }
2106 2087
2107 return; 2088 return;
2108 } 2089 }
2109
2110#if MENUBAR
2111 /*
2112 * Menubar window processing of button press
2113 */
2114 if (isMenuBarWindow (ev.window))
2115 menubar_control (ev);
2116#endif
2117} 2090}
2118 2091
2119void 2092void
2120rxvt_term::button_release (XButtonEvent &ev) 2093rxvt_term::button_release (XButtonEvent &ev)
2121{ 2094{
… …
2230 } 2203 }
2231 break; 2204 break;
2232#endif 2205#endif
2233 } 2206 }
2234 } 2207 }
2235#ifdef MENUBAR
2236 else if (isMenuBarWindow (ev.window))
2237 menubar_control (ev);
2238#endif
2239} 2208}
2240 2209
2241#ifdef TRANSPARENT 2210#ifdef TRANSPARENT
2242#if TINTING 2211#if TINTING
2243/* taken from aterm-0.4.2 */ 2212/* taken from aterm-0.4.2 */
… …
2786 } 2755 }
2787 2756
2788 // scr_add_lines only works for nlines <= nrow - 1. 2757 // scr_add_lines only works for nlines <= nrow - 1.
2789 if (nlines >= nrow - 1) 2758 if (nlines >= nrow - 1)
2790 { 2759 {
2760 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2791 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) 2761 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2792 scr_add_lines (buf, str - buf, nlines); 2762 scr_add_lines (buf, str - buf, nlines);
2793 2763
2794 nlines = 0; 2764 nlines = 0;
2795 str = buf; 2765 str = buf;
2796 eol = str + min (ncol, UBUFSIZ); 2766 eol = str + min (ncol, UBUFSIZ);
… …
2811 2781
2812 seq_begin = cmdbuf_ptr; 2782 seq_begin = cmdbuf_ptr;
2813 ch = next_char (); 2783 ch = next_char ();
2814 } 2784 }
2815 2785
2786 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2816 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) 2787 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2817 scr_add_lines (buf, str - buf, nlines); 2788 scr_add_lines (buf, str - buf, nlines);
2818 2789
2819 /* 2790 /*
2820 * If there have been a lot of new lines, then update the screen 2791 * If there have been a lot of new lines, then update the screen
2821 * What the heck I'll cheat and only refresh less than every page-full. 2792 * What the heck I'll cheat and only refresh less than every page-full.
… …
3962 3933
3963 case XTerm_logfile: 3934 case XTerm_logfile:
3964 // TODO, when secure mode? 3935 // TODO, when secure mode?
3965 break; 3936 break;
3966 3937
3967#ifdef MENUBAR
3968 case URxvt_Menu:
3969 if (OPTION (Opt_insecure))
3970 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3971 break;
3972#endif
3973#if 0 3938#if 0
3974 case Rxvt_dumpscreen: /* no error notices */ 3939 case Rxvt_dumpscreen: /* no error notices */
3975 { 3940 {
3976 int fd; 3941 int fd;
3977 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3942 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
… …
4094 { 5, PrivMode_rVideo }, 4059 { 5, PrivMode_rVideo },
4095 { 6, PrivMode_relOrigin }, 4060 { 6, PrivMode_relOrigin },
4096 { 7, PrivMode_Autowrap }, 4061 { 7, PrivMode_Autowrap },
4097 // 8, bi-directional support mode 4062 // 8, bi-directional support mode
4098 { 9, PrivMode_MouseX10 }, 4063 { 9, PrivMode_MouseX10 },
4099#ifdef menuBar_esc
4100 { menuBar_esc, PrivMode_menuBar },
4101#endif
4102 // 18, 19 printing-related 4064 // 18, 19 printing-related
4103 { 25, PrivMode_VisibleCursor }, 4065 { 25, PrivMode_VisibleCursor },
4104#ifdef scrollBar_esc 4066#ifdef scrollBar_esc
4105 { scrollBar_esc, PrivMode_scrollBar }, 4067 { scrollBar_esc, PrivMode_scrollBar },
4106#endif 4068#endif
… …
4201 /* case 8: - auto repeat, can't do on a per window basis */ 4163 /* case 8: - auto repeat, can't do on a per window basis */
4202 case 9: /* X10 mouse reporting */ 4164 case 9: /* X10 mouse reporting */
4203 if (state) /* orthogonal */ 4165 if (state) /* orthogonal */
4204 priv_modes &= ~PrivMode_MouseX11; 4166 priv_modes &= ~PrivMode_MouseX11;
4205 break; 4167 break;
4206#ifdef menuBar_esc
4207 case menuBar_esc:
4208#ifdef MENUBAR
4209 map_menuBar (state);
4210#endif
4211 break;
4212#endif
4213#ifdef scrollBar_esc 4168#ifdef scrollBar_esc
4214 case scrollBar_esc: 4169 case scrollBar_esc:
4215 if (scrollbar_mapping (state)) 4170 if (scrollbar_mapping (state))
4216 { 4171 {
4217 resize_all_windows (0, 0, 0); 4172 resize_all_windows (0, 0, 0);

Diff Legend

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