diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2013-02-28 18:48:11 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2013-02-28 18:48:11 +0000 |
commit | a63f8bb684d01a23bfe1ee85b1d7faf983b9d1ea (patch) | |
tree | 3f51cea039f16c0a9b0b8e05550fe9112d72d824 /NxWidgets/nxwm/include | |
parent | f1b1e3ba11994bcbb0a1ddad9f8e686a6a9ae475 (diff) | |
download | px4-nuttx-a63f8bb684d01a23bfe1ee85b1d7faf983b9d1ea.tar.gz px4-nuttx-a63f8bb684d01a23bfe1ee85b1d7faf983b9d1ea.tar.bz2 px4-nuttx-a63f8bb684d01a23bfe1ee85b1d7faf983b9d1ea.zip |
NxWidgets/NxWM updates from Petteri Aimonen (Patches 0007-0013)
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5689 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'NxWidgets/nxwm/include')
-rw-r--r-- | NxWidgets/nxwm/include/cstartwindow.hxx | 1 | ||||
-rw-r--r-- | NxWidgets/nxwm/include/cwindowmessenger.hxx | 25 |
2 files changed, 18 insertions, 8 deletions
diff --git a/NxWidgets/nxwm/include/cstartwindow.hxx b/NxWidgets/nxwm/include/cstartwindow.hxx index 52a67fbd4..250d5068c 100644 --- a/NxWidgets/nxwm/include/cstartwindow.hxx +++ b/NxWidgets/nxwm/include/cstartwindow.hxx @@ -119,7 +119,6 @@ namespace NxWM CApplicationWindow *m_window; /**< Reference to the application window */ TNxArray<struct SStartWindowSlot> m_slots; /**< List of apps in the start window */ struct nxgl_size_s m_iconSize; /**< A box big enough to hold the largest icon */ - pid_t m_taskId; /**< ID of the start window task */ /** * This is the start window task. This function receives window events from diff --git a/NxWidgets/nxwm/include/cwindowmessenger.hxx b/NxWidgets/nxwm/include/cwindowmessenger.hxx index 11a48645b..a30010fd8 100644 --- a/NxWidgets/nxwm/include/cwindowmessenger.hxx +++ b/NxWidgets/nxwm/include/cwindowmessenger.hxx @@ -1,7 +1,7 @@ /**************************************************************************** * NxWidgets/nxwm/include/cwindowmessenger.hxx * - * Copyright (C) 2012 Gregory Nutt. All rights reserved. + * Copyright (C) 2012-2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> * * Redistribution and use in source and binary forms, with or without @@ -39,12 +39,12 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include <sys/types.h> -#include <mqueue.h> +#include <nuttx/wqueue.h> #include <nuttx/nx/nxtk.h> #include <nuttx/nx/nxconsole.h> @@ -83,9 +83,20 @@ namespace NxWM public NXWidgets::CWidgetControl { private: - mqd_t m_mqd; /**< Message queue descriptor used to commincate with the - ** start window thread. */ - + /** Structure that stores data for the work queue callback. */ + + struct work_state_t + { + work_s work; + CWindowMessenger *windowMessenger; + void *instance; + }; + + /** Work queue callback functions */ + + static void inputWorkCallback(FAR void *arg); + static void destroyWorkCallback(FAR void *arg); + /** * Handle an NX window mouse input event. * @@ -109,7 +120,7 @@ namespace NxWM * * @param arg - User provided argument (see nx_block or nxtk_block) */ - + void handleBlockedEvent(FAR void *arg); public: |