sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Updated NxWM widgets, several NX, NxWidgets, and NxWM bug fixes

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4699 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2012-05-04 20:48:52 +00:00
parent 7675996733
commit aa9c2de787
10 changed files with 170 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -2702,3 +2702,10 @@
* Various files. Fix warnings about variables that were initialized by not used.
* configs/sim/*/defconfig: Changes to build a 32-bit simulation on a 32-bit
platform did not make into all of the Make.defs files.
* graphics/nxmu/nx_move.c: Wrong opcode was being used in the server message;
Also there was an error in the offset calculation.
* graphics/nxglib/fb/nxglib_moverectangle.c: Offset argument is really a
position, not an offset.
* graphics/nxtk/nxtk_drawframe.c: Framed windows are now drawn in three
colors (instead of just two).

13
Documentation/NXGraphicsSubsystem.html
View File

@ -12,7 +12,7 @@
<h1><big><font color="#3c34ec">
<i>NX Graphics Subsystem</i>
</font></big></h1>
<p>Last Updated: March 25, 2012</p>
<p>Last Updated: May 4, 2012</p>
</td>
</tr>
</table>
@ -3277,11 +3277,13 @@ int nxf_convert_32bpp(FAR uint32_t *dest, uint16_t height,
<dt><code>CONFIG_NXTK_BORDERWIDTH</code>:
<dd>Specifies with with of the border (in pixels) used with
framed windows. The default is 4.
<dt><code>CONFIG_NXTK_BORDERCOLOR1</code> and <code>CONFIG_NXTK_BORDERCOLOR2</code>:
<dt><code>CONFIG_NXTK_BORDERCOLOR1</code>, <code>CONFIG_NXTK_BORDERCOLOR2</code>, and <code>CONFIG_NXTK_BORDERCOLOR3</code>:
<dd>Specify the colors of the border used with framed windows.
<dt><code>CONFIG_NXTK_BORDERCOLOR2</code> is the shadow side color and so
<dd>is normally darker. The default is medium and dark grey,
respectively
<dt><code>CONFIG_NXTK_BORDERCOLOR2</code>
<dd>The shadow side color and so is normally darker.
<dt><code>CONFIG_NXTK_BORDERCOLOR3</code>
<dd>The shiny side color and so is normally brighter.
The default is medium, dark, and light grey, respectively
<dt><code>CONFIG_NXTK_AUTORAISE</code>:
<dd>If set, a window will be raised to the top if the mouse position
is over a visible portion of the window. Default: A mouse
@ -4198,6 +4200,7 @@ sudo ln -s libXext.so.6.4.0 libXext.so
</tr>
<tr>
<td align="left" valign="top"><a href="#nxfconvertbpp"><code>nxf_convert_32bpp()</code></a></td>
<td><br></td>
<td align="center" bgcolor="skyblue">YES</td>
</tr>
</table></center>

9
configs/sim/nxwm/defconfig
View File

@ -454,11 +454,11 @@ CONFIG_NET_RESOLV_ENTRIES=4
# CONFIG_NXTK_BORDERWIDTH
# Specifies with with of the border (in pixels) used with
# framed windows. The default is 4.
# CONFIG_NXTK_BORDERCOLOR1 and CONFIG_NXTK_BORDERCOLOR2
# CONFIG_NXTK_BORDERCOLOR1, CONFIG_NXTK_BORDERCOLOR2, CONFIG_NXTK_BORDERCOLOR3
# Specify the colors of the border used with framed windows.
# CONFIG_NXTK_BORDERCOLOR2 is the shadow side color and so
# is normally darker. The default is medium and dark grey,
# respectively
# CONFIG_NXTK_BORDERCOLOR2 is the shadow side color and so is normally darker.
# CONFIG_NXTK_BORDERCOLOR3 is the shiny side color and so is normally brighter.
# The default is mediumdark grey, and light grey, respectively
# CONFIG_NXTK_AUTORAISE
# If set, a window will be raised to the top if the mouse position
# is over a visible portion of the window. Default: A mouse
@ -534,6 +534,7 @@ CONFIG_NX_KBD=y
#CONFIG_NXTK_BORDERWIDTH=4
CONFIG_NXTK_BORDERCOLOR1=0x005a96bd
CONFIG_NXTK_BORDERCOLOR2=0x00233a49
CONFIG_NXTK_BORDERCOLOR3=0x00f8f8f8
CONFIG_NXTK_AUTORAISE=n
CONFIG_NXFONT_SANS22X29=n
CONFIG_NXFONT_SANS23X27=y

5
graphics/README.txt
View File

@ -256,10 +256,11 @@ CONFIG_NX_KBD
CONFIG_NXTK_BORDERWIDTH
Specifies with with of the border (in pixels) used with framed windows.
The default is 4.
CONFIG_NXTK_BORDERCOLOR1 and CONFIG_NXTK_BORDERCOLOR2
CONFIG_NXTK_BORDERCOLOR1, CONFIG_NXTK_BORDERCOLOR2, CONFIG_NXTK_BORDERCOLOR3
Specify the colors of the border used with framed windows.
CONFIG_NXTK_BORDERCOLOR2 is the shadow side color and so is normally darker.
The default is medium and dark grey, respectively
CONFIG_NXTK_BORDERCOLOR3 is the shiny side color and so is normally brighter.
The default is mediumdark grey, and light grey, respectively
CONFIG_NXTK_AUTORAISE
If set, a window will be raised to the top if the mouse position is over a
visible portion of the window. Default: A mouse button must be clicked over

9
graphics/nxbe/nxbe_move.c
View File

@ -1,8 +1,8 @@
/****************************************************************************
* graphics/nxbe/nxbe_move.c
*
* Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
* Copyright (C) 2008-2009, 2011-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
@ -93,6 +93,8 @@ static void nxbe_clipmovesrc(FAR struct nxbe_clipops_s *cops,
if (info->offset.x != 0 || info->offset.y != 0)
{
/* Offset is the destination position of the moved rectangle */
offset.x = rect->pt1.x + info->offset.x;
offset.y = rect->pt1.y + info->offset.y;
@ -160,8 +162,7 @@ static void nxbe_clipmovedest(FAR struct nxbe_clipops_s *cops,
/* Clip to determine what is inside the bounds */
nxgl_rectoffset(&tmprect1, rect, -offset.x, -offset.y);
nxgl_rectintersect(&src, &tmprect1, &dstdata->srcrect);
nxgl_rectintersect(&src, rect, &dstdata->srcrect);
if (!nxgl_nullrect(&src))
{

14
graphics/nxglib/fb/nxglib_moverectangle.c
View File

@ -1,8 +1,8 @@
/****************************************************************************
* graphics/nxglib/fb/nxglib_moverectangle.c
*
* Copyright (C) 2008-2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
* Copyright (C) 2008-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
@ -185,14 +185,16 @@ void NXGL_FUNCNAME(nxgl_moverectangle,NXGLIB_SUFFIX)
* source position.
*/
dline = (FAR uint8_t*)sline - offset->y * stride - NXGL_SCALEX(offset->x);
dline = pinfo->fbmem + offset->y * stride + NXGL_SCALEX(offset->x);
/* Case 1: Is the destination position above the displayed position?
* If the Y offset is negative, then the destination is offset to a
* postion below (or to the right) in the source in framebuffer memory.
* If the destination position is less then then the src address, then the
* destination is offset to a postion below (and or to the left) of the
* source in framebuffer memory.
*/
if (offset->y < 0 || (offset->y == 0 && offset->x <= 0))
if (offset->y < rect->pt1.y ||
(offset->y < rect->pt1.y && offset->x <= rect->pt1.x))
{
/* Yes.. Copy the rectangle from top down (i.e., adding the stride
* to move to the next, lower row) */

6
graphics/nxmu/nx_move.c
View File

@ -1,8 +1,8 @@
/****************************************************************************
* graphics/nxmu/nx_move.c
*
* Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
* Copyright (C) 2008-2009, 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
@ -102,7 +102,7 @@ int nx_move(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect,
/* Format the fill command */
outmsg.msgid = NX_SVRMSG_FILL;
outmsg.msgid = NX_SVRMSG_MOVE;
outmsg.wnd = wnd;
outmsg.offset.x = offset->x;
outmsg.offset.y = offset->y;

175
graphics/nxtk/nxtk_drawframe.c
View File

@ -1,8 +1,8 @@
/****************************************************************************
* graphics/nxtk/nxtk_drawframe.c
*
* Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
* Copyright (C) 2008-2009, 2011-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
@ -114,45 +114,79 @@ int nxtk_drawframe(FAR struct nxtk_framedwindow_s *fwnd,
struct nxgl_rect_s frame;
struct nxgl_size_s wndsize;
struct nxgl_size_s tbsize;
nxgl_coord_t thickness;
/* Shiny edge:
* Thickness: 1
* Color: CONFIG_NXTK_BORDERCOLOR3;
* Condition: CONFIG_NXTK_BORDERWIDTH > 2
* Central part:
* Thickness: Varies with CONFIG_NXTK_BORDERWIDTH
* Color: CONFIG_NXTK_BORDERCOLOR1;
* Condition: CONFIG_NXTK_BORDERWIDTH > 0
* Shadow part:
* Thickness: 1;
* Color: CONFIG_NXTK_BORDERCOLOR2;
* Condition: CONFIG_NXTK_BORDERWIDTH > 1
*/
#if CONFIG_NXTK_BORDERWIDTH > 2
thickness = CONFIG_NXTK_BORDERWIDTH - 2;
#elif CONFIG_NXTK_BORDERWIDTH > 1
thickness = CONFIG_NXTK_BORDERWIDTH - 1;
#else
thickness = CONFIG_NXTK_BORDERWIDTH;
#endif
/* Get the size of the rectangle */
nxgl_rectsize(&wndsize, &fwnd->wnd.bounds);
nxgl_rectsize(&tbsize, &fwnd->tbrect);
/* Draw the top. Thickness: CONFIG_NXTK_BORDERWIDTH-1, Color:
* CONFIG_NXTK_BORDERCOLOR1
*/
/* Draw the top ***********************************************************/
#if CONFIG_NXTK_BORDERWIDTH > 0
frame.pt1.x = 0;
frame.pt2.x = wndsize.w - 1;
frame.pt1.y = 0;
#if CONFIG_NXTK_BORDERWIDTH > 1
frame.pt2.y = CONFIG_NXTK_BORDERWIDTH - 2;
#else
frame.pt2.y = CONFIG_NXTK_BORDERWIDTH - 1;
/* Draw the shiny edge */
#if CONFIG_NXTK_BORDERWIDTH > 2
frame.pt2.y = 0;
nxtk_drawframeside(fwnd, &frame, bounds, g_bordercolor3);
frame.pt1.y = 1;
#endif
/* Draw the central part */
frame.pt2.y = frame.pt1.y + thickness - 1;
nxtk_drawframeside(fwnd, &frame, bounds, g_bordercolor1);
/* Draw a single line under the toolbar, color CONFIG_NXTK_BORDERCOLOR2 */
#if CONFIG_NXTK_BORDERWIDTH > 1
frame.pt1.y += tbsize.h + CONFIG_NXTK_BORDERWIDTH - 1;
frame.pt1.y += tbsize.h + thickness;
frame.pt2.y = frame.pt1.y;
nxtk_drawframeside(fwnd, &frame, bounds, g_bordercolor2);
#endif
/* Draw the bottom. First, thickness: CONFIG_NXTK_BORDERWIDTH-1,
* Color: CONFIG_NXTK_BORDERCOLOR1
*/
/* Draw the bottom ********************************************************/
#if CONFIG_NXTK_BORDERWIDTH > 0
frame.pt1.y = wndsize.h - CONFIG_NXTK_BORDERWIDTH;
#if CONFIG_NXTK_BORDERWIDTH > 1
frame.pt2.y = wndsize.h - 2;
#else
/* Draw the shiny edge */
#if CONFIG_NXTK_BORDERWIDTH > 2
frame.pt2.y = frame.pt1.y;
nxtk_drawframeside(fwnd, &frame, bounds, g_bordercolor3);
frame.pt1.y ++;
#endif
/* Draw the central part */
frame.pt2.y = frame.pt1.y + thickness - 1;
nxtk_drawframeside(fwnd, &frame, bounds, g_bordercolor1);
/* Then a single line at the very bottom, Color: CONFIG_NXTK_BORDERCOLOR2 */
@ -162,75 +196,82 @@ int nxtk_drawframe(FAR struct nxtk_framedwindow_s *fwnd,
frame.pt2.y = frame.pt1.y;
nxtk_drawframeside(fwnd, &frame, bounds, g_bordercolor2);
#endif
/* Draw the outer left side. Thickness: CONFIG_NXTK_BORDERWIDTH-1,
* Color: CONFIG_NXTK_BORDERCOLOR1
*/
frame.pt1.y = 0;
frame.pt2.y = wndsize.h - 2;
frame.pt1.x = 0;
#if CONFIG_NXTK_BORDERWIDTH > 1
frame.pt2.x = CONFIG_NXTK_BORDERWIDTH - 2;
#else
frame.pt2.x = frame.pt1.x;
#endif
nxtk_drawframeside(fwnd, &frame, bounds, g_bordercolor1);
/* Draw the outer right side. Thickness: 1, Color: CONFIG_NXTK_BORDERCOLOR2 */
/* Draw left and right outer edges *****************************************/
/* Draw the shiny left out edge */
#if CONFIG_NXTK_BORDERWIDTH > 1
frame.pt1.x = wndsize.w - 1;
frame.pt1.x = 0;
frame.pt1.y = 1;
#if CONFIG_NXTK_BORDERWIDTH > 2
frame.pt2.x = frame.pt1.x;
frame.pt2.y = wndsize.h - 2;
nxtk_drawframeside(fwnd, &frame, bounds, g_bordercolor3);
#endif
/* Draw the shadowed right outer edge */
frame.pt1.x = wndsize.w - 2;
frame.pt2.x = frame.pt1.x;
nxtk_drawframeside(fwnd, &frame, bounds, g_bordercolor2);
#endif
/* Draw the inner left side, Thickness: 1, Color: CONFIG_NXTK_BORDERCOLOR2.
* This segment stops at the bottom of the toolbar. If there is a
/* Draw left and right central regions *************************************/
#if CONFIG_NXTK_BORDERWIDTH > 2
frame.pt1.x = 1;
frame.pt1.y = 1;
frame.pt2.x = frame.pt1.x + thickness - 1;
frame.pt2.y = wndsize.h - 2;
#else
frame.pt1.x = 0;
frame.pt1.y = 0;
frame.pt2.x = frame.pt1.x + thickness - 1;
frame.pt2.y = wndsize.h - 1;
#endif
nxtk_drawframeside(fwnd, &frame, bounds, g_bordercolor1);
#if CONFIG_NXTK_BORDERWIDTH > 2
frame.pt1.x = wndsize.w - thickness - 1;
frame.pt2.x = wndsize.w - 2;
#else
frame.pt1.x = wndsize.w - thickness;
frame.pt2.x = wndsize.w - 1;
#endif
nxtk_drawframeside(fwnd, &frame, bounds, g_bordercolor1);
#endif
/* Draw left and right inner sides *****************************************/
/* This segment stops at the bottom of the toolbar. If there is a
* tool bar, then we have to continue this to the top of the display
* using g_bordercolor1 (see below)
*/
/* Draw the shadowed left inner edge */
#if CONFIG_NXTK_BORDERWIDTH > 1
frame.pt1.y = CONFIG_NXTK_BORDERWIDTH - 1 + tbsize.h;
#else
frame.pt1.y = CONFIG_NXTK_BORDERWIDTH + tbsize.h;
#endif
frame.pt2.y = wndsize.h - CONFIG_NXTK_BORDERWIDTH - 1;
#if CONFIG_NXTK_BORDERWIDTH > 1
frame.pt1.x = CONFIG_NXTK_BORDERWIDTH - 1;
#if CONFIG_NXTK_BORDERWIDTH > 2
frame.pt1.x = thickness + 1;
frame.pt1.y = tbsize.h + thickness + 1;
frame.pt2.x = frame.pt1.x;
frame.pt2.y = wndsize.h - thickness - 2;
#else
frame.pt1.x = thickness;
frame.pt1.y = tbsize.h + thickness;
frame.pt2.x = frame.pt1.x;
frame.pt2.y = wndsize.h - thickness - 1;
#endif
nxtk_drawframeside(fwnd, &frame, bounds, g_bordercolor2);
#endif
/* Draw the inner left side, Thickness: CONFIG_NXTK_BORDERWIDTH-1,
* Color: CONFIG_NXTK_BORDERCOLOR1
*/
/* Draw the shiny right inner edge */
#if CONFIG_NXTK_BORDERWIDTH > 1
frame.pt1.x = wndsize.w - CONFIG_NXTK_BORDERWIDTH;
frame.pt2.x = wndsize.w - 2;
#else
frame.pt1.x = wndsize.w - 1;
#if CONFIG_NXTK_BORDERWIDTH > 2
frame.pt1.x = wndsize.w - thickness - 2;
frame.pt2.x = frame.pt1.x;
nxtk_drawframeside(fwnd, &frame, bounds, g_bordercolor3);
#endif
nxtk_drawframeside(fwnd, &frame, bounds, g_bordercolor1);
/* When there is a toolbar, we also have to patch in this tiny
* line segment -- Is there a better way?
*/
#if CONFIG_NXTK_BORDERWIDTH > 1
if (tbsize.h > 0)
{
frame.pt1.y = 0;
frame.pt2.y = CONFIG_NXTK_BORDERWIDTH + tbsize.h - 2;
frame.pt1.x = CONFIG_NXTK_BORDERWIDTH - 1;
frame.pt2.x = frame.pt1.x;
nxtk_drawframeside(fwnd, &frame, bounds, g_bordercolor1);
}
#endif
return OK;

13
graphics/nxtk/nxtk_internal.h
View File

@ -80,6 +80,18 @@
# endif
#endif
#ifndef CONFIG_NXTK_BORDERCOLOR3
# if !defined(CONFIG_NX_DISABLE_32BPP) || !defined(CONFIG_NX_DISABLE_24BPP)
# define CONFIG_NXTK_BORDERCOLOR3 0x00d9d9d9
# elif !defined(CONFIG_NX_DISABLE_16BPP)
# define CONFIG_NXTK_BORDERCOLOR3 0xdedb
# elif !defined(CONFIG_NX_DISABLE_4BPP)
# define CONFIG_NXTK_BORDERCOLOR3 8
# else
# define CONFIG_NXTK_BORDERCOLOR3 'S'
# endif
#endif
/****************************************************************************
* Public Types
****************************************************************************/
@ -124,6 +136,7 @@ extern FAR const struct nx_callback_s g_nxtkcb;
extern nxgl_mxpixel_t g_bordercolor1[CONFIG_NX_NPLANES];
extern nxgl_mxpixel_t g_bordercolor2[CONFIG_NX_NPLANES];
extern nxgl_mxpixel_t g_bordercolor3[CONFIG_NX_NPLANES];
/****************************************************************************
* Public Function Prototypes

12
graphics/nxtk/nxtk_openwindow.c
View File

@ -68,7 +68,7 @@ nxgl_mxpixel_t g_bordercolor1[CONFIG_NX_NPLANES] =
{
CONFIG_NXTK_BORDERCOLOR1
#if CONFIG_NX_NPLANES > 1
# error "Multiple corder colors not defined"
# error "Multiple plane border colors not defined"
#endif
};
@ -76,7 +76,15 @@ nxgl_mxpixel_t g_bordercolor2[CONFIG_NX_NPLANES] =
{
CONFIG_NXTK_BORDERCOLOR2
#if CONFIG_NX_NPLANES > 1
# error "Multiple border colors not defined"
# error "Multiple plane border colors not defined"
#endif
};
nxgl_mxpixel_t g_bordercolor3[CONFIG_NX_NPLANES] =
{
CONFIG_NXTK_BORDERCOLOR3
#if CONFIG_NX_NPLANES > 1
# error "Multiple plane border colors not defined"
#endif
};