[Xfce4-commits] [xfce/xfwm4] 06/07: device: Rename XfwmEventMeta's XEvent as 'xevent'
noreply at xfce.org
noreply at xfce.org
Wed May 8 09:31:25 CEST 2019
This is an automated email from the git hooks/post-receive script.
o l i v i e r p u s h e d a c o m m i t t o b r a n c h m a s t e r
in repository xfce/xfwm4.
commit 5628495003f020493ccf4d9c1bbe2fddddc07de5
Author: Olivier Fourdan <fourdan at xfce.org>
Date: Wed May 8 09:16:18 2019 +0200
device: Rename XfwmEventMeta's XEvent as 'xevent'
Using just “x” for the name of the generic `XEvent` is really confusing.
Rename it as “xevent” for clarity.
Signed-off-by: Olivier Fourdan <fourdan at xfce.org>
---
src/client.c | 4 ++--
src/cycle.c | 10 +++++-----
src/device.c | 18 +++++++++---------
src/device.h | 4 ++--
src/display.c | 4 ++--
src/event_filter.c | 4 ++--
src/events.c | 48 ++++++++++++++++++++++++------------------------
src/menu.c | 2 +-
src/moveresize.c | 8 ++++----
9 files changed, 51 insertions(+), 51 deletions(-)
diff --git a/src/client.c b/src/client.c
index d429de0..7bf530e 100644
--- a/src/client.c
+++ b/src/client.c
@@ -3808,8 +3808,8 @@ clientButtonPressEventFilter (XfwmEvent *event, gpointer data)
}
status = EVENT_FILTER_STOP;
break;
- case XFWM_EVENT_X:
- switch (event->meta.x->type)
+ case XFWM_EVENT_XEVENT:
+ switch (event->meta.xevent->type)
{
case UnmapNotify:
if (event->meta.window == c->window)
diff --git a/src/cycle.c b/src/cycle.c
index 5b092f5..e2279ff 100644
--- a/src/cycle.c
+++ b/src/cycle.c
@@ -334,7 +334,7 @@ clientCycleEventFilter (XfwmEvent *event, gpointer data)
}
else
{
- int keysym = XkbKeycodeToKeysym (event->meta.x->xany.display, event->key.keycode, 0, 0);
+ int keysym = XkbKeycodeToKeysym (event->meta.xevent->xany.display, event->key.keycode, 0, 0);
if (IsModifierKey(keysym))
{
@@ -394,13 +394,13 @@ clientCycleEventFilter (XfwmEvent *event, gpointer data)
}
status = EVENT_FILTER_STOP;
break;
- case XFWM_EVENT_X:
- switch (event->meta.x->type)
+ case XFWM_EVENT_XEVENT:
+ switch (event->meta.xevent->type)
{
case DestroyNotify:
status = EVENT_FILTER_CONTINUE;
removed = myScreenGetClientFromWindow (screen_info,
- ((XDestroyWindowEvent *) event->meta.x)->window,
+ ((XDestroyWindowEvent *) event->meta.xevent)->window,
SEARCH_WINDOW);
if (removed == NULL)
{
@@ -412,7 +412,7 @@ clientCycleEventFilter (XfwmEvent *event, gpointer data)
if (!removed)
{
removed = myScreenGetClientFromWindow (screen_info,
- ((XUnmapEvent *) event->meta.x)->window,
+ ((XUnmapEvent *) event->meta.xevent)->window,
SEARCH_WINDOW);
if (removed == NULL)
{
diff --git a/src/device.c b/src/device.c
index 01c0c81..47403b1 100644
--- a/src/device.c
+++ b/src/device.c
@@ -53,7 +53,7 @@ static const struct
event->meta.type = evtype; \
event->meta.window = evwindow; \
event->meta.device = evdevice; \
- event->meta.x = xevent; \
+ event->meta.xevent = xevent; \
}
#ifdef HAVE_XI2
@@ -219,7 +219,7 @@ xfwm_device_translate_event_crossing_xi2 (XEvent *xevent, XIEnterEvent *xievent,
static XfwmEvent *
xfwm_device_translate_event_common (XEvent *xevent, XfwmEvent *event)
{
- xfwm_device_fill_meta (XFWM_EVENT_X, xevent->xany.window, None);
+ xfwm_device_fill_meta (XFWM_EVENT_XEVENT, xevent->xany.window, None);
return event;
}
@@ -283,12 +283,12 @@ xfwm_device_button_update_window (XfwmEventButton *event, Window window)
#ifdef HAVE_XI2
if (event->meta.device != None)
{
- ((XIDeviceEvent *)event->meta.x->xcookie.data)->event = window;
+ ((XIDeviceEvent *)event->meta.xevent->xcookie.data)->event = window;
}
else
#endif
{
- event->meta.x->xany.window = window;
+ event->meta.xevent->xany.window = window;
}
}
@@ -535,7 +535,7 @@ xfwm_device_check_mask_event_xi2_predicate (Display *display, XEvent *xevent, XP
XIMaskIsSet (context->xievent_mask.mask, xevent->xgeneric.evtype))
{
/* GDK holds XI2 event data which we are replacing so it should be released here */
- XFreeEventData (display, &context->event->meta.x->xcookie);
+ XFreeEventData (display, &context->event->meta.xevent->xcookie);
return TRUE;
}
@@ -558,25 +558,25 @@ xfwm_device_check_mask_event (XfwmDevices *devices, Display *display,
context.devices = devices;
context.event = event;
xfwm_device_fill_xi2_event_mask (&context.xievent_mask, event_mask);
- result = XCheckIfEvent (display, event->meta.x,
+ result = XCheckIfEvent (display, event->meta.xevent,
xfwm_device_check_mask_event_xi2_predicate, (XPointer)&context);
g_free (context.xievent_mask.mask);
if (result)
{
/* Previos data was released in predicate, allocate a new data for the new event */
- XGetEventData (display, &event->meta.x->xcookie);
+ XGetEventData (display, &event->meta.xevent->xcookie);
}
}
else
#endif
{
- result = XCheckMaskEvent (display, event_mask, event->meta.x);
+ result = XCheckMaskEvent (display, event_mask, event->meta.xevent);
}
if (result)
{
- xfwm_device_translate_event (devices, event->meta.x, event);
+ xfwm_device_translate_event (devices, event->meta.xevent, event);
}
return result;
diff --git a/src/device.h b/src/device.h
index 7cebdd3..c99b97a 100644
--- a/src/device.h
+++ b/src/device.h
@@ -32,7 +32,7 @@
typedef enum
{
- XFWM_EVENT_X,
+ XFWM_EVENT_XEVENT,
XFWM_EVENT_KEY,
XFWM_EVENT_BUTTON,
XFWM_EVENT_MOTION,
@@ -44,7 +44,7 @@ typedef struct
XfwmEventType type;
Window window;
gint device;
- XEvent *x;
+ XEvent *xevent;
} XfwmEventMeta;
typedef struct
diff --git a/src/display.c b/src/display.c
index 02da303..5f04911 100644
--- a/src/display.c
+++ b/src/display.c
@@ -781,8 +781,8 @@ myDisplayUpdateCurrentTime (DisplayInfo *display, XfwmEvent *event)
case XFWM_EVENT_CROSSING:
timestamp = (guint32) event->crossing.time;
break;
- case XFWM_EVENT_X:
- xevent = event->meta.x;
+ case XFWM_EVENT_XEVENT:
+ xevent = event->meta.xevent;
switch (xevent->type)
{
diff --git a/src/event_filter.c b/src/event_filter.c
index 313c434..12c7895 100644
--- a/src/event_filter.c
+++ b/src/event_filter.c
@@ -50,8 +50,8 @@ default_event_filter (XfwmEvent *event, gpointer data)
case XFWM_EVENT_CROSSING:
TRACE ("unhandled XFWM_EVENT_CROSSING [%d] event", event->crossing.enter);
break;
- case XFWM_EVENT_X:
- switch (event->meta.x->type)
+ case XFWM_EVENT_XEVENT:
+ switch (event->meta.xevent->type)
{
case KeyPress:
TRACE ("unhandled KeyPress event");
diff --git a/src/events.c b/src/events.c
index 99c3395..b4acdd6 100644
--- a/src/events.c
+++ b/src/events.c
@@ -199,7 +199,7 @@ typeOfClick_event_filter (XfwmEvent *event, gpointer data)
}
status = EVENT_FILTER_STOP;
}
- else if ((event->meta.x->type == DestroyNotify) || (event->meta.x->type == UnmapNotify))
+ else if ((event->meta.xevent->type == DestroyNotify) || (event->meta.xevent->type == UnmapNotify))
{
if (event->meta.window == passdata->w)
{
@@ -1090,7 +1090,7 @@ handleButtonPress (DisplayInfo *display_info, XfwmEventButton *event)
myDisplayErrorTrapPush (display_info);
xfwm_device_ungrab (display_info->devices, &display_info->devices->pointer,
display_info->dpy, event->time);
- XSendEvent (display_info->dpy, screen_info->xfwm4_win, FALSE, SubstructureNotifyMask, event->meta.x);
+ XSendEvent (display_info->dpy, screen_info->xfwm4_win, FALSE, SubstructureNotifyMask, event->meta.xevent);
myDisplayErrorTrapPopIgnored (display_info);
}
}
@@ -1115,7 +1115,7 @@ handleButtonRelease (DisplayInfo *display_info, XfwmEventButton *event)
if (screen_info)
{
XSendEvent (display_info->dpy, screen_info->xfwm4_win, FALSE, SubstructureNotifyMask,
- (XEvent *) event->meta.x);
+ (XEvent *) event->meta.xevent);
}
/* Release pending events */
@@ -2211,7 +2211,7 @@ handleEvent (DisplayInfo *display_info, XfwmEvent *event)
/* Update the display time */
myDisplayUpdateCurrentTime (display_info, event);
- sn_process_event (event->meta.x);
+ sn_process_event (event->meta.xevent);
switch (event->meta.type)
{
@@ -2248,59 +2248,59 @@ handleEvent (DisplayInfo *display_info, XfwmEvent *event)
status = handleLeaveNotify (display_info, &event->crossing);
}
break;
- case XFWM_EVENT_X:
- switch (event->meta.x->type)
+ case XFWM_EVENT_XEVENT:
+ switch (event->meta.xevent->type)
{
case DestroyNotify:
- status = handleDestroyNotify (display_info, (XDestroyWindowEvent *) event->meta.x);
+ status = handleDestroyNotify (display_info, (XDestroyWindowEvent *) event->meta.xevent);
break;
case UnmapNotify:
- status = handleUnmapNotify (display_info, (XUnmapEvent *) event->meta.x);
+ status = handleUnmapNotify (display_info, (XUnmapEvent *) event->meta.xevent);
break;
case MapRequest:
- status = handleMapRequest (display_info, (XMapRequestEvent *) event->meta.x);
+ status = handleMapRequest (display_info, (XMapRequestEvent *) event->meta.xevent);
break;
case MapNotify:
- status = handleMapNotify (display_info, (XMapEvent *) event->meta.x);
+ status = handleMapNotify (display_info, (XMapEvent *) event->meta.xevent);
break;
case ConfigureNotify:
- status = handleConfigureNotify (display_info, (XConfigureEvent *) event->meta.x);
+ status = handleConfigureNotify (display_info, (XConfigureEvent *) event->meta.xevent);
break;
case ConfigureRequest:
- status = handleConfigureRequest (display_info, (XConfigureRequestEvent *) event->meta.x);
+ status = handleConfigureRequest (display_info, (XConfigureRequestEvent *) event->meta.xevent);
break;
case FocusIn:
- status = handleFocusIn (display_info, (XFocusChangeEvent *) event->meta.x);
+ status = handleFocusIn (display_info, (XFocusChangeEvent *) event->meta.xevent);
break;
case FocusOut:
- status = handleFocusOut (display_info, (XFocusChangeEvent *) event->meta.x);
+ status = handleFocusOut (display_info, (XFocusChangeEvent *) event->meta.xevent);
break;
case PropertyNotify:
- status = handlePropertyNotify (display_info, (XPropertyEvent *) event->meta.x);
+ status = handlePropertyNotify (display_info, (XPropertyEvent *) event->meta.xevent);
break;
case ClientMessage:
- status = handleClientMessage (display_info, (XClientMessageEvent *) event->meta.x);
+ status = handleClientMessage (display_info, (XClientMessageEvent *) event->meta.xevent);
break;
case SelectionClear:
- status = handleSelectionClear (display_info, (XSelectionClearEvent *) event->meta.x);
+ status = handleSelectionClear (display_info, (XSelectionClearEvent *) event->meta.xevent);
break;
case ColormapNotify:
- handleColormapNotify (display_info, (XColormapEvent *) event->meta.x);
+ handleColormapNotify (display_info, (XColormapEvent *) event->meta.xevent);
break;
case ReparentNotify:
- status = handleReparentNotify (display_info, (XReparentEvent *) event->meta.x);
+ status = handleReparentNotify (display_info, (XReparentEvent *) event->meta.xevent);
break;
default:
if ((display_info->have_shape) &&
- (event->meta.x->type == display_info->shape_event_base))
+ (event->meta.xevent->type == display_info->shape_event_base))
{
- status = handleShape (display_info, (XShapeEvent *) event->meta.x);
+ status = handleShape (display_info, (XShapeEvent *) event->meta.xevent);
}
#ifdef HAVE_XSYNC
if ((display_info->have_xsync) &&
- (event->meta.x->type == (display_info->xsync_event_base + XSyncAlarmNotify)))
+ (event->meta.xevent->type == (display_info->xsync_event_base + XSyncAlarmNotify)))
{
- status = handleXSyncAlarmNotify (display_info, (XSyncAlarmNotifyEvent *) event->meta.x);
+ status = handleXSyncAlarmNotify (display_info, (XSyncAlarmNotifyEvent *) event->meta.xevent);
}
#endif /* HAVE_XSYNC */
break;
@@ -2325,7 +2325,7 @@ handleEvent (DisplayInfo *display_info, XfwmEvent *event)
}
}
- compositorHandleEvent (display_info, event->meta.x);
+ compositorHandleEvent (display_info, event->meta.xevent);
return status;
}
diff --git a/src/menu.c b/src/menu.c
index d6e5da8..7453e23 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -89,7 +89,7 @@ menu_filter (XfwmEvent *event, gpointer data)
case XFWM_EVENT_MOTION:
case XFWM_EVENT_CROSSING:
return EVENT_FILTER_STOP;
- case XFWM_EVENT_X:
+ case XFWM_EVENT_XEVENT:
break;
}
return EVENT_FILTER_CONTINUE;
diff --git a/src/moveresize.c b/src/moveresize.c
index e8196c0..e70045d 100644
--- a/src/moveresize.c
+++ b/src/moveresize.c
@@ -186,7 +186,7 @@ clientMovePointer (DisplayInfo *display_info, gint dx, gint dy, guint repeat)
static gboolean
clientKeyPressIsModifier (XfwmEventKey *event)
{
- int keysym = XkbKeycodeToKeysym (event->meta.x->xany.display, event->keycode, 0, 0);
+ int keysym = XkbKeycodeToKeysym (event->meta.xevent->xany.display, event->keycode, 0, 0);
return (gboolean) IsModifierKey(keysym);
}
@@ -1100,7 +1100,7 @@ clientMoveEventFilter (XfwmEvent *event, gpointer data)
passdata->configure_flags = NO_CFG_FLAG;
}
}
- else if ((event->meta.x->type == UnmapNotify) && (event->meta.window == c->window))
+ else if ((event->meta.xevent->type == UnmapNotify) && (event->meta.window == c->window))
{
moving = FALSE;
status = EVENT_FILTER_CONTINUE;
@@ -1543,7 +1543,7 @@ clientResizeEventFilter (XfwmEvent *event, gpointer data)
myDisplayUpdateCurrentTime (display_info, event);
}
- if (event->meta.x->type == ButtonRelease)
+ if (event->meta.xevent->type == ButtonRelease)
{
resizing = FALSE;
}
@@ -1648,7 +1648,7 @@ clientResizeEventFilter (XfwmEvent *event, gpointer data)
passdata->button == AnyButton ||
passdata->button == event->button.button);
}
- else if ((event->meta.x->type == UnmapNotify) && (event->meta.window == c->window))
+ else if ((event->meta.xevent->type == UnmapNotify) && (event->meta.window == c->window))
{
resizing = FALSE;
status = EVENT_FILTER_CONTINUE;
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list