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.264 by root, Mon Jan 16 06:37:51 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 }
… …
1070rxvt_term::cont_scroll_cb (time_watcher &w) 1068rxvt_term::cont_scroll_cb (time_watcher &w)
1071{ 1069{
1072 if ((scrollbar_isUp() || scrollbar_isDn()) && 1070 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1073 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1071 scr_page (scrollbar_isUp() ? UP : DN, 1))
1074 { 1072 {
1075 refresh_type |= SMOOTH_REFRESH;
1076 want_refresh = 1; 1073 want_refresh = 1;
1077 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1074 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1078 } 1075 }
1079} 1076}
1080#endif 1077#endif
… …
1084rxvt_term::sel_scroll_cb (time_watcher &w) 1081rxvt_term::sel_scroll_cb (time_watcher &w)
1085{ 1082{
1086 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1083 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1087 { 1084 {
1088 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1085 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1089 refresh_type |= SMOOTH_REFRESH;
1090 want_refresh = 1; 1086 want_refresh = 1;
1091 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1087 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1092 } 1088 }
1093} 1089}
1094#endif 1090#endif
… …
1102 : scr_page (UP, mouse_slip_wheel_speed)) 1098 : scr_page (UP, mouse_slip_wheel_speed))
1103 { 1099 {
1104 if (view_start == top_row || view_start == 0) 1100 if (view_start == top_row || view_start == 0)
1105 mouse_slip_wheel_speed = 0; 1101 mouse_slip_wheel_speed = 0;
1106 1102
1107 refresh_type |= SMOOTH_REFRESH;
1108 want_refresh = 1; 1103 want_refresh = 1;
1109 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1104 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1110 } 1105 }
1111} 1106}
1112#endif 1107#endif
… …
1306 make_current (); 1301 make_current ();
1307 1302
1308 dDisp; 1303 dDisp;
1309 1304
1310 if (ev.xany.window == vt 1305 if (ev.xany.window == vt
1306 && SHOULD_INVOKE (HOOK_X_EVENT)
1311 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1307 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1312 return; 1308 return;
1313 1309
1314 // for XQueryPointer 1310 // for XQueryPointer
1315 Window unused_root, unused_child; 1311 Window unused_root, unused_child;
… …
1586 if (isScrollbarWindow (ev.xany.window)) 1582 if (isScrollbarWindow (ev.xany.window))
1587 { 1583 {
1588 scrollBar.setIdle (); 1584 scrollBar.setIdle ();
1589 scrollbar_show (0); 1585 scrollbar_show (0);
1590 } 1586 }
1591#ifdef MENUBAR
1592 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1593 menubar_expose ();
1594#endif
1595 1587
1596#ifdef TRANSPARENT 1588#ifdef TRANSPARENT
1597 if (am_transparent && ev.xany.window == parent[0]) 1589 if (am_transparent && ev.xany.window == parent[0])
1598 XClearWindow (disp, ev.xany.window); 1590 XClearWindow (disp, ev.xany.window);
1599#endif 1591#endif
… …
1603 case MotionNotify: 1595 case MotionNotify:
1604#ifdef POINTER_BLANK 1596#ifdef POINTER_BLANK
1605 if (hidden_pointer) 1597 if (hidden_pointer)
1606 pointer_unblank (); 1598 pointer_unblank ();
1607#endif 1599#endif
1608#if MENUBAR
1609 if (isMenuBarWindow (ev.xany.window))
1610 {
1611 menubar_control (ev.xbutton);
1612 break;
1613 }
1614#endif
1615 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1600 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1616 break; 1601 break;
1617 1602
1618 if (ev.xany.window == vt) 1603 if (ev.xany.window == vt)
1619 { 1604 {
1605 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1620 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1606 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1621 ; // nop 1607 ; // nop
1622 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1608 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1623 { 1609 {
1624 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1610 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1625 ; 1611 ;
… …
2096 } 2082 }
2097 } 2083 }
2098 2084
2099 return; 2085 return;
2100 } 2086 }
2101
2102#if MENUBAR
2103 /*
2104 * Menubar window processing of button press
2105 */
2106 if (isMenuBarWindow (ev.window))
2107 menubar_control (ev);
2108#endif
2109} 2087}
2110 2088
2111void 2089void
2112rxvt_term::button_release (XButtonEvent &ev) 2090rxvt_term::button_release (XButtonEvent &ev)
2113{ 2091{
… …
2119 2097
2120 if (scrollbar_isUpDn ()) 2098 if (scrollbar_isUpDn ())
2121 { 2099 {
2122 scrollBar.setIdle (); 2100 scrollBar.setIdle ();
2123 scrollbar_show (0); 2101 scrollbar_show (0);
2124#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2125 refresh_type &= ~SMOOTH_REFRESH;
2126#endif
2127 } 2102 }
2128 2103
2129#ifdef SELECTION_SCROLLING 2104#ifdef SELECTION_SCROLLING
2130 if (sel_scroll_ev.active) 2105 if (sel_scroll_ev.active)
2131 sel_scroll_ev.stop(); 2106 sel_scroll_ev.stop();
… …
2222 } 2197 }
2223 break; 2198 break;
2224#endif 2199#endif
2225 } 2200 }
2226 } 2201 }
2227#ifdef MENUBAR
2228 else if (isMenuBarWindow (ev.window))
2229 menubar_control (ev);
2230#endif
2231} 2202}
2232 2203
2233#ifdef TRANSPARENT 2204#ifdef TRANSPARENT
2234#if TINTING 2205#if TINTING
2235/* taken from aterm-0.4.2 */ 2206/* taken from aterm-0.4.2 */
… …
2778 } 2749 }
2779 2750
2780 // scr_add_lines only works for nlines <= nrow - 1. 2751 // scr_add_lines only works for nlines <= nrow - 1.
2781 if (nlines >= nrow - 1) 2752 if (nlines >= nrow - 1)
2782 { 2753 {
2754 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2783 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))))
2784 scr_add_lines (buf, str - buf, nlines); 2756 scr_add_lines (buf, str - buf, nlines);
2785 2757
2786 nlines = 0; 2758 nlines = 0;
2787 str = buf; 2759 str = buf;
2788 eol = str + min (ncol, UBUFSIZ); 2760 eol = str + min (ncol, UBUFSIZ);
… …
2803 2775
2804 seq_begin = cmdbuf_ptr; 2776 seq_begin = cmdbuf_ptr;
2805 ch = next_char (); 2777 ch = next_char ();
2806 } 2778 }
2807 2779
2780 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2808 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))))
2809 scr_add_lines (buf, str - buf, nlines); 2782 scr_add_lines (buf, str - buf, nlines);
2810 2783
2811 /* 2784 /*
2812 * 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
2813 * 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.
… …
2819 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2792 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2820 refresh_limit++; 2793 refresh_limit++;
2821 else 2794 else
2822 { 2795 {
2823 flag = true; 2796 flag = true;
2824 scr_refresh (refresh_type); 2797 scr_refresh ();
2825 want_refresh = 1; 2798 want_refresh = 1;
2826 } 2799 }
2827 } 2800 }
2828 2801
2829 } 2802 }
… …
3954 3927
3955 case XTerm_logfile: 3928 case XTerm_logfile:
3956 // TODO, when secure mode? 3929 // TODO, when secure mode?
3957 break; 3930 break;
3958 3931
3959#ifdef MENUBAR
3960 case URxvt_Menu:
3961 if (OPTION (Opt_insecure))
3962 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3963 break;
3964#endif
3965#if 0 3932#if 0
3966 case Rxvt_dumpscreen: /* no error notices */ 3933 case Rxvt_dumpscreen: /* no error notices */
3967 { 3934 {
3968 int fd; 3935 int fd;
3969 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)
… …
4086 { 5, PrivMode_rVideo }, 4053 { 5, PrivMode_rVideo },
4087 { 6, PrivMode_relOrigin }, 4054 { 6, PrivMode_relOrigin },
4088 { 7, PrivMode_Autowrap }, 4055 { 7, PrivMode_Autowrap },
4089 // 8, bi-directional support mode 4056 // 8, bi-directional support mode
4090 { 9, PrivMode_MouseX10 }, 4057 { 9, PrivMode_MouseX10 },
4091#ifdef menuBar_esc
4092 { menuBar_esc, PrivMode_menuBar },
4093#endif
4094 // 18, 19 printing-related 4058 // 18, 19 printing-related
4095 { 25, PrivMode_VisibleCursor }, 4059 { 25, PrivMode_VisibleCursor },
4096#ifdef scrollBar_esc 4060#ifdef scrollBar_esc
4097 { scrollBar_esc, PrivMode_scrollBar }, 4061 { scrollBar_esc, PrivMode_scrollBar },
4098#endif 4062#endif
… …
4193 /* 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 */
4194 case 9: /* X10 mouse reporting */ 4158 case 9: /* X10 mouse reporting */
4195 if (state) /* orthogonal */ 4159 if (state) /* orthogonal */
4196 priv_modes &= ~PrivMode_MouseX11; 4160 priv_modes &= ~PrivMode_MouseX11;
4197 break; 4161 break;
4198#ifdef menuBar_esc
4199 case menuBar_esc:
4200#ifdef MENUBAR
4201 map_menuBar (state);
4202#endif
4203 break;
4204#endif
4205#ifdef scrollBar_esc 4162#ifdef scrollBar_esc
4206 case scrollBar_esc: 4163 case scrollBar_esc:
4207 if (scrollbar_mapping (state)) 4164 if (scrollbar_mapping (state))
4208 { 4165 {
4209 resize_all_windows (0, 0, 0); 4166 resize_all_windows (0, 0, 0);

Diff Legend

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