Add argument to window callbacks

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@1366 42af7a65-404d-4744-a932-0658087f49c3

6 files changed, 9 insertions, 7 deletions

diff --git a/nuttx/graphics/nxsu/nx_kbdchin.c b/nuttx/graphics/nxsu/nx_kbdchin.c
index 37a357b42..27e588e8d 100644
--- a/nuttx/graphics/nxsu/nx_kbdchin.c
+++ b/nuttx/graphics/nxsu/nx_kbdchin.c
@@ -93,7 +93,7 @@ int nx_kbdchin(NXHANDLE handle, ubyte ch)
 
   if (wnd->cb->kbdin)
     {
-      wnd->kbdin(wnd, 1, &ch);
+      wnd->cb->kbdin(wnd, 1, &ch, wnd->arg);
     }
 }
 
diff --git a/nuttx/graphics/nxsu/nx_kbdin.c b/nuttx/graphics/nxsu/nx_kbdin.c
index c6f65eabb..3fe6a26c0 100644
--- a/nuttx/graphics/nxsu/nx_kbdin.c
+++ b/nuttx/graphics/nxsu/nx_kbdin.c
@@ -92,7 +92,7 @@ int int nx_kbdin(NXHANDLE handle, ubyte nch const char *ch)
 
   if (wnd->cb->kbdin)
     {
-      wnd->cb->kbdin(wnd, kbd->nch, kbd->ch);
+      wnd->cb->kbdin(wnd, kbd->nch, kbd->ch, wnd->arg);
     }
 }
 
diff --git a/nuttx/graphics/nxsu/nx_mousein.c b/nuttx/graphics/nxsu/nx_mousein.c
index 256d59da1..2ae753b94 100644
--- a/nuttx/graphics/nxsu/nx_mousein.c
+++ b/nuttx/graphics/nxsu/nx_mousein.c
@@ -107,7 +107,7 @@ void nxsu_mousereport(struct nxbe_window_s *wnd)
 
   if (win->cb->mousein)
     {
-      win->cb->mousein((NXWINDOW)wnd, &g_mpos, g_mbutton);
+      win->cb->mousein((NXWINDOW)wnd, &g_mpos, g_mbutton, wnd->arg);
     }
 }
 
diff --git a/nuttx/graphics/nxsu/nx_open.c b/nuttx/graphics/nxsu/nx_open.c
index 481a75e42..15efd3dbe 100644
--- a/nuttx/graphics/nxsu/nx_open.c
+++ b/nuttx/graphics/nxsu/nx_open.c
@@ -61,7 +61,8 @@
  ****************************************************************************/
 
 static void nxsu_bkgdredraw(NXWINDOW hwnd,
-                            FAR const struct nxgl_rect_s *rect, boolean more);
+                            FAR const struct nxgl_rect_s *rect,
+                            boolean more, FAR void *arg);
 
 /****************************************************************************
  * Private Data
@@ -92,7 +93,8 @@ const struct nx_callback_s g_bkgdcb =
  ****************************************************************************/
 
 static void nxsu_bkgdredraw(NXWINDOW hwnd,
-                            FAR const struct nxgl_rect_s *rect, boolean more)
+                            FAR const struct nxgl_rect_s *rect,
+                            boolean more, FAR void *arg)
 {
   FAR struct nxbe_window_s *wnd = (FAR struct nxbe_window_s *)hwnd;
   FAR struct nxbe_state_s  *be  = wnd->be;
diff --git a/nuttx/graphics/nxsu/nxsu_redrawreq.c b/nuttx/graphics/nxsu/nxsu_redrawreq.c
index b7623f426..9952709c8 100644
--- a/nuttx/graphics/nxsu/nxsu_redrawreq.c
+++ b/nuttx/graphics/nxsu/nxsu_redrawreq.c
@@ -97,7 +97,7 @@ void nxfe_redrawreq(FAR struct nxbe_window_s *wnd, FAR const struct nxgl_rect_s
 
       /* And request the redraw */
 
-      wnd->cb->redraw((NXWINDOW)wnd, &relrect, FALSE);
+      wnd->cb->redraw((NXWINDOW)wnd, &relrect, FALSE, wnd->arg);
     }
 }
 
diff --git a/nuttx/graphics/nxsu/nxsu_reportposition.c b/nuttx/graphics/nxsu/nxsu_reportposition.c
index 7c7bad751..9ad8197e6 100644
--- a/nuttx/graphics/nxsu/nxsu_reportposition.c
+++ b/nuttx/graphics/nxsu/nxsu_reportposition.c
@@ -102,6 +102,6 @@ void nxfe_reportposition(FAR struct nxbe_window_s *wnd)
 
       /* And provide this to the client */
 
-      wnd->cb->position(wnd, &rect, &wnd->origin, &be->bkgd.bounds);
+      wnd->cb->position(wnd, &rect, &wnd->origin, &be->bkgd.bounds, wnd->arg);
     }
 }