From 4b67aa3df9151ddb1a41118601d51a3197e47a63 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Fri, 20 Nov 2020 20:33:38 +0900 Subject: [PATCH] graphics/nxmu/nxmu_server.c: Appease nxstyle --- graphics/nxmu/nxmu_server.c | 471 +++++++++++++++++++----------------- 1 file changed, 253 insertions(+), 218 deletions(-) diff --git a/graphics/nxmu/nxmu_server.c b/graphics/nxmu/nxmu_server.c index 40c9f06cfe..028cd6db0a 100644 --- a/graphics/nxmu/nxmu_server.c +++ b/graphics/nxmu/nxmu_server.c @@ -70,7 +70,8 @@ static inline void nxmu_disconnect(FAR struct nxmu_conn_s *conn) outmsg.msgid = NX_CLIMSG_DISCONNECTED; - ret = nxmu_sendclient(conn, &outmsg, sizeof(struct nxclimsg_disconnected_s)); + ret = nxmu_sendclient(conn, &outmsg, + sizeof(struct nxclimsg_disconnected_s)); if (ret < 0) { gerr("ERROR: nxmu_sendclient failed: %d\n", ret); @@ -95,7 +96,9 @@ static inline void nxmu_connect(FAR struct nxmu_conn_s *conn) sprintf(mqname, NX_CLIENT_MQNAMEFMT, conn->cid); - /* Open the client MQ -- this should have already been created by the client */ + /* Open the client MQ -- this should have already been created by the + * client + */ conn->swrmq = mq_open(mqname, O_WRONLY); if (conn->swrmq == (mqd_t)-1) @@ -308,275 +311,307 @@ int nx_runinstance(FAR const char *mqname, FAR NX_DRIVERTYPE *dev) for (; ; ) { - /* Receive the next server message */ + /* Receive the next server message */ - nbytes = nxmq_receive(nxmu.conn.crdmq, buffer, NX_MXSVRMSGLEN, 0); - if (nbytes < 0) - { - if (nbytes != -EINTR) - { - gerr("ERROR: nxmq_receive() failed: %d\n", nbytes); - ret = nbytes; - goto errout; - } + nbytes = nxmq_receive(nxmu.conn.crdmq, buffer, NX_MXSVRMSGLEN, 0); + if (nbytes < 0) + { + if (nbytes != -EINTR) + { + gerr("ERROR: nxmq_receive() failed: %d\n", nbytes); + ret = nbytes; + goto errout; + } - continue; - } + continue; + } - /* Dispatch the message appropriately */ + /* Dispatch the message appropriately */ - DEBUGASSERT(nbytes >= sizeof(struct nxsvrmsg_releasebkgd_s)); - msg = (FAR struct nxsvrmsg_s *)buffer; + DEBUGASSERT(nbytes >= sizeof(struct nxsvrmsg_releasebkgd_s)); + msg = (FAR struct nxsvrmsg_s *)buffer; - ginfo("Received opcode=%d nbytes=%d\n", msg->msgid, nbytes); - switch (msg->msgid) - { - /* Messages sent from clients to the NX server *********************/ + ginfo("Received opcode=%d nbytes=%d\n", msg->msgid, nbytes); + switch (msg->msgid) + { + /* Messages sent from clients to the NX server ********************/ - case NX_SVRMSG_CONNECT: /* Establish connection with new NX server client */ - { - FAR struct nxsvrmsg_s *connmsg = (FAR struct nxsvrmsg_s *)buffer; - nxmu_connect(connmsg->conn); - } - break; + case NX_SVRMSG_CONNECT: /* Establish connection with new NX server client */ + { + FAR struct nxsvrmsg_s *connmsg = + (FAR struct nxsvrmsg_s *)buffer; + nxmu_connect(connmsg->conn); + } + break; - case NX_SVRMSG_DISCONNECT: /* Tear down connection with terminating client */ - { - FAR struct nxsvrmsg_s *disconnmsg = (FAR struct nxsvrmsg_s *)buffer; - nxmu_disconnect(disconnmsg->conn); - } - break; + case NX_SVRMSG_DISCONNECT: /* Tear down connection with terminating client */ + { + FAR struct nxsvrmsg_s *disconnmsg = + (FAR struct nxsvrmsg_s *)buffer; + nxmu_disconnect(disconnmsg->conn); + } + break; - case NX_SVRMSG_OPENWINDOW: /* Create a new window */ - { - FAR struct nxsvrmsg_openwindow_s *openmsg = (FAR struct nxsvrmsg_openwindow_s *)buffer; - nxmu_openwindow(&nxmu.be, openmsg->wnd); - } - break; + case NX_SVRMSG_OPENWINDOW: /* Create a new window */ + { + FAR struct nxsvrmsg_openwindow_s *openmsg = + (FAR struct nxsvrmsg_openwindow_s *)buffer; + nxmu_openwindow(&nxmu.be, openmsg->wnd); + } + break; - case NX_SVRMSG_CLOSEWINDOW: /* Close an existing window */ - { - FAR struct nxsvrmsg_closewindow_s *closemsg = (FAR struct nxsvrmsg_closewindow_s *)buffer; - nxbe_closewindow(closemsg->wnd); - } - break; + case NX_SVRMSG_CLOSEWINDOW: /* Close an existing window */ + { + FAR struct nxsvrmsg_closewindow_s *closemsg = + (FAR struct nxsvrmsg_closewindow_s *)buffer; + nxbe_closewindow(closemsg->wnd); + } + break; - case NX_SVRMSG_BLOCKED: /* Block messages to a window */ - { - FAR struct nxsvrmsg_blocked_s *blocked = (FAR struct nxsvrmsg_blocked_s *)buffer; - nxmu_event(blocked->wnd, NXEVENT_BLOCKED, blocked->arg); - } - break; + case NX_SVRMSG_BLOCKED: /* Block messages to a window */ + { + FAR struct nxsvrmsg_blocked_s *blocked = + (FAR struct nxsvrmsg_blocked_s *)buffer; + nxmu_event(blocked->wnd, NXEVENT_BLOCKED, blocked->arg); + } + break; - case NX_SVRMSG_SYNCH: /* Synchronization request */ - { - FAR struct nxsvrmsg_synch_s *synch = (FAR struct nxsvrmsg_synch_s *)buffer; - nxmu_event(synch->wnd, NXEVENT_SYNCHED, synch->arg); - } - break; + case NX_SVRMSG_SYNCH: /* Synchronization request */ + { + FAR struct nxsvrmsg_synch_s *synch = + (FAR struct nxsvrmsg_synch_s *)buffer; + nxmu_event(synch->wnd, NXEVENT_SYNCHED, synch->arg); + } + break; #if defined(CONFIG_NX_SWCURSOR) || defined(CONFIG_NX_HWCURSOR) - case NX_SVRMSG_CURSOR_ENABLE: /* Enable/disable cursor */ - { - FAR struct nxsvrmsg_curenable_s *enabmsg = (FAR struct nxsvrmsg_curenable_s *)buffer; - nxbe_cursor_enable(&nxmu.be, enabmsg->enable); - } - break; + case NX_SVRMSG_CURSOR_ENABLE: /* Enable/disable cursor */ + { + FAR struct nxsvrmsg_curenable_s *enabmsg = + (FAR struct nxsvrmsg_curenable_s *)buffer; + nxbe_cursor_enable(&nxmu.be, enabmsg->enable); + } + break; #if defined(CONFIG_NX_HWCURSORIMAGE) || defined(CONFIG_NX_SWCURSOR) - case NX_SVRMSG_CURSOR_IMAGE: /* Set cursor image */ - { - FAR struct nxsvrmsg_curimage_s *imgmsg = (FAR struct nxsvrmsg_curimage_s *)buffer; - nxbe_cursor_setimage(&nxmu.be, &imgmsg->image); - } - break; + case NX_SVRMSG_CURSOR_IMAGE: /* Set cursor image */ + { + FAR struct nxsvrmsg_curimage_s *imgmsg = + (FAR struct nxsvrmsg_curimage_s *)buffer; + nxbe_cursor_setimage(&nxmu.be, &imgmsg->image); + } + break; #endif - case NX_SVRMSG_CURSOR_SETPOS: /* Set cursor position */ - { - FAR struct nxsvrmsg_curpos_s *posmsg = (FAR struct nxsvrmsg_curpos_s *)buffer; - nxbe_cursor_setposition(&nxmu.be, &posmsg->pos); - } - break; + case NX_SVRMSG_CURSOR_SETPOS: /* Set cursor position */ + { + FAR struct nxsvrmsg_curpos_s *posmsg = + (FAR struct nxsvrmsg_curpos_s *)buffer; + nxbe_cursor_setposition(&nxmu.be, &posmsg->pos); + } + break; #endif - case NX_SVRMSG_REQUESTBKGD: /* Give access to the background window */ - { - FAR struct nxsvrmsg_requestbkgd_s *rqbgmsg = (FAR struct nxsvrmsg_requestbkgd_s *)buffer; - nxmu_requestbkgd(rqbgmsg->conn, &nxmu.be, rqbgmsg->cb, rqbgmsg->arg); - } - break; + case NX_SVRMSG_REQUESTBKGD: /* Give access to the background window */ + { + FAR struct nxsvrmsg_requestbkgd_s *rqbgmsg = + (FAR struct nxsvrmsg_requestbkgd_s *)buffer; + nxmu_requestbkgd(rqbgmsg->conn, &nxmu.be, rqbgmsg->cb, + rqbgmsg->arg); + } + break; - case NX_SVRMSG_RELEASEBKGD: /* End access to the background window */ - { - nxmu_releasebkgd(&nxmu); - } - break; + case NX_SVRMSG_RELEASEBKGD: /* End access to the background window */ + { + nxmu_releasebkgd(&nxmu); + } + break; - case NX_SVRMSG_SETPOSITION: /* Change window position */ - { - FAR struct nxsvrmsg_setposition_s *setposmsg = (FAR struct nxsvrmsg_setposition_s *)buffer; - nxbe_setposition(setposmsg->wnd, &setposmsg->pos); - } - break; + case NX_SVRMSG_SETPOSITION: /* Change window position */ + { + FAR struct nxsvrmsg_setposition_s *setposmsg = + (FAR struct nxsvrmsg_setposition_s *)buffer; + nxbe_setposition(setposmsg->wnd, &setposmsg->pos); + } + break; - case NX_SVRMSG_SETSIZE: /* Change window size */ - { - FAR struct nxsvrmsg_setsize_s *setsizemsg = (FAR struct nxsvrmsg_setsize_s *)buffer; - nxbe_setsize(setsizemsg->wnd, &setsizemsg->size); - } - break; + case NX_SVRMSG_SETSIZE: /* Change window size */ + { + FAR struct nxsvrmsg_setsize_s *setsizemsg = + (FAR struct nxsvrmsg_setsize_s *)buffer; + nxbe_setsize(setsizemsg->wnd, &setsizemsg->size); + } + break; - case NX_SVRMSG_GETPOSITION: /* Get the window size/position */ - { - FAR struct nxsvrmsg_getposition_s *getposmsg = (FAR struct nxsvrmsg_getposition_s *)buffer; - nxmu_reportposition(getposmsg->wnd); - } - break; + case NX_SVRMSG_GETPOSITION: /* Get the window size/position */ + { + FAR struct nxsvrmsg_getposition_s *getposmsg = + (FAR struct nxsvrmsg_getposition_s *)buffer; + nxmu_reportposition(getposmsg->wnd); + } + break; - case NX_SVRMSG_RAISE: /* Move the window to the top of the display */ - { - FAR struct nxsvrmsg_raise_s *raisemsg = (FAR struct nxsvrmsg_raise_s *)buffer; - nxbe_raise(raisemsg->wnd); - } - break; + case NX_SVRMSG_RAISE: /* Move the window to the top of the display */ + { + FAR struct nxsvrmsg_raise_s *raisemsg = + (FAR struct nxsvrmsg_raise_s *)buffer; + nxbe_raise(raisemsg->wnd); + } + break; - case NX_SVRMSG_LOWER: /* Lower the window to the bottom of the display */ - { - FAR struct nxsvrmsg_lower_s *lowermsg = (FAR struct nxsvrmsg_lower_s *)buffer; - nxbe_lower(lowermsg->wnd); - } - break; + case NX_SVRMSG_LOWER: /* Lower the window to the bottom of the display */ + { + FAR struct nxsvrmsg_lower_s *lowermsg = + (FAR struct nxsvrmsg_lower_s *)buffer; + nxbe_lower(lowermsg->wnd); + } + break; - case NX_SVRMSG_MODAL: /* Select/De-select window modal state */ - { - FAR struct nxsvrmsg_modal_s *modalmsg = (FAR struct nxsvrmsg_modal_s *)buffer; - nxbe_modal(modalmsg->wnd, modalmsg->modal); - } - break; + case NX_SVRMSG_MODAL: /* Select/De-select window modal state */ + { + FAR struct nxsvrmsg_modal_s *modalmsg = + (FAR struct nxsvrmsg_modal_s *)buffer; + nxbe_modal(modalmsg->wnd, modalmsg->modal); + } + break; - case NX_SVRMSG_SETVISIBILITY: /* Show or hide a window */ - { - FAR struct nxsvrmsg_setvisibility_s *vismsg = + case NX_SVRMSG_SETVISIBILITY: /* Show or hide a window */ + { + FAR struct nxsvrmsg_setvisibility_s *vismsg = (FAR struct nxsvrmsg_setvisibility_s *)buffer; - nxbe_setvisibility(vismsg->wnd, vismsg->hide); - } - break; + nxbe_setvisibility(vismsg->wnd, vismsg->hide); + } + break; - case NX_SVRMSG_SETPIXEL: /* Set a single pixel in the window with a color */ - { - FAR struct nxsvrmsg_setpixel_s *setmsg = (FAR struct nxsvrmsg_setpixel_s *)buffer; - nxbe_setpixel(setmsg->wnd, &setmsg->pos, setmsg->color); - } - break; + case NX_SVRMSG_SETPIXEL: /* Set a single pixel in the window with a color */ + { + FAR struct nxsvrmsg_setpixel_s *setmsg = + (FAR struct nxsvrmsg_setpixel_s *)buffer; + nxbe_setpixel(setmsg->wnd, &setmsg->pos, setmsg->color); + } + break; - case NX_SVRMSG_FILL: /* Fill a rectangular region in the window with a color */ - { - FAR struct nxsvrmsg_fill_s *fillmsg = (FAR struct nxsvrmsg_fill_s *)buffer; - nxbe_fill(fillmsg->wnd, &fillmsg->rect, fillmsg->color); - } - break; + case NX_SVRMSG_FILL: /* Fill a rectangular region in the window with a color */ + { + FAR struct nxsvrmsg_fill_s *fillmsg = + (FAR struct nxsvrmsg_fill_s *)buffer; + nxbe_fill(fillmsg->wnd, &fillmsg->rect, fillmsg->color); + } + break; - case NX_SVRMSG_GETRECTANGLE: /* Get a rectangular region from the window */ - { - FAR struct nxsvrmsg_getrectangle_s *getmsg = (FAR struct nxsvrmsg_getrectangle_s *)buffer; - nxbe_getrectangle(getmsg->wnd, &getmsg->rect, getmsg->plane, getmsg->dest, getmsg->deststride); + case NX_SVRMSG_GETRECTANGLE: /* Get a rectangular region from the window */ + { + FAR struct nxsvrmsg_getrectangle_s *getmsg = + (FAR struct nxsvrmsg_getrectangle_s *)buffer; + nxbe_getrectangle(getmsg->wnd, &getmsg->rect, getmsg->plane, + getmsg->dest, getmsg->deststride); - if (getmsg->sem_done) - { - nxsem_post(getmsg->sem_done); - } - } - break; + if (getmsg->sem_done) + { + nxsem_post(getmsg->sem_done); + } + } + break; - case NX_SVRMSG_FILLTRAP: /* Fill a trapezoidal region in the window with a color */ - { - FAR struct nxsvrmsg_filltrapezoid_s *trapmsg = (FAR struct nxsvrmsg_filltrapezoid_s *)buffer; - nxbe_filltrapezoid(trapmsg->wnd, &trapmsg->clip, &trapmsg->trap, trapmsg->color); - } - break; - case NX_SVRMSG_MOVE: /* Move a rectangular region within the window */ - { - FAR struct nxsvrmsg_move_s *movemsg = (FAR struct nxsvrmsg_move_s *)buffer; - nxbe_move(movemsg->wnd, &movemsg->rect, &movemsg->offset); - } - break; + case NX_SVRMSG_FILLTRAP: /* Fill a trapezoidal region in the window with a color */ + { + FAR struct nxsvrmsg_filltrapezoid_s *trapmsg = + (FAR struct nxsvrmsg_filltrapezoid_s *)buffer; + nxbe_filltrapezoid(trapmsg->wnd, &trapmsg->clip, + &trapmsg->trap, trapmsg->color); + } + break; - case NX_SVRMSG_BITMAP: /* Copy a rectangular bitmap into the window */ - { - FAR struct nxsvrmsg_bitmap_s *bmpmsg = (FAR struct nxsvrmsg_bitmap_s *)buffer; - nxbe_bitmap(bmpmsg->wnd, &bmpmsg->dest, bmpmsg->src, &bmpmsg->origin, bmpmsg->stride); + case NX_SVRMSG_MOVE: /* Move a rectangular region within the window */ + { + FAR struct nxsvrmsg_move_s *movemsg = + (FAR struct nxsvrmsg_move_s *)buffer; + nxbe_move(movemsg->wnd, &movemsg->rect, &movemsg->offset); + } + break; - if (bmpmsg->sem_done) - { - nxsem_post(bmpmsg->sem_done); - } - } - break; + case NX_SVRMSG_BITMAP: /* Copy a rectangular bitmap into the window */ + { + FAR struct nxsvrmsg_bitmap_s *bmpmsg = + (FAR struct nxsvrmsg_bitmap_s *)buffer; + nxbe_bitmap(bmpmsg->wnd, &bmpmsg->dest, bmpmsg->src, + &bmpmsg->origin, bmpmsg->stride); - case NX_SVRMSG_SETBGCOLOR: /* Set the color of the background */ - { - FAR struct nxsvrmsg_setbgcolor_s *bgcolormsg = - (FAR struct nxsvrmsg_setbgcolor_s *)buffer; + if (bmpmsg->sem_done) + { + nxsem_post(bmpmsg->sem_done); + } + } + break; - /* Has the background color changed? */ + case NX_SVRMSG_SETBGCOLOR: /* Set the color of the background */ + { + FAR struct nxsvrmsg_setbgcolor_s *bgcolormsg = + (FAR struct nxsvrmsg_setbgcolor_s *)buffer; - if (!nxgl_colorcmp(nxmu.be.bgcolor, bgcolormsg->color)) - { - /* Yes.. fill the background */ + /* Has the background color changed? */ - nxgl_colorcopy(nxmu.be.bgcolor, bgcolormsg->color); - nxbe_fill(&nxmu.be.bkgd, &nxmu.be.bkgd.bounds, bgcolormsg->color); - } - } - break; + if (!nxgl_colorcmp(nxmu.be.bgcolor, bgcolormsg->color)) + { + /* Yes.. fill the background */ + + nxgl_colorcopy(nxmu.be.bgcolor, bgcolormsg->color); + nxbe_fill(&nxmu.be.bkgd, &nxmu.be.bkgd.bounds, + bgcolormsg->color); + } + } + break; #ifdef CONFIG_NX_XYINPUT - case NX_SVRMSG_MOUSEIN: /* New mouse report from mouse client */ - { - FAR struct nxsvrmsg_mousein_s *mousemsg = (FAR struct nxsvrmsg_mousein_s *)buffer; - nxmu_mousein(&nxmu, &mousemsg->pt, mousemsg->buttons); - } - break; + case NX_SVRMSG_MOUSEIN: /* New mouse report from mouse client */ + { + FAR struct nxsvrmsg_mousein_s *mousemsg = + (FAR struct nxsvrmsg_mousein_s *)buffer; + nxmu_mousein(&nxmu, &mousemsg->pt, mousemsg->buttons); + } + break; #endif #ifdef CONFIG_NX_KBD - case NX_SVRMSG_KBDIN: /* New keyboard report from keyboard client */ - { - FAR struct nxsvrmsg_kbdin_s *kbdmsg = (FAR struct nxsvrmsg_kbdin_s *)buffer; - nxmu_kbdin(&nxmu, kbdmsg->nch, kbdmsg->ch); - } - break; + case NX_SVRMSG_KBDIN: /* New keyboard report from keyboard client */ + { + FAR struct nxsvrmsg_kbdin_s *kbdmsg = + (FAR struct nxsvrmsg_kbdin_s *)buffer; + nxmu_kbdin(&nxmu, kbdmsg->nch, kbdmsg->ch); + } + break; #endif - case NX_SVRMSG_REDRAWREQ: /* Request re-drawing of rectangular region */ - { - FAR struct nxsvrmsg_redrawreq_s *redrawmsg = (FAR struct nxsvrmsg_redrawreq_s *)buffer; - nxmu_redraw(redrawmsg->wnd, &redrawmsg->rect); - } - break; - - /* Messages sent to the background window **************************/ - - case NX_CLIMSG_REDRAW: /* Re-draw the background window */ + case NX_SVRMSG_REDRAWREQ: /* Request re-drawing of rectangular region */ { - FAR struct nxclimsg_redraw_s *redraw = (FAR struct nxclimsg_redraw_s *)buffer; + FAR struct nxsvrmsg_redrawreq_s *redrawmsg = + (FAR struct nxsvrmsg_redrawreq_s *)buffer; + nxmu_redraw(redrawmsg->wnd, &redrawmsg->rect); + } + break; + + /* Messages sent to the background window *************************/ + + case NX_CLIMSG_REDRAW: /* Re-draw the background window */ + { + FAR struct nxclimsg_redraw_s *redraw = + (FAR struct nxclimsg_redraw_s *)buffer; DEBUGASSERT(redraw->wnd == &nxmu.be.bkgd); ginfo("Re-draw background rect={(%d,%d),(%d,%d)}\n", redraw->rect.pt1.x, redraw->rect.pt1.y, redraw->rect.pt2.x, redraw->rect.pt2.y); nxbe_fill(&nxmu.be.bkgd, &redraw->rect, nxmu.be.bgcolor); } - break; + break; - case NX_CLIMSG_MOUSEIN: /* Ignored */ - case NX_CLIMSG_KBDIN: - break; + case NX_CLIMSG_MOUSEIN: /* Ignored */ + case NX_CLIMSG_KBDIN: + break; - case NX_CLIMSG_CONNECTED: /* Shouldn't happen */ - case NX_CLIMSG_DISCONNECTED: - default: - gerr("ERROR: Unrecognized command: %d\n", msg->msgid); - break; - } + case NX_CLIMSG_CONNECTED: /* Shouldn't happen */ + case NX_CLIMSG_DISCONNECTED: + default: + gerr("ERROR: Unrecognized command: %d\n", msg->msgid); + break; + } } nxmu_shutdown(&nxmu);