Skip to content

Commit

Permalink
gamepad: API clean ups.
Browse files Browse the repository at this point in the history 
* Use const on callback structures from WebKit and application
* Change int type for gamepad identifies to uintptr_t thus
  transparent hash tables among different archs can be used.
  • Loading branch information
@ceyusa @aperezdc
ceyusa authored and aperezdc committed Aug 22, 2022
1 parent d8b7324 commit 73080fd
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 23 deletions.
21 changes: 11 additions & 10 deletions include/wpe/gamepad.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,8 @@ struct wpe_gamepad_provider;
* Since: 1.14
*/
struct wpe_gamepad_provider_client_interface {
void (*connected)(void*, unsigned);
void (*disconnected)(void*, unsigned);
void (*connected)(void*, uintptr_t);
void (*disconnected)(void*, uintptr_t);

/*< private >*/
void (*_wpe_reserved1)(void);
Expand Down Expand Up @@ -183,7 +183,7 @@ struct wpe_gamepad_provider_interface {
* Since: 1.14
*/
struct wpe_gamepad_interface {
void* (*create)(struct wpe_gamepad*, struct wpe_gamepad_provider*, unsigned);
void* (*create)(struct wpe_gamepad*, struct wpe_gamepad_provider*, uintptr_t);
void (*destroy)(void*);
const char* (*get_id)(void*);

Expand Down Expand Up @@ -229,8 +229,9 @@ void wpe_gamepad_provider_destroy(struct wpe_gamepad_provider*);
* Since: 1.14
*/
WPE_EXPORT
void
wpe_gamepad_provider_set_client(struct wpe_gamepad_provider*, struct wpe_gamepad_provider_client_interface*, void*);
void wpe_gamepad_provider_set_client(struct wpe_gamepad_provider*,
const struct wpe_gamepad_provider_client_interface*,
void*);

/**
* wpe_gamepad_provider_start:
Expand Down Expand Up @@ -292,7 +293,7 @@ struct wpe_view_backend* wpe_gamepad_provider_get_view_backend(struct wpe_gamepa
* Since: 1.14
*/
WPE_EXPORT
void wpe_gamepad_provider_dispatch_gamepad_connected(struct wpe_gamepad_provider*, unsigned);
void wpe_gamepad_provider_dispatch_gamepad_connected(struct wpe_gamepad_provider*, uintptr_t);

/**
* wpe_gamepad_provider_dispatch_gamepad_disconnected:
Expand All @@ -305,7 +306,7 @@ void wpe_gamepad_provider_dispatch_gamepad_connected(struct wpe_gamepad_provider
* Since: 1.14
*/
WPE_EXPORT
void wpe_gamepad_provider_dispatch_gamepad_disconnected(struct wpe_gamepad_provider*, unsigned);
void wpe_gamepad_provider_dispatch_gamepad_disconnected(struct wpe_gamepad_provider*, uintptr_t);

/**
* wpe_gamepad_create:
Expand All @@ -319,7 +320,7 @@ void wpe_gamepad_provider_dispatch_gamepad_disconnected(struct wpe_gamepad_provi
* Since: 1.14
*/
WPE_EXPORT
struct wpe_gamepad* wpe_gamepad_create(struct wpe_gamepad_provider*, unsigned);
struct wpe_gamepad* wpe_gamepad_create(struct wpe_gamepad_provider*, uintptr_t);

/**
* wpe_gamepad_destroy:
Expand All @@ -344,7 +345,7 @@ void wpe_gamepad_destroy(struct wpe_gamepad*);
* Since: 1.14
*/
WPE_EXPORT
void wpe_gamepad_set_client(struct wpe_gamepad*, struct wpe_gamepad_client_interface*, void*);
void wpe_gamepad_set_client(struct wpe_gamepad*, const struct wpe_gamepad_client_interface*, void*);

/**
* wpe_gamepad_get_id:
Expand Down Expand Up @@ -399,7 +400,7 @@ void wpe_gamepad_dispatch_axis_changed(struct wpe_gamepad*, enum wpe_gamepad_axi
* Since: 1.14
*/
WPE_EXPORT
void wpe_gamepad_set_handler(struct wpe_gamepad_provider_interface*, struct wpe_gamepad_interface*);
void wpe_gamepad_set_handler(const struct wpe_gamepad_provider_interface*, const struct wpe_gamepad_interface*);

#ifdef __cplusplus
}
Expand Down
26 changes: 13 additions & 13 deletions src/gamepad.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ struct wpe_gamepad {
void* client_data;
};

static struct wpe_gamepad_provider_interface* provider_interface = NULL;
static struct wpe_gamepad_interface* gamepad_interface = NULL;
static const struct wpe_gamepad_provider_interface* provider_interface = NULL;
static const struct wpe_gamepad_interface* gamepad_interface = NULL;

struct wpe_gamepad_provider*
wpe_gamepad_provider_create(void)
Expand All @@ -63,9 +63,9 @@ wpe_gamepad_provider_destroy(struct wpe_gamepad_provider* provider)
}

void
wpe_gamepad_provider_set_client(struct wpe_gamepad_provider* provider,
struct wpe_gamepad_provider_client_interface* client_interface,
void* client_data)
wpe_gamepad_provider_set_client(struct wpe_gamepad_provider* provider,
const struct wpe_gamepad_provider_client_interface* client_interface,
void* client_data)
{
if (!provider)
return;
Expand Down Expand Up @@ -105,21 +105,21 @@ wpe_gamepad_provider_get_view_backend(struct wpe_gamepad_provider* provider, str
}

void
wpe_gamepad_provider_dispatch_gamepad_connected(struct wpe_gamepad_provider* provider, unsigned gamepad_id)
wpe_gamepad_provider_dispatch_gamepad_connected(struct wpe_gamepad_provider* provider, uintptr_t gamepad_id)
{
if (provider && provider->client_interface && provider->client_interface->connected)
provider->client_interface->connected(provider->client_data, gamepad_id);
}

void
wpe_gamepad_provider_dispatch_gamepad_disconnected(struct wpe_gamepad_provider* provider, unsigned gamepad_id)
wpe_gamepad_provider_dispatch_gamepad_disconnected(struct wpe_gamepad_provider* provider, uintptr_t gamepad_id)
{
if (provider && provider->client_interface && provider->client_interface->disconnected)
provider->client_interface->disconnected(provider->client_data, gamepad_id);
}

struct wpe_gamepad*
wpe_gamepad_create(struct wpe_gamepad_provider* provider, unsigned gamepad_id)
wpe_gamepad_create(struct wpe_gamepad_provider* provider, uintptr_t gamepad_id)
{
if (!gamepad_interface)
return NULL;
Expand All @@ -143,9 +143,9 @@ wpe_gamepad_destroy(struct wpe_gamepad* gamepad)
}

void
wpe_gamepad_set_client(struct wpe_gamepad* gamepad,
struct wpe_gamepad_client_interface* client_interface,
void* client_data)
wpe_gamepad_set_client(struct wpe_gamepad* gamepad,
const struct wpe_gamepad_client_interface* client_interface,
void* client_data)
{
if (gamepad) {
gamepad->client_interface = client_interface;
Expand Down Expand Up @@ -176,8 +176,8 @@ wpe_gamepad_dispatch_axis_changed(struct wpe_gamepad* gamepad, enum wpe_gamepad_
}

void
wpe_gamepad_set_handler(struct wpe_gamepad_provider_interface* provider_iface,
struct wpe_gamepad_interface* gamepad_iface)
wpe_gamepad_set_handler(const struct wpe_gamepad_provider_interface* provider_iface,
const struct wpe_gamepad_interface* gamepad_iface)
{
if (provider_iface && !provider_interface && gamepad_iface && !gamepad_interface) {
provider_interface = provider_iface;
Expand Down

0 comments on commit 73080fd

Please sign in to comment.