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

Diff Legend

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