Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
desktops.c ecompmgr.c ewins.c menus.c setup.c systray.c
tooltips.c x.c xwin.h
Log Message:
Eliminate some pointer event processing.
===================================================================
RCS file: /cvs/e/e16/e/src/desktops.c,v
retrieving revision 1.261
retrieving revision 1.262
diff -u -3 -r1.261 -r1.262
--- desktops.c 25 May 2007 23:02:25 -0000 1.261
+++ desktops.c 11 Jul 2007 08:54:19 -0000 1.262
@@ -47,7 +47,7 @@
#define EDESK_EVENT_MASK \
(ButtonPressMask | ButtonReleaseMask | \
- EnterWindowMask | LeaveWindowMask | PointerMotionMask | ButtonMotionMask | \
+ EnterWindowMask | LeaveWindowMask /* | PointerMotionMask | ButtonMotionMask
*/ | \
SubstructureNotifyMask | SubstructureRedirectMask | PropertyChangeMask)
#define ENLIGHTENMENT_CONF_NUM_DESKTOPS 32
===================================================================
RCS file: /cvs/e/e16/e/src/ecompmgr.c,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -3 -r1.157 -r1.158
--- ecompmgr.c 11 Jul 2007 08:44:12 -0000 1.157
+++ ecompmgr.c 11 Jul 2007 08:54:19 -0000 1.158
@@ -1565,7 +1565,7 @@
if (eo->type == EOBJ_TYPE_DESK || eo->type == EOBJ_TYPE_ROOT_BG)
{
- ESelectInputAdd(eo->win, VisibilityChangeMask);
+ ESelectInputChange(eo->win, VisibilityChangeMask, 0);
}
if (eo->type != EOBJ_TYPE_EWIN)
@@ -2452,12 +2452,12 @@
case ECM_MODE_ROOT:
XCompositeRedirectSubwindows(disp, VRoot.xwin, CompositeRedirectManual);
#if USE_DESK_EXPOSE /* FIXME - Remove? */
- ESelectInputAdd(VRoot.xwin, ExposureMask);
+ ESelectInputChange(VRoot.xwin, ExposureMask, 0);
#endif
break;
case ECM_MODE_WINDOW:
#if USE_DESK_EXPOSE /* FIXME - Remove? */
- ESelectInputAdd(VRoot.xwin, ExposureMask);
+ ESelectInputChange(VRoot.xwin, ExposureMask, 0);
#endif
break;
case ECM_MODE_AUTO:
===================================================================
RCS file: /cvs/e/e16/e/src/ewins.c,v
retrieving revision 1.201
retrieving revision 1.202
diff -u -3 -r1.201 -r1.202
--- ewins.c 17 Jun 2007 08:33:22 -0000 1.201
+++ ewins.c 11 Jul 2007 08:54:19 -0000 1.202
@@ -41,17 +41,15 @@
#include "xwin.h"
#define EWIN_TOP_EVENT_MASK \
- (ButtonPressMask | ButtonReleaseMask | \
- EnterWindowMask | LeaveWindowMask | PointerMotionMask /* | \
+ (/* ButtonPressMask | ButtonReleaseMask | */ \
+ EnterWindowMask | LeaveWindowMask /* | PointerMotionMask */ /* | \
StructureNotifyMask */)
#define EWIN_CONTAINER_EVENT_MASK \
- (/* ButtonPressMask | ButtonReleaseMask | */ \
- /* StructureNotifyMask | ResizeRedirectMask | */ \
- SubstructureNotifyMask | SubstructureRedirectMask)
+ (SubstructureNotifyMask | SubstructureRedirectMask)
#define EWIN_CLIENT_EVENT_MASK \
- (EnterWindowMask | LeaveWindowMask | FocusChangeMask | \
+ (/* EnterWindowMask | LeaveWindowMask | */ FocusChangeMask | \
/* StructureNotifyMask | */ ResizeRedirectMask | \
PropertyChangeMask | ColormapChangeMask | VisibilityChangeMask)
@@ -2258,12 +2256,6 @@
switch (ev->type)
{
- case ButtonPress:
- case ButtonRelease:
- case MotionNotify:
- case EnterNotify:
- case LeaveNotify:
- break;
case FocusIn:
case FocusOut:
if (ev->xfocus.detail == NotifyInferior)
===================================================================
RCS file: /cvs/e/e16/e/src/menus.c,v
retrieving revision 1.280
retrieving revision 1.281
diff -u -3 -r1.280 -r1.281
--- menus.c 16 Jun 2007 08:41:53 -0000 1.280
+++ menus.c 11 Jul 2007 08:54:19 -0000 1.281
@@ -123,7 +123,7 @@
#define MENU_ITEM_EVENT_MASK \
KeyPressMask | KeyReleaseMask | \
ButtonPressMask | ButtonReleaseMask | \
- EnterWindowMask | LeaveWindowMask /* | PointerMotionMask */
+ EnterWindowMask | LeaveWindowMask
static void MenuRedraw(Menu * m);
static void MenuRealize(Menu * m);
===================================================================
RCS file: /cvs/e/e16/e/src/setup.c,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -3 -r1.183 -r1.184
--- setup.c 1 Feb 2007 01:23:40 -0000 1.183
+++ setup.c 11 Jul 2007 08:54:19 -0000 1.184
@@ -235,9 +235,7 @@
/* select all the root window events to start managing */
Mode.wm.xselect = 1;
mask =
- ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask |
- ButtonMotionMask | PropertyChangeMask | SubstructureRedirectMask |
- PointerMotionMask | StructureNotifyMask | SubstructureNotifyMask;
+ StructureNotifyMask | SubstructureNotifyMask | SubstructureRedirectMask;
ESelectInput(VRoot.win, mask);
ESync();
===================================================================
RCS file: /cvs/e/e16/e/src/systray.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- systray.c 17 Jan 2007 01:10:43 -0000 1.6
+++ systray.c 11 Jul 2007 08:54:19 -0000 1.7
@@ -445,8 +445,7 @@
}
win = ct->icon_win;
- ESelectInputAdd(win,
- SubstructureRedirectMask /* | SubstructureNotifyMask */ );
+ ESelectInputChange(win, SubstructureRedirectMask, 0);
EventCallbackRegister(win, 0, SystrayEvent, ct);
/* Container parameter setup */
===================================================================
RCS file: /cvs/e/e16/e/src/tooltips.c,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -3 -r1.115 -r1.116
--- tooltips.c 18 May 2007 08:25:06 -0000 1.115
+++ tooltips.c 11 Jul 2007 08:54:19 -0000 1.116
@@ -47,6 +47,7 @@
static struct
{
int inhibit;
+ char root_motion_mask_set;
CB_GetAclass *ac_func;
void *ac_data;
} Mode_tooltips;
@@ -806,6 +807,23 @@
TooltipHide(ttip);
RemoveTimerEvent("TOOLTIP_TIMEOUT");
+
+ if (Conf_tooltips.showroottooltip)
+ {
+ if (!Mode_tooltips.root_motion_mask_set)
+ {
+ Mode_tooltips.root_motion_mask_set = 1;
+ ESelectInputChange(VRoot.win, PointerMotionMask, 0);
+ }
+ }
+ else
+ {
+ if (Mode_tooltips.root_motion_mask_set)
+ {
+ Mode_tooltips.root_motion_mask_set = 0;
+ ESelectInputChange(VRoot.win, 0, PointerMotionMask);
+ }
+ }
if (!func)
return;
===================================================================
RCS file: /cvs/e/e16/e/src/x.c,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -3 -r1.159 -r1.160
--- x.c 24 Jun 2007 16:48:16 -0000 1.159
+++ x.c 11 Jul 2007 08:54:19 -0000 1.160
@@ -1113,12 +1113,13 @@
}
void
-ESelectInputAdd(Win win, long mask)
+ESelectInputChange(Win win, long set, long clear)
{
XWindowAttributes xwa;
XGetWindowAttributes(disp, win->xwin, &xwa);
- xwa.your_event_mask |= mask;
+ xwa.your_event_mask |= set;
+ xwa.your_event_mask &= ~clear;
XSelectInput(disp, win->xwin, xwa.your_event_mask);
}
===================================================================
RCS file: /cvs/e/e16/e/src/xwin.h,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -3 -r1.31 -r1.32
--- xwin.h 11 Jul 2007 08:27:14 -0000 1.31
+++ xwin.h 11 Jul 2007 08:54:19 -0000 1.32
@@ -141,7 +141,7 @@
void EWindowSetGeometry(Win win, int x, int y, int w, int h,
int bw);
void EWindowSetMapped(Win win, int mapped);
-void ESelectInputAdd(Win win, long mask);
+void ESelectInputChange(Win win, long set, long clear);
void EMoveWindow(Win win, int x, int y);
void EResizeWindow(Win win, int w, int h);
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
