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.248 by root, Sun Jan 8 00:07:18 2006 UTC vs.
Revision 1.261 by root, Fri Jan 13 15:42:50 2006 UTC

… …
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
… …
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 > -nsaved && 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
… …
1312 dDisp; 1311 dDisp;
1313 1312
1314 SET_R (this); 1313 SET_R (this);
1315 SET_LOCALE (locale); 1314 SET_LOCALE (locale);
1316 1315
1316 if (ev.xany.window == vt
1317 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1318 return;
1319
1320 // for XQueryPointer
1317 Window unused_root, unused_child; 1321 Window unused_root, unused_child;
1318 int unused_root_x, unused_root_y; 1322 int unused_root_x, unused_root_y;
1319 unsigned int unused_mask; 1323 unsigned int unused_mask;
1320 1324
1321 switch (ev.type) 1325 switch (ev.type)
… …
1328 1332
1329 break; 1333 break;
1330 1334
1331 case KeyRelease: 1335 case KeyRelease:
1332 { 1336 {
1333#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 1337#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1334 KeySym ks; 1338 KeySym keysym;
1335 1339
1336 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ 1340 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1337#endif 1341#endif
1338 1342
1339#if ENABLE_FRILLS || ISO_14755 1343#if ENABLE_FRILLS || ISO_14755
1340 // ISO 14755 support 1344 // ISO 14755 support
1341 if (iso14755buf) 1345 if (iso14755buf)
… …
1346# endif 1350# endif
1347# if ISO_14755 1351# if ISO_14755
1348 // iso14755 part 5.2 handling: release time 1352 // iso14755 part 5.2 handling: release time
1349 // first: controls 1353 // first: controls
1350 if ((ev.xkey.state & ControlMask) 1354 if ((ev.xkey.state & ControlMask)
1351 && ((ks >= 0x40 && ks <= 0x5f) 1355 && ((keysym >= 0x40 && keysym <= 0x5f)
1352 || (ks >= 0x61 && ks <= 0x7f))) 1356 || (keysym >= 0x61 && keysym <= 0x7f)))
1353 { 1357 {
1354 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); 1358 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1355 commit_iso14755 (); 1359 commit_iso14755 ();
1356 goto skip_switch; 1360 goto skip_switch;
1357 } 1361 }
1358 1362
1359 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1363 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1360 if (i[0] == ks) 1364 if (i[0] == keysym)
1361 { 1365 {
1362 iso14755buf = ISO_14755_51 | i[1]; 1366 iso14755buf = ISO_14755_51 | i[1];
1363 commit_iso14755 (); 1367 commit_iso14755 ();
1364 goto skip_switch; 1368 goto skip_switch;
1365 } 1369 }
… …
1389 iso14755buf = 0; 1393 iso14755buf = 0;
1390 } 1394 }
1391#endif 1395#endif
1392 1396
1393 if (ev.xany.window == vt 1397 if (ev.xany.window == vt
1394 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_END))) 1398 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1395 break; 1399 break;
1396 1400
1397#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1401#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1398 if (!(ev.xkey.state & ControlMask)) 1402 if (!(ev.xkey.state & ControlMask))
1399 slip_wheel_ev.stop (); 1403 slip_wheel_ev.stop ();
1400 else if (ks == XK_Control_L || ks == XK_Control_R) 1404 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1401 mouse_slip_wheel_speed = 0; 1405 mouse_slip_wheel_speed = 0;
1402#endif 1406#endif
1403 break; 1407 break;
1404 } 1408 }
1405 1409
… …
1572 1576
1573 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1577 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1574 scr_expose (ev.xexpose.x, ev.xexpose.y, 1578 scr_expose (ev.xexpose.x, ev.xexpose.y,
1575 ev.xexpose.width, ev.xexpose.height, False); 1579 ev.xexpose.width, ev.xexpose.height, False);
1576 1580
1577 scr_refresh (refresh_type); 1581 want_refresh = 1;
1578 } 1582 }
1579 else 1583 else
1580 { 1584 {
1581 XEvent unused_event; 1585 XEvent unused_event;
1582 1586
… …
1709 &unused_root_x, &unused_root_y, 1713 &unused_root_x, &unused_root_y,
1710 &ev.xbutton.x, &ev.xbutton.y, 1714 &ev.xbutton.x, &ev.xbutton.y,
1711 &unused_mask); 1715 &unused_mask);
1712 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1716 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1713 scrollbar_size ()); 1717 scrollbar_size ());
1714 scr_refresh (refresh_type); 1718 want_refresh = 1;
1715 refresh_limit = 0; 1719 refresh_limit = 0;
1716 scrollbar_show (1); 1720 scrollbar_show (1);
1717 } 1721 }
1718 break; 1722 break;
1719 } 1723 }
… …
1921#else 1925#else
1922 selection.rect = false; 1926 selection.rect = false;
1923#endif 1927#endif
1924 1928
1925 /* allow shift+left click to extend selection */ 1929 /* allow shift+left click to extend selection */
1926 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1930 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1927 { 1931 {
1928 if (MEvent.button == Button1 && clickintime) 1932 if (MEvent.button == Button1 && clickintime)
1929 selection_rotate (ev.x, ev.y); 1933 selection_rotate (ev.x, ev.y);
1930 else 1934 else
1931 selection_extend (ev.x, ev.y, 1); 1935 selection_extend (ev.x, ev.y, 1);
… …
2215 slip_wheel_ev.start (); 2219 slip_wheel_ev.start ();
2216 } 2220 }
2217 else 2221 else
2218 { 2222 {
2219# endif 2223# endif
2220# ifdef JUMP_MOUSE_WHEEL
2221 scr_page (v, i); 2224 scr_page (v, i);
2222 scr_refresh (SMOOTH_REFRESH);
2223 scrollbar_show (1); 2225 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 2226# ifdef MOUSE_SLIP_WHEELING
2233 } 2227 }
2234#endif 2228# endif
2235 } 2229 }
2236 break; 2230 break;
2237#endif 2231#endif
2238 } 2232 }
2239 } 2233 }
… …
2833 refresh_limit++; 2827 refresh_limit++;
2834 else 2828 else
2835 { 2829 {
2836 flag = true; 2830 flag = true;
2837 scr_refresh (refresh_type); 2831 scr_refresh (refresh_type);
2838 flush_ev.stop (); 2832 want_refresh = 1;
2839 } 2833 }
2840 } 2834 }
2841 2835
2842 } 2836 }
2843 else 2837 else
… …
3869 { 3863 {
3870 if ((name = strchr (buf, ';')) == NULL) 3864 if ((name = strchr (buf, ';')) == NULL)
3871 break; 3865 break;
3872 3866
3873 *name++ = '\0'; 3867 *name++ = '\0';
3874 color = atoi (buf); 3868 color = atoi (buf) + minCOLOR;
3875 3869
3876 if (color < 0 || color >= TOTAL_COLORS) 3870 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3877 break; 3871 break;
3878 3872
3879 if ((buf = strchr (name, ';')) != NULL) 3873 if ((buf = strchr (name, ';')) != NULL)
3880 *buf++ = '\0'; 3874 *buf++ = '\0';
3881 3875
3882 if (name[0] == '?' && !name[1]) 3876 if (name[0] == '?' && !name[1])
3883 { 3877 {
3884 unsigned short r, g, b; 3878 unsigned short r, g, b;
3885 pix_colors_focused[color + minCOLOR].get (display, r, g, b); 3879 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); 3880 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3887 } 3881 }
3888 else 3882 else
3889 set_window_color (color + minCOLOR, name); 3883 set_window_color (color, name);
3890 } 3884 }
3891 break; 3885 break;
3892 case XTerm_Color00: 3886 case XTerm_Color00:
3893 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3887 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3894 break; 3888 break;
3895 case XTerm_Color01: 3889 case XTerm_Color01:
3896 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3890 process_color_seq (XTerm_Color01, Color_bg, str, resp);
3897 break; 3891 break;
3898#ifndef NO_CURSORCOLOR 3892#ifndef NO_CURSORCOLOR
3899 case XTerm_Color_cursor: 3893 case XTerm_Color_cursor:
3900 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3894 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3901 break; 3895 break;
… …
3905 break; 3899 break;
3906 case XTerm_Color_pointer_bg: 3900 case XTerm_Color_pointer_bg:
3907 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3901 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3908 break; 3902 break;
3909#ifndef NO_BOLD_UNDERLINE_REVERSE 3903#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: 3904 case XTerm_Color_RV:
3917 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3905 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3906 break;
3907 case Rxvt_Color_BD:
3908 case URxvt_Color_BD:
3909 process_color_seq (op, Color_BD, str, resp);
3910 break;
3911 case Rxvt_Color_UL:
3912 case URxvt_Color_UL:
3913 process_color_seq (op, Color_UL, str, resp);
3918 break; 3914 break;
3919 case URxvt_Color_IT: 3915 case URxvt_Color_IT:
3920 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3916 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3921 break; 3917 break;
3922#endif 3918#endif
… …
3927 if (am_transparent) 3923 if (am_transparent)
3928 want_full_refresh = want_refresh = 1; 3924 want_full_refresh = want_refresh = 1;
3929 break; 3925 break;
3930#endif 3926#endif
3931 3927
3932 case XTerm_Pixmap: 3928 case Rxvt_Pixmap:
3933 if (*str != ';') 3929 if (*str != ';')
3934 { 3930 {
3935#if XPM_BACKGROUND 3931#if XPM_BACKGROUND
3936 scale_pixmap (""); /* reset to default scaling */ 3932 scale_pixmap (""); /* reset to default scaling */
3937 set_bgPixmap (str); /* change pixmap */ 3933 set_bgPixmap (str); /* change pixmap */
3938#endif
3939 scr_touch (true); 3934 scr_touch (true);
3935#endif
3940 } 3936 }
3937
3941 while ((str = strchr (str, ';')) != NULL) 3938 while ((str = strchr (str, ';')) != NULL)
3942 { 3939 {
3943 str++; 3940 str++;
3944#if XPM_BACKGROUND 3941#if XPM_BACKGROUND
3945 changed += scale_pixmap (str); 3942 changed += scale_pixmap (str);
… …
3948 3945
3949 if (changed) 3946 if (changed)
3950 { 3947 {
3951#ifdef XPM_BACKGROUND 3948#ifdef XPM_BACKGROUND
3952 resize_pixmap (); 3949 resize_pixmap ();
3953#endif
3954 scr_touch (true); 3950 scr_touch (true);
3951#endif
3955 } 3952 }
3956 break; 3953 break;
3957 3954
3958 case XTerm_restoreFG: 3955 case Rxvt_restoreFG:
3959 set_window_color (Color_fg, str); 3956 set_window_color (Color_fg, str);
3960 break; 3957 break;
3961 case XTerm_restoreBG: 3958 case Rxvt_restoreBG:
3962 set_window_color (Color_bg, str); 3959 set_window_color (Color_bg, str);
3963 break; 3960 break;
3964 3961
3965 case XTerm_logfile: 3962 case XTerm_logfile:
3966 // TODO, when secure mode? 3963 // TODO, when secure mode?
… …
3971 if (OPTION (Opt_insecure)) 3968 if (OPTION (Opt_insecure))
3972 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3969 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3973 break; 3970 break;
3974#endif 3971#endif
3975#if 0 3972#if 0
3976 case XTerm_dumpscreen: /* no error notices */ 3973 case Rxvt_dumpscreen: /* no error notices */
3977 { 3974 {
3978 int fd; 3975 int fd;
3979 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3976 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3980 { 3977 {
3981 scr_dump (fd); 3978 scr_dump (fd);
… …
4155 /* extra handling for values with state unkept */ 4152 /* extra handling for values with state unkept */
4156 switch (arg[i]) 4153 switch (arg[i])
4157 { 4154 {
4158#if ENABLE_STYLES 4155#if ENABLE_STYLES
4159 case 1021: 4156 case 1021:
4160 if (mode) 4157 set_option (Opt_intensityStyles, mode);
4161 SET_OPTION (Opt_intensityStyles);
4162 else
4163 CLR_OPTION (Opt_intensityStyles);
4164 4158
4165 scr_touch (true); 4159 scr_touch (true);
4166 break; 4160 break;
4167#endif 4161#endif
4168 case 1048: /* alternative cursor save */ 4162 case 1048: /* alternative cursor save */
… …
4190 case 3: /* 80/132 */ 4184 case 3: /* 80/132 */
4191 if (priv_modes & PrivMode_132OK) 4185 if (priv_modes & PrivMode_132OK)
4192 set_widthheight (((state ? 132 : 80) * fwidth), height); 4186 set_widthheight (((state ? 132 : 80) * fwidth), height);
4193 break; 4187 break;
4194 case 4: /* smooth scrolling */ 4188 case 4: /* smooth scrolling */
4195 if (!state) 4189 set_option (Opt_jumpScroll, !state);
4196 SET_OPTION (Opt_jumpScroll);
4197 else
4198 CLR_OPTION (Opt_jumpScroll);
4199 break; 4190 break;
4200 case 5: /* reverse video */ 4191 case 5: /* reverse video */
4201 scr_rvideo_mode (state); 4192 scr_rvideo_mode (state);
4202 break; 4193 break;
4203 case 6: /* relative/absolute origins */ 4194 case 6: /* relative/absolute origins */
… …
4244#if 0 4235#if 0
4245 case 1001: 4236 case 1001:
4246 break; /* X11 mouse highlighting */ 4237 break; /* X11 mouse highlighting */
4247#endif 4238#endif
4248 case 1010: /* scroll to bottom on TTY output inhibit */ 4239 case 1010: /* scroll to bottom on TTY output inhibit */
4249 if (!state) 4240 set_option (Opt_scrollTtyOutput, !state);
4250 SET_OPTION (Opt_scrollTtyOutput);
4251 else
4252 CLR_OPTION (Opt_scrollTtyOutput);
4253 break; 4241 break;
4254 case 1011: /* scroll to bottom on key press */ 4242 case 1011: /* scroll to bottom on key press */
4255 if (state) 4243 set_option (Opt_scrollTtyKeypress, state);
4256 SET_OPTION (Opt_scrollTtyKeypress);
4257 else
4258 CLR_OPTION (Opt_scrollTtyKeypress);
4259 break; 4244 break;
4260 case 1047: /* secondary screen w/ clearing last */ 4245 case 1047: /* secondary screen w/ clearing last */
4261 if (OPTION (Opt_secondaryScreen)) 4246 if (OPTION (Opt_secondaryScreen))
4262 if (current_screen != PRIMARY) 4247 if (current_screen != PRIMARY)
4263 scr_erase_screen (2); 4248 scr_erase_screen (2);
… …
4473const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4458const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4474 4459
4475void 4460void
4476rxvt_term::tt_write (const char *data, unsigned int len) 4461rxvt_term::tt_write (const char *data, unsigned int len)
4477{ 4462{
4463 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4464 return;
4465
4478 if (pty.pty < 0) 4466 if (pty.pty < 0)
4479 return; 4467 return;
4480 4468
4481 if (v_buflen == 0) 4469 if (v_buflen == 0)
4482 { 4470 {

Diff Legend

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