Reapply "Fix Event.h variable names"
View the diff against patchset 0 to see changes since the revert.
This reverts commit 97f0fef83d8ab9fd43c628867273a4b753de63ef.
... to avoid errors like
/host/testlibs/Event.h:80:33: error: declaration of ‘Event::KeyEvent
Event::<unnamed union>::Key’ changes meaning of ‘Key’ [-Wchanges-
...
/host/testlibs/Event.h:30:9: note: used here to mean ‘enum Key’
30 | Key Code;
| ^~~
Bug: n/a
Test: cd hardware/google/gfxstream
mkdir build
cd build
cmake .. -G Ninja
ninja
Test: emulator-mac_x64_gfxstream on ATBD (see checks tab)
Change-Id: Ie420aa2166db2ee09efea660b49b3e132a39c72f
diff --git a/host/testlibs/Event.h b/host/testlibs/Event.h
index 7dd9cb3..20c50f0 100644
--- a/host/testlibs/Event.h
+++ b/host/testlibs/Event.h
@@ -15,41 +15,41 @@
public:
struct MoveEvent
{
- int X;
- int Y;
+ int x;
+ int y;
};
struct SizeEvent
{
- int Width;
- int Height;
+ int width;
+ int height;
};
struct KeyEvent
{
- Key Code;
- bool Alt;
- bool Control;
- bool Shift;
- bool System;
+ Key code;
+ bool alt;
+ bool control;
+ bool shift;
+ bool system;
};
struct MouseMoveEvent
{
- int X;
- int Y;
+ int x;
+ int y;
};
struct MouseButtonEvent
{
- MouseButton Button;
- int X;
- int Y;
+ MouseButton button;
+ int x;
+ int y;
};
struct MouseWheelEvent
{
- int Delta;
+ int delta;
};
enum EventType
@@ -71,16 +71,16 @@
EVENT_TEST, // Event for testing purposes
};
- EventType Type;
+ EventType type;
union
{
- MoveEvent Move; // Move event parameters
- SizeEvent Size; // Size event parameters
- KeyEvent Key; // Key event parameters
- MouseMoveEvent MouseMove; // Mouse move event parameters
- MouseButtonEvent MouseButton; // Mouse button event parameters
- MouseWheelEvent MouseWheel; // Mouse wheel event parameters
+ MoveEvent move; // Move event parameters
+ SizeEvent size; // Size event parameters
+ KeyEvent key; // Key event parameters
+ MouseMoveEvent mouseMove; // Mouse move event parameters
+ MouseButtonEvent mouseButton; // Mouse button event parameters
+ MouseWheelEvent mouseWheel; // Mouse wheel event parameters
};
};
diff --git a/host/testlibs/OSWindow.cpp b/host/testlibs/OSWindow.cpp
index 631c4c0..61ba494 100644
--- a/host/testlibs/OSWindow.cpp
+++ b/host/testlibs/OSWindow.cpp
@@ -290,15 +290,15 @@
void OSWindow::pushEvent(Event event)
{
- switch (event.Type)
+ switch (event.type)
{
case Event::EVENT_MOVED:
- mX = event.Move.X;
- mY = event.Move.Y;
+ mX = event.move.x;
+ mY = event.move.y;
break;
case Event::EVENT_RESIZED:
- mWidth = event.Size.Width;
- mHeight = event.Size.Height;
+ mWidth = event.size.width;
+ mHeight = event.size.height;
break;
default:
break;
@@ -316,7 +316,7 @@
Event topEvent;
while (popEvent(&topEvent))
{
- if (topEvent.Type == Event::EVENT_TEST)
+ if (topEvent.type == Event::EVENT_TEST)
{
return true;
}
diff --git a/host/testlibs/osx/OSXWindow.mm b/host/testlibs/osx/OSXWindow.mm
index 04fc173..66169f2 100644
--- a/host/testlibs/osx/OSXWindow.mm
+++ b/host/testlibs/osx/OSXWindow.mm
@@ -37,7 +37,7 @@
if ([window->getNSWindow() windowNumber] == [nsEvent windowNumber])
{
Event event;
- event.Type = Event::EVENT_TEST;
+ event.type = Event::EVENT_TEST;
window->pushEvent(event);
}
}
@@ -54,7 +54,7 @@
- (NSApplicationTerminateReply) applicationShouldTerminate: (NSApplication*) sender
{
Event event;
- event.Type = Event::EVENT_CLOSED;
+ event.type = Event::EVENT_CLOSED;
for (auto window : gAllWindows)
{
window->pushEvent(event);
@@ -118,7 +118,7 @@
- (BOOL) windowShouldClose: (id) sender
{
Event event;
- event.Type = Event::EVENT_CLOSED;
+ event.type = Event::EVENT_CLOSED;
mWindow->pushEvent(event);
return NO;
}
@@ -127,9 +127,9 @@
{
NSSize windowSize = [[mWindow->getNSWindow() contentView] frame].size;
Event event;
- event.Type = Event::EVENT_RESIZED;
- event.Size.Width = windowSize.width;
- event.Size.Height = windowSize.height;
+ event.type = Event::EVENT_RESIZED;
+ event.size.width = windowSize.width;
+ event.size.height = windowSize.height;
mWindow->pushEvent(event);
}
@@ -137,16 +137,16 @@
{
NSRect screenspace = [mWindow->getNSWindow() frame];
Event event;
- event.Type = Event::EVENT_MOVED;
- event.Move.X = screenspace.origin.x;
- event.Move.Y = YCoordToFromCG(screenspace.origin.y + screenspace.size.height);
+ event.type = Event::EVENT_MOVED;
+ event.move.x = screenspace.origin.x;
+ event.move.y = YCoordToFromCG(screenspace.origin.y + screenspace.size.height);
mWindow->pushEvent(event);
}
- (void) windowDidBecomeKey: (NSNotification*) notification
{
Event event;
- event.Type = Event::EVENT_GAINED_FOCUS;
+ event.type = Event::EVENT_GAINED_FOCUS;
mWindow->pushEvent(event);
[self retain];
}
@@ -156,7 +156,7 @@
if (mWindow != nil)
{
Event event;
- event.Type = Event::EVENT_LOST_FOCUS;
+ event.type = Event::EVENT_LOST_FOCUS;
mWindow->pushEvent(event);
}
[self release];
@@ -281,10 +281,10 @@
static void AddNSKeyStateToEvent(Event *event, int state)
{
- event->Key.Shift = state & NSShiftKeyMask;
- event->Key.Control = state & NSControlKeyMask;
- event->Key.Alt = state & NSAlternateKeyMask;
- event->Key.System = state & NSCommandKeyMask;
+ event->key.shift = state & NSShiftKeyMask;
+ event->key.control = state & NSControlKeyMask;
+ event->key.alt = state & NSAlternateKeyMask;
+ event->key.system = state & NSCommandKeyMask;
}
static MouseButton TranslateMouseButton(int button)
@@ -372,10 +372,10 @@
- (void) addButtonEvent: (NSEvent*) nsEvent type:(Event::EventType) eventType button:(MouseButton) button
{
Event event;
- event.Type = eventType;
- event.MouseButton.Button = button;
- event.MouseButton.X = [nsEvent locationInWindow].x;
- event.MouseButton.Y = [self translateMouseY: [nsEvent locationInWindow].y];
+ event.type = eventType;
+ event.mouseButton.button = button;
+ event.mouseButton.x = [nsEvent locationInWindow].x;
+ event.mouseButton.y = [self translateMouseY: [nsEvent locationInWindow].y];
mWindow->pushEvent(event);
}
@@ -401,23 +401,23 @@
- (void) mouseMoved: (NSEvent*) nsEvent
{
Event event;
- event.Type = Event::EVENT_MOUSE_MOVED;
- event.MouseMove.X = [nsEvent locationInWindow].x;
- event.MouseMove.Y = [self translateMouseY: [nsEvent locationInWindow].y];
+ event.type = Event::EVENT_MOUSE_MOVED;
+ event.mouseMove.x = [nsEvent locationInWindow].x;
+ event.mouseMove.y = [self translateMouseY: [nsEvent locationInWindow].y];
mWindow->pushEvent(event);
}
- (void) mouseEntered: (NSEvent*) nsEvent
{
Event event;
- event.Type = Event::EVENT_MOUSE_ENTERED;
+ event.type = Event::EVENT_MOUSE_ENTERED;
mWindow->pushEvent(event);
}
- (void) mouseExited: (NSEvent*) nsEvent
{
Event event;
- event.Type = Event::EVENT_MOUSE_LEFT;
+ event.type = Event::EVENT_MOUSE_LEFT;
mWindow->pushEvent(event);
}
@@ -467,8 +467,8 @@
}
Event event;
- event.Type = Event::EVENT_MOUSE_WHEEL_MOVED;
- event.MouseWheel.Delta = [nsEvent deltaY];
+ event.type = Event::EVENT_MOUSE_WHEEL_MOVED;
+ event.mouseWheel.delta = [nsEvent deltaY];
mWindow->pushEvent(event);
}
@@ -477,8 +477,8 @@
{
// TODO(cwallez) also send text events
Event event;
- event.Type = Event::EVENT_KEY_PRESSED;
- event.Key.Code = NSCodeToKey([nsEvent keyCode]);
+ event.type = Event::EVENT_KEY_PRESSED;
+ event.key.code = NSCodeToKey([nsEvent keyCode]);
AddNSKeyStateToEvent(&event, [nsEvent modifierFlags]);
mWindow->pushEvent(event);
}
@@ -486,8 +486,8 @@
- (void) keyUp: (NSEvent*) nsEvent
{
Event event;
- event.Type = Event::EVENT_KEY_RELEASED;
- event.Key.Code = NSCodeToKey([nsEvent keyCode]);
+ event.type = Event::EVENT_KEY_RELEASED;
+ event.key.code = NSCodeToKey([nsEvent keyCode]);
AddNSKeyStateToEvent(&event, [nsEvent modifierFlags]);
mWindow->pushEvent(event);
}
@@ -504,15 +504,15 @@
int modifier = [nsEvent modifierFlags] & NSDeviceIndependentModifierFlagsMask;
if (modifier < mCurrentModifier)
{
- event.Type = Event::EVENT_KEY_RELEASED;
+ event.type = Event::EVENT_KEY_RELEASED;
}
else
{
- event.Type = Event::EVENT_KEY_PRESSED;
+ event.type = Event::EVENT_KEY_PRESSED;
}
mCurrentModifier = modifier;
- event.Key.Code = NSCodeToKey([nsEvent keyCode]);
+ event.key.code = NSCodeToKey([nsEvent keyCode]);
AddNSKeyStateToEvent(&event, [nsEvent modifierFlags]);
mWindow->pushEvent(event);
}
diff --git a/host/testlibs/windows/win32/Win32Window.cpp b/host/testlibs/windows/win32/Win32Window.cpp
index 457bb9e..5a85fe2 100644
--- a/host/testlibs/windows/win32/Win32Window.cpp
+++ b/host/testlibs/windows/win32/Win32Window.cpp
@@ -248,7 +248,7 @@
case WM_CLOSE:
{
Event event;
- event.Type = Event::EVENT_CLOSED;
+ event.type = Event::EVENT_CLOSED;
window->pushEvent(event);
break;
}
@@ -264,9 +264,9 @@
ClientToScreen(hWnd, &topLeft);
Event event;
- event.Type = Event::EVENT_MOVED;
- event.Move.X = topLeft.x;
- event.Move.Y = topLeft.y;
+ event.type = Event::EVENT_MOVED;
+ event.move.x = topLeft.x;
+ event.move.y = topLeft.y;
window->pushEvent(event);
break;
@@ -288,9 +288,9 @@
ClientToScreen(hWnd, &botRight);
Event event;
- event.Type = Event::EVENT_RESIZED;
- event.Size.Width = botRight.x - topLeft.x;
- event.Size.Height = botRight.y - topLeft.y;
+ event.type = Event::EVENT_RESIZED;
+ event.size.width = botRight.x - topLeft.x;
+ event.size.height = botRight.y - topLeft.y;
window->pushEvent(event);
break;
@@ -299,7 +299,7 @@
case WM_SETFOCUS:
{
Event event;
- event.Type = Event::EVENT_GAINED_FOCUS;
+ event.type = Event::EVENT_GAINED_FOCUS;
window->pushEvent(event);
break;
}
@@ -307,7 +307,7 @@
case WM_KILLFOCUS:
{
Event event;
- event.Type = Event::EVENT_LOST_FOCUS;
+ event.type = Event::EVENT_LOST_FOCUS;
window->pushEvent(event);
break;
}
@@ -320,13 +320,13 @@
bool down = (message == WM_KEYDOWN || message == WM_SYSKEYDOWN);
Event event;
- event.Type = down ? Event::EVENT_KEY_PRESSED : Event::EVENT_KEY_RELEASED;
- event.Key.Alt = HIWORD(GetAsyncKeyState(VK_MENU)) != 0;
- event.Key.Control = HIWORD(GetAsyncKeyState(VK_CONTROL)) != 0;
- event.Key.Shift = HIWORD(GetAsyncKeyState(VK_SHIFT)) != 0;
- event.Key.System =
+ event.type = down ? Event::EVENT_KEY_PRESSED : Event::EVENT_KEY_RELEASED;
+ event.key.alt = HIWORD(GetAsyncKeyState(VK_MENU)) != 0;
+ event.key.control = HIWORD(GetAsyncKeyState(VK_CONTROL)) != 0;
+ event.key.shift = HIWORD(GetAsyncKeyState(VK_SHIFT)) != 0;
+ event.key.system =
HIWORD(GetAsyncKeyState(VK_LWIN)) || HIWORD(GetAsyncKeyState(VK_RWIN));
- event.Key.Code = VirtualKeyCodeToKey(wParam, lParam);
+ event.key.code = VirtualKeyCodeToKey(wParam, lParam);
window->pushEvent(event);
break;
@@ -335,8 +335,8 @@
case WM_MOUSEWHEEL:
{
Event event;
- event.Type = Event::EVENT_MOUSE_WHEEL_MOVED;
- event.MouseWheel.Delta = static_cast<short>(HIWORD(wParam)) / 120;
+ event.type = Event::EVENT_MOUSE_WHEEL_MOVED;
+ event.mouseWheel.delta = static_cast<short>(HIWORD(wParam)) / 120;
window->pushEvent(event);
break;
}
@@ -345,10 +345,10 @@
case WM_LBUTTONDBLCLK:
{
Event event;
- event.Type = Event::EVENT_MOUSE_BUTTON_PRESSED;
- event.MouseButton.Button = MOUSEBUTTON_LEFT;
- event.MouseButton.X = static_cast<short>(LOWORD(lParam));
- event.MouseButton.Y = static_cast<short>(HIWORD(lParam));
+ event.type = Event::EVENT_MOUSE_BUTTON_PRESSED;
+ event.mouseButton.button = MOUSEBUTTON_LEFT;
+ event.mouseButton.x = static_cast<short>(LOWORD(lParam));
+ event.mouseButton.y = static_cast<short>(HIWORD(lParam));
window->pushEvent(event);
break;
}
@@ -356,10 +356,10 @@
case WM_LBUTTONUP:
{
Event event;
- event.Type = Event::EVENT_MOUSE_BUTTON_RELEASED;
- event.MouseButton.Button = MOUSEBUTTON_LEFT;
- event.MouseButton.X = static_cast<short>(LOWORD(lParam));
- event.MouseButton.Y = static_cast<short>(HIWORD(lParam));
+ event.type = Event::EVENT_MOUSE_BUTTON_RELEASED;
+ event.mouseButton.button = MOUSEBUTTON_LEFT;
+ event.mouseButton.x = static_cast<short>(LOWORD(lParam));
+ event.mouseButton.y = static_cast<short>(HIWORD(lParam));
window->pushEvent(event);
break;
}
@@ -368,10 +368,10 @@
case WM_RBUTTONDBLCLK:
{
Event event;
- event.Type = Event::EVENT_MOUSE_BUTTON_PRESSED;
- event.MouseButton.Button = MOUSEBUTTON_RIGHT;
- event.MouseButton.X = static_cast<short>(LOWORD(lParam));
- event.MouseButton.Y = static_cast<short>(HIWORD(lParam));
+ event.type = Event::EVENT_MOUSE_BUTTON_PRESSED;
+ event.mouseButton.button = MOUSEBUTTON_RIGHT;
+ event.mouseButton.x = static_cast<short>(LOWORD(lParam));
+ event.mouseButton.y = static_cast<short>(HIWORD(lParam));
window->pushEvent(event);
break;
}
@@ -380,10 +380,10 @@
case WM_RBUTTONUP:
{
Event event;
- event.Type = Event::EVENT_MOUSE_BUTTON_RELEASED;
- event.MouseButton.Button = MOUSEBUTTON_RIGHT;
- event.MouseButton.X = static_cast<short>(LOWORD(lParam));
- event.MouseButton.Y = static_cast<short>(HIWORD(lParam));
+ event.type = Event::EVENT_MOUSE_BUTTON_RELEASED;
+ event.mouseButton.button = MOUSEBUTTON_RIGHT;
+ event.mouseButton.x = static_cast<short>(LOWORD(lParam));
+ event.mouseButton.y = static_cast<short>(HIWORD(lParam));
window->pushEvent(event);
break;
}
@@ -393,10 +393,10 @@
case WM_MBUTTONDBLCLK:
{
Event event;
- event.Type = Event::EVENT_MOUSE_BUTTON_PRESSED;
- event.MouseButton.Button = MOUSEBUTTON_MIDDLE;
- event.MouseButton.X = static_cast<short>(LOWORD(lParam));
- event.MouseButton.Y = static_cast<short>(HIWORD(lParam));
+ event.type = Event::EVENT_MOUSE_BUTTON_PRESSED;
+ event.mouseButton.button = MOUSEBUTTON_MIDDLE;
+ event.mouseButton.x = static_cast<short>(LOWORD(lParam));
+ event.mouseButton.y = static_cast<short>(HIWORD(lParam));
window->pushEvent(event);
break;
}
@@ -405,10 +405,10 @@
case WM_MBUTTONUP:
{
Event event;
- event.Type = Event::EVENT_MOUSE_BUTTON_RELEASED;
- event.MouseButton.Button = MOUSEBUTTON_MIDDLE;
- event.MouseButton.X = static_cast<short>(LOWORD(lParam));
- event.MouseButton.Y = static_cast<short>(HIWORD(lParam));
+ event.type = Event::EVENT_MOUSE_BUTTON_RELEASED;
+ event.mouseButton.button = MOUSEBUTTON_MIDDLE;
+ event.mouseButton.x = static_cast<short>(LOWORD(lParam));
+ event.mouseButton.y = static_cast<short>(HIWORD(lParam));
window->pushEvent(event);
break;
}
@@ -418,11 +418,11 @@
case WM_XBUTTONDBLCLK:
{
Event event;
- event.Type = Event::EVENT_MOUSE_BUTTON_PRESSED;
- event.MouseButton.Button =
+ event.type = Event::EVENT_MOUSE_BUTTON_PRESSED;
+ event.mouseButton.button =
(HIWORD(wParam) == XBUTTON1) ? MOUSEBUTTON_BUTTON4 : MOUSEBUTTON_BUTTON5;
- event.MouseButton.X = static_cast<short>(LOWORD(lParam));
- event.MouseButton.Y = static_cast<short>(HIWORD(lParam));
+ event.mouseButton.x = static_cast<short>(LOWORD(lParam));
+ event.mouseButton.y = static_cast<short>(HIWORD(lParam));
window->pushEvent(event);
break;
}
@@ -431,11 +431,11 @@
case WM_XBUTTONUP:
{
Event event;
- event.Type = Event::EVENT_MOUSE_BUTTON_RELEASED;
- event.MouseButton.Button =
+ event.type = Event::EVENT_MOUSE_BUTTON_RELEASED;
+ event.mouseButton.button =
(HIWORD(wParam) == XBUTTON1) ? MOUSEBUTTON_BUTTON4 : MOUSEBUTTON_BUTTON5;
- event.MouseButton.X = static_cast<short>(LOWORD(lParam));
- event.MouseButton.Y = static_cast<short>(HIWORD(lParam));
+ event.mouseButton.x = static_cast<short>(LOWORD(lParam));
+ event.mouseButton.y = static_cast<short>(HIWORD(lParam));
window->pushEvent(event);
break;
}
@@ -446,7 +446,7 @@
{
window->mIsMouseInWindow = true;
Event event;
- event.Type = Event::EVENT_MOUSE_ENTERED;
+ event.type = Event::EVENT_MOUSE_ENTERED;
window->pushEvent(event);
}
@@ -454,9 +454,9 @@
int mouseY = static_cast<short>(HIWORD(lParam));
Event event;
- event.Type = Event::EVENT_MOUSE_MOVED;
- event.MouseMove.X = mouseX;
- event.MouseMove.Y = mouseY;
+ event.type = Event::EVENT_MOUSE_MOVED;
+ event.mouseMove.x = mouseX;
+ event.mouseMove.y = mouseY;
window->pushEvent(event);
break;
}
@@ -464,7 +464,7 @@
case WM_MOUSELEAVE:
{
Event event;
- event.Type = Event::EVENT_MOUSE_LEFT;
+ event.type = Event::EVENT_MOUSE_LEFT;
window->pushEvent(event);
window->mIsMouseInWindow = false;
break;
@@ -473,7 +473,7 @@
case WM_USER:
{
Event testEvent;
- testEvent.Type = Event::EVENT_TEST;
+ testEvent.type = Event::EVENT_TEST;
window->pushEvent(testEvent);
break;
}
@@ -820,7 +820,7 @@
{
OSWindow::pushEvent(event);
- switch (event.Type)
+ switch (event.type)
{
case Event::EVENT_RESIZED:
MoveWindow(mNativeWindow, 0, 0, mWidth, mHeight, FALSE);
diff --git a/host/testlibs/x11/X11Window.cpp b/host/testlibs/x11/X11Window.cpp
index 1570d75..cdbfb9e 100644
--- a/host/testlibs/x11/X11Window.cpp
+++ b/host/testlibs/x11/X11Window.cpp
@@ -143,10 +143,10 @@
static void AddX11KeyStateToEvent(Event *event, unsigned int state)
{
- event->Key.Shift = state & ShiftMask;
- event->Key.Control = state & ControlMask;
- event->Key.Alt = state & Mod1Mask;
- event->Key.System = state & Mod4Mask;
+ event->key.shift = state & ShiftMask;
+ event->key.control = state & ControlMask;
+ event->key.alt = state & Mod1Mask;
+ event->key.system = state & Mod4Mask;
}
}
@@ -434,17 +434,17 @@
if (wheelY != 0)
{
- event.Type = Event::EVENT_MOUSE_WHEEL_MOVED;
- event.MouseWheel.Delta = wheelY;
+ event.type = Event::EVENT_MOUSE_WHEEL_MOVED;
+ event.mouseWheel.delta = wheelY;
pushEvent(event);
}
if (button != MOUSEBUTTON_UNKNOWN)
{
- event.Type = Event::EVENT_MOUSE_BUTTON_RELEASED;
- event.MouseButton.Button = button;
- event.MouseButton.X = xEvent.xbutton.x;
- event.MouseButton.Y = xEvent.xbutton.y;
+ event.type = Event::EVENT_MOUSE_BUTTON_RELEASED;
+ event.mouseButton.button = button;
+ event.mouseButton.x = xEvent.xbutton.x;
+ event.mouseButton.y = xEvent.xbutton.y;
pushEvent(event);
}
}
@@ -479,10 +479,10 @@
if (button != MOUSEBUTTON_UNKNOWN)
{
- event.Type = Event::EVENT_MOUSE_BUTTON_RELEASED;
- event.MouseButton.Button = button;
- event.MouseButton.X = xEvent.xbutton.x;
- event.MouseButton.Y = xEvent.xbutton.y;
+ event.type = Event::EVENT_MOUSE_BUTTON_RELEASED;
+ event.mouseButton.button = button;
+ event.mouseButton.x = xEvent.xbutton.x;
+ event.mouseButton.y = xEvent.xbutton.y;
pushEvent(event);
}
}
@@ -491,8 +491,8 @@
case KeyPress:
{
Event event;
- event.Type = Event::EVENT_KEY_PRESSED;
- event.Key.Code = X11CodeToKey(mDisplay, xEvent.xkey.keycode);
+ event.type = Event::EVENT_KEY_PRESSED;
+ event.key.code = X11CodeToKey(mDisplay, xEvent.xkey.keycode);
AddX11KeyStateToEvent(&event, xEvent.xkey.state);
pushEvent(event);
}
@@ -501,8 +501,8 @@
case KeyRelease:
{
Event event;
- event.Type = Event::EVENT_KEY_RELEASED;
- event.Key.Code = X11CodeToKey(mDisplay, xEvent.xkey.keycode);
+ event.type = Event::EVENT_KEY_RELEASED;
+ event.key.code = X11CodeToKey(mDisplay, xEvent.xkey.keycode);
AddX11KeyStateToEvent(&event, xEvent.xkey.state);
pushEvent(event);
}
@@ -511,7 +511,7 @@
case EnterNotify:
{
Event event;
- event.Type = Event::EVENT_MOUSE_ENTERED;
+ event.type = Event::EVENT_MOUSE_ENTERED;
pushEvent(event);
}
break;
@@ -519,7 +519,7 @@
case LeaveNotify:
{
Event event;
- event.Type = Event::EVENT_MOUSE_LEFT;
+ event.type = Event::EVENT_MOUSE_LEFT;
pushEvent(event);
}
break;
@@ -527,9 +527,9 @@
case MotionNotify:
{
Event event;
- event.Type = Event::EVENT_MOUSE_MOVED;
- event.MouseMove.X = xEvent.xmotion.x;
- event.MouseMove.Y = xEvent.xmotion.y;
+ event.type = Event::EVENT_MOUSE_MOVED;
+ event.mouseMove.x = xEvent.xmotion.x;
+ event.mouseMove.y = xEvent.xmotion.y;
pushEvent(event);
}
break;
@@ -539,9 +539,9 @@
if (xEvent.xconfigure.width != mWidth || xEvent.xconfigure.height != mHeight)
{
Event event;
- event.Type = Event::EVENT_RESIZED;
- event.Size.Width = xEvent.xconfigure.width;
- event.Size.Height = xEvent.xconfigure.height;
+ event.type = Event::EVENT_RESIZED;
+ event.size.width = xEvent.xconfigure.width;
+ event.size.height = xEvent.xconfigure.height;
pushEvent(event);
}
if (xEvent.xconfigure.x != mX || xEvent.xconfigure.y != mY)
@@ -560,9 +560,9 @@
if (x != mX || y != mY)
{
Event event;
- event.Type = Event::EVENT_MOVED;
- event.Move.X = x;
- event.Move.Y = y;
+ event.type = Event::EVENT_MOVED;
+ event.move.x = x;
+ event.move.y = y;
pushEvent(event);
}
}
@@ -573,7 +573,7 @@
if (xEvent.xfocus.mode == NotifyNormal || xEvent.xfocus.mode == NotifyWhileGrabbed)
{
Event event;
- event.Type = Event::EVENT_GAINED_FOCUS;
+ event.type = Event::EVENT_GAINED_FOCUS;
pushEvent(event);
}
break;
@@ -582,7 +582,7 @@
if (xEvent.xfocus.mode == NotifyNormal || xEvent.xfocus.mode == NotifyWhileGrabbed)
{
Event event;
- event.Type = Event::EVENT_LOST_FOCUS;
+ event.type = Event::EVENT_LOST_FOCUS;
pushEvent(event);
}
break;
@@ -596,13 +596,13 @@
static_cast<Atom>(xEvent.xclient.data.l[0]) == WM_DELETE_WINDOW)
{
Event event;
- event.Type = Event::EVENT_CLOSED;
+ event.type = Event::EVENT_CLOSED;
pushEvent(event);
}
else if (xEvent.xclient.message_type == TEST_EVENT)
{
Event event;
- event.Type = Event::EVENT_TEST;
+ event.type = Event::EVENT_TEST;
pushEvent(event);
}
break;
