diff --git a/ChangeLog b/ChangeLog index 1711573..bab2c07 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5219,3 +5219,9 @@ Mon May 10 18:43:15 2004 Michael Jennings (mej) Revert change from February 29th. I never could reproduce it anyway. ---------------------------------------------------------------------- +Fri Jun 25 17:48:24 2004 Michael Jennings (mej) + +Chris Schoeneman pointed out that Eterm didn't get +keypresses if another app (like synergy) decided to listen for its +events. This should correct that behavior. +---------------------------------------------------------------------- diff --git a/Eterm.spec b/Eterm.spec index 7649adb..2e46ce6 100644 --- a/Eterm.spec +++ b/Eterm.spec @@ -1,19 +1,16 @@ -%define bzip 0 +%if %{!?compression:1}0 +%define compression gz +%endif Summary: Enlightened terminal emulator Name: Eterm Version: 0.9.3 -Release: 0.1 +Release: 0.2 Copyright: BSD Group: User Interface/X Requires: imlib2, imlib2-loader_jpeg, imlib2-loader_png -%if %{bzip} -Source0: ftp://ftp.eterm.org/pub/Eterm/%{name}-%{version}.tar.bz2 -Source1: ftp://ftp.eterm.org/pub/Eterm/%{name}-bg-%{version}.tar.bz2 -%else -Source0: ftp://ftp.eterm.org/pub/Eterm/%{name}-%{version}.tar.gz -Source1: ftp://ftp.eterm.org/pub/Eterm/%{name}-bg-%{version}.tar.gz -%endif +Source0: ftp://ftp.eterm.org/pub/Eterm/%{name}-%{version}.tar.%{compression} +Source1: ftp://ftp.eterm.org/pub/Eterm/%{name}-bg-%{version}.tar.%{compression} URL: http://www.eterm.org/ BuildRoot: /var/tmp/%{name}-%{version}-root @@ -69,14 +66,14 @@ EOF chmod 0644 $RPM_BUILD_ROOT%{_sysconfdir}/X11/applnk/Utilities/Eterm.desktop %post -test -x /sbin/ldconfig && /sbin/ldconfig +/sbin/ldconfig || : if [ -d /usr/share/terminfo -a ! -f /usr/share/terminfo/E/Eterm ]; then tic -o/usr/share/terminfo $RPM_DOC_DIR/%{name}-%{version}/%{name}.ti || : fi %postun -test -x /sbin/ldconfig && /sbin/ldconfig +/sbin/ldconfig || : %clean rm -rf $RPM_BUILD_ROOT diff --git a/src/buttons.c b/src/buttons.c index 041c3fa..b1daf92 100644 --- a/src/buttons.c +++ b/src/buttons.c @@ -91,7 +91,7 @@ buttonbar_t *bbar_create(void) xattr.colormap = cmap; cursor = XCreateFontCursor(Xdisplay, XC_left_ptr); - mask = EnterWindowMask | LeaveWindowMask | PointerMotionMask | ButtonMotionMask | ButtonPressMask | ButtonReleaseMask; + mask = KeyPressMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask | ButtonMotionMask | ButtonPressMask | ButtonReleaseMask; gcvalue.foreground = xattr.border_pixel; bbar->font = load_font(etfonts[def_font_idx], "fixed", FONT_TYPE_X); diff --git a/src/events.c b/src/events.c index 3cfa341..29d9214 100644 --- a/src/events.c +++ b/src/events.c @@ -205,7 +205,9 @@ handle_key_press(event_t *ev) PROF_INIT(handle_key_press); D_EVENTS(("handle_key_press(ev [%8p] on window 0x%08x)\n", ev, ev->xany.window)); +#if UNUSED_BLOCK REQUIRE_RVAL(XEVENT_IS_MYWIN(ev, &primary_data), 0); +#endif COUNT_EVENT(keypress_cnt); if (!(BITFIELD_IS_SET(eterm_options, ETERM_OPTIONS_NO_INPUT))) { diff --git a/src/menus.c b/src/menus.c index 35e3fcd..5db6e5f 100644 --- a/src/menus.c +++ b/src/menus.c @@ -461,7 +461,8 @@ menu_t *menu_create(char *title) xattr.colormap = cmap; cursor = XCreateFontCursor(Xdisplay, XC_left_ptr); - mask = PointerMotionMask | ButtonMotionMask | ButtonPressMask | ButtonReleaseMask | Button1MotionMask | Button2MotionMask | Button3MotionMask; + mask = KeyPressMask | PointerMotionMask | ButtonMotionMask | ButtonPressMask | ButtonReleaseMask + | Button1MotionMask | Button2MotionMask | Button3MotionMask; } menu = (menu_t *) MALLOC(sizeof(menu_t)); MEMSET(menu, 0, sizeof(menu_t)); diff --git a/src/scrollbar.c b/src/scrollbar.c index 46f23ce..e659df8 100644 --- a/src/scrollbar.c +++ b/src/scrollbar.c @@ -688,7 +688,8 @@ scrollbar_init(int width, int height) Attributes.override_redirect = TRUE; Attributes.save_under = TRUE; cursor = XCreateFontCursor(Xdisplay, XC_left_ptr); - mask = ExposureMask | EnterWindowMask | LeaveWindowMask | ButtonPressMask | ButtonReleaseMask | Button1MotionMask | Button2MotionMask | Button3MotionMask; + mask = KeyPressMask | ExposureMask | EnterWindowMask | LeaveWindowMask | ButtonPressMask | ButtonReleaseMask + | Button1MotionMask | Button2MotionMask | Button3MotionMask; scrollbar_calc_size(width, height); scrollbar.anchor_top = scrollbar.scrollarea_start; scrollbar.anchor_bottom = scrollbar.scrollarea_end; diff --git a/src/windows.c b/src/windows.c index d0ff1ae..3807520 100644 --- a/src/windows.c +++ b/src/windows.c @@ -467,7 +467,9 @@ Create_Windows(int argc, char *argv[]) XClearWindow(Xdisplay, TermWin.vt); } XDefineCursor(Xdisplay, TermWin.vt, TermWin_cursor); - TermWin.mask = (EnterWindowMask | LeaveWindowMask | ExposureMask | ButtonPressMask | ButtonReleaseMask | Button1MotionMask | Button2MotionMask | Button3MotionMask); + TermWin.mask = (KeyPressMask | EnterWindowMask | LeaveWindowMask | ExposureMask + | ButtonPressMask | ButtonReleaseMask | Button1MotionMask + | Button2MotionMask | Button3MotionMask); XSelectInput(Xdisplay, TermWin.vt, TermWin.mask); /* If the user wants a specific desktop, tell the WM that */