Author: Xiang Xiao <xiaoxiang@xiaomi.com>
Check POLLHUP and POLLERR in telnet poll loop
to handle the remote end close correctly
Send "NVT"(network virtual terminal) as the default if getenv("TERM") return NULL
telnet should trigger the error handling if inet_pton return zero
since zero mean the string has format error
Don't return 1 in _environ_telnet to avoid trigger the compression
and remove the redundant TELNET_TELOPT_COMPRESS2 check
Change telnet_error_u to telnet_error_e required by the coding standard
Ensure telnet object get freed before the abnormal exit
Run all .c and .h files in last PR through nxstyle and fix all complaints.
Author: Xiang Xiao <xiaoxiang@xiaomi.com>
Wapi improvement (#16)
* wireless: add passphrase control
* wireless: add disconnect control
apps/netutils/dhcpd/dhcpd.c: Fix unused const variable
dhcpd.c:273:29: warning: 'g_anyipaddr' defined but not used [-Wunused-const-variable=]
static const uint8_t g_anyipaddr[4] = {0, 0, 0, 0};
apps/netutils/dhcpd: Make dhcpd interface configurable
apps/netutils/dhcpd: Lease address directly if hit in address range
apps/netutils/netinit: Initialize dhcpc_state
update the addresses only on request success
1.Remove void cast for function because many place ignore the returned value witout cast
2.Replace void cast for variable with UNUSED macro
Change-Id: Ie644129a563244a6397036789c4c3ea83c4e9b09
Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
Some improvements to netutils/cjson and testing/unity
* netutils/cjson/Makefile: fix the error when creating Make.dep
* testing/unity/Makefile: fix the error when creating Make.dep
* include/.gitignore: ignore cJSON headers
* netutils/cjson/Kconfig: update default version to 1.7.12. Previous releases raise compilation warnings about redefined true/false
Approved-by: Gregory Nutt <gnutt@nuttx.org>
I8sak improvements
* wireless/ieee802154: Adds support for getting/setting maxretries and promsicuous mode from i8sak
* wireless/ieee802154/i8sak: Fixes a build warning and handles a few cases where a fault can occur due to not catching missing arguments.
Approved-by: Gregory Nutt <gnutt@nuttx.org>
apps/examples/webserver: Fix to compile with CONFIG_NETUTILS_HTTPD_SENDFILE=y
Also, in this PR, some configs such as CONFIG_NETUTILS_HTTPDFILESTATS
can be selected by menuconfig.
Signed-off-by: Masayuki Ishikawa <Masayuki.Ishikawa@jp.sony.com>
Approved-by: Gregory Nutt <gnutt@nuttx.org>
apps/graphics/tmw4nx and apps/graphics/slcd: This seems the last of the show stopper bugs. All seems functional.
apps/graphics/slcd: Correct some errors found in early texting. Now the Twm4Nx::CClock window comes up, but there are problems with the way that the segments are being displayed.
apps/graphicx/twm4nx: CClock is complete and compiles correctly. Crashes with a hardware when the clock is selected from the Main Menu, however.
apps/graphics/slcd: With these changes the CSLcd class now compiles
successfully. Still untested.
apps/graphics/slcd: Finish off rendering. Hook into configuration and build system.
apps/graphics/nxglyphs: Add images that will eventually be used for clock icons
apps/graphics/slcd: Completes all CLcd methods except for rendering to the window.
apps/graphics/slcd: Add beginning of SLCD class.
Add ASCII to SLCD character mapping.
apps/graphics/slcd: Represent segments as runs rather than trapezoids. Trapezoids will be synthesized later.
A little more SLCD logic
apps/graphics/slcd: Flesh out more trapezoids in the decomposition.
apps/graphics/twm4nx: Revise logic to detect clicks on the background image. The original implementation had some side effects.
apps/graphics/twm4nx: Remove some remaining, unused stuff from TWM that was never used. Menus need to close after the 'terminal' selection is made. Otherwise, the menu can become buried under a newly open menu and not easily recovered.
apps/graphics/twm4ndx: Add a 'critical' bit to the eventID. While resizing, all events will be ignore except those marked critical.
apps/graphics/twm4nx: CBackground now brings up the main menu if the background image is click. This makes the behavior the same across all of the background except when an icon is clicked.
apps/graphics/twm4nx: Adds some colors and better style control to support the CONTEMPORARY theme. Still getting a few artifacts on the display.
apps/graphics/twm4nx: Use custom CWidgetStyle to force Icon background to match selected desktop background.
apps/graphics/nxglyphs: Add more modern looking button images for the Twm4Nx CONTEMPORARY theme
apps/graphics/twm4nx: Add some definitions to support Themes. Background image is now optional.
apps/graphics/twm4nx: Fix an uninitialized variable that was causing toolbar buttons to randomly come up enabled or disabled. Remove some unused event definitions.
apps/graphics/twm4nx: Fix a calibration screen startup issue. Make an initial calibration scrren optional
Squashed commit of the following:
apps/graphics/twm4nx: The calibration seems to be functional. Needs more testing.
apps/graphics/twm4nx: Extend event handling to support receiving raw, uncalibaated touchscreen inputs. This is needed for touchscreen calibration.
apps/graphics/twm4nx: Extend event handling to support shutting down of externally controlled windows. This is need to end the calibration sequence.
apps/graphics/twm4nx: CCalibration now compiles okay, but is missing event handling logic for touchscreen input and for window termination.
apps/graphics/twm4nx: Move application-related files into different directories to separate them from the core Twm4Nx files.
apps/graphics/twm4nx: A little more progress on calibration display.
app/graphics/twm4ndx: Add files that will support a calibration display. This initial commit is simply the calibration display from NxWM and is not hooked into the configuration or build systems.
apps/graphics/twm4ndx: Compile out cursor support if we are using a mouse
apps/graphics/twm4nx: Clean up some build issues.
apps/graphics/nxglyphs: Remove some warnings due to coupling with NXWM.
apps/graphics/twmndx: Separate out the main() entry point for ctwm4nx.cxx. There is functionality there that does not involve CTwm4Nx and so it is better if the main function were totally separate.
apps/graphics/twm4nx: Other toolbar buttons need to be disabled while resizing. Lots of problems if you decide to iconify or exit while resizing. CResize now disables all buttons except for the RESIZE button while resizing.
apps/graphics/twm4nx: Add an event and logic to support notification of changes in the size of a window to NxTerm.
Various updates to adapt to change in boardctl() interface.
apps/graphics/twm4nx: Correct an error in the NxTerm resize logic
apps/graphics/twm4nx: Update debug output when failures to send a message occur. The returned value of -1 is not interested, need to show the errno value instead.
apps/graphics/twm4nx: Correct the maximum size of a message. Recent changes caused message send failures because a message exceed that previous maximum size.
apps/graphics/twm4nx: Fix routing of redraw events.
apps/graphics/twm4nx: Fix a bad width calculation.
apps/graphics/twm4nx: Debugging resize. Only partially functional.
apps/graphics/twm4nx: Forgot to install the IEventTap instance. No resizing kind of works, but I can't get out of it! There is a basic problem in the window needs to be updated for the new size and there is no mechanism in place to do that (at least not with RAM backed windows).
apps/graphics/twm4nx: Add missing part of the resize logic. Initial testing is mixed. The resize window appears, but nothing else good happens. No hardfaults though.
apps/graphics/twm4nx: This is a complete redesign of the CResize class. Unverified on initial commit.
apps/graphics/twm4nx: Commit of in-progress resize changes
apps/graphics/nxwidgets/src/cbuttonarray.cxx: Correct an error CButtonArray. Was not correctly resizing the widget when the dimensions of the button array changed.
apps/graphics/twm4nx: Trival correcion of some typos in comments.
apps/graphics/twm4nx: Rename IDragEvent interface to IEventTap. I intend to reuse this interface for window resizing as well as dragging.
apps/graphics/twm4nx: Some trivial elimination of some unused logic in CResize.
apps/graphics/twm4nx: In the Icon Manager, do not use the window name to identify which button press corresponds to which Window. Window names are not unique. Instead, it now keeps track of thich row x column was assigned to the window name. That row x column uniquely associates a window with a button and does not depend on the window name in any way.
apps/graphics/twm4nx: Fix an error in event notification sent by the Icon Manager when a window is selected.
apps/graphics/twm4nx: Correct logic in Icon Manager for the case where the number of windows causes the Icon Manager to increase in size by one row.
apps/graphics/twm4nx: Add logic to detect collisions with reserved regions in the backgroud or with other icons when moving an icon on the desktop.
apps/graphics/twm4nx: When moving icons, erase the old icon image before drawing the new one.
apps/graphics/twm4nx: Fix several errors associated with the NxTerm buttons. Most changes involved fixing crashes with the exit button is pressed. Now the NxTerm windows behave well. However, they are not receiving console input so there is still more to be done.
apps/graphics/twm4nx: Various fixes to get the NxTerm window to come up properly. It does now come up okay, but the system basically loses its mind thereafter. Goods good until some buttons are pressed.
apps/graphics/twm4nx: Simpify application startup.
apps/graphics/twm4nx: Fix some errors in debug statements.
Squashed commit of the following:
apps/graphics/twm4nx: Revamp the event system to support notification of external applications when the window is being closed.
apps/graphics/twm4nx: A little NxTerm progress
apps/graphics/twm4nx: Clean up some logic associated with use of multiple Icon Managers.
apps/graphics/twm4nx: Add CNxterm to the build. It is a long way from compiling.
apps/graphics/twm4nx: This resolves the problems noted in the previous commit comments. Window events are now communicated properly to the appliation-specific event handler. Menus now seem to be receiving events and working well.
apps/graphics/twm4nx: Revamp application event handler. Better design but still crashes when a main menu entry is clicked.
apps/graphics/twm4nx: First cut at application window event distribution. Has some issues. Not ready for prime time.
apps/graphics/twm4nx: Add more controls for the events that will be generated on basic window redraw, mouse/keyboard input, and keyboard input.
apps/graphpics/twm4nx: Add a 'Desktop' item to the main menu that will iconify all windows and menus and just show the open desktop.
apps/graphics/twm4nx: Remove some unnecessary twiddling with widget settings.
apps/graphics/twm4nx: Correct an error in how menu windows are created.
apps/graphics/twm4nx: Use button array vs list box for menus.
apps/graphics/twm4nx: Mostly cosmetic stuff.
apps/graphics/twm4ndx: In icon manager, fixing some places where width was used when height was intended. Fixe uninitialized variable.
apps/graphics/twm4nx: The Icon Manager now adds a Main Menu entry that will de-iconify the Icon Manager or raise to the top of the hieararchy if not iconfified. This is useful when there are many open windows.
apps/graphics/twm4nx: In resize operation, don't let window get narrower than the minimum toolbar width.
apps/graphics/twm4nx: Add logic so that the main menu is place at (or near) the position where the background was clicked.
apps/graphics/twm4nx: Better integrate menus and iconifiction: Bringup up a menu is like de-iconifcation, except there is no icon to be erases; taking down a menu is like iconification except that there is no icon to present.
apps/graphics/nxwidgets: Add methods to all windows to query if a window is visible or hidden.
apps/graphics/twm4nx: Use NxWidgets methods which work in all contexts instead of trying to come up with a way to know if a window is displayed through complex flags.
apps/graphics/twm4nx: CWindow: Add a global function that can be used to determine the minimum width of a window. If the window is set to a width smaller than this, then toolbar items will overlap and the toolbar will be corrupted. This is a global function (rather than a method of CWindow) because in some cases, this minimum width must be known before the window is created.
apps/graphics/twm4nx: CMenus now uses CWindows, rather that raw NX windows. This rippled through to many other things due to conflicts between NUL-terminated C strings and NXWidgets::CNxStrings.
apps/graphics/nxwidgets: CWidgetControl::handleLeftClick now returns a value to indicate if the click was actually processed or not. CWidgetControl::pollMouseEvents: Correct return value.
apps/graphics/twm4nx: CBackground::event(): Implement logic to handle a left click on the background and to bring up the main Menu. CWindowEvent: Extend message to distinguish between keyboard and mouse input. Mouse position and buttons now accompany the mouse input data. CMenus: Add methods to query and control the visibility of the menu.
apps/graphics/twm4nx: Additional redesign. Window draggin now sort of works in an unreliable hurky-gurky way. More to be done.
apps/graphics/twm4nx: First cut at redesigned dragging logic
apps/graphics/twm4nx: Replace most usage of NUL-terminated C strings with NXWidgets::CNxString.
apps/graphics/twm4nx: Add initial support for the main menu. The main menu will come up when a left click is performed on the background. The main menu is used for starting applications. The adds the CMainMenu class that implements the main menu and an IApplication interface class the provides th template for how any external C++ application can add itself to the Main Menu.
Still missing is the logic that responds to the meny item selection and sends the event to the Main Menu as well as the logic in the Main Menu that handles the event and either brings up a sub-menu or starts and application.
Things are still basically functional after these changes, but my gut feeling is these changes added some instabilities that will need to be smoothed out.
apps/graphics/twm4nx: Try to improve icon text spacing. Not noticeably better, however.
apps/graphics: Split long icon title on two lines below the icon image.
apps/graphics/twm4nx: Both iconification and de-iconification work.
apps/graphics/twm4nx: Various fixed toward de-iconifying a window. Progress but still not there yet.
graphics/twm4nx/src/window.cxx: Add flags to CWindow initializer to support customization of toolbar buttons and other window properties. Add framework to handle toolbar button presses. Window minimization (aka, iconification) does not work.
graphics/twm4nx/src/input.cxx: Add support to scaling touchscreen. Not needed for the current testing because the touchscreen naturally matches the display size. But will be needed, along with calibration scren, in the future.
graphics/twm4nx/src/ciconmgr.cxx: Correct initial window size and position in the upper righthand corner; Need to fill draw the button array immediately on window creation.
graphics/twm4nx/src/cwindow.cxx: Need to fill the toolbar initially with the widget background color.
Some improvements could be made by anyone. For example, I know the main routine in perform() shall be split into several parts for readability. I apologize in advance for this kind of spaghetti code, but I was short on time to refactor it. Also chunked HTTP transfer encoding would be a nice contribution from anyone interested. It is detected but not yet supported.
apps/graphics/twm4nx: Fix various bugs found in bringup: Re-order object instantiation to account for inter-object dependencies. Correct mq_receive() buffer size. Fix a backward comparison.
apps/graphics/twm4nx: Twm4Nx debug can now be separately enabled so that it does not get overwhelmed by other graphics debug output.
apps/graphics/NxWidgets: Fix a possible deadlock condition when waiting for window geometry data that will never come. Fixed by re-requesting geometry data if we don't already have it.
apps/graphics/twm4nx: Add some debug output.
apps/graphics/twm4nx: Rethink how background events are handled.
apps/grephics/twm4nx: Expermimental organization to capture background events.
include/ and netutils/: Remove references to CONFIG_DISABLE_SIGNALS. Signals can no longer be disabled.
nshlib/: Remove references to CONFIG_DISABLE_SIGNALS. Signals can no longer be disabled.
system/: Remove references to CONFIG_DISABLE_SIGNALS. Signals can no longer be disabled.
testing/: Remove references to CONFIG_DISABLE_SIGNALS. Signals can no longer be disabled.
examples/: Remove references to CONFIG_DISABLE_SIGNALS. Signals can no longer be disabled.
Squashed commit of the following:
apps/nshlib: Remove NSH initialization. Now uses the common apps/netutils/netinit logic (which was cloned from nshlib to begin with).
apps/netutils/netinit: Clone network initialization logic from NSH to this directory so that it can be available for general use.
apps/graphics/twm4nx: Remove Icon Windows; replace with IconWidgets that are draw on the background.
apps/graphics/twm4nx: Add CIconWidget event generation.
apps/graphics/twm4nx: Add event handling logic to CIconWidget.
graphics/twm4nx/src/ciconmgr.cxx: Integrate use of CButtonArray; implement first cut at event handling.
graphics/nxwidgets/src/cbuttonarray.cxx: Add a method to CButtonArray that will allow us to dynamically resize the array (at the cost of losing all button labels).
graphics/twm4nx/src/ciconmgr.cxx: Add some fragments of CButtonArray logic.
graphics/twm4nx/src/cwindow.cxx: Finishes first cut at window event management.
version 1.0.10 to NuttX NX windows server. No, a port is not the right
word. It is a re-design of TWM from the inside out to work with the NuttX
NX server. The name Twm4Nx reflects this legacy. But Twm4Nx is more a
homage to TWM than a port of TWM.
The original TWM was based on X11 which provides a rich set of features.
TWM provided titlebars, shaped windows, several forms of icon management,
user-defined macro functions, click-to-type and pointer-driven keyboard
focus, graphic contexts, and user-specified key and pointer button bindings,
etc.
Twm4Nx, on the other hand is based on the NuttX NX server which provides
comparatively minimal support. Additional drawing support comes from
the NuttX NxWidgets library (which necessitated the change to C++).
Twm4Nx is greatly stripped down and targeted on small embedded systems
with minimal resources. For example, no assumption is made about the
availability of a file system; no .twmrc file is used. Bitmaps are not
used (other than for fonts).
The TWM license is, I believe compatible with the BSD license used by NuttX.
The origin TWM license required notice of copyrights within each file and
a full copy of the original license which you can find in the COPYING file.
within this directory.
STATUS:
This port was brutal. Much TWM logic was removed because it depending on X11 features (or just because I could not understand how to use it). The logic is partial. A lot more needs to be done to have a complete system (hence, it is marked EXPERIMENTAL). The kinds of things that need to done are:
1. Update some logic that is only fragmentary for how like resizing, and menus.
2. Integrate NxWidgets into the windows: The resize menu needs a CLabel, the menus are CListBox'es, but not completely integrated, the Icon Manager needs to be a button array.
3. Resit Icons. They are windows now, but need to be compound widgets lying on the background.
4. Widget events are only partially integrated. A lot more needs to be done. A partial change to thoe event system that hints at the redesign is in place but it is far from complete.
apps/system/nxplayer: Fix some logical errors from recent comments. They broke the build of the nxplayer as a library vs. a task. apps/graphics/nxglyphs: Fix yet more namespace problems.
graphics/nxwm/src/nxwm_main.cxx: Move from graphics/nxwidgets/UnitTests/nxwm/nxwm_main.cxx.
apps/graphicx/nx*: Fixes numerous build issues mostly associated with include paths and namespaces.
apps/nxglyphs: Decouple (mostly) from nxwidgets and nxwm so that they can be used elsewhere. Creates include/graphics/nxglyphs.h
apps/graphics/nxglyphs: Put all NxWidgets and NxWM glyphs into a common directory where they can eventually be shared. Not very sharable at the moment due to header file entanglements. Need a separate nxglyps.hxx header file.
Separate nxwidets and nxwm into separate directories. Remove old, common NxWidgets directory.
1. A memory corruption issue that occurs from a paste operation that would overflow the fixed buffer size for keyboard processing.
2. A stall in getch() processing when there are cached keycodes in the termcurses emulation (tcurses_vt100.c).
The patch provided in issue 135, which adds support for HTTP Chunked Encoding, covers all paths in the webserver app except CGI callbacks. As a result, if a page being served happens to use CGI, it could generate stream content that does not comply with HTTP Chunked Encoding.
The patch attached amends the webserver app's CGI callbacks to use the HTTP Chunked Encoding sender function instead of using send() directly.
The webserver/httpd app is currently broken when script support is enabled (CONFIG_NETUTILS_HTTPD_SCRIPT_DISABLE). The root cause has been tracked down to the "Content-length" not being available ahead of time in this case (length of -1 passed to send_headers() ). On the other hand, the server closing the socket does not result in FIN being sent to the browser either (FIN not supported by NuttX yet).
Simple solution: Add support for HTTP Chunked Encoding to webserver/httpd (attached patch).
The attached patch is simple. It adds a configuration option to enable chunked encoding. When enabled, the implementation will auto-detect the cases where content length is not available ahead of time, and will automatically engage chunked encoding transfers.
Without this patch, the browser/client hangs forever, as it is expecting more data. With this patch, the browser displays the content.
NxWidgets improvements
* NxWidgets: fix garbage returned when CCycleButton::getValue() is called after removeAllOptions().
It's a bit questionable whether returning 0 here is reasonable or
if it would be better to assert(). But either is better than reading
into random memory and returning a garbage value.
* NXWidgets CScrollingPanel: Don't draw outside the widget area.
The port->move() function doesn't support clipping the
copied area to the client area, so we have to manually
calculate the part that can be moved without going outside
the widget.
* CNxString: Add string + operator and ::format() function
* CNumericEdit: Add option to include unit name after the value
* NxWidgets: CNxWidget: Make useWidgetStyle() public
Makes it easier to update styles when multiple controls are nested.
* NxWidgets: Add CLabelGrid control for displaying text in grid format.
Approved-by: GregoryN <gnutt@nuttx.org>
Reviewers note: Reviewing the changes I also see that these file did not follow the NuttX codings standard. I ran all files through nuttx/tools/indent.sh, manually reviewed all files for coding style issues. I also changed occurrences of non-standard types u8_t, u16_t, and u32_t to the standard uint8_t, uint16_t, and uint32_t.
Squashed commit of the following:
Clean-up some include path problems introduced with the previous set of changes.
app/include/graphics, apps/NxWidgets/UnitTests: Update include paths for file in new location.
apps/NxWidgets/nxwidgets and nxwm: Update include paths for file in new location.
apps/graphics/NxWidgets: Move nxwidgets and nxwm include/ directories to apps/include/graphics
- fix error "sz_main.o: No such file or directory"
- support -p <path> for rz to change the folder for the recevied file
- switch debug output from printf to syslog
- send the next packet for ZME_ACK in ZMS_SENDING to avoid rz on the host side stuck
- make send work reliable even without hardware flow control
testing: add Unity - unit testing library from ThrowTheSwitch.org
* examples/powerled: add arch initialization; examples/smps: fixes in some printf and in Kconfig
* testing: add Unity - unit testing library from ThrowTheSwitch.org
Approved-by: GregoryN <gnutt@nuttx.org>
apps/examples/ft80x: Fix some size calculations. Add option to disable primitive tests... just too boring to have to watch over and over again.
apps/graphics/ft80x: Fix a typo in backlight fade logic; Fix error in formmatted display light debug dump output.
apps/graphics/ft80x: Fix some warnings when debug features are enabled.
