sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

This commit removes naming associated with and naming for the now non-existent NXFE graphics layer.

Browse Source 
Squashed commit of the following:

    graphics/:  Rename nxfe_reportposition to nxmu_reportposition.  The is no longer an nxfe layer.

    graphics/:  Renmae nxfe_redrawreq to nxmu_redrawreq.  The is no longer an nxfe layer.

    graphics/nxmu/nxmu.h:  Renmae nxfe.h to nxmu.h.  There is no long an nxfe layer.

    graphics/: Rename nxfe_state_s to nxmu_state_s.  There is no longer an nxfe layer.

    graphics/: Rename nxfe_conn_s to nxmu_conn_s.  There is no longer an nxfe layer.
This commit is contained in:
Gregory Nutt 2019-03-13 09:16:30 -06:00
parent e780ee3a08
commit 0454ae2a10
31 changed files with 84 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
graphics/nxbe/nxbe_move.c
View File

@ -44,7 +44,7 @@
#include <nuttx/nx/nxglib.h>
#include "nxbe.h"
#include "nxfe.h"
#include "nxmu.h"
/****************************************************************************
* Private Types
@ -123,7 +123,7 @@ static void nxbe_clipmoveobscured(FAR struct nxbe_clipops_s *cops,
struct nxgl_rect_s dst;
nxgl_rectoffset(&dst, rect, info->offset.x, info->offset.y);
nxfe_redrawreq(info->wnd, &dst);
nxmu_redrawreq(info->wnd, &dst);
}
/****************************************************************************
@ -160,7 +160,7 @@ static void nxbe_clipmovedest(FAR struct nxbe_clipops_s *cops,
{
if (!nxgl_nullrect(&nonintersecting[i]))
{
nxfe_redrawreq(dstdata->wnd, &nonintersecting[i]);
nxmu_redrawreq(dstdata->wnd, &nonintersecting[i]);
}
}

4
graphics/nxbe/nxbe_raise.c
View File

@ -42,7 +42,7 @@
#include <nuttx/nx/nxglib.h>
#include "nxbe.h"
#include "nxfe.h"
#include "nxmu.h"
/****************************************************************************
* Private Types
@ -96,5 +96,5 @@ void nxbe_raise(FAR struct nxbe_window_s *wnd)
* it is not obscured by another window
*/
nxfe_redrawreq(wnd, &wnd->bounds);
nxmu_redrawreq(wnd, &wnd->bounds);
}

4
graphics/nxbe/nxbe_redraw.c
View File

@ -45,7 +45,7 @@
#include <nuttx/nx/nxglib.h>
#include "nxbe.h"
#include "nxfe.h"
#include "nxmu.h"
/****************************************************************************
* Private Types
@ -72,7 +72,7 @@ static void nxbe_clipredraw(FAR struct nxbe_clipops_s *cops,
FAR struct nxbe_window_s *wnd = ((struct nxbe_redraw_s *)cops)->wnd;
if (wnd)
{
nxfe_redrawreq(wnd, rect);
nxmu_redrawreq(wnd, rect);
}
}

4
graphics/nxbe/nxbe_setposition.c
View File

@ -42,7 +42,7 @@
#include <nuttx/nx/nxglib.h>
#include "nxbe.h"
#include "nxfe.h"
#include "nxmu.h"
/****************************************************************************
* Public Functions
@ -88,7 +88,7 @@ void nxbe_setposition(FAR struct nxbe_window_s *wnd,
/* Report the new size/position */
nxfe_reportposition(wnd);
nxmu_reportposition(wnd);
/* Then redraw this window AND all windows below it. Having moved the
* window, we may have exposed previoulsy obscured portions of windows

4
graphics/nxbe/nxbe_setsize.c
View File

@ -42,7 +42,7 @@
#include <nuttx/nx/nxglib.h>
#include "nxbe.h"
#include "nxfe.h"
#include "nxmu.h"
/****************************************************************************
* Public Functions
@ -90,7 +90,7 @@ void nxbe_setsize(FAR struct nxbe_window_s *wnd,
/* Report the new size/position */
nxfe_reportposition(wnd);
nxmu_reportposition(wnd);
/* Then redraw this window AND all windows below it. Having resized the
* window, we may have exposed previoulsy obscured portions of windows

2
graphics/nxbe/nxbe_visible.c
View File

@ -46,7 +46,7 @@
#include <nuttx/nx/nxglib.h>
#include "nxbe.h"
#include "nxfe.h"
#include "nxmu.h"
/****************************************************************************
* Private Types

34
graphics/nxmu/nxfe.h → graphics/nxmu/nxmu.h
View File

@ -1,7 +1,7 @@
/****************************************************************************
* graphics/nxmu/nxfe.h
* graphics/nxmu/nxmu.h
*
* Copyright (C) 2008-2013 Gregory Nutt. All rights reserved.
* Copyright (C) 2008-2013, 2019 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
@ -33,8 +33,8 @@
*
****************************************************************************/
#ifndef __GRAPHICS_NXMU_NXFE_H
#define __GRAPHICS_NXMU_NXFE_H
#ifndef __GRAPHICS_NXMU_NXMU_H
#define __GRAPHICS_NXMU_NXMU_H
/****************************************************************************
* Included Files
@ -64,18 +64,18 @@
/* This the server 'front-end' state structure */
struct nxfe_state_s
struct nxmu_state_s
{
/* The 'back-end' window status. Must be first so that instances of
* struct nxbe_state_s can be simply cast to an instance of struct
* nxfe_state_s
* nxmu_state_s
*/
struct nxbe_state_s be;
/* This is the server's connection to itself */
struct nxfe_conn_s conn;
struct nxmu_conn_s conn;
};
/****************************************************************************
@ -111,7 +111,7 @@ extern "C"
*
****************************************************************************/
int nxmu_sendclient(FAR struct nxfe_conn_s *conn,
int nxmu_sendclient(FAR struct nxmu_conn_s *conn,
FAR const void *msg, size_t msglen);
/****************************************************************************
@ -169,7 +169,7 @@ void nxmu_openwindow(FAR struct nxbe_state_s *be,
*
****************************************************************************/
void nxmu_requestbkgd(FAR struct nxfe_conn_s *conn,
void nxmu_requestbkgd(FAR struct nxmu_conn_s *conn,
FAR struct nxbe_state_s *be,
FAR const struct nx_callback_s *cb,
FAR void *arg);
@ -189,27 +189,27 @@ void nxmu_requestbkgd(FAR struct nxfe_conn_s *conn,
*
****************************************************************************/
void nxmu_releasebkgd(FAR struct nxfe_state_s *fe);
void nxmu_releasebkgd(FAR struct nxmu_state_s *fe);
/****************************************************************************
* Name: nxfe_reportposition
* Name: nxmu_reportposition
*
* Description:
* Report the new size/position of the window.
*
****************************************************************************/
void nxfe_reportposition(FAR struct nxbe_window_s *wnd);
void nxmu_reportposition(FAR struct nxbe_window_s *wnd);
/****************************************************************************
* Name: nxfe_redrawreq
* Name: nxmu_redrawreq
*
* Description:
* Request the client that has this window to redraw the rectangular region.
*
****************************************************************************/
void nxfe_redrawreq(FAR struct nxbe_window_s *wnd,
void nxmu_redrawreq(FAR struct nxbe_window_s *wnd,
FAR const struct nxgl_rect_s *rect);
/****************************************************************************
@ -253,7 +253,7 @@ int nxmu_mousereport(struct nxbe_window_s *wnd);
****************************************************************************/
#ifdef CONFIG_NX_XYINPUT
int nxmu_mousein(FAR struct nxfe_state_s *fe,
int nxmu_mousein(FAR struct nxmu_state_s *fe,
FAR const struct nxgl_point_s *pos, int button);
#endif
@ -268,7 +268,7 @@ int nxmu_mousein(FAR struct nxfe_state_s *fe,
****************************************************************************/
#ifdef CONFIG_NX_KBD
void nxmu_kbdin(FAR struct nxfe_state_s *fe, uint8_t nch, FAR uint8_t *ch);
void nxmu_kbdin(FAR struct nxmu_state_s *fe, uint8_t nch, FAR uint8_t *ch);
#endif
#undef EXTERN
@ -276,4 +276,4 @@ void nxmu_kbdin(FAR struct nxfe_state_s *fe, uint8_t nch, FAR uint8_t *ch);
}
#endif
#endif /* __GRAPHICS_NXMU_NXFE_H */
#endif /* __GRAPHICS_NXMU_NXMU_H */

4
graphics/nxmu/nxmu_kbdin.c
View File

@ -47,7 +47,7 @@
#include <nuttx/kmalloc.h>
#include <nuttx/nx/nx.h>
#include "nxfe.h"
#include "nxmu.h"
#ifdef CONFIG_NX_KBD
@ -85,7 +85,7 @@
*
****************************************************************************/
void nxmu_kbdin(FAR struct nxfe_state_s *fe, uint8_t nch, FAR uint8_t *ch)
void nxmu_kbdin(FAR struct nxmu_state_s *fe, uint8_t nch, FAR uint8_t *ch)
{
FAR struct nxclimsg_kbdin_s *outmsg;
int size;

4
graphics/nxmu/nxmu_mouse.c
View File

@ -46,7 +46,7 @@
#include <nuttx/nx/nxglib.h>
#include <nuttx/nx/nx.h>
#include "nxfe.h"
#include "nxmu.h"
#ifdef CONFIG_NX_XYINPUT
@ -169,7 +169,7 @@ int nxmu_mousereport(struct nxbe_window_s *wnd)
*
****************************************************************************/
int nxmu_mousein(FAR struct nxfe_state_s *fe,
int nxmu_mousein(FAR struct nxmu_state_s *fe,
FAR const struct nxgl_point_s *pos, int buttons)
{
FAR struct nxbe_window_s *wnd;

4
graphics/nxmu/nxmu_openwindow.c
View File

@ -40,7 +40,7 @@
#include <nuttx/config.h>
#include <nuttx/nx/nx.h>
#include "nxfe.h"
#include "nxmu.h"
/****************************************************************************
* Pre-processor Definitions
@ -103,7 +103,7 @@ void nxmu_openwindow(FAR struct nxbe_state_s *be, FAR struct nxbe_window_s *wnd)
/* Report the initial size/position of the window to the client */
nxfe_reportposition(wnd);
nxmu_reportposition(wnd);
/* Provide the initial mouse settings to the client */

6
graphics/nxmu/nxmu_redrawreq.c
View File

@ -44,7 +44,7 @@
#include <debug.h>
#include <nuttx/nx/nx.h>
#include "nxfe.h"
#include "nxmu.h"
/****************************************************************************
* Pre-processor Definitions
@ -71,14 +71,14 @@
****************************************************************************/
/****************************************************************************
* Name: nxfe_redrawreq
* Name: nxmu_redrawreq
*
* Description:
* Request the client that has this window to redraw the rectangular region.
*
****************************************************************************/
void nxfe_redrawreq(FAR struct nxbe_window_s *wnd, FAR const struct nxgl_rect_s *rect)
void nxmu_redrawreq(FAR struct nxbe_window_s *wnd, FAR const struct nxgl_rect_s *rect)
{
struct nxclimsg_redraw_s outmsg;

6
graphics/nxmu/nxmu_releasebkgd.c
View File

@ -43,7 +43,7 @@
#include <debug.h>
#include <nuttx/nx/nx.h>
#include "nxfe.h"
#include "nxmu.h"
/****************************************************************************
* Pre-processor Definitions
@ -84,7 +84,7 @@
*
****************************************************************************/
void nxmu_releasebkgd(FAR struct nxfe_state_s *fe)
void nxmu_releasebkgd(FAR struct nxmu_state_s *fe)
{
FAR struct nxbe_state_s *be = &fe->be;
@ -105,6 +105,6 @@ void nxmu_releasebkgd(FAR struct nxfe_state_s *fe)
/* Redraw the background window */
nxfe_redrawreq(&be->bkgd, &be->bkgd.bounds);
nxmu_redrawreq(&be->bkgd, &be->bkgd.bounds);
}

6
graphics/nxmu/nxmu_reportposition.c
View File

@ -44,7 +44,7 @@
#include <nuttx/nx/nxglib.h>
#include <nuttx/nx/nx.h>
#include "nxfe.h"
#include "nxmu.h"
/****************************************************************************
* Pre-processor Definitions
@ -71,14 +71,14 @@
****************************************************************************/
/****************************************************************************
* Name: nxfe_reportposition
* Name: nxmu_reportposition
*
* Description:
* Report the new size/position of the window.
*
****************************************************************************/
void nxfe_reportposition(FAR struct nxbe_window_s *wnd)
void nxmu_reportposition(FAR struct nxbe_window_s *wnd)
{
FAR struct nxclimsg_newposition_s outmsg;
int ret;

8
graphics/nxmu/nxmu_requestbkgd.c
View File

@ -44,7 +44,7 @@
#include <debug.h>
#include <nuttx/nx/nx.h>
#include "nxfe.h"
#include "nxmu.h"
/****************************************************************************
* Public Functions
@ -68,7 +68,7 @@
*
****************************************************************************/
void nxmu_requestbkgd(FAR struct nxfe_conn_s *conn,
void nxmu_requestbkgd(FAR struct nxmu_conn_s *conn,
FAR struct nxbe_state_s *be,
FAR const struct nx_callback_s *cb,
FAR void *arg)
@ -85,11 +85,11 @@ void nxmu_requestbkgd(FAR struct nxfe_conn_s *conn,
/* Report the size/position of the background window to the client */
nxfe_reportposition((NXWINDOW)&be->bkgd);
nxmu_reportposition((NXWINDOW)&be->bkgd);
/* Redraw the background window */
nxfe_redrawreq(&be->bkgd, &be->bkgd.bounds);
nxmu_redrawreq(&be->bkgd, &be->bkgd.bounds);
/* Provide the mouse settings */

4
graphics/nxmu/nxmu_sendclient.c
View File

@ -45,7 +45,7 @@
#include <nuttx/mqueue.h>
#include "nxfe.h"
#include "nxmu.h"
/****************************************************************************
* Public Functions
@ -67,7 +67,7 @@
*
****************************************************************************/
int nxmu_sendclient(FAR struct nxfe_conn_s *conn, FAR const void *msg,
int nxmu_sendclient(FAR struct nxmu_conn_s *conn, FAR const void *msg,
size_t msglen)
{
int ret;

2
graphics/nxmu/nxmu_sendclientwindow.c
View File

@ -43,7 +43,7 @@
#include <errno.h>
#include <debug.h>
#include "nxfe.h"
#include "nxmu.h"
/****************************************************************************
* Pre-processor Definitions

18
graphics/nxmu/nxmu_server.c
View File

@ -52,7 +52,7 @@
#include <nuttx/mqueue.h>
#include <nuttx/nx/nx.h>
#include "nxfe.h"
#include "nxmu.h"
/****************************************************************************
* Private Functions
@ -62,7 +62,7 @@
* Name: nxmu_disconnect
****************************************************************************/
static inline void nxmu_disconnect(FAR struct nxfe_conn_s *conn)
static inline void nxmu_disconnect(FAR struct nxmu_conn_s *conn)
{
struct nxclimsg_disconnected_s outmsg;
int ret;
@ -86,7 +86,7 @@ static inline void nxmu_disconnect(FAR struct nxfe_conn_s *conn)
* Name: nxmu_connect
****************************************************************************/
static inline void nxmu_connect(FAR struct nxfe_conn_s *conn)
static inline void nxmu_connect(FAR struct nxmu_conn_s *conn)
{
char mqname[NX_CLIENT_MXNAMELEN];
struct nxclimsg_connected_s outmsg;
@ -119,7 +119,7 @@ static inline void nxmu_connect(FAR struct nxfe_conn_s *conn)
* Name: nxmu_shutdown
****************************************************************************/
static inline void nxmu_shutdown(FAR struct nxfe_state_s *fe)
static inline void nxmu_shutdown(FAR struct nxmu_state_s *fe)
{
FAR struct nxbe_window_s *wnd;
@ -162,12 +162,12 @@ static inline void nxmu_blocked(FAR struct nxbe_window_s *wnd, FAR void *arg)
****************************************************************************/
static inline int nxmu_setup(FAR const char *mqname, FAR NX_DRIVERTYPE *dev,
FAR struct nxfe_state_s *fe)
FAR struct nxmu_state_s *fe)
{
struct mq_attr attr;
int ret;
memset(fe, 0, sizeof(struct nxfe_state_s));
memset(fe, 0, sizeof(struct nxmu_state_s));
/* Configure the framebuffer/LCD device */
@ -278,7 +278,7 @@ static inline int nxmu_setup(FAR const char *mqname, FAR NX_DRIVERTYPE *dev,
int nx_runinstance(FAR const char *mqname, FAR NX_DRIVERTYPE *dev)
{
struct nxfe_state_s fe;
struct nxmu_state_s fe;
FAR struct nxsvrmsg_s *msg;
char buffer[NX_MXSVRMSGLEN];
int nbytes;
@ -396,7 +396,7 @@ int nx_runinstance(FAR const char *mqname, FAR NX_DRIVERTYPE *dev)
case NX_SVRMSG_GETPOSITION: /* Get the window size/position */
{
FAR struct nxsvrmsg_getposition_s *getposmsg = (FAR struct nxsvrmsg_getposition_s *)buffer;
nxfe_reportposition(getposmsg->wnd);
nxmu_reportposition(getposmsg->wnd);
}
break;
@ -502,7 +502,7 @@ int nx_runinstance(FAR const char *mqname, FAR NX_DRIVERTYPE *dev)
case NX_SVRMSG_REDRAWREQ: /* Request re-drawing of rectangular region */
{
FAR struct nxsvrmsg_redrawreq_s *redrawmsg = (FAR struct nxsvrmsg_redrawreq_s *)buffer;
nxfe_redrawreq(redrawmsg->wnd, &redrawmsg->rect);
nxmu_redrawreq(redrawmsg->wnd, &redrawmsg->rect);
}
break;

2
graphics/nxmu/nxmu_start.c
View File

@ -53,7 +53,7 @@
#include <nuttx/nx/nx.h>
#include <nuttx/nx/nxmu.h>
#include "nxfe.h"
#include "nxmu.h"
/****************************************************************************
* Private Data

4
include/nuttx/nx/nxbe.h
View File

@ -83,13 +83,13 @@
*/
struct nxbe_state_s;
struct nxfe_conn_s;
struct nxmu_conn_s;
struct nxbe_window_s
{
/* State information */
FAR struct nxbe_state_s *be; /* The back-end state structure */
FAR struct nxfe_conn_s *conn; /* Connection to the window client */
FAR struct nxmu_conn_s *conn; /* Connection to the window client */
FAR const struct nx_callback_s *cb; /* Event handling callbacks */
/* The following links provide the window's vertical position using a

13
include/nuttx/nx/nxmu.h
View File

@ -101,7 +101,7 @@ enum nx_clistate_e
/* This structure represents a connection between the client and the server */
struct nxfe_conn_s
struct nxmu_conn_s
{
/* This number uniquely identifies the client */
@ -181,8 +181,9 @@ struct nxclimsg_disconnected_s
uint32_t msgid; /* NX_CLIMSG_REDRAW_DISCONNECTED */
};
/* This message is received when a requested window has been opened. If wnd is NULL
* then errorcode is the errno value that provides the explanation of the error.
/* This message is received when a requested window has been opened. If wnd
* is NULL then errorcode is the errno value that provides the explanation of
* the error.
*/
struct nxclimsg_redraw_s
@ -249,7 +250,7 @@ struct nxclimsg_blocked_s
struct nxsvrmsg_s /* Generic server message */
{
uint32_t msgid; /* One of enum nxsvrmsg_e */
FAR struct nxfe_conn_s *conn; /* The specific connection sending the message */
FAR struct nxmu_conn_s *conn; /* The specific connection sending the message */
};
/* This message requests the server to create a new window */
@ -286,7 +287,7 @@ struct nxsvrmsg_blocked_s
struct nxsvrmsg_requestbkgd_s
{
uint32_t msgid; /* NX_SVRMSG_REQUESTBKGD */
FAR struct nxfe_conn_s *conn; /* The specific connection sending the message */
FAR struct nxmu_conn_s *conn; /* The specific connection sending the message */
FAR const struct nx_callback_s *cb; /* Event handling callbacks */
FAR void *arg; /* Client argument used with callbacks */
};
@ -527,7 +528,7 @@ void nxmu_semtake(sem_t *sem);
*
****************************************************************************/
int nxmu_sendserver(FAR struct nxfe_conn_s *conn,
int nxmu_sendserver(FAR struct nxmu_conn_s *conn,
FAR const void *msg, size_t msglen);
/****************************************************************************

4
libs/libnx/nxmu/nx_connect.c
View File

@ -101,7 +101,7 @@ static uint32_t g_nxcid = 1;
NXHANDLE nx_connectinstance(FAR const char *svrmqname)
{
FAR struct nxfe_conn_s *conn;
FAR struct nxmu_conn_s *conn;
struct nxsvrmsg_s outmsg;
char climqname[NX_CLIENT_MXNAMELEN];
struct mq_attr attr;
@ -119,7 +119,7 @@ NXHANDLE nx_connectinstance(FAR const char *svrmqname)
/* Allocate the NX client structure */
conn = (FAR struct nxfe_conn_s *)lib_uzalloc(sizeof(struct nxfe_conn_s));
conn = (FAR struct nxmu_conn_s *)lib_uzalloc(sizeof(struct nxmu_conn_s));
if (!conn)
{
set_errno(ENOMEM);

2
libs/libnx/nxmu/nx_constructwindow.c
View File

@ -84,7 +84,7 @@
int nx_constructwindow(NXHANDLE handle, NXWINDOW hwnd,
FAR const struct nx_callback_s *cb, FAR void *arg)
{
FAR struct nxfe_conn_s *conn = (FAR struct nxfe_conn_s *)handle;
FAR struct nxmu_conn_s *conn = (FAR struct nxmu_conn_s *)handle;
FAR struct nxbe_window_s *wnd = (FAR struct nxbe_window_s *)hwnd;
struct nxsvrmsg_openwindow_s outmsg;

2
libs/libnx/nxmu/nx_disconnect.c
View File

@ -69,7 +69,7 @@
void nx_disconnect(NXHANDLE handle)
{
FAR struct nxfe_conn_s *conn = (FAR struct nxfe_conn_s *)handle;
FAR struct nxmu_conn_s *conn = (FAR struct nxmu_conn_s *)handle;
struct nxsvrmsg_s outmsg;
char climqname[NX_CLIENT_MXNAMELEN];
int ret;

6
libs/libnx/nxmu/nx_eventhandler.c
View File

@ -65,7 +65,7 @@
*
****************************************************************************/
static inline void nx_connected(FAR struct nxfe_conn_s *conn)
static inline void nx_connected(FAR struct nxmu_conn_s *conn)
{
DEBUGASSERT(conn->state == NX_CLISTATE_NOTCONNECTED);
conn->state = NX_CLISTATE_CONNECTED;
@ -75,7 +75,7 @@ static inline void nx_connected(FAR struct nxfe_conn_s *conn)
* Name: nx_disconnected
****************************************************************************/
static inline void nx_disconnected(FAR struct nxfe_conn_s *conn)
static inline void nx_disconnected(FAR struct nxmu_conn_s *conn)
{
/* Close the server and client MQs */
@ -120,7 +120,7 @@ static inline void nx_disconnected(FAR struct nxfe_conn_s *conn)
int nx_eventhandler(NXHANDLE handle)
{
FAR struct nxfe_conn_s *conn = (FAR struct nxfe_conn_s *)handle;
FAR struct nxmu_conn_s *conn = (FAR struct nxmu_conn_s *)handle;
struct nxsvrmsg_s *msg;
struct nxbe_window_s *wnd;
char buffer[NX_MXCLIMSGLEN];

2
libs/libnx/nxmu/nx_eventnotify.c
View File

@ -78,7 +78,7 @@
int nx_eventnotify(NXHANDLE handle, int signo)
{
FAR struct nxfe_conn_s *conn = (FAR struct nxfe_conn_s *)handle;
FAR struct nxmu_conn_s *conn = (FAR struct nxmu_conn_s *)handle;
struct sigevent se;
se.sigev_notify = SIGEV_SIGNAL;

2
libs/libnx/nxmu/nx_kbdchin.c
View File

@ -64,7 +64,7 @@
int nx_kbdchin(NXHANDLE handle, uint8_t ch)
{
FAR struct nxfe_conn_s *conn = (FAR struct nxfe_conn_s *)handle;
FAR struct nxmu_conn_s *conn = (FAR struct nxmu_conn_s *)handle;
struct nxsvrmsg_kbdin_s outmsg;
/* Inform the server of the new keypad data */

2
libs/libnx/nxmu/nx_kbdin.c
View File

@ -65,7 +65,7 @@
int nx_kbdin(NXHANDLE handle, uint8_t nch, FAR const uint8_t *ch)
{
FAR struct nxfe_conn_s *conn = (FAR struct nxfe_conn_s *)handle;
FAR struct nxmu_conn_s *conn = (FAR struct nxmu_conn_s *)handle;
FAR struct nxsvrmsg_kbdin_s *outmsg;
int size;
int ret;

2
libs/libnx/nxmu/nx_mousein.c
View File

@ -64,7 +64,7 @@
int nx_mousein(NXHANDLE handle, nxgl_coord_t x, nxgl_coord_t y, uint8_t buttons)
{
FAR struct nxfe_conn_s *conn = (FAR struct nxfe_conn_s *)handle;
FAR struct nxmu_conn_s *conn = (FAR struct nxmu_conn_s *)handle;
struct nxsvrmsg_mousein_s outmsg;
/* Inform the server that this client no longer exists */

2
libs/libnx/nxmu/nx_requestbkgd.c
View File

@ -92,7 +92,7 @@
int nx_requestbkgd(NXHANDLE handle, FAR const struct nx_callback_s *cb,
FAR void *arg)
{
FAR struct nxfe_conn_s *conn = (FAR struct nxfe_conn_s *)handle;
FAR struct nxmu_conn_s *conn = (FAR struct nxmu_conn_s *)handle;
struct nxsvrmsg_requestbkgd_s outmsg;
#ifdef CONFIG_DEBUG_FEATURES

2
libs/libnx/nxmu/nx_setbgcolor.c
View File

@ -67,7 +67,7 @@
int nx_setbgcolor(NXHANDLE handle,
nxgl_mxpixel_t color[CONFIG_NX_NPLANES])
{
FAR struct nxfe_conn_s *conn = (FAR struct nxfe_conn_s *)handle;
FAR struct nxmu_conn_s *conn = (FAR struct nxmu_conn_s *)handle;
struct nxsvrmsg_setbgcolor_s outmsg;
#ifdef CONFIG_DEBUG_FEATURES

2
libs/libnx/nxmu/nxmu_sendserver.c
View File

@ -66,7 +66,7 @@
*
****************************************************************************/
int nxmu_sendserver(FAR struct nxfe_conn_s *conn, FAR const void *msg,
int nxmu_sendserver(FAR struct nxmu_conn_s *conn, FAR const void *msg,
size_t msglen)
{
int ret;