Enlightenment CVS committal
Author : mej
Project : eterm
Module : Eterm
Dir : eterm/Eterm/src
Modified Files:
buttons.c events.c menus.c scrollbar.c windows.c
Log Message:
Fri Jun 25 17:48:24 2004 Michael Jennings (mej)
Chris Schoeneman <[EMAIL PROTECTED]> pointed out that Eterm didn't get
keypresses if another app (like synergy) decided to listen for its
events. This should correct that behavior.
----------------------------------------------------------------------
===================================================================
RCS file: /cvsroot/enlightenment/eterm/Eterm/src/buttons.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -3 -r1.43 -r1.44
--- buttons.c 11 Jan 2004 22:10:29 -0000 1.43
+++ buttons.c 25 Jun 2004 21:52:00 -0000 1.44
@@ -21,7 +21,7 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-static const char cvs_ident[] = "$Id: buttons.c,v 1.43 2004/01/11 22:10:29 mej Exp $";
+static const char cvs_ident[] = "$Id: buttons.c,v 1.44 2004/06/25 21:52:00 mej Exp $";
#include "config.h"
#include "feature.h"
@@ -91,7 +91,7 @@
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);
===================================================================
RCS file: /cvsroot/enlightenment/eterm/Eterm/src/events.c,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -3 -r1.62 -r1.63
--- events.c 11 Jan 2004 22:10:29 -0000 1.62
+++ events.c 25 Jun 2004 21:52:00 -0000 1.63
@@ -21,7 +21,7 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-static const char cvs_ident[] = "$Id: events.c,v 1.62 2004/01/11 22:10:29 mej Exp $";
+static const char cvs_ident[] = "$Id: events.c,v 1.63 2004/06/25 21:52:00 mej Exp $";
#include "config.h"
#include "feature.h"
@@ -205,7 +205,9 @@
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))) {
===================================================================
RCS file: /cvsroot/enlightenment/eterm/Eterm/src/menus.c,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -3 -r1.62 -r1.63
--- menus.c 11 Jan 2004 22:10:29 -0000 1.62
+++ menus.c 25 Jun 2004 21:52:00 -0000 1.63
@@ -21,7 +21,7 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-static const char cvs_ident[] = "$Id: menus.c,v 1.62 2004/01/11 22:10:29 mej Exp $";
+static const char cvs_ident[] = "$Id: menus.c,v 1.63 2004/06/25 21:52:00 mej Exp $";
#include "config.h"
#include "feature.h"
@@ -461,7 +461,8 @@
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));
===================================================================
RCS file: /cvsroot/enlightenment/eterm/Eterm/src/scrollbar.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -3 -r1.47 -r1.48
--- scrollbar.c 11 Jan 2004 22:10:29 -0000 1.47
+++ scrollbar.c 25 Jun 2004 21:52:00 -0000 1.48
@@ -21,7 +21,7 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-static const char cvs_ident[] = "$Id: scrollbar.c,v 1.47 2004/01/11 22:10:29 mej Exp
$";
+static const char cvs_ident[] = "$Id: scrollbar.c,v 1.48 2004/06/25 21:52:00 mej Exp
$";
#include "config.h"
#include "feature.h"
@@ -688,7 +688,8 @@
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;
===================================================================
RCS file: /cvsroot/enlightenment/eterm/Eterm/src/windows.c,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -3 -r1.66 -r1.67
--- windows.c 11 Jan 2004 22:10:29 -0000 1.66
+++ windows.c 25 Jun 2004 21:52:00 -0000 1.67
@@ -21,7 +21,7 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-static const char cvs_ident[] = "$Id: windows.c,v 1.66 2004/01/11 22:10:29 mej Exp $";
+static const char cvs_ident[] = "$Id: windows.c,v 1.67 2004/06/25 21:52:00 mej Exp $";
#include "config.h"
#include "feature.h"
@@ -467,7 +467,9 @@
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 */
-------------------------------------------------------
This SF.Net email sponsored by Black Hat Briefings & Training.
Attend Black Hat Briefings & Training, Las Vegas July 24-29 -
digital self defense, top technical experts, no vendor pitches,
unmatched networking opportunities. Visit www.blackhat.com
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
