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

Diff Legend

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