More NX window manager pieces

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4670 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2012-04-28 22:46:36 +00:00
parent beb26c7316
commit f566d87e5b
7 changed files with 823 additions and 9 deletions

View File

@ -0,0 +1,88 @@
/****************************************************************************
* NxWidgets/nxwm/include/cnxbackimage.hxx
*
* Copyright (C) 2012 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
* 3. Neither the name NuttX, NxWidgets, nor the names of its contributors
* me be used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
****************************************************************************/
#ifndef __NXWM_INCLUDE_CNXBACKIMAGE_HXX
#define __NXWM_INCLUDE_CNXBACKIMAGE_HXX
/****************************************************************************
* Included Files
****************************************************************************/
/****************************************************************************
* Included Files
****************************************************************************/
#include <nuttx/config.h>
#include "nxconfig.hxx"
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
/****************************************************************************
* Implementation Class Definition
****************************************************************************/
#if defined(__cplusplus)
namespace NxWM
{
/**
* This class describes the NX windo manager's background image.
*/
class CNxBackImage : public NxWidgets::CImage
{
private:
NxWidgets::CWidgetControl *m_widgetControl; // The controlling widget for the window
public:
/**
* CNxBackImage Constructor
*/
CNxBackImage(void);
/**
* CNxBackImage Destructor
*/
~CNxBackImage(void);
};
}
#endif // __cplusplus
#endif // __NXWM_INCLUDE_CNXBACKIMAGE_HXX

View File

@ -43,6 +43,7 @@
#include <nuttx/config.h>
#include "crlepalettebitmap.hxx"
#include "inxwindow.hxx"
#include "cnxapplication.hxx"
/****************************************************************************
@ -69,19 +70,22 @@ namespace NxWM
class CNxConsole : public CNxApplication
{
public:
/**
* CNxConsole constructor
*/
CNxConsole(void);
protected:
/**
* CNxConsole destructor
*/
~CNxConsole(void);
public:
/**
* CNxConsole constructor
*
* @param window. The application window
*/
CNxConsole(NXWidgets::INxWindow *window);
/**
* Get the icon associated with the application
*

102
nxwm/include/cnxstart.hxx Normal file
View File

@ -0,0 +1,102 @@
/****************************************************************************
* NxWidgets/nxwm/include/cnxstart.hxx
*
* Copyright (C) 2012 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
* 3. Neither the name NuttX, NxWidgets, nor the names of its contributors
* me be used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
****************************************************************************/
#ifndef __INCLUDE_CNXSTART_NXX
#define __INCLUDE_CNXSTART_NXX
/****************************************************************************
* Included Files
****************************************************************************/
#include <nuttx/config.h>
#include "cnxapplication.hxx"
/****************************************************************************
* Pre-Processor Definitions
****************************************************************************/
/****************************************************************************
* Abstract Base Classes
****************************************************************************/
#if defined(__cplusplus)
namespace NxWM
{
class CNxStart : public INxApplication
{
protected:
CNxTaskbar *m_taskbar; /**< Reference to the "parent" taskbar */
/**
* CNxStart Constructor
*/
~CNxStart(void);
public:
/**
* CNxStart Constructor
*/
CNxStart(CNxTaskbar *taskbar);
/**
* Get the icon associated with the application
*
* @return An instance if INxBitmap that may be used to rend the
* application's icon. This is an new INxBitmap instance that must
* be deleted by the caller when it is no long needed.
*/
NXWidgets::INxBitmap *getIcon(void);
/**
* Add the application to the start window
*
* @param application. The new application to add to the start window
* @return true on success
*/
bool addApplication(INxApplication *application);
};
}
#endif // __cplusplus
#endif // __INCLUDE_CNXSTART_NXX

201
nxwm/include/cnxtaskbar.hxx Normal file
View File

@ -0,0 +1,201 @@
/****************************************************************************
* NxWidgets/nxwm/include/cnxtaskbar.hxx
*
* Copyright (C) 2012 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
* 3. Neither the name NuttX, NxWidgets, nor the names of its contributors
* me be used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
****************************************************************************/
#ifndef __NXWM_INCLUDE_CNXTASKBAR_HXX
#define __NXWM_INCLUDE_CNXTASKBAR_HXX
/****************************************************************************
* Included Files
****************************************************************************/
#include <nuttx/config.h>
#include "nxconfig.hxx"
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
/****************************************************************************
* Implementation Class Definition
****************************************************************************/
#if defined(__cplusplus)
namespace NxWM
{
/**
* This class describes the NX window manager's task bar
*/
class CNxTaskBar : public NxWidgets::CNxServer
{
private:
NxWidgets:INxWindow *m_toolbar; /**< The toolbar window */
NxWidgets:INxWindow *m_background; /**< The background window */
INxApplication *m_start; /**< The start window */
/**
* Connect to the server
*/
bool connect(void);
/**
* Disconnect from the server
*/
void disconnect(void);
/**
* Create a raw window.
*
* 1) Create a dumb CWigetControl instance
* 2) Pass the dumb CWidgetControl instance to the window constructor
* that inherits from INxWindow. This will "smarten" the CWidgetControl
* instance with some window knowlede
* 3) Call the open() method on the window to display the window.
* 4) After that, the fully smartened CWidgetControl instance can
* be used to generate additional widgets by passing it to the
* widget constructor
*/
NXWidgets::INxWindow *openRawWindow(void);
/**
* Create a framed application window
*
* This may be used to provide the window parater to the INxApplication constructor
*
* @return A partially initialized application window instance.
*/
NXWidgets::INxWindow *openFramedWindow(void);
/**
* Create the toolbar window.
*
* @return true on success
*/
bool createToolbarWindow(void);
/**
* Create the background window.
*
* @return true on success
*/
bool createBackgroundWindow(void);
/**
* CNxTaskBar Destructor
*/
~CNxTaskBar(void);
public:
/**
* CNxTaskBar Constructor
*
* @param hWnd - NX server handle
*/
CNxTaskBar(void);
/**
* Add the application to the start window. The window manager start-up
* sequence is:
*
* 1. Create the CNxTaskBar instance,
* 2. Call addApplication repeatedly to add applications to the start window
* 3. Call startWindowManager to start the display
*
* @param application. The new application to add to the start window
* @return true on success
*/
bool addApplication(INxApplication *application);
/**
* Start the window manager and present the initial displays. The window
* manager start-up sequence is:
*
* 1. Create the CNxTaskBar instance,
* 2. Call addApplication repeatedly to add applications to the start window
* 3. Call startWindowManager to start the display
*
* startWindowManager will present the taskar and the background image. The
* initial taskbar will contain only the start window icon.
*
* @param application. The new application to add to the start window
* @return true on success
*/
bool startWindowManager(start);
/**
* Start an application and add its icon to the taskbar. The applications's
* window is brought to the top.
*
* @param application. The new application to add to the task bar
* @return true on success
*/
bool startApplication(INxApplication *application);
/**
* Hide an application by moving its window to the bottom.
*
* @param application. The new application to add to the task bar
* @return true on success
*/
bool hideApplication(INxApplication *application);
/**
* Destroy an application. Move its window to the bottom and remove its
* icon from the task bar.
*
* @param application. The new application to remove from the task bar
* @return true on success
*/
bool stopApplication(INxApplication *application);
};
}
#endif // __cplusplus
#endif // __NXWM_INCLUDE_CNXTASKBAR_HXX

View File

@ -42,8 +42,6 @@
#include <nuttx/config.h>
#include "ibitmap.hxx"
/****************************************************************************
* Pre-Processor Definitions
****************************************************************************/
@ -68,6 +66,12 @@ namespace NxWM
*/
virtual NXWidgets::INxBitmap *getIcon(void) = 0;
/**
* Start the application.
*/
virtual run(void) = 0;
};
}

76
nxwm/src/cnxconsole.cxx Normal file
View File

@ -0,0 +1,76 @@
/********************************************************************************************
* NxWidgets/nxwm/src/cnxconsole.cxx
*
* Copyright (C) 2012 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
* 3. Neither the name NuttX, NxWidgets, nor the names of its contributors
* me be used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
********************************************************************************************/
/********************************************************************************************
* Included Files
********************************************************************************************/
#include <nuttx/config.h>
#include "nxwmconfig.hxx"
#include "cnxconsole.hxx"
/********************************************************************************************
* Pre-Processor Definitions
********************************************************************************************/
/********************************************************************************************
* CNxConsole Method Implementations
********************************************************************************************/
/**
* CNxConsole constructor
*
* @param window. The application window
*/
CNxConsole::CNxConsole(NXWidgets::INxWindow *window)
{
}
/**
* Get the icon associated with the application
*
* @return An instance if INxBitmap that may be used to rend the
* application's icon. This is an new INxBitmap instance that must
* be deleted by the caller when it is no long needed.
*/
NXWidgets::INxBitmap *CNxConsole::getIcon(void)
{
NXWidgets::CRlePaletteBitmap *bitmap = new NXWidgets::CRlePaletteBitmap(&g_nshBitmap);
return static_cast<INxBitmap>(bitmap);
}

339
nxwm/src/cnxtaskbar.cxx Normal file
View File

@ -0,0 +1,339 @@
/********************************************************************************************
* NxWidgets/nxwm/src/cnxtaskbar.cxx
*
* Copyright (C) 2012 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
* 3. Neither the name NuttX, NxWidgets, nor the names of its contributors
* me be used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
********************************************************************************************/
/********************************************************************************************
* Included Files
********************************************************************************************/
#include <nuttx/config.h>
#include "nxwmconfig.hxx"
#include "cnxconsole.hxx"
/********************************************************************************************
* Pre-Processor Definitions
********************************************************************************************/
/********************************************************************************************
* CNxConsole Method Implementations
********************************************************************************************/
/**
* CNxTaskBar Constructor
*
* @param hWnd - NX server handle
*/
CNxTaskBar::CNxTaskBar(void)
{
m_toolbar = (INxWindow *)NULL;
m_background = (INxWindow *)NULL;
m_start = (INxWindow *)NULL;
}
/**
* CNxTaskBar Destructor
*/
CNxTaskBar::~CNxTaskBar(void)
{
disconnect();
}
/**
* Add the application to the start window. The window manager start-up
* sequence is:
*
* 1. Create the CNxTaskBar instance,
* 2. Call addApplication repeatedly to add applications to the start window
* 3. Call startWindowManager to start the display
*
* @param application. The new application to add to the start window
* @return true on success
*/
bool CNxTaskBar::addApplication(INxApplication *application)
{
}
/**
* Start the window manager and present the initial displays. The window
* manager start-up sequence is:
*
* 1. Create the CNxTaskBar instance,
* 2. Call addApplication repeatedly to add applications to the start window
* 3. Call startWindowManager to start the display
*
* startWindowManager will present the taskar and the background image. The
* initial taskbar will contain only the start window icon.
*
* @param application. The new application to add to the start window
* @return true on success
*/
bool CNxTaskBar::startWindowManager(start);
/**
* Start an application and add its icon to the taskbar
*
* @param application. The new application to add to the task bar
* @return true on success
*/
bool CNxTaskBar::startApplication(INxApplication *application)
{
}
/**
* Hide an application by moving its window to the bottom.
*
* @param application. The new application to add to the task bar
* @return true on success
*/
bool CNxTaskBar::hideApplication(INxApplication *application)
{
}
/**
* Destroy an application. Move its window to the bottom and remove its
* icon from the task bar.
*
* @param application. The new application to remove from the task bar
* @return true on success
*/
bool CNxTaskBar::stopApplication(INxApplication *application)
{
}
/**
* Connect to the server
*/
bool CNxTaskBar::connect(void)
{
// Connect to the server
bool nxConnected = CNxServer::connect();
if (nxConnected)
{
// Set the background color
if (!setBackgroundColor(CONFIG_CNXWM_BGCOLOR))
{
message("CNxwm::connect: setBackgroundColor failed\n");
}
}
return nxConnected;
}
/**
* Disconnect from the server
*/
void CNxTaskBar::disconnect(void)
{
// Delete all applications
#warning "Missing logic
// Close the windows
if (m_toolbar)
{
delete m_toolbar;
}
if (m_background)
{
delete m_background;
}
if (m_start)
{
delete m_start;
}
// And disconnect from the server
CNxServer::disconnect();
}
/**
* Create a raw window.
*
* 1) Create a dumb CWigetControl instance
* 2) Pass the dumb CWidgetControl instance to the window constructor
* that inherits from INxWindow. This will "smarten" the CWidgetControl
* instance with some window knowlede
* 3) Call the open() method on the window to display the window.
* 4) After that, the fully smartened CWidgetControl instance can
* be used to generate additional widgets by passing it to the
* widget constructor
*/
NXWidgets::INxWindow *CNxTaskBar::openRawWindow(void)
{
// Initialize the widget control using the default style
NxWidgets::CWidgetControl *widgetControl = new CWidgetControl((CWidgetStyle *)NULL);
// Get an (uninitialized) instance of the background window as a class
// that derives from INxWindow.
NxWidgets::CNxWindow window = createRawWindow(widgetControl);
if (!window)
{
message("CNxwm::createGraphics: Failed to create background window\n");
delete widgetControl;
return false;
}
// Open (and initialize) the window
bool success = window->open();
if (!success)
{
message("CNxwm::createGraphics: Failed to open background window\n");
delete window;
window = (NXWidgets::INxWindow *)0;
return false;
}
return static_cast<INxWindow*>(window);
}
/**
* Create a framed application window
*
* This may be used to provide the window parater to the INxApplication constructor
*
* @return A partially initialized application window instance.
*/
NXWidgets::INxWindow *CNxTaskBar::openFramedWindow(void)
{
// Initialize the widget control using the default style
NxWidgets::CWidgetControl *widgetControl = new CWidgetControl((CWidgetStyle *)NULL);
// Get an (uninitialized) instance of the background window as a class
// that derives from INxWindow.
NxWidgets:CFramedWindow window = createRawWindow(widgetControl);
if (!window)
{
message("CNxwm::createGraphics: Failed to create background window\n");
delete widgetControl;
return false;
}
// Open (and initialize) the window
bool success = window->open();
if (!success)
{
message("CNxwm::createGraphics: Failed to open background window\n");
delete window;
window = (NXWidgets::INxWindow *)0;
return false;
}
return static_cast<INxWindow*>(window);
}
/**
* Create the toolbar window.
*
* @return true on success
*/
bool CNxTaskBar::createToolbarWindow(void)
{
// Create a raw window to present the toolbar
m_toolbar = openRawWindow();
if (!m_toolbar)
{
message("CNxwm::createGraphics: Failed to create CBgWindow instance\n");
return false;
}
return true;
}
/**
* Create the background window.
*
* @return true on success
*/
bool CNxTaskBar::createBackgroundWindow(void)
{
// Create a raw window to present the background image
m_background = openRawWindow();
if (!m_background)
{
message("CNxwm::createGraphics: Failed to create background window\n");
return false;
}
return true;
}
/**
* Create the background window.
*
* @return true on success
*/
bool CNxTaskBar::createStartWindow(void)
{
// Create a raw window to present the background image
INxWindow *window = openFramedWindow();
if (!window)
{
message("CNxwm::createGraphics: Failed to create start window\n");
return false;
}
// Now create the start up application
#warning "Missing logic"
// m_start
return true;
}