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.255 by root, Wed Jan 11 03:13:26 2006 UTC vs.
Revision 1.265 by root, Mon Jan 16 08:29:57 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 }
… …
972 972
973 if (want_refresh) 973 if (want_refresh)
974 { 974 {
975 if (SHOULD_INVOKE (HOOK_LINE_UPDATE)) 975 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
976 { 976 {
977 int row = -view_start; 977 int row = view_start;
978 int end_row = row + nrow; 978 int end_row = row + nrow;
979 979
980 while (row > -nsaved && ROW (row - 1).is_longer ()) 980 while (row > top_row && ROW (row - 1).is_longer ())
981 --row; 981 --row;
982 982
983 do 983 do
984 { 984 {
985 int start_row = row; 985 int start_row = row;
… …
1021} 1021}
1022 1022
1023void 1023void
1024rxvt_term::check_cb (check_watcher &w) 1024rxvt_term::check_cb (check_watcher &w)
1025{ 1025{
1026 SET_R (this); 1026 make_current ();
1027 SET_LOCALE (locale);
1028 1027
1029 display->flush (); 1028 display->flush ();
1030 1029
1031 if (want_refresh && !flush_ev.active) 1030 if (want_refresh && !flush_ev.active)
1032 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally 1031 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1033} 1032}
1034 1033
1035void 1034void
1036rxvt_term::flush_cb (time_watcher &w) 1035rxvt_term::flush_cb (time_watcher &w)
1037{ 1036{
1038 SET_R (this); 1037 make_current ();
1039 SET_LOCALE (locale);
1040 1038
1041 refresh_limit = 1; 1039 refresh_limit = 1;
1042 refresh_count = 0; 1040 refresh_count = 0;
1043 flush (); 1041 flush ();
1044} 1042}
… …
1101{ 1099{
1102 if (mouse_slip_wheel_speed == 0 1100 if (mouse_slip_wheel_speed == 0
1103 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1101 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1104 : scr_page (UP, mouse_slip_wheel_speed)) 1102 : scr_page (UP, mouse_slip_wheel_speed))
1105 { 1103 {
1106 if (view_start == nsaved || 1104 if (view_start == top_row || view_start == 0)
1107 view_start == 0)
1108 mouse_slip_wheel_speed = 0; 1105 mouse_slip_wheel_speed = 0;
1109 1106
1110 refresh_type |= SMOOTH_REFRESH; 1107 refresh_type |= SMOOTH_REFRESH;
1111 want_refresh = 1; 1108 want_refresh = 1;
1112 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1109 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
… …
1173} 1170}
1174 1171
1175void 1172void
1176rxvt_term::pty_cb (io_watcher &w, short revents) 1173rxvt_term::pty_cb (io_watcher &w, short revents)
1177{ 1174{
1178 SET_R (this); 1175 make_current ();
1179 SET_LOCALE (locale);
1180 1176
1181 if (revents & EVENT_READ) 1177 if (revents & EVENT_READ)
1182 // loop, but don't allow a single term to monopolize us 1178 // loop, but don't allow a single term to monopolize us
1183 while (pty_fill ()) 1179 while (pty_fill ())
1184 if (cmd_parse ()) 1180 if (cmd_parse ())
… …
1216} 1212}
1217 1213
1218void 1214void
1219rxvt_term::pointer_cb (time_watcher &w) 1215rxvt_term::pointer_cb (time_watcher &w)
1220{ 1216{
1221 SET_R (this); 1217 make_current ();
1222 SET_LOCALE (locale);
1223 1218
1224 pointer_blank (); 1219 pointer_blank ();
1225} 1220}
1226#endif 1221#endif
1227 1222
… …
1306 1301
1307/*{{{ process an X event */ 1302/*{{{ process an X event */
1308void 1303void
1309rxvt_term::x_cb (XEvent &ev) 1304rxvt_term::x_cb (XEvent &ev)
1310{ 1305{
1306 make_current ();
1307
1311 dDisp; 1308 dDisp;
1312 1309
1313 SET_R (this); 1310 if (ev.xany.window == vt
1314 SET_LOCALE (locale); 1311 && SHOULD_INVOKE (HOOK_X_EVENT)
1312 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1313 return;
1315 1314
1315 // for XQueryPointer
1316 Window unused_root, unused_child; 1316 Window unused_root, unused_child;
1317 int unused_root_x, unused_root_y; 1317 int unused_root_x, unused_root_y;
1318 unsigned int unused_mask; 1318 unsigned int unused_mask;
1319 1319
1320 switch (ev.type) 1320 switch (ev.type)
… …
1616 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1616 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1617 break; 1617 break;
1618 1618
1619 if (ev.xany.window == vt) 1619 if (ev.xany.window == vt)
1620 { 1620 {
1621 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1621 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1622 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1622 ; // nop 1623 ; // nop
1623 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1624 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1624 { 1625 {
1625 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1626 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1626 ; 1627 ;
… …
1818 1819
1819#if TRANSPARENT 1820#if TRANSPARENT
1820void 1821void
1821rxvt_term::rootwin_cb (XEvent &ev) 1822rxvt_term::rootwin_cb (XEvent &ev)
1822{ 1823{
1823 SET_R (this); 1824 make_current ();
1824 SET_LOCALE (locale);
1825 1825
1826 switch (ev.type) 1826 switch (ev.type)
1827 { 1827 {
1828 case PropertyNotify: 1828 case PropertyNotify:
1829 /* 1829 /*
… …
1920#else 1920#else
1921 selection.rect = false; 1921 selection.rect = false;
1922#endif 1922#endif
1923 1923
1924 /* allow shift+left click to extend selection */ 1924 /* allow shift+left click to extend selection */
1925 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1925 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1926 { 1926 {
1927 if (MEvent.button == Button1 && clickintime) 1927 if (MEvent.button == Button1 && clickintime)
1928 selection_rotate (ev.x, ev.y); 1928 selection_rotate (ev.x, ev.y);
1929 else 1929 else
1930 selection_extend (ev.x, ev.y, 1); 1930 selection_extend (ev.x, ev.y, 1);
… …
3858 { 3858 {
3859 if ((name = strchr (buf, ';')) == NULL) 3859 if ((name = strchr (buf, ';')) == NULL)
3860 break; 3860 break;
3861 3861
3862 *name++ = '\0'; 3862 *name++ = '\0';
3863 color = atoi (buf); 3863 color = atoi (buf) + minCOLOR;
3864 3864
3865 if (color < 0 || color >= TOTAL_COLORS) 3865 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3866 break; 3866 break;
3867 3867
3868 if ((buf = strchr (name, ';')) != NULL) 3868 if ((buf = strchr (name, ';')) != NULL)
3869 *buf++ = '\0'; 3869 *buf++ = '\0';
3870 3870
3871 if (name[0] == '?' && !name[1]) 3871 if (name[0] == '?' && !name[1])
3872 { 3872 {
3873 unsigned short r, g, b; 3873 unsigned short r, g, b;
3874 pix_colors_focused[color + minCOLOR].get (display, r, g, b); 3874 pix_colors_focused[color].get (display, r, g, b);
3875 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3875 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3876 } 3876 }
3877 else 3877 else
3878 set_window_color (color + minCOLOR, name); 3878 set_window_color (color, name);
3879 } 3879 }
3880 break; 3880 break;
3881 case XTerm_Color00: 3881 case XTerm_Color00:
3882 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3882 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3883 break; 3883 break;
3884 case XTerm_Color01: 3884 case XTerm_Color01:
3885 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3885 process_color_seq (XTerm_Color01, Color_bg, str, resp);
3886 break; 3886 break;
3887#ifndef NO_CURSORCOLOR 3887#ifndef NO_CURSORCOLOR
3888 case XTerm_Color_cursor: 3888 case XTerm_Color_cursor:
3889 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3889 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3890 break; 3890 break;
… …
3894 break; 3894 break;
3895 case XTerm_Color_pointer_bg: 3895 case XTerm_Color_pointer_bg:
3896 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3896 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3897 break; 3897 break;
3898#ifndef NO_BOLD_UNDERLINE_REVERSE 3898#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: 3899 case XTerm_Color_RV:
3906 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3900 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3901 break;
3902 case Rxvt_Color_BD:
3903 case URxvt_Color_BD:
3904 process_color_seq (op, Color_BD, str, resp);
3905 break;
3906 case Rxvt_Color_UL:
3907 case URxvt_Color_UL:
3908 process_color_seq (op, Color_UL, str, resp);
3907 break; 3909 break;
3908 case URxvt_Color_IT: 3910 case URxvt_Color_IT:
3909 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3911 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3910 break; 3912 break;
3911#endif 3913#endif
… …
3916 if (am_transparent) 3918 if (am_transparent)
3917 want_full_refresh = want_refresh = 1; 3919 want_full_refresh = want_refresh = 1;
3918 break; 3920 break;
3919#endif 3921#endif
3920 3922
3921 case XTerm_Pixmap: 3923 case Rxvt_Pixmap:
3922 if (*str != ';') 3924 if (*str != ';')
3923 { 3925 {
3924#if XPM_BACKGROUND 3926#if XPM_BACKGROUND
3925 scale_pixmap (""); /* reset to default scaling */ 3927 scale_pixmap (""); /* reset to default scaling */
3926 set_bgPixmap (str); /* change pixmap */ 3928 set_bgPixmap (str); /* change pixmap */
3927#endif
3928 scr_touch (true); 3929 scr_touch (true);
3930#endif
3929 } 3931 }
3932
3930 while ((str = strchr (str, ';')) != NULL) 3933 while ((str = strchr (str, ';')) != NULL)
3931 { 3934 {
3932 str++; 3935 str++;
3933#if XPM_BACKGROUND 3936#if XPM_BACKGROUND
3934 changed += scale_pixmap (str); 3937 changed += scale_pixmap (str);
… …
3937 3940
3938 if (changed) 3941 if (changed)
3939 { 3942 {
3940#ifdef XPM_BACKGROUND 3943#ifdef XPM_BACKGROUND
3941 resize_pixmap (); 3944 resize_pixmap ();
3942#endif
3943 scr_touch (true); 3945 scr_touch (true);
3946#endif
3944 } 3947 }
3945 break; 3948 break;
3946 3949
3947 case XTerm_restoreFG: 3950 case Rxvt_restoreFG:
3948 set_window_color (Color_fg, str); 3951 set_window_color (Color_fg, str);
3949 break; 3952 break;
3950 case XTerm_restoreBG: 3953 case Rxvt_restoreBG:
3951 set_window_color (Color_bg, str); 3954 set_window_color (Color_bg, str);
3952 break; 3955 break;
3953 3956
3954 case XTerm_logfile: 3957 case XTerm_logfile:
3955 // TODO, when secure mode? 3958 // TODO, when secure mode?
… …
3960 if (OPTION (Opt_insecure)) 3963 if (OPTION (Opt_insecure))
3961 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3964 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3962 break; 3965 break;
3963#endif 3966#endif
3964#if 0 3967#if 0
3965 case XTerm_dumpscreen: /* no error notices */ 3968 case Rxvt_dumpscreen: /* no error notices */
3966 { 3969 {
3967 int fd; 3970 int fd;
3968 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3971 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3969 { 3972 {
3970 scr_dump (fd); 3973 scr_dump (fd);

Diff Legend

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