gwm17/glfw
1
0
Fork 0
mirror of https://github.com/gwm17/glfw.git synced 2024-11-23 02:38:52 -05:00
Code Issues Projects Releases Wiki Activity

Wayland: Clean up pointer declarations

Browse Source 
Adapt style to match the rest of the project.
This commit is contained in:
Camilla Löwy 2022-03-23 18:55:22 +01:00
parent ba11e60859
commit 4506175023
4 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/wl_init.c
View File

@ -724,10 +724,10 @@ static void dataDeviceHandleDataOffer(void* data,
static void dataDeviceHandleEnter(void* data, static void dataDeviceHandleEnter(void* data,
struct wl_data_device* device, struct wl_data_device* device,
uint32_t serial, uint32_t serial,
struct wl_surface *surface, struct wl_surface* surface,
wl_fixed_t x, wl_fixed_t x,
wl_fixed_t y, wl_fixed_t y,
struct wl_data_offer *offer) struct wl_data_offer* offer)
{ {
} }
@ -863,8 +863,8 @@ static void registryHandleGlobal(void* data,
} }
} }
static void registryHandleGlobalRemove(void *data, static void registryHandleGlobalRemove(void* data,
struct wl_registry *registry, struct wl_registry* registry,
uint32_t name) uint32_t name)
{ {
_GLFWmonitor* monitor; _GLFWmonitor* monitor;
@ -1155,9 +1155,9 @@ GLFWbool _glfwConnectWayland(int platformID, _GLFWplatform* platform)
int _glfwInitWayland(void) int _glfwInitWayland(void)
{ {
const char *cursorTheme; const char* cursorTheme;
const char *cursorSizeStr; const char* cursorSizeStr;
char *cursorSizeEnd; char* cursorSizeEnd;
long cursorSizeLong; long cursorSizeLong;
int cursorSize; int cursorSize;

12
src/wl_monitor.c
View File

@ -48,7 +48,7 @@ static void outputHandleGeometry(void* data,
const char* model, const char* model,
int32_t transform) int32_t transform)
{ {
struct _GLFWmonitor *monitor = data; struct _GLFWmonitor* monitor = data;
monitor->wl.x = x; monitor->wl.x = x;
monitor->wl.y = y; monitor->wl.y = y;
@ -65,7 +65,7 @@ static void outputHandleMode(void* data,
int32_t height, int32_t height,
int32_t refresh) int32_t refresh)
{ {
struct _GLFWmonitor *monitor = data; struct _GLFWmonitor* monitor = data;
GLFWvidmode mode; GLFWvidmode mode;
mode.width = width; mode.width = width;
@ -86,7 +86,7 @@ static void outputHandleMode(void* data,
static void outputHandleDone(void* data, struct wl_output* output) static void outputHandleDone(void* data, struct wl_output* output)
{ {
struct _GLFWmonitor *monitor = data; struct _GLFWmonitor* monitor = data;
if (monitor->widthMM <= 0 || monitor->heightMM <= 0) if (monitor->widthMM <= 0 || monitor->heightMM <= 0)
{ {
@ -103,7 +103,7 @@ static void outputHandleScale(void* data,
struct wl_output* output, struct wl_output* output,
int32_t factor) int32_t factor)
{ {
struct _GLFWmonitor *monitor = data; struct _GLFWmonitor* monitor = data;
monitor->wl.scale = factor; monitor->wl.scale = factor;
} }
@ -122,8 +122,8 @@ static const struct wl_output_listener outputListener = {
void _glfwAddOutputWayland(uint32_t name, uint32_t version) void _glfwAddOutputWayland(uint32_t name, uint32_t version)
{ {
_GLFWmonitor *monitor; _GLFWmonitor* monitor;
struct wl_output *output; struct wl_output* output;
if (version < 2) if (version < 2)
{ {

10
src/wl_platform.h
View File

@ -45,10 +45,10 @@ typedef VkBool32 (APIENTRY *PFN_vkGetPhysicalDeviceWaylandPresentationSupportKHR
#include "xkb_unicode.h" #include "xkb_unicode.h"
#include "posix_poll.h" #include "posix_poll.h"
typedef int (* PFN_wl_display_flush)(struct wl_display *display); typedef int (* PFN_wl_display_flush)(struct wl_display* display);
typedef void (* PFN_wl_display_cancel_read)(struct wl_display *display); typedef void (* PFN_wl_display_cancel_read)(struct wl_display* display);
typedef int (* PFN_wl_display_dispatch_pending)(struct wl_display *display); typedef int (* PFN_wl_display_dispatch_pending)(struct wl_display* display);
typedef int (* PFN_wl_display_read_events)(struct wl_display *display); typedef int (* PFN_wl_display_read_events)(struct wl_display* display);
typedef struct wl_display* (* PFN_wl_display_connect)(const char*); typedef struct wl_display* (* PFN_wl_display_connect)(const char*);
typedef void (* PFN_wl_display_disconnect)(struct wl_display*); typedef void (* PFN_wl_display_disconnect)(struct wl_display*);
typedef int (* PFN_wl_display_roundtrip)(struct wl_display*); typedef int (* PFN_wl_display_roundtrip)(struct wl_display*);
@ -457,7 +457,7 @@ float _glfwGetWindowOpacityWayland(_GLFWwindow* window);
void _glfwSetWindowOpacityWayland(_GLFWwindow* window, float opacity); void _glfwSetWindowOpacityWayland(_GLFWwindow* window, float opacity);
void _glfwSetWindowMousePassthroughWayland(_GLFWwindow* window, GLFWbool enabled); void _glfwSetWindowMousePassthroughWayland(_GLFWwindow* window, GLFWbool enabled);
void _glfwSetRawMouseMotionWayland(_GLFWwindow *window, GLFWbool enabled); void _glfwSetRawMouseMotionWayland(_GLFWwindow* window, GLFWbool enabled);
GLFWbool _glfwRawMouseMotionSupportedWayland(void); GLFWbool _glfwRawMouseMotionSupportedWayland(void);
void _glfwPollEventsWayland(void); void _glfwPollEventsWayland(void);

14
src/wl_window.c
View File

@ -364,9 +364,9 @@ static void checkScaleChange(_GLFWwindow* window)
} }
} }
static void surfaceHandleEnter(void *data, static void surfaceHandleEnter(void* data,
struct wl_surface *surface, struct wl_surface* surface,
struct wl_output *output) struct wl_output* output)
{ {
_GLFWwindow* window = data; _GLFWwindow* window = data;
_GLFWmonitor* monitor = wl_output_get_user_data(output); _GLFWmonitor* monitor = wl_output_get_user_data(output);
@ -384,9 +384,9 @@ static void surfaceHandleEnter(void *data,
checkScaleChange(window); checkScaleChange(window);
} }
static void surfaceHandleLeave(void *data, static void surfaceHandleLeave(void* data,
struct wl_surface *surface, struct wl_surface* surface,
struct wl_output *output) struct wl_output* output)
{ {
_GLFWwindow* window = data; _GLFWwindow* window = data;
_GLFWmonitor* monitor = wl_output_get_user_data(output); _GLFWmonitor* monitor = wl_output_get_user_data(output);
@ -1163,7 +1163,7 @@ void _glfwSetWindowOpacityWayland(_GLFWwindow* window, float opacity)
"Wayland: The platform does not support setting the window opacity"); "Wayland: The platform does not support setting the window opacity");
} }
void _glfwSetRawMouseMotionWayland(_GLFWwindow *window, GLFWbool enabled) void _glfwSetRawMouseMotionWayland(_GLFWwindow* window, GLFWbool enabled)
{ {
// This is handled in relativePointerHandleRelativeMotion // This is handled in relativePointerHandleRelativeMotion
} }