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

NxWM updates (with some NX and NxWidget fixes too)

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4689 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2012-05-02 22:03:05 +00:00
parent a65d283e96
commit 2d4cd8d1a3
4 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -2696,4 +2696,9 @@
* include/cxx/cunistd: C++ header file to make sure that everything in * include/cxx/cunistd: C++ header file to make sure that everything in
unistd.h is in the std:: namespace. unistd.h is in the std:: namespace.
* configs/sim/nxwm: Added a configuration for testing the NuttX Window Manager * configs/sim/nxwm: Added a configuration for testing the NuttX Window Manager
(NxWM) (NxWM)
* fs/fs_fcntl.h: On success, always returned OK. However, some fcntl commands
require returning other values on success.
* 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.

8
configs/sim/README.txt
View File

@ -111,11 +111,17 @@ http://tech.groups.yahoo.com/group/nuttx/files.
Compiler differences Compiler differences
-------------------- --------------------
operator new operator new:
Problem: "'operator new' takes size_t ('...') as first parameter" Problem: "'operator new' takes size_t ('...') as first parameter"
Workaround: Add -fpermissive to the compilation flags Workaround: Add -fpermissive to the compilation flags
Continue up_setjmp() issues:
With some newer compilers, I am now getting segmentation faults in
up_setjmp.S (even when built with the -m32 option). I have not looked into
this yet.
Stack Size Issues Stack Size Issues
----------------- -----------------
When you run the NuttX simulation, it uses stacks allocated by NuttX from the When you run the NuttX simulation, it uses stacks allocated by NuttX from the

4
configs/sim/nxwm/defconfig
View File

@ -524,8 +524,8 @@ CONFIG_NX_PACKEDMSFIRST=n
CONFIG_NX_MOUSE=y CONFIG_NX_MOUSE=y
CONFIG_NX_KBD=y CONFIG_NX_KBD=y
#CONFIG_NXTK_BORDERWIDTH=4 #CONFIG_NXTK_BORDERWIDTH=4
#CONFIG_NXTK_BORDERCOLOR1 CONFIG_NXTK_BORDERCOLOR1=0x00a9a9a9
#CONFIG_NXTK_BORDERCOLOR2 CONFIG_NXTK_BORDERCOLOR2=0x00696969
CONFIG_NXTK_AUTORAISE=n CONFIG_NXTK_AUTORAISE=n
CONFIG_NXFONT_SANS22X29=n CONFIG_NXFONT_SANS22X29=n
CONFIG_NXFONT_SANS23X27=y CONFIG_NXFONT_SANS23X27=y

8
graphics/nxtk/nxtk_bitmaptoolbar.c
View File

@ -1,8 +1,8 @@
/**************************************************************************** /****************************************************************************
* graphics/nxtk/nxtk_bitmaptoolbar.c * graphics/nxtk/nxtk_bitmaptoolbar.c
* *
* Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. * Copyright (C) 2008-2009, 2012 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr> * Author: Gregory Nutt <gnutt@nuttx.org>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * modification, are permitted provided that the following conditions
@ -122,7 +122,7 @@ int nxtk_bitmaptoolbar(NXTKWINDOW hfwnd, FAR const struct nxgl_rect_s *dest,
* Temporarily, position the origin in absolute screen coordinates * Temporarily, position the origin in absolute screen coordinates
*/ */
nxgl_vectoradd(&wndorigin, origin, &fwnd->fwrect.pt1); nxgl_vectoradd(&wndorigin, origin, &fwnd->tbrect.pt1);
/* Then move the origin so that is relative to the containing window, not the /* Then move the origin so that is relative to the containing window, not the
* client subwindow * client subwindow
@ -132,6 +132,6 @@ int nxtk_bitmaptoolbar(NXTKWINDOW hfwnd, FAR const struct nxgl_rect_s *dest,
/* Then copy the bitmap */ /* Then copy the bitmap */
nx_bitmap((NXWINDOW)hfwnd, &clipdest, src, origin, stride); nx_bitmap((NXWINDOW)hfwnd, &clipdest, src, &wndorigin, stride);
return OK; return OK;
} }