This commit removes naming associated with and naming for the now non…

…-existent NXFE graphics layer. 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.
PX4 · Mar 13, 2019 · 0454ae2 · 0454ae2
1 parent e780ee3
commit 0454ae2
Show file tree

Hide file tree

Showing 31 changed files with 84 additions and 83 deletions.
diff --git a/graphics/nxbe/nxbe_move.c b/graphics/nxbe/nxbe_move.c
@@ -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]);
         }
     }
 

diff --git a/graphics/nxbe/nxbe_raise.c b/graphics/nxbe/nxbe_raise.c
@@ -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);
 }
diff --git a/graphics/nxbe/nxbe_redraw.c b/graphics/nxbe/nxbe_redraw.c
@@ -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);
     }
 }
 

diff --git a/graphics/nxbe/nxbe_setposition.c b/graphics/nxbe/nxbe_setposition.c
@@ -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

diff --git a/graphics/nxbe/nxbe_setsize.c b/graphics/nxbe/nxbe_setsize.c
@@ -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

diff --git a/graphics/nxbe/nxbe_visible.c b/graphics/nxbe/nxbe_visible.c
@@ -46,7 +46,7 @@
 #include <nuttx/nx/nxglib.h>
 
 #include "nxbe.h"
-#include "nxfe.h"
+#include "nxmu.h"
 
 /****************************************************************************
  * Private Types

diff --git a/graphics/nxmu/nxfe.h → graphics/nxmu/nxmu.h b/graphics/nxmu/nxfe.h → graphics/nxmu/nxmu.h
@@ -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,12 +268,12 @@ 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
 #if defined(__cplusplus)
 }
 #endif
 
-#endif  /* __GRAPHICS_NXMU_NXFE_H */
+#endif  /* __GRAPHICS_NXMU_NXMU_H */
diff --git a/graphics/nxmu/nxmu_kbdin.c b/graphics/nxmu/nxmu_kbdin.c
@@ -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;

diff --git a/graphics/nxmu/nxmu_mouse.c b/graphics/nxmu/nxmu_mouse.c
@@ -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;

diff --git a/graphics/nxmu/nxmu_openwindow.c b/graphics/nxmu/nxmu_openwindow.c
@@ -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 */
 

diff --git a/graphics/nxmu/nxmu_redrawreq.c b/graphics/nxmu/nxmu_redrawreq.c
@@ -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;
 

diff --git a/graphics/nxmu/nxmu_releasebkgd.c b/graphics/nxmu/nxmu_releasebkgd.c
@@ -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);
 }
 
diff --git a/graphics/nxmu/nxmu_reportposition.c b/graphics/nxmu/nxmu_reportposition.c
@@ -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;

diff --git a/graphics/nxmu/nxmu_requestbkgd.c b/graphics/nxmu/nxmu_requestbkgd.c
@@ -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 */