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