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