mirror/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2024-11-22 13:04:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Wayland: Clean up pointer declarations

Browse Source 
Adapt style to match the rest of the project.

(cherry picked from commit 4506175023)
This commit is contained in:
Camilla Löwy 2022-03-23 18:55:22 +01:00
parent 1ee540bf48
commit 3599fe4a78
4 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/wl_init.c
View File

@ -720,10 +720,10 @@ static void dataDeviceHandleDataOffer(void* data,
static void dataDeviceHandleEnter(void* data,
struct wl_data_device* device,
uint32_t serial,
struct wl_surface *surface,
struct wl_surface* surface,
wl_fixed_t x,
wl_fixed_t y,
struct wl_data_offer *offer)
struct wl_data_offer* offer)
{
}
@ -864,8 +864,8 @@ static void registryHandleGlobal(void* data,
}
}
static void registryHandleGlobalRemove(void *data,
struct wl_registry *registry,
static void registryHandleGlobalRemove(void* data,
struct wl_registry* registry,
uint32_t name)
{
int i;
@ -1030,9 +1030,9 @@ static void createKeyTables(void)
int _glfwPlatformInit(void)
{
const char *cursorTheme;
const char *cursorSizeStr;
char *cursorSizeEnd;
const char* cursorTheme;
const char* cursorSizeStr;
char* cursorSizeEnd;
long cursorSizeLong;
int cursorSize;

12
src/wl_monitor.c
View File

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

1
src/wl_platform.h
View File

@ -347,7 +347,6 @@ typedef struct _GLFWcursorWayland
int currentImage;
} _GLFWcursorWayland;
void _glfwAddOutputWayland(uint32_t name, uint32_t version);
GLFWbool _glfwInputTextWayland(_GLFWwindow* window, uint32_t scancode);

14
src/wl_window.c
View File

@ -471,9 +471,9 @@ static void checkScaleChange(_GLFWwindow* window)
}
}
static void surfaceHandleEnter(void *data,
struct wl_surface *surface,
struct wl_output *output)
static void surfaceHandleEnter(void* data,
struct wl_surface* surface,
struct wl_output* output)
{
_GLFWwindow* window = data;
_GLFWmonitor* monitor = wl_output_get_user_data(output);
@ -491,9 +491,9 @@ static void surfaceHandleEnter(void *data,
checkScaleChange(window);
}
static void surfaceHandleLeave(void *data,
struct wl_surface *surface,
struct wl_output *output)
static void surfaceHandleLeave(void* data,
struct wl_surface* surface,
struct wl_output* output)
{
_GLFWwindow* window = data;
_GLFWmonitor* monitor = wl_output_get_user_data(output);
@ -1371,7 +1371,7 @@ void _glfwPlatformSetWindowOpacity(_GLFWwindow* window, float opacity)
{
}
void _glfwPlatformSetRawMouseMotion(_GLFWwindow *window, GLFWbool enabled)
void _glfwPlatformSetRawMouseMotion(_GLFWwindow* window, GLFWbool enabled)
{
// This is handled in relativePointerHandleRelativeMotion
}