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.257 by root, Wed Jan 11 05:29:40 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
… …
1329 1327
1330 break; 1328 break;
1331 1329
1332 case KeyRelease: 1330 case KeyRelease:
1333 { 1331 {
1334#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 1332#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1335 KeySym ks; 1333 KeySym keysym;
1336 1334
1337 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ 1335 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1338#endif 1336#endif
1339 1337
1340#if ENABLE_FRILLS || ISO_14755 1338#if ENABLE_FRILLS || ISO_14755
1341 // ISO 14755 support 1339 // ISO 14755 support
1342 if (iso14755buf) 1340 if (iso14755buf)
… …
1347# endif 1345# endif
1348# if ISO_14755 1346# if ISO_14755
1349 // iso14755 part 5.2 handling: release time 1347 // iso14755 part 5.2 handling: release time
1350 // first: controls 1348 // first: controls
1351 if ((ev.xkey.state & ControlMask) 1349 if ((ev.xkey.state & ControlMask)
1352 && ((ks >= 0x40 && ks <= 0x5f) 1350 && ((keysym >= 0x40 && keysym <= 0x5f)
1353 || (ks >= 0x61 && ks <= 0x7f))) 1351 || (keysym >= 0x61 && keysym <= 0x7f)))
1354 { 1352 {
1355 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); 1353 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1356 commit_iso14755 (); 1354 commit_iso14755 ();
1357 goto skip_switch; 1355 goto skip_switch;
1358 } 1356 }
1359 1357
1360 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1358 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1361 if (i[0] == ks) 1359 if (i[0] == keysym)
1362 { 1360 {
1363 iso14755buf = ISO_14755_51 | i[1]; 1361 iso14755buf = ISO_14755_51 | i[1];
1364 commit_iso14755 (); 1362 commit_iso14755 ();
1365 goto skip_switch; 1363 goto skip_switch;
1366 } 1364 }
… …
1390 iso14755buf = 0; 1388 iso14755buf = 0;
1391 } 1389 }
1392#endif 1390#endif
1393 1391
1394 if (ev.xany.window == vt 1392 if (ev.xany.window == vt
1395 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_END))) 1393 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1396 break; 1394 break;
1397 1395
1398#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1396#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1399 if (!(ev.xkey.state & ControlMask)) 1397 if (!(ev.xkey.state & ControlMask))
1400 slip_wheel_ev.stop (); 1398 slip_wheel_ev.stop ();
1401 else if (ks == XK_Control_L || ks == XK_Control_R) 1399 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1402 mouse_slip_wheel_speed = 0; 1400 mouse_slip_wheel_speed = 0;
1403#endif 1401#endif
1404 break; 1402 break;
1405 } 1403 }
1406 1404
… …
1573 1571
1574 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1572 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1575 scr_expose (ev.xexpose.x, ev.xexpose.y, 1573 scr_expose (ev.xexpose.x, ev.xexpose.y,
1576 ev.xexpose.width, ev.xexpose.height, False); 1574 ev.xexpose.width, ev.xexpose.height, False);
1577 1575
1578 scr_refresh (refresh_type); 1576 want_refresh = 1;
1579 } 1577 }
1580 else 1578 else
1581 { 1579 {
1582 XEvent unused_event; 1580 XEvent unused_event;
1583 1581
… …
1710 &unused_root_x, &unused_root_y, 1708 &unused_root_x, &unused_root_y,
1711 &ev.xbutton.x, &ev.xbutton.y, 1709 &ev.xbutton.x, &ev.xbutton.y,
1712 &unused_mask); 1710 &unused_mask);
1713 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1711 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1714 scrollbar_size ()); 1712 scrollbar_size ());
1715 scr_refresh (refresh_type); 1713 want_refresh = 1;
1716 refresh_limit = 0; 1714 refresh_limit = 0;
1717 scrollbar_show (1); 1715 scrollbar_show (1);
1718 } 1716 }
1719 break; 1717 break;
1720 } 1718 }
… …
2216 slip_wheel_ev.start (); 2214 slip_wheel_ev.start ();
2217 } 2215 }
2218 else 2216 else
2219 { 2217 {
2220# endif 2218# endif
2221# ifdef JUMP_MOUSE_WHEEL
2222 scr_page (v, i); 2219 scr_page (v, i);
2223 scr_refresh (SMOOTH_REFRESH);
2224 scrollbar_show (1); 2220 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 2221# ifdef MOUSE_SLIP_WHEELING
2234 } 2222 }
2235#endif 2223# endif
2236 } 2224 }
2237 break; 2225 break;
2238#endif 2226#endif
2239 } 2227 }
2240 } 2228 }
… …
2834 refresh_limit++; 2822 refresh_limit++;
2835 else 2823 else
2836 { 2824 {
2837 flag = true; 2825 flag = true;
2838 scr_refresh (refresh_type); 2826 scr_refresh (refresh_type);
2839 flush_ev.stop (); 2827 want_refresh = 1;
2840 } 2828 }
2841 } 2829 }
2842 2830
2843 } 2831 }
2844 else 2832 else
… …
3870 { 3858 {
3871 if ((name = strchr (buf, ';')) == NULL) 3859 if ((name = strchr (buf, ';')) == NULL)
3872 break; 3860 break;
3873 3861
3874 *name++ = '\0'; 3862 *name++ = '\0';
3875 color = atoi (buf); 3863 color = atoi (buf) + minCOLOR;
3876 3864
3877 if (color < 0 || color >= TOTAL_COLORS) 3865 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3878 break; 3866 break;
3879 3867
3880 if ((buf = strchr (name, ';')) != NULL) 3868 if ((buf = strchr (name, ';')) != NULL)
3881 *buf++ = '\0'; 3869 *buf++ = '\0';
3882 3870
3883 if (name[0] == '?' && !name[1]) 3871 if (name[0] == '?' && !name[1])
3884 { 3872 {
3885 unsigned short r, g, b; 3873 unsigned short r, g, b;
3886 pix_colors_focused[color + minCOLOR].get (display, r, g, b); 3874 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); 3875 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3888 } 3876 }
3889 else 3877 else
3890 set_window_color (color + minCOLOR, name); 3878 set_window_color (color, name);
3891 } 3879 }
3892 break; 3880 break;
3893 case XTerm_Color00: 3881 case XTerm_Color00:
3894 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3882 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3895 break; 3883 break;
3896 case XTerm_Color01: 3884 case XTerm_Color01:
3897 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3885 process_color_seq (XTerm_Color01, Color_bg, str, resp);
3898 break; 3886 break;
3899#ifndef NO_CURSORCOLOR 3887#ifndef NO_CURSORCOLOR
3900 case XTerm_Color_cursor: 3888 case XTerm_Color_cursor:
3901 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3889 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3902 break; 3890 break;
… …
3906 break; 3894 break;
3907 case XTerm_Color_pointer_bg: 3895 case XTerm_Color_pointer_bg:
3908 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);
3909 break; 3897 break;
3910#ifndef NO_BOLD_UNDERLINE_REVERSE 3898#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: 3899 case XTerm_Color_RV:
3918 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);
3919 break; 3909 break;
3920 case URxvt_Color_IT: 3910 case URxvt_Color_IT:
3921 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3911 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3922 break; 3912 break;
3923#endif 3913#endif
… …
3928 if (am_transparent) 3918 if (am_transparent)
3929 want_full_refresh = want_refresh = 1; 3919 want_full_refresh = want_refresh = 1;
3930 break; 3920 break;
3931#endif 3921#endif
3932 3922
3933 case XTerm_Pixmap: 3923 case Rxvt_Pixmap:
3934 if (*str != ';') 3924 if (*str != ';')
3935 { 3925 {
3936#if XPM_BACKGROUND 3926#if XPM_BACKGROUND
3937 scale_pixmap (""); /* reset to default scaling */ 3927 scale_pixmap (""); /* reset to default scaling */
3938 set_bgPixmap (str); /* change pixmap */ 3928 set_bgPixmap (str); /* change pixmap */
3939#endif
3940 scr_touch (true); 3929 scr_touch (true);
3930#endif
3941 } 3931 }
3932
3942 while ((str = strchr (str, ';')) != NULL) 3933 while ((str = strchr (str, ';')) != NULL)
3943 { 3934 {
3944 str++; 3935 str++;
3945#if XPM_BACKGROUND 3936#if XPM_BACKGROUND
3946 changed += scale_pixmap (str); 3937 changed += scale_pixmap (str);
… …
3949 3940
3950 if (changed) 3941 if (changed)
3951 { 3942 {
3952#ifdef XPM_BACKGROUND 3943#ifdef XPM_BACKGROUND
3953 resize_pixmap (); 3944 resize_pixmap ();
3954#endif
3955 scr_touch (true); 3945 scr_touch (true);
3946#endif
3956 } 3947 }
3957 break; 3948 break;
3958 3949
3959 case XTerm_restoreFG: 3950 case Rxvt_restoreFG:
3960 set_window_color (Color_fg, str); 3951 set_window_color (Color_fg, str);
3961 break; 3952 break;
3962 case XTerm_restoreBG: 3953 case Rxvt_restoreBG:
3963 set_window_color (Color_bg, str); 3954 set_window_color (Color_bg, str);
3964 break; 3955 break;
3965 3956
3966 case XTerm_logfile: 3957 case XTerm_logfile:
3967 // TODO, when secure mode? 3958 // TODO, when secure mode?
… …
3972 if (OPTION (Opt_insecure)) 3963 if (OPTION (Opt_insecure))
3973 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3964 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3974 break; 3965 break;
3975#endif 3966#endif
3976#if 0 3967#if 0
3977 case XTerm_dumpscreen: /* no error notices */ 3968 case Rxvt_dumpscreen: /* no error notices */
3978 { 3969 {
3979 int fd; 3970 int fd;
3980 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)
3981 { 3972 {
3982 scr_dump (fd); 3973 scr_dump (fd);
… …
4462const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4453const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4463 4454
4464void 4455void
4465rxvt_term::tt_write (const char *data, unsigned int len) 4456rxvt_term::tt_write (const char *data, unsigned int len)
4466{ 4457{
4458 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4459 return;
4460
4467 if (pty.pty < 0) 4461 if (pty.pty < 0)
4468 return; 4462 return;
4469 4463
4470 if (v_buflen == 0) 4464 if (v_buflen == 0)
4471 { 4465 {

Diff Legend

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