Skip to content

Commit

Permalink
refactor: add typedefs for structs and use them
Browse files Browse the repository at this point in the history
  • Loading branch information
@gnif
gnif committed May 22, 2022
1 parent c330e3f commit 4cd5254
Show file tree
Hide file tree
Showing 14 changed files with 72 additions and 68 deletions.
12 changes: 7 additions & 5 deletions src/agent.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ Place, Suite 330, Boston, MA 02111-1307 USA

#include <spice/vd_agent.h>

typedef struct PSAgent PSAgent;

struct PSAgent
{
bool present;
Expand All @@ -57,7 +59,7 @@ struct PSAgent
ssize_t msgSize;
};

static struct PSAgent agent = {0};
static PSAgent agent = {0};

static PS_STATUS agent_sendCaps(bool request);
static void agent_onClipboard(void);
Expand All @@ -80,7 +82,7 @@ PS_STATUS agent_connect(void)
SPICE_RAW_PACKET_FREE(msg);
}

struct PSChannel * channel = &g_ps.channels[PS_CHANNEL_MAIN];
PSChannel * channel = &g_ps.channels[PS_CHANNEL_MAIN];
uint32_t * packet = SPICE_PACKET(SPICE_MSGC_MAIN_AGENT_START, uint32_t, 0);
memcpy(packet, &(uint32_t){SPICE_AGENT_TOKENS_MAX}, sizeof(uint32_t));
if (!SPICE_SEND_PACKET(channel, packet))
Expand Down Expand Up @@ -136,7 +138,7 @@ struct Selection
};
#pragma pack(pop)

PS_STATUS agent_process(struct PSChannel * channel)
PS_STATUS agent_process(PSChannel * channel)
{
if (agent.cbRemain)
{
Expand Down Expand Up @@ -297,7 +299,7 @@ void agent_setServerTokens(unsigned int tokens)

static bool agent_takeServerToken(void)
{
struct PSChannel * channel = &g_ps.channels[PS_CHANNEL_MAIN];
PSChannel * channel = &g_ps.channels[PS_CHANNEL_MAIN];

unsigned int tokens;
do
Expand All @@ -321,7 +323,7 @@ void agent_returnServerTokens(unsigned int tokens)

bool agent_processQueue(void)
{
struct PSChannel * channel = &g_ps.channels[PS_CHANNEL_MAIN];
PSChannel * channel = &g_ps.channels[PS_CHANNEL_MAIN];

SPICE_LOCK(channel->lock);
while (queue_peek(agent.queue, NULL) && agent_takeServerToken())
Expand Down
2 changes: 1 addition & 1 deletion src/agent.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,6 @@ void agent_returnServerTokens(unsigned int tokens);

void agent_disconnect(void);

PS_STATUS agent_process(struct PSChannel * channel);
PS_STATUS agent_process(PSChannel * channel);

bool agent_processQueue(void);
22 changes: 11 additions & 11 deletions src/channel.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ static uint64_t get_timestamp(void)
return (uint64_t)time.tv_sec * 1000LL + time.tv_nsec / 1000000LL;
}

PS_STATUS channel_connect(struct PSChannel * channel)
PS_STATUS channel_connect(PSChannel * channel)
{
PS_STATUS status;

Expand Down Expand Up @@ -210,7 +210,7 @@ PS_STATUS channel_connect(struct PSChannel * channel)
return PS_STATUS_OK;
}

void channel_disconnect(struct PSChannel * channel)
void channel_disconnect(PSChannel * channel)
{
if (!channel->connected)
return;
Expand Down Expand Up @@ -253,7 +253,7 @@ void channel_disconnect(struct PSChannel * channel)
channel->buffer = NULL;
}

static PS_STATUS onMessage_setAck(struct PSChannel * channel)
static PS_STATUS onMessage_setAck(PSChannel * channel)
{
SpiceMsgSetAck * msg = (SpiceMsgSetAck *)channel->buffer;

Expand All @@ -268,7 +268,7 @@ static PS_STATUS onMessage_setAck(struct PSChannel * channel)
PS_STATUS_OK : PS_STATUS_ERROR;
}

static PS_STATUS onMessage_ping(struct PSChannel * channel)
static PS_STATUS onMessage_ping(PSChannel * channel)
{
SpiceMsgPing * msg = (SpiceMsgPing *)channel->buffer;

Expand All @@ -286,22 +286,22 @@ static PS_STATUS onMessage_ping(struct PSChannel * channel)
return PS_STATUS_OK;
}

static PS_STATUS onMessage_disconnecting(struct PSChannel * channel)
static PS_STATUS onMessage_disconnecting(PSChannel * channel)
{
shutdown(channel->socket, SHUT_WR);
PS_LOG_INFO("Server sent disconnect message");
return PS_STATUS_HANDLED;
}

static PS_STATUS onMessage_notify(struct PSChannel * channel)
static PS_STATUS onMessage_notify(PSChannel * channel)
{
SpiceMsgNotify * msg = (SpiceMsgNotify *)channel->buffer;

PS_LOG_INFO("[notify] %s", msg->message);
return PS_STATUS_OK;
}

PSHandlerFn channel_onMessage(struct PSChannel * channel)
PSHandlerFn channel_onMessage(PSChannel * channel)
{
switch(channel->header.type)
{
Expand All @@ -328,7 +328,7 @@ PSHandlerFn channel_onMessage(struct PSChannel * channel)
return PS_HANDLER_ERROR;
}

bool channel_ack(struct PSChannel * channel)
bool channel_ack(PSChannel * channel)
{
if (channel->ackFrequency == 0)
return true;
Expand All @@ -349,7 +349,7 @@ bool channel_ack(struct PSChannel * channel)
return true;
}

ssize_t channel_writeNL(const struct PSChannel * channel,
ssize_t channel_writeNL(const PSChannel * channel,
const void * buffer, size_t size)
{
if (!channel->connected)
Expand All @@ -361,7 +361,7 @@ ssize_t channel_writeNL(const struct PSChannel * channel,
return send(channel->socket, buffer, size, 0);
}

PS_STATUS channel_readNL(struct PSChannel * channel, void * buffer,
PS_STATUS channel_readNL(PSChannel * channel, void * buffer,
size_t size, int * dataAvailable)
{
if (!channel->connected)
Expand Down Expand Up @@ -400,7 +400,7 @@ PS_STATUS channel_readNL(struct PSChannel * channel, void * buffer,
return PS_STATUS_OK;
}

PS_STATUS channel_discardNL(struct PSChannel * channel,
PS_STATUS channel_discardNL(PSChannel * channel,
size_t size, int * dataAvailable)
{
uint8_t c[1024];
Expand Down
14 changes: 7 additions & 7 deletions src/channel.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,19 +19,19 @@ Place, Suite 330, Boston, MA 02111-1307 USA

#include "ps.h"

PS_STATUS channel_connect (struct PSChannel * channel);
PS_STATUS channel_connect(PSChannel * channel);

void channel_disconnect(struct PSChannel * channel);
void channel_disconnect(PSChannel * channel);

PSHandlerFn channel_onMessage(struct PSChannel * channel);
PSHandlerFn channel_onMessage(PSChannel * channel);

bool channel_ack(struct PSChannel * channel);
bool channel_ack(PSChannel * channel);

ssize_t channel_writeNL(const struct PSChannel * channel,
ssize_t channel_writeNL(const PSChannel * channel,
const void * buffer, size_t size);

PS_STATUS channel_readNL(struct PSChannel * channel, void * buffer,
PS_STATUS channel_readNL(PSChannel * channel, void * buffer,
size_t size, int * dataAvailable);

PS_STATUS channel_discardNL(struct PSChannel * channel,
PS_STATUS channel_discardNL(PSChannel * channel,
size_t size, int * dataAvailable);
12 changes: 6 additions & 6 deletions src/channel_display.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ const SpiceLinkHeader * channelDisplay_getConnectPacket(void)
return &p.header;
}

PS_STATUS channelDisplay_onConnect(struct PSChannel * channel)
PS_STATUS channelDisplay_onConnect(PSChannel * channel)
{
SpiceMsgcDisplayInit * msg =
SPICE_PACKET(SPICE_MSGC_DISPLAY_INIT,
Expand Down Expand Up @@ -246,7 +246,7 @@ static void resolveDisplayDrawFill(uint8_t * data, SpiceMsgDisplayDrawFill * dst
resolveSpiceFill (data, &ptr, &dst->data);
}

static PS_STATUS onMessage_displaySurfaceCreate(struct PSChannel * channel)
static PS_STATUS onMessage_displaySurfaceCreate(PSChannel * channel)
{
SpiceMsgSurfaceCreate * msg = (SpiceMsgSurfaceCreate *)channel->buffer;

Expand All @@ -271,15 +271,15 @@ static PS_STATUS onMessage_displaySurfaceCreate(struct PSChannel * channel)
return PS_STATUS_OK;
}

static PS_STATUS onMessage_displaySurfaceDestroy(struct PSChannel * channel)
static PS_STATUS onMessage_displaySurfaceDestroy(PSChannel * channel)
{
SpiceMsgSurfaceDestroy * msg = (SpiceMsgSurfaceDestroy *)channel->buffer;

g_ps.config.display.surfaceDestroy(msg->surface_id);
return PS_STATUS_OK;
}

static PS_STATUS onMessage_displayDrawFill(struct PSChannel * channel)
static PS_STATUS onMessage_displayDrawFill(PSChannel * channel)
{
SpiceMsgDisplayDrawFill dst;
resolveDisplayDrawFill(channel->buffer, &dst);
Expand All @@ -300,7 +300,7 @@ static PS_STATUS onMessage_displayDrawFill(struct PSChannel * channel)
return PS_STATUS_OK;
}

static PS_STATUS onMessage_displayDrawCopy(struct PSChannel * channel)
static PS_STATUS onMessage_displayDrawCopy(PSChannel * channel)
{
SpiceMsgDisplayDrawCopy dst;
resolveDisplayDrawCopy(channel->buffer, &dst);
Expand Down Expand Up @@ -340,7 +340,7 @@ static PS_STATUS onMessage_displayDrawCopy(struct PSChannel * channel)
return PS_STATUS_OK;
}

PSHandlerFn channelDisplay_onMessage(struct PSChannel * channel)
PSHandlerFn channelDisplay_onMessage(PSChannel * channel)
{
channel->initDone = true;
switch(channel->header.type)
Expand Down
4 changes: 2 additions & 2 deletions src/channel_display.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@ Place, Suite 330, Boston, MA 02111-1307 USA

const SpiceLinkHeader * channelDisplay_getConnectPacket(void);

PS_STATUS channelDisplay_onConnect(struct PSChannel * channel);
PS_STATUS channelDisplay_onConnect(PSChannel * channel);

PSHandlerFn channelDisplay_onMessage(struct PSChannel * channel);
PSHandlerFn channelDisplay_onMessage(PSChannel * channel);
24 changes: 12 additions & 12 deletions src/channel_inputs.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,22 +66,22 @@ const SpiceLinkHeader * channelInputs_getConnectPacket(void)
return &p.header;
}

static PS_STATUS onMessage_inputsInit(struct PSChannel * channel)
static PS_STATUS onMessage_inputsInit(PSChannel * channel)
{
channel->initDone = true;
//SpiceMsgInputsInit * msg = (SpiceMsgInputsInit *)channel->buffer;

return PS_STATUS_OK;
}

static PS_STATUS onMessage_inputsKeyModifiers(struct PSChannel * channel)
static PS_STATUS onMessage_inputsKeyModifiers(PSChannel * channel)
{
SpiceMsgInputsInit * msg = (SpiceMsgInputsInit *)channel->buffer;
g_ps.kb.modifiers = msg->modifiers;
return PS_STATUS_OK;
}

static PS_STATUS onMessage_inputsMouseMotionAck(struct PSChannel * channel)
static PS_STATUS onMessage_inputsMouseMotionAck(PSChannel * channel)
{
(void)channel;

Expand All @@ -97,7 +97,7 @@ static PS_STATUS onMessage_inputsMouseMotionAck(struct PSChannel * channel)
return PS_STATUS_OK;
}

PSHandlerFn channelInputs_onMessage(struct PSChannel * channel)
PSHandlerFn channelInputs_onMessage(PSChannel * channel)
{
if (!channel->initDone)
{
Expand Down Expand Up @@ -128,7 +128,7 @@ PSHandlerFn channelInputs_onMessage(struct PSChannel * channel)

bool purespice_keyDown(uint32_t code)
{
struct PSChannel * channel = &g_ps.channels[PS_CHANNEL_INPUTS];
PSChannel * channel = &g_ps.channels[PS_CHANNEL_INPUTS];
if (!channel->connected || !channel->ready)
return false;

Expand All @@ -151,7 +151,7 @@ bool purespice_keyDown(uint32_t code)

bool purespice_keyUp(uint32_t code)
{
struct PSChannel * channel = &g_ps.channels[PS_CHANNEL_INPUTS];
PSChannel * channel = &g_ps.channels[PS_CHANNEL_INPUTS];
if (!channel->connected || !channel->ready)
return false;

Expand All @@ -176,7 +176,7 @@ bool purespice_keyUp(uint32_t code)

bool purespice_keyModifiers(uint32_t modifiers)
{
struct PSChannel * channel = &g_ps.channels[PS_CHANNEL_INPUTS];
PSChannel * channel = &g_ps.channels[PS_CHANNEL_INPUTS];
if (!channel->connected || !channel->ready)
return false;

Expand All @@ -196,7 +196,7 @@ bool purespice_keyModifiers(uint32_t modifiers)

bool purespice_mouseMode(bool server)
{
struct PSChannel * channel = &g_ps.channels[PS_CHANNEL_MAIN];
PSChannel * channel = &g_ps.channels[PS_CHANNEL_MAIN];
if (!channel->connected || !channel->ready)
return false;

Expand All @@ -217,7 +217,7 @@ bool purespice_mouseMode(bool server)

bool purespice_mousePosition(uint32_t x, uint32_t y)
{
struct PSChannel * channel = &g_ps.channels[PS_CHANNEL_INPUTS];
PSChannel * channel = &g_ps.channels[PS_CHANNEL_INPUTS];
if (!channel->connected || !channel->ready)
return false;

Expand All @@ -243,7 +243,7 @@ bool purespice_mousePosition(uint32_t x, uint32_t y)

bool purespice_mouseMotion(int32_t x, int32_t y)
{
struct PSChannel * channel = &g_ps.channels[PS_CHANNEL_INPUTS];
PSChannel * channel = &g_ps.channels[PS_CHANNEL_INPUTS];
if (!channel->connected || !channel->ready)
return false;

Expand Down Expand Up @@ -329,7 +329,7 @@ bool purespice_mouseMotion(int32_t x, int32_t y)

bool purespice_mousePress(uint32_t button)
{
struct PSChannel * channel = &g_ps.channels[PS_CHANNEL_INPUTS];
PSChannel * channel = &g_ps.channels[PS_CHANNEL_INPUTS];
if (!channel->connected || !channel->ready)
return false;

Expand Down Expand Up @@ -366,7 +366,7 @@ bool purespice_mousePress(uint32_t button)

bool purespice_mouseRelease(uint32_t button)
{
struct PSChannel * channel = &g_ps.channels[PS_CHANNEL_INPUTS];
PSChannel * channel = &g_ps.channels[PS_CHANNEL_INPUTS];
if (!channel->connected || !channel->ready)
return false;

Expand Down
2 changes: 1 addition & 1 deletion src/channel_inputs.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ Place, Suite 330, Boston, MA 02111-1307 USA

const SpiceLinkHeader * channelInputs_getConnectPacket(void);

PSHandlerFn channelInputs_onMessage(struct PSChannel * channel);
PSHandlerFn channelInputs_onMessage(PSChannel * channel);
Loading

0 comments on commit 4cd5254

Please sign in to comment.