fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-11-05 00:41:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Several bugfixes contributed by Petteri Aimonen

Browse Source 
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5238 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo
2012-10-20 16:07:49 +00:00
parent 736ac8982a
commit f44266675e
16 changed files with 72 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nuttx/graphics/nxtk/nxtk_events.c
+24
View File
@@ -76,6 +76,9 @@ static void nxtk_mousein(NXWINDOW hwnd, FAR const struct nxgl_point_s *pos,
static void nxtk_kbdin(NXWINDOW hwnd, uint8_t nch, const uint8_t *ch,
FAR void *arg);
#endif
#ifdef CONFIG_NX_MULTIUSER
static void nxtk_blocked(NXWINDOW hwnd, FAR void *arg1, FAR void *arg2);
#endif
/****************************************************************************
* Private Data
@@ -95,6 +98,9 @@ const struct nx_callback_s g_nxtkcb =
#ifdef CONFIG_NX_KBD
, nxtk_kbdin /* kbdin */
#endif
#ifdef CONFIG_NX_MULTIUSER
, nxtk_blocked
#endif
};
/****************************************************************************
@@ -292,6 +298,24 @@ static void nxtk_kbdin(NXWINDOW hwnd, uint8_t nch, const uint8_t *ch,
}
#endif
/****************************************************************************
* Name: nxtk_blocked
****************************************************************************/
#ifdef CONFIG_NX_MULTIUSER
static void nxtk_blocked(NXWINDOW hwnd, FAR void *arg1, FAR void *arg2)
{
FAR struct nxtk_framedwindow_s *fwnd = (FAR struct nxtk_framedwindow_s *)hwnd;
/* Only the client window gets keyboard input */
if (fwnd->fwcb->blocked)
{
fwnd->fwcb->blocked((NXTKWINDOW)fwnd, fwnd->fwarg, arg2);
}
}
#endif
/****************************************************************************
* Public Functions
****************************************************************************/