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.249 by root, Sun Jan 8 01:02:15 2006 UTC vs.
Revision 1.263 by root, Sun Jan 15 16:48:17 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 }
… …
867#endif 867#endif
868 /* nil */ ; 868 /* nil */ ;
869 } 869 }
870 } 870 }
871 871
872 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_STR_LEN, kbuf, len, DT_END))) 872 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
873 return; 873 return;
874 874
875 if (len <= 0) 875 if (len <= 0)
876 return; /* not mapped */ 876 return; /* not mapped */
877 877
… …
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 979
979 while (row > -nsaved && ROW (row - 1).is_longer ()) 980 while (row > top_row && ROW (row - 1).is_longer ())
980 --row; 981 --row;
981 982
982 while (row < -view_start + nrow) 983 do
983 { 984 {
984 int start_row = row; 985 int start_row = row;
985 line_t *l; 986 line_t *l;
986 987
987 do 988 do
988 { 989 {
989 l = &ROW (row); 990 l = &ROW (row++);
990 991
991 if (!(l->f & LINE_FILTERED)) 992 if (!(l->f & LINE_FILTERED))
992 { 993 {
993 // line not filtered, mark it as filtered 994 // line not filtered, mark it as filtered
994 l->f |= LINE_FILTERED; 995 l->f |= LINE_FILTERED;
995 while (l->is_longer ()) 996 while (l->is_longer ())
996 { 997 {
997 l = &ROW (++row); 998 l = &ROW (row++);
998 l->f |= LINE_FILTERED; 999 l->f |= LINE_FILTERED;
999 } 1000 }
1000 1001
1001 // and filter it 1002 // and filter it
1002 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END)); 1003 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1003 1004
1004 break; 1005 break;
1005 } 1006 }
1006 } 1007 }
1007 while (l->is_longer ()); 1008 while (l->is_longer () && row < end_row);
1008
1009 row++;
1010 } 1009 }
1011 1010 while (row < end_row);
1012 } 1011 }
1013 1012
1014 scr_refresh (refresh_type); 1013 scr_refresh (refresh_type);
1015 scrollbar_show (1); 1014 scrollbar_show (1);
1016#ifdef USE_XIM 1015#ifdef USE_XIM
… …
1102{ 1101{
1103 if (mouse_slip_wheel_speed == 0 1102 if (mouse_slip_wheel_speed == 0
1104 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1103 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1105 : scr_page (UP, mouse_slip_wheel_speed)) 1104 : scr_page (UP, mouse_slip_wheel_speed))
1106 { 1105 {
1107 if (view_start == nsaved || 1106 if (view_start == top_row || view_start == 0)
1108 view_start == 0)
1109 mouse_slip_wheel_speed = 0; 1107 mouse_slip_wheel_speed = 0;
1110 1108
1111 refresh_type |= SMOOTH_REFRESH; 1109 refresh_type |= SMOOTH_REFRESH;
1112 want_refresh = 1; 1110 want_refresh = 1;
1113 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1111 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
… …
1312 dDisp; 1310 dDisp;
1313 1311
1314 SET_R (this); 1312 SET_R (this);
1315 SET_LOCALE (locale); 1313 SET_LOCALE (locale);
1316 1314
1315 if (ev.xany.window == vt
1316 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1317 return;
1318
1319 // for XQueryPointer
1317 Window unused_root, unused_child; 1320 Window unused_root, unused_child;
1318 int unused_root_x, unused_root_y; 1321 int unused_root_x, unused_root_y;
1319 unsigned int unused_mask; 1322 unsigned int unused_mask;
1320 1323
1321 switch (ev.type) 1324 switch (ev.type)
… …
1328 1331
1329 break; 1332 break;
1330 1333
1331 case KeyRelease: 1334 case KeyRelease:
1332 { 1335 {
1333#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 1336#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1334 KeySym ks; 1337 KeySym keysym;
1335 1338
1336 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ 1339 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1337#endif 1340#endif
1338 1341
1339#if ENABLE_FRILLS || ISO_14755 1342#if ENABLE_FRILLS || ISO_14755
1340 // ISO 14755 support 1343 // ISO 14755 support
1341 if (iso14755buf) 1344 if (iso14755buf)
… …
1346# endif 1349# endif
1347# if ISO_14755 1350# if ISO_14755
1348 // iso14755 part 5.2 handling: release time 1351 // iso14755 part 5.2 handling: release time
1349 // first: controls 1352 // first: controls
1350 if ((ev.xkey.state & ControlMask) 1353 if ((ev.xkey.state & ControlMask)
1351 && ((ks >= 0x40 && ks <= 0x5f) 1354 && ((keysym >= 0x40 && keysym <= 0x5f)
1352 || (ks >= 0x61 && ks <= 0x7f))) 1355 || (keysym >= 0x61 && keysym <= 0x7f)))
1353 { 1356 {
1354 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); 1357 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1355 commit_iso14755 (); 1358 commit_iso14755 ();
1356 goto skip_switch; 1359 goto skip_switch;
1357 } 1360 }
1358 1361
1359 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1362 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1360 if (i[0] == ks) 1363 if (i[0] == keysym)
1361 { 1364 {
1362 iso14755buf = ISO_14755_51 | i[1]; 1365 iso14755buf = ISO_14755_51 | i[1];
1363 commit_iso14755 (); 1366 commit_iso14755 ();
1364 goto skip_switch; 1367 goto skip_switch;
1365 } 1368 }
… …
1389 iso14755buf = 0; 1392 iso14755buf = 0;
1390 } 1393 }
1391#endif 1394#endif
1392 1395
1393 if (ev.xany.window == vt 1396 if (ev.xany.window == vt
1394 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_END))) 1397 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1395 break; 1398 break;
1396 1399
1397#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1400#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1398 if (!(ev.xkey.state & ControlMask)) 1401 if (!(ev.xkey.state & ControlMask))
1399 slip_wheel_ev.stop (); 1402 slip_wheel_ev.stop ();
1400 else if (ks == XK_Control_L || ks == XK_Control_R) 1403 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1401 mouse_slip_wheel_speed = 0; 1404 mouse_slip_wheel_speed = 0;
1402#endif 1405#endif
1403 break; 1406 break;
1404 } 1407 }
1405 1408
… …
1572 1575
1573 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1576 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1574 scr_expose (ev.xexpose.x, ev.xexpose.y, 1577 scr_expose (ev.xexpose.x, ev.xexpose.y,
1575 ev.xexpose.width, ev.xexpose.height, False); 1578 ev.xexpose.width, ev.xexpose.height, False);
1576 1579
1577 scr_refresh (refresh_type); 1580 want_refresh = 1;
1578 } 1581 }
1579 else 1582 else
1580 { 1583 {
1581 XEvent unused_event; 1584 XEvent unused_event;
1582 1585
… …
1709 &unused_root_x, &unused_root_y, 1712 &unused_root_x, &unused_root_y,
1710 &ev.xbutton.x, &ev.xbutton.y, 1713 &ev.xbutton.x, &ev.xbutton.y,
1711 &unused_mask); 1714 &unused_mask);
1712 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1715 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1713 scrollbar_size ()); 1716 scrollbar_size ());
1714 scr_refresh (refresh_type); 1717 want_refresh = 1;
1715 refresh_limit = 0; 1718 refresh_limit = 0;
1716 scrollbar_show (1); 1719 scrollbar_show (1);
1717 } 1720 }
1718 break; 1721 break;
1719 } 1722 }
… …
1921#else 1924#else
1922 selection.rect = false; 1925 selection.rect = false;
1923#endif 1926#endif
1924 1927
1925 /* allow shift+left click to extend selection */ 1928 /* allow shift+left click to extend selection */
1926 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1929 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1927 { 1930 {
1928 if (MEvent.button == Button1 && clickintime) 1931 if (MEvent.button == Button1 && clickintime)
1929 selection_rotate (ev.x, ev.y); 1932 selection_rotate (ev.x, ev.y);
1930 else 1933 else
1931 selection_extend (ev.x, ev.y, 1); 1934 selection_extend (ev.x, ev.y, 1);
… …
2215 slip_wheel_ev.start (); 2218 slip_wheel_ev.start ();
2216 } 2219 }
2217 else 2220 else
2218 { 2221 {
2219# endif 2222# endif
2220# ifdef JUMP_MOUSE_WHEEL
2221 scr_page (v, i); 2223 scr_page (v, i);
2222 scr_refresh (SMOOTH_REFRESH);
2223 scrollbar_show (1); 2224 scrollbar_show (1);
2224# else
2225 while (i--)
2226 {
2227 scr_page (v, 1);
2228 scr_refresh (SMOOTH_REFRESH);
2229 scrollbar_show (1);
2230 }
2231# endif
2232# ifdef MOUSE_SLIP_WHEELING 2225# ifdef MOUSE_SLIP_WHEELING
2233 } 2226 }
2234#endif 2227# endif
2235 } 2228 }
2236 break; 2229 break;
2237#endif 2230#endif
2238 } 2231 }
2239 } 2232 }
… …
2833 refresh_limit++; 2826 refresh_limit++;
2834 else 2827 else
2835 { 2828 {
2836 flag = true; 2829 flag = true;
2837 scr_refresh (refresh_type); 2830 scr_refresh (refresh_type);
2838 flush_ev.stop (); 2831 want_refresh = 1;
2839 } 2832 }
2840 } 2833 }
2841 2834
2842 } 2835 }
2843 else 2836 else
… …
3869 { 3862 {
3870 if ((name = strchr (buf, ';')) == NULL) 3863 if ((name = strchr (buf, ';')) == NULL)
3871 break; 3864 break;
3872 3865
3873 *name++ = '\0'; 3866 *name++ = '\0';
3874 color = atoi (buf); 3867 color = atoi (buf) + minCOLOR;
3875 3868
3876 if (color < 0 || color >= TOTAL_COLORS) 3869 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3877 break; 3870 break;
3878 3871
3879 if ((buf = strchr (name, ';')) != NULL) 3872 if ((buf = strchr (name, ';')) != NULL)
3880 *buf++ = '\0'; 3873 *buf++ = '\0';
3881 3874
3882 if (name[0] == '?' && !name[1]) 3875 if (name[0] == '?' && !name[1])
3883 { 3876 {
3884 unsigned short r, g, b; 3877 unsigned short r, g, b;
3885 pix_colors_focused[color + minCOLOR].get (display, r, g, b); 3878 pix_colors_focused[color].get (display, r, g, b);
3886 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3879 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3887 } 3880 }
3888 else 3881 else
3889 set_window_color (color + minCOLOR, name); 3882 set_window_color (color, name);
3890 } 3883 }
3891 break; 3884 break;
3892 case XTerm_Color00: 3885 case XTerm_Color00:
3893 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3886 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3894 break; 3887 break;
3895 case XTerm_Color01: 3888 case XTerm_Color01:
3896 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3889 process_color_seq (XTerm_Color01, Color_bg, str, resp);
3897 break; 3890 break;
3898#ifndef NO_CURSORCOLOR 3891#ifndef NO_CURSORCOLOR
3899 case XTerm_Color_cursor: 3892 case XTerm_Color_cursor:
3900 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3893 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3901 break; 3894 break;
… …
3905 break; 3898 break;
3906 case XTerm_Color_pointer_bg: 3899 case XTerm_Color_pointer_bg:
3907 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3900 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3908 break; 3901 break;
3909#ifndef NO_BOLD_UNDERLINE_REVERSE 3902#ifndef NO_BOLD_UNDERLINE_REVERSE
3910 case XTerm_Color_BD:
3911 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3912 break;
3913 case XTerm_Color_UL:
3914 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3915 break;
3916 case XTerm_Color_RV: 3903 case XTerm_Color_RV:
3917 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3904 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3905 break;
3906 case Rxvt_Color_BD:
3907 case URxvt_Color_BD:
3908 process_color_seq (op, Color_BD, str, resp);
3909 break;
3910 case Rxvt_Color_UL:
3911 case URxvt_Color_UL:
3912 process_color_seq (op, Color_UL, str, resp);
3918 break; 3913 break;
3919 case URxvt_Color_IT: 3914 case URxvt_Color_IT:
3920 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3915 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3921 break; 3916 break;
3922#endif 3917#endif
… …
3927 if (am_transparent) 3922 if (am_transparent)
3928 want_full_refresh = want_refresh = 1; 3923 want_full_refresh = want_refresh = 1;
3929 break; 3924 break;
3930#endif 3925#endif
3931 3926
3932 case XTerm_Pixmap: 3927 case Rxvt_Pixmap:
3933 if (*str != ';') 3928 if (*str != ';')
3934 { 3929 {
3935#if XPM_BACKGROUND 3930#if XPM_BACKGROUND
3936 scale_pixmap (""); /* reset to default scaling */ 3931 scale_pixmap (""); /* reset to default scaling */
3937 set_bgPixmap (str); /* change pixmap */ 3932 set_bgPixmap (str); /* change pixmap */
3938#endif
3939 scr_touch (true); 3933 scr_touch (true);
3934#endif
3940 } 3935 }
3936
3941 while ((str = strchr (str, ';')) != NULL) 3937 while ((str = strchr (str, ';')) != NULL)
3942 { 3938 {
3943 str++; 3939 str++;
3944#if XPM_BACKGROUND 3940#if XPM_BACKGROUND
3945 changed += scale_pixmap (str); 3941 changed += scale_pixmap (str);
… …
3948 3944
3949 if (changed) 3945 if (changed)
3950 { 3946 {
3951#ifdef XPM_BACKGROUND 3947#ifdef XPM_BACKGROUND
3952 resize_pixmap (); 3948 resize_pixmap ();
3953#endif
3954 scr_touch (true); 3949 scr_touch (true);
3950#endif
3955 } 3951 }
3956 break; 3952 break;
3957 3953
3958 case XTerm_restoreFG: 3954 case Rxvt_restoreFG:
3959 set_window_color (Color_fg, str); 3955 set_window_color (Color_fg, str);
3960 break; 3956 break;
3961 case XTerm_restoreBG: 3957 case Rxvt_restoreBG:
3962 set_window_color (Color_bg, str); 3958 set_window_color (Color_bg, str);
3963 break; 3959 break;
3964 3960
3965 case XTerm_logfile: 3961 case XTerm_logfile:
3966 // TODO, when secure mode? 3962 // TODO, when secure mode?
… …
3971 if (OPTION (Opt_insecure)) 3967 if (OPTION (Opt_insecure))
3972 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3968 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3973 break; 3969 break;
3974#endif 3970#endif
3975#if 0 3971#if 0
3976 case XTerm_dumpscreen: /* no error notices */ 3972 case Rxvt_dumpscreen: /* no error notices */
3977 { 3973 {
3978 int fd; 3974 int fd;
3979 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3975 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3980 { 3976 {
3981 scr_dump (fd); 3977 scr_dump (fd);
… …
4461const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4457const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4462 4458
4463void 4459void
4464rxvt_term::tt_write (const char *data, unsigned int len) 4460rxvt_term::tt_write (const char *data, unsigned int len)
4465{ 4461{
4462 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4463 return;
4464
4466 if (pty.pty < 0) 4465 if (pty.pty < 0)
4467 return; 4466 return;
4468 4467
4469 if (v_buflen == 0) 4468 if (v_buflen == 0)
4470 { 4469 {

Diff Legend

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