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.256 by root, Wed Jan 11 05:14:26 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 }
… …
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;
… …
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)
… …
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 ;
… …
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();
… …
2224 } 2197 }
2225 break; 2198 break;
2226#endif 2199#endif
2227 } 2200 }
2228 } 2201 }
2229#ifdef MENUBAR
2230 else if (isMenuBarWindow (ev.window))
2231 menubar_control (ev);
2232#endif
2233} 2202}
2234 2203
2235#ifdef TRANSPARENT 2204#ifdef TRANSPARENT
2236#if TINTING 2205#if TINTING
2237/* taken from aterm-0.4.2 */ 2206/* taken from aterm-0.4.2 */
… …
2780 } 2749 }
2781 2750
2782 // scr_add_lines only works for nlines <= nrow - 1. 2751 // scr_add_lines only works for nlines <= nrow - 1.
2783 if (nlines >= nrow - 1) 2752 if (nlines >= nrow - 1)
2784 { 2753 {
2754 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2785 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))))
2786 scr_add_lines (buf, str - buf, nlines); 2756 scr_add_lines (buf, str - buf, nlines);
2787 2757
2788 nlines = 0; 2758 nlines = 0;
2789 str = buf; 2759 str = buf;
2790 eol = str + min (ncol, UBUFSIZ); 2760 eol = str + min (ncol, UBUFSIZ);
… …
2805 2775
2806 seq_begin = cmdbuf_ptr; 2776 seq_begin = cmdbuf_ptr;
2807 ch = next_char (); 2777 ch = next_char ();
2808 } 2778 }
2809 2779
2780 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2810 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))))
2811 scr_add_lines (buf, str - buf, nlines); 2782 scr_add_lines (buf, str - buf, nlines);
2812 2783
2813 /* 2784 /*
2814 * 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
2815 * 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.
… …
2821 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2792 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2822 refresh_limit++; 2793 refresh_limit++;
2823 else 2794 else
2824 { 2795 {
2825 flag = true; 2796 flag = true;
2826 scr_refresh (refresh_type); 2797 scr_refresh ();
2827 want_refresh = 1; 2798 want_refresh = 1;
2828 } 2799 }
2829 } 2800 }
2830 2801
2831 } 2802 }
… …
3860 break; 3831 break;
3861 3832
3862 *name++ = '\0'; 3833 *name++ = '\0';
3863 color = atoi (buf) + minCOLOR; 3834 color = atoi (buf) + minCOLOR;
3864 3835
3865 if (!IN_RANGE_EXC (color, minCOLOR, TOTAL_COLORS)) 3836 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3866 break; 3837 break;
3867 3838
3868 if ((buf = strchr (name, ';')) != NULL) 3839 if ((buf = strchr (name, ';')) != NULL)
3869 *buf++ = '\0'; 3840 *buf++ = '\0';
3870 3841
… …
3894 break; 3865 break;
3895 case XTerm_Color_pointer_bg: 3866 case XTerm_Color_pointer_bg:
3896 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);
3897 break; 3868 break;
3898#ifndef NO_BOLD_UNDERLINE_REVERSE 3869#ifndef NO_BOLD_UNDERLINE_REVERSE
3899 case XTerm_Color_BD:
3900 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3901 break;
3902 case XTerm_Color_UL:
3903 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3904 break;
3905 case XTerm_Color_RV: 3870 case XTerm_Color_RV:
3906 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);
3907 break; 3880 break;
3908 case URxvt_Color_IT: 3881 case URxvt_Color_IT:
3909 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3882 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3910 break; 3883 break;
3911#endif 3884#endif
… …
3916 if (am_transparent) 3889 if (am_transparent)
3917 want_full_refresh = want_refresh = 1; 3890 want_full_refresh = want_refresh = 1;
3918 break; 3891 break;
3919#endif 3892#endif
3920 3893
3921 case XTerm_Pixmap: 3894 case Rxvt_Pixmap:
3922 if (*str != ';') 3895 if (*str != ';')
3923 { 3896 {
3924#if XPM_BACKGROUND 3897#if XPM_BACKGROUND
3925 scale_pixmap (""); /* reset to default scaling */ 3898 scale_pixmap (""); /* reset to default scaling */
3926 set_bgPixmap (str); /* change pixmap */ 3899 set_bgPixmap (str); /* change pixmap */
… …
3943 scr_touch (true); 3916 scr_touch (true);
3944#endif 3917#endif
3945 } 3918 }
3946 break; 3919 break;
3947 3920
3948 case XTerm_restoreFG: 3921 case Rxvt_restoreFG:
3949 set_window_color (Color_fg, str); 3922 set_window_color (Color_fg, str);
3950 break; 3923 break;
3951 case XTerm_restoreBG: 3924 case Rxvt_restoreBG:
3952 set_window_color (Color_bg, str); 3925 set_window_color (Color_bg, str);
3953 break; 3926 break;
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 XTerm_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)
3970 { 3937 {
3971 scr_dump (fd); 3938 scr_dump (fd);
… …
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