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.247 by root, Sat Jan 7 20:23:52 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
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
1317#if defined(CURSOR_BLINK) 1316 if (ev.xany.window == vt
1318 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1317 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1319 { 1318 return;
1320 if (hidden_cursor)
1321 {
1322 hidden_cursor = 0;
1323 want_refresh = 1;
1324 }
1325 1319
1326 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1320 // for XQueryPointer
1327 }
1328#endif
1329
1330#if defined(POINTER_BLANK)
1331 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1332 {
1333 if (ev.type == MotionNotify
1334 || ev.type == ButtonPress
1335 || ev.type == ButtonRelease)
1336 if (hidden_pointer)
1337 pointer_unblank ();
1338
1339 if (ev.type == KeyPress && hidden_pointer == 0)
1340 pointer_blank ();
1341 }
1342#endif
1343
1344 Window unused_root, unused_child; 1321 Window unused_root, unused_child;
1345 int unused_root_x, unused_root_y; 1322 int unused_root_x, unused_root_y;
1346 unsigned int unused_mask; 1323 unsigned int unused_mask;
1347 1324
1348 switch (ev.type) 1325 switch (ev.type)
1355 1332
1356 break; 1333 break;
1357 1334
1358 case KeyRelease: 1335 case KeyRelease:
1359 { 1336 {
1360#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 1337#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1361 KeySym ks; 1338 KeySym keysym;
1362 1339
1363 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 :/
1364#endif 1341#endif
1365 1342
1366#if ENABLE_FRILLS || ISO_14755 1343#if ENABLE_FRILLS || ISO_14755
1367 // ISO 14755 support 1344 // ISO 14755 support
1368 if (iso14755buf) 1345 if (iso14755buf)
1373# endif 1350# endif
1374# if ISO_14755 1351# if ISO_14755
1375 // iso14755 part 5.2 handling: release time 1352 // iso14755 part 5.2 handling: release time
1376 // first: controls 1353 // first: controls
1377 if ((ev.xkey.state & ControlMask) 1354 if ((ev.xkey.state & ControlMask)
1378 && ((ks >= 0x40 && ks <= 0x5f) 1355 && ((keysym >= 0x40 && keysym <= 0x5f)
1379 || (ks >= 0x61 && ks <= 0x7f))) 1356 || (keysym >= 0x61 && keysym <= 0x7f)))
1380 { 1357 {
1381 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); 1358 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1382 commit_iso14755 (); 1359 commit_iso14755 ();
1383 return; // case-break; 1360 goto skip_switch;
1384 } 1361 }
1385 1362
1386 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1363 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1387 if (i[0] == ks) 1364 if (i[0] == keysym)
1388 { 1365 {
1389 iso14755buf = ISO_14755_51 | i[1]; 1366 iso14755buf = ISO_14755_51 | i[1];
1390 commit_iso14755 (); 1367 commit_iso14755 ();
1391 return; // case-break; 1368 goto skip_switch;
1392 } 1369 }
1393 1370
1394 scr_bell (); 1371 scr_bell ();
1395# endif 1372# endif
1396 iso14755buf = 0; 1373 iso14755buf = 0;
1416 iso14755buf = 0; 1393 iso14755buf = 0;
1417 } 1394 }
1418#endif 1395#endif
1419 1396
1420 if (ev.xany.window == vt 1397 if (ev.xany.window == vt
1421 && 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)))
1422 break; 1399 break;
1423 1400
1424#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1401#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1425 if (!(ev.xkey.state & ControlMask)) 1402 if (!(ev.xkey.state & ControlMask))
1426 slip_wheel_ev.stop (); 1403 slip_wheel_ev.stop ();
1427 else if (ks == XK_Control_L || ks == XK_Control_R) 1404 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1428 mouse_slip_wheel_speed = 0; 1405 mouse_slip_wheel_speed = 0;
1429#endif 1406#endif
1430 break; 1407 break;
1431 } 1408 }
1432 1409
1599 1576
1600 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1577 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1601 scr_expose (ev.xexpose.x, ev.xexpose.y, 1578 scr_expose (ev.xexpose.x, ev.xexpose.y,
1602 ev.xexpose.width, ev.xexpose.height, False); 1579 ev.xexpose.width, ev.xexpose.height, False);
1603 1580
1604 scr_refresh (refresh_type); 1581 want_refresh = 1;
1605 } 1582 }
1606 else 1583 else
1607 { 1584 {
1608 XEvent unused_event; 1585 XEvent unused_event;
1609 1586
1628#endif 1605#endif
1629 } 1606 }
1630 break; 1607 break;
1631 1608
1632 case MotionNotify: 1609 case MotionNotify:
1610 printf ("motion notify\n");//D
1633#ifdef POINTER_BLANK 1611#ifdef POINTER_BLANK
1634 if (hidden_pointer) 1612 if (hidden_pointer)
1635 pointer_unblank (); 1613 pointer_unblank ();
1636#endif 1614#endif
1637#if MENUBAR 1615#if MENUBAR
1736 &unused_root_x, &unused_root_y, 1714 &unused_root_x, &unused_root_y,
1737 &ev.xbutton.x, &ev.xbutton.y, 1715 &ev.xbutton.x, &ev.xbutton.y,
1738 &unused_mask); 1716 &unused_mask);
1739 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1717 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1740 scrollbar_size ()); 1718 scrollbar_size ());
1741 scr_refresh (refresh_type); 1719 want_refresh = 1;
1742 refresh_limit = 0; 1720 refresh_limit = 0;
1743 scrollbar_show (1); 1721 scrollbar_show (1);
1744 } 1722 }
1745 break; 1723 break;
1746 } 1724 }
1725
1726skip_switch: ;
1727
1728#if defined(CURSOR_BLINK)
1729 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1730 {
1731 if (hidden_cursor)
1732 {
1733 hidden_cursor = 0;
1734 want_refresh = 1;
1735 }
1736
1737 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1738 }
1739#endif
1740
1741#if defined(POINTER_BLANK)
1742 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1743 {
1744 if (ev.type == MotionNotify
1745 || ev.type == ButtonPress
1746 || ev.type == ButtonRelease)
1747 if (hidden_pointer)
1748 pointer_unblank ();
1749
1750 if (ev.type == KeyPress && hidden_pointer == 0)
1751 pointer_blank ();
1752 }
1753#endif
1747} 1754}
1748 1755
1749void 1756void
1750rxvt_term::focus_in () 1757rxvt_term::focus_in ()
1751{ 1758{
1919#else 1926#else
1920 selection.rect = false; 1927 selection.rect = false;
1921#endif 1928#endif
1922 1929
1923 /* allow shift+left click to extend selection */ 1930 /* allow shift+left click to extend selection */
1924 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1931 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1925 { 1932 {
1926 if (MEvent.button == Button1 && clickintime) 1933 if (MEvent.button == Button1 && clickintime)
1927 selection_rotate (ev.x, ev.y); 1934 selection_rotate (ev.x, ev.y);
1928 else 1935 else
1929 selection_extend (ev.x, ev.y, 1); 1936 selection_extend (ev.x, ev.y, 1);
2213 slip_wheel_ev.start (); 2220 slip_wheel_ev.start ();
2214 } 2221 }
2215 else 2222 else
2216 { 2223 {
2217# endif 2224# endif
2218# ifdef JUMP_MOUSE_WHEEL
2219 scr_page (v, i); 2225 scr_page (v, i);
2220 scr_refresh (SMOOTH_REFRESH);
2221 scrollbar_show (1); 2226 scrollbar_show (1);
2222# else
2223 while (i--)
2224 {
2225 scr_page (v, 1);
2226 scr_refresh (SMOOTH_REFRESH);
2227 scrollbar_show (1);
2228 }
2229# endif
2230# ifdef MOUSE_SLIP_WHEELING 2227# ifdef MOUSE_SLIP_WHEELING
2231 } 2228 }
2232#endif 2229# endif
2233 } 2230 }
2234 break; 2231 break;
2235#endif 2232#endif
2236 } 2233 }
2237 } 2234 }
2831 refresh_limit++; 2828 refresh_limit++;
2832 else 2829 else
2833 { 2830 {
2834 flag = true; 2831 flag = true;
2835 scr_refresh (refresh_type); 2832 scr_refresh (refresh_type);
2836 flush_ev.stop (); 2833 want_refresh = 1;
2837 } 2834 }
2838 } 2835 }
2839 2836
2840 } 2837 }
2841 else 2838 else
3867 { 3864 {
3868 if ((name = strchr (buf, ';')) == NULL) 3865 if ((name = strchr (buf, ';')) == NULL)
3869 break; 3866 break;
3870 3867
3871 *name++ = '\0'; 3868 *name++ = '\0';
3872 color = atoi (buf); 3869 color = atoi (buf) + minCOLOR;
3873 3870
3874 if (color < 0 || color >= TOTAL_COLORS) 3871 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3875 break; 3872 break;
3876 3873
3877 if ((buf = strchr (name, ';')) != NULL) 3874 if ((buf = strchr (name, ';')) != NULL)
3878 *buf++ = '\0'; 3875 *buf++ = '\0';
3879 3876
3880 if (name[0] == '?' && !name[1]) 3877 if (name[0] == '?' && !name[1])
3881 { 3878 {
3882 unsigned short r, g, b; 3879 unsigned short r, g, b;
3883 pix_colors_focused[color + minCOLOR].get (display, r, g, b); 3880 pix_colors_focused[color].get (display, r, g, b);
3884 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);
3885 } 3882 }
3886 else 3883 else
3887 set_window_color (color + minCOLOR, name); 3884 set_window_color (color, name);
3888 } 3885 }
3889 break; 3886 break;
3890 case XTerm_Color00: 3887 case XTerm_Color00:
3891 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3888 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3892 break; 3889 break;
3893 case XTerm_Color01: 3890 case XTerm_Color01:
3894 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3891 process_color_seq (XTerm_Color01, Color_bg, str, resp);
3895 break; 3892 break;
3896#ifndef NO_CURSORCOLOR 3893#ifndef NO_CURSORCOLOR
3897 case XTerm_Color_cursor: 3894 case XTerm_Color_cursor:
3898 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3895 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3899 break; 3896 break;
3903 break; 3900 break;
3904 case XTerm_Color_pointer_bg: 3901 case XTerm_Color_pointer_bg:
3905 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);
3906 break; 3903 break;
3907#ifndef NO_BOLD_UNDERLINE_REVERSE 3904#ifndef NO_BOLD_UNDERLINE_REVERSE
3908 case XTerm_Color_BD:
3909 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3910 break;
3911 case XTerm_Color_UL:
3912 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3913 break;
3914 case XTerm_Color_RV: 3905 case XTerm_Color_RV:
3915 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);
3916 break; 3915 break;
3917 case URxvt_Color_IT: 3916 case URxvt_Color_IT:
3918 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3917 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3919 break; 3918 break;
3920#endif 3919#endif
3925 if (am_transparent) 3924 if (am_transparent)
3926 want_full_refresh = want_refresh = 1; 3925 want_full_refresh = want_refresh = 1;
3927 break; 3926 break;
3928#endif 3927#endif
3929 3928
3930 case XTerm_Pixmap: 3929 case Rxvt_Pixmap:
3931 if (*str != ';') 3930 if (*str != ';')
3932 { 3931 {
3933#if XPM_BACKGROUND 3932#if XPM_BACKGROUND
3934 scale_pixmap (""); /* reset to default scaling */ 3933 scale_pixmap (""); /* reset to default scaling */
3935 set_bgPixmap (str); /* change pixmap */ 3934 set_bgPixmap (str); /* change pixmap */
3936#endif
3937 scr_touch (true); 3935 scr_touch (true);
3936#endif
3938 } 3937 }
3938
3939 while ((str = strchr (str, ';')) != NULL) 3939 while ((str = strchr (str, ';')) != NULL)
3940 { 3940 {
3941 str++; 3941 str++;
3942#if XPM_BACKGROUND 3942#if XPM_BACKGROUND
3943 changed += scale_pixmap (str); 3943 changed += scale_pixmap (str);
3946 3946
3947 if (changed) 3947 if (changed)
3948 { 3948 {
3949#ifdef XPM_BACKGROUND 3949#ifdef XPM_BACKGROUND
3950 resize_pixmap (); 3950 resize_pixmap ();
3951#endif
3952 scr_touch (true); 3951 scr_touch (true);
3952#endif
3953 } 3953 }
3954 break; 3954 break;
3955 3955
3956 case XTerm_restoreFG: 3956 case Rxvt_restoreFG:
3957 set_window_color (Color_fg, str); 3957 set_window_color (Color_fg, str);
3958 break; 3958 break;
3959 case XTerm_restoreBG: 3959 case Rxvt_restoreBG:
3960 set_window_color (Color_bg, str); 3960 set_window_color (Color_bg, str);
3961 break; 3961 break;
3962 3962
3963 case XTerm_logfile: 3963 case XTerm_logfile:
3964 // TODO, when secure mode? 3964 // TODO, when secure mode?
3969 if (OPTION (Opt_insecure)) 3969 if (OPTION (Opt_insecure))
3970 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3970 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3971 break; 3971 break;
3972#endif 3972#endif
3973#if 0 3973#if 0
3974 case XTerm_dumpscreen: /* no error notices */ 3974 case Rxvt_dumpscreen: /* no error notices */
3975 { 3975 {
3976 int fd; 3976 int fd;
3977 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)
3978 { 3978 {
3979 scr_dump (fd); 3979 scr_dump (fd);
4153 /* extra handling for values with state unkept */ 4153 /* extra handling for values with state unkept */
4154 switch (arg[i]) 4154 switch (arg[i])
4155 { 4155 {
4156#if ENABLE_STYLES 4156#if ENABLE_STYLES
4157 case 1021: 4157 case 1021:
4158 if (mode) 4158 set_option (Opt_intensityStyles, mode);
4159 SET_OPTION (Opt_intensityStyles);
4160 else
4161 CLR_OPTION (Opt_intensityStyles);
4162 4159
4163 scr_touch (true); 4160 scr_touch (true);
4164 break; 4161 break;
4165#endif 4162#endif
4166 case 1048: /* alternative cursor save */ 4163 case 1048: /* alternative cursor save */
4188 case 3: /* 80/132 */ 4185 case 3: /* 80/132 */
4189 if (priv_modes & PrivMode_132OK) 4186 if (priv_modes & PrivMode_132OK)
4190 set_widthheight (((state ? 132 : 80) * fwidth), height); 4187 set_widthheight (((state ? 132 : 80) * fwidth), height);
4191 break; 4188 break;
4192 case 4: /* smooth scrolling */ 4189 case 4: /* smooth scrolling */
4193 if (!state) 4190 set_option (Opt_jumpScroll, !state);
4194 SET_OPTION (Opt_jumpScroll);
4195 else
4196 CLR_OPTION (Opt_jumpScroll);
4197 break; 4191 break;
4198 case 5: /* reverse video */ 4192 case 5: /* reverse video */
4199 scr_rvideo_mode (state); 4193 scr_rvideo_mode (state);
4200 break; 4194 break;
4201 case 6: /* relative/absolute origins */ 4195 case 6: /* relative/absolute origins */
4242#if 0 4236#if 0
4243 case 1001: 4237 case 1001:
4244 break; /* X11 mouse highlighting */ 4238 break; /* X11 mouse highlighting */
4245#endif 4239#endif
4246 case 1010: /* scroll to bottom on TTY output inhibit */ 4240 case 1010: /* scroll to bottom on TTY output inhibit */
4247 if (!state) 4241 set_option (Opt_scrollTtyOutput, !state);
4248 SET_OPTION (Opt_scrollTtyOutput);
4249 else
4250 CLR_OPTION (Opt_scrollTtyOutput);
4251 break; 4242 break;
4252 case 1011: /* scroll to bottom on key press */ 4243 case 1011: /* scroll to bottom on key press */
4253 if (state) 4244 set_option (Opt_scrollTtyKeypress, state);
4254 SET_OPTION (Opt_scrollTtyKeypress);
4255 else
4256 CLR_OPTION (Opt_scrollTtyKeypress);
4257 break; 4245 break;
4258 case 1047: /* secondary screen w/ clearing last */ 4246 case 1047: /* secondary screen w/ clearing last */
4259 if (OPTION (Opt_secondaryScreen)) 4247 if (OPTION (Opt_secondaryScreen))
4260 if (current_screen != PRIMARY) 4248 if (current_screen != PRIMARY)
4261 scr_erase_screen (2); 4249 scr_erase_screen (2);
4471const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4459const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4472 4460
4473void 4461void
4474rxvt_term::tt_write (const char *data, unsigned int len) 4462rxvt_term::tt_write (const char *data, unsigned int len)
4475{ 4463{
4464 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4465 return;
4466
4476 if (pty.pty < 0) 4467 if (pty.pty < 0)
4477 return; 4468 return;
4478 4469
4479 if (v_buflen == 0) 4470 if (v_buflen == 0)
4480 { 4471 {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines