diff --git a/configs/README.txt b/configs/README.txt index 354245339b8..669152d396d 100644 --- a/configs/README.txt +++ b/configs/README.txt @@ -370,27 +370,45 @@ defconfig -- This is a configuration file similar to the Linux Graphics related configuration settings - CONFIG_NXGRAPHICS + CONFIG_NX Enables overall support for graphics library and NX CONFIG_NX_MULTIUSER Configures NX in multi-user mode CONFIG_NX_NPLANES Some YUV color formats requires support for multiple planes, one for each color component. Unless you have such special - hardware, this value should be undefined or set to 1 - CONFIG_NXGLIB_DISABLE_1BPP, CONFIG_NXGLIB_DISABLE_2BPP, - CONFIG_NXGLIB_DISABLE_4BPP, CONFIG_NXGLIB_DISABLE_8BPP, - CONFIG_NXGLIB_DISABLE_16BPP, CONFIG_NXGLIB_DISABLE_24BPP, and - CONFIG_NXGLIB_DISABLE_32BPP + hardware, this value should be undefined or set to 1. + CONFIG_NX_DISABLE_1BPP, CONFIG_NX_DISABLE_2BPP, + CONFIG_NX_DISABLE_4BPP, CONFIG_NX_DISABLE_8BPP, + CONFIG_NX_DISABLE_16BPP, CONFIG_NX_DISABLE_24BPP, and + CONFIG_NX_DISABLE_32BPP NX supports a variety of pixel depths. You can save some memory by disabling support for unused color depths. - CONFIG_NXGL_PACKEDMSFIRST + CONFIG_NX_PACKEDMSFIRST If a pixel depth of less than 8-bits is used, then NX needs to know if the pixels pack from the MS to LS or from LS to MS CONFIG_NX_MOUSE - Build in support for mouse input + Build in support for mouse input. CONFIG_NX_KBD - Build in support of keypad/keyboard input + Build in support of keypad/keyboard input. + 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 + 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_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 a visible portion of the window. + CONFIG_NXFONTS_CHARBITS + The number of bits in the character set. Current options are + only 7 and 8. The default is 7. + CONFIG_NXFONT_SANS + At present, there is only one font. But if there were were more, + then this option would select the sans serif font. NX Multi-user only options: @@ -404,7 +422,6 @@ defconfig -- This is a configuration file similar to the Linux too many messages (CONFIG_PREALLOC_MQ_MSGS controls how many messages are pre-allocated). - Stack and heap information CONFIG_BOOT_FROM_FLASH - Some configurations support XIP diff --git a/configs/sim/README.txt b/configs/sim/README.txt index 39f6d7a63f0..54485872bc2 100644 --- a/configs/sim/README.txt +++ b/configs/sim/README.txt @@ -51,7 +51,7 @@ nx My system has 24-bit color, but packed into 32-bit words so the correct seeting of CONFIG_SIM_FBBPP is 32. - For whatever value of CONFIG_SIM_FBBPP is selected, then - the corresponidng CONFIG_NXGLIB_DISABLE_*BPP setting must + the corresponidng CONFIG_NX_DISABLE_*BPP setting must not be disabled. - The default in defconfig is to use a generic memory buffer for the framebuffer. defconfig-x11 is an example with X11 diff --git a/configs/sim/nx/defconfig b/configs/sim/nx/defconfig index 4717caac980..8e1ec8810f6 100644 --- a/configs/sim/nx/defconfig +++ b/configs/sim/nx/defconfig @@ -297,7 +297,7 @@ CONFIG_NET_RESOLV_ENTRIES=4 # # Graphics related configuration settings # -# CONFIG_NXGRAPHICS +# CONFIG_NX # Enables overall support for graphics library and NX # CONFIG_NX_MULTIUSER # Configures NX in multi-user mode @@ -305,44 +305,69 @@ CONFIG_NET_RESOLV_ENTRIES=4 # Some YUV color formats requires support for multiple planes, # one for each color component. Unless you have such special # hardware, this value should be undefined or set to 1 -# CONFIG_NXGLIB_DISABLE_1BPP, CONFIG_NXGLIB_DISABLE_2BPP, -# CONFIG_NXGLIB_DISABLE_4BPP, CONFIG_NXGLIB_DISABLE_8BPP, -# CONFIG_NXGLIB_DISABLE_16BPP, CONFIG_NXGLIB_DISABLE_24BPP, and -# CONFIG_NXGLIB_DISABLE_32BPP +# CONFIG_NX_DISABLE_1BPP, CONFIG_NX_DISABLE_2BPP, +# CONFIG_NX_DISABLE_4BPP, CONFIG_NX_DISABLE_8BPP, +# CONFIG_NX_DISABLE_16BPP, CONFIG_NX_DISABLE_24BPP, and +# CONFIG_NX_DISABLE_32BPP # NX supports a variety of pixel depths. You can save some # memory by disabling support for unused color depths. -# CONFIG_NXGL_PACKEDMSFIRST +# CONFIG_NX_PACKEDMSFIRST # If a pixel depth of less than 8-bits is used, then NX needs # to know if the pixels pack from the MS to LS or from LS to MS # CONFIG_NX_MOUSE # Build in support for mouse input # CONFIG_NX_KBD # Build in support of keypad/keyboard input +# 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 +# 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_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 a visible portion of the window. +# CONFIG_NXFONTS_CHARBITS +# The number of bits in the character set. Current options are +# only 7 and 8. The default is 7. +# CONFIG_NXFONT_SANS +# At present, there is only one font. But if there were were more, +# then this option would select the sans serif font. # # NX Multi-user only options: # # CONFIG_NX_BLOCKING # Open the client message queues in blocking mode. In this case, -# nx_eventhandler() will never return. +# nx_eventhandler() will not return until a message is received and processed. # CONFIG_NX_MXSERVERMSGS and CONFIG_NX_MXCLIENTMSGS # Specifies the maximum number of messages that can fit in # the message queues. No additional resources are allocated, but # this can be set to prevent flooding of the client or server with # too many messages (CONFIG_PREALLOC_MQ_MSGS controls how many # messages are pre-allocated). -CONFIG_NXGRAPHICS=y +# +CONFIG_NX=y CONFIG_NX_MULTIUSER=n CONFIG_NX_NPLANES=1 -CONFIG_NXGLIB_DISABLE_1BPP=y -CONFIG_NXGLIB_DISABLE_2BPP=y -CONFIG_NXGLIB_DISABLE_4BPP=y -CONFIG_NXGLIB_DISABLE_8BPP=n -CONFIG_NXGLIB_DISABLE_16BPP=y -CONFIG_NXGLIB_DISABLE_24BPP=y -CONFIG_NXGLIB_DISABLE_32BPP=y -CONFIG_NXGL_PACKEDMSFIRST=n +CONFIG_NX_DISABLE_1BPP=y +CONFIG_NX_DISABLE_2BPP=y +CONFIG_NX_DISABLE_4BPP=y +CONFIG_NX_DISABLE_8BPP=n +CONFIG_NX_DISABLE_16BPP=y +CONFIG_NX_DISABLE_24BPP=y +CONFIG_NX_DISABLE_32BPP=y +CONFIG_NX_PACKEDMSFIRST=n CONFIG_NX_MOUSE=y CONFIG_NX_KBD=y +#CONFIG_NXTK_BORDERWIDTH=4 +#CONFIG_NXTK_BORDERCOLOR1 +#CONFIG_NXTK_BORDERCOLOR2 +CONFIG_NXTK_AUTORAISE=n +CONFIG_NXFONT_SANS=y +CONFIG_NXFONTS_CHARBITS=7 CONFIG_NX_BLOCKING=y CONFIG_NX_MXSERVERMSGS=32 CONFIG_NX_MXCLIENTMSGS=16 diff --git a/configs/sim/nx/defconfig-x11 b/configs/sim/nx/defconfig-x11 index 88097ab66ac..e82f32aa9ab 100644 --- a/configs/sim/nx/defconfig-x11 +++ b/configs/sim/nx/defconfig-x11 @@ -297,7 +297,7 @@ CONFIG_NET_RESOLV_ENTRIES=4 # # Graphics related configuration settings # -# CONFIG_NXGRAPHICS +# CONFIG_NX # Enables overall support for graphics library and NX # CONFIG_NX_MULTIUSER # Configures NX in multi-user mode @@ -305,44 +305,69 @@ CONFIG_NET_RESOLV_ENTRIES=4 # Some YUV color formats requires support for multiple planes, # one for each color component. Unless you have such special # hardware, this value should be undefined or set to 1 -# CONFIG_NXGLIB_DISABLE_1BPP, CONFIG_NXGLIB_DISABLE_2BPP, -# CONFIG_NXGLIB_DISABLE_4BPP, CONFIG_NXGLIB_DISABLE_8BPP, -# CONFIG_NXGLIB_DISABLE_16BPP, CONFIG_NXGLIB_DISABLE_24BPP, and -# CONFIG_NXGLIB_DISABLE_32BPP +# CONFIG_NX_DISABLE_1BPP, CONFIG_NX_DISABLE_2BPP, +# CONFIG_NX_DISABLE_4BPP, CONFIG_NX_DISABLE_8BPP, +# CONFIG_NX_DISABLE_16BPP, CONFIG_NX_DISABLE_24BPP, and +# CONFIG_NX_DISABLE_32BPP # NX supports a variety of pixel depths. You can save some # memory by disabling support for unused color depths. -# CONFIG_NXGL_PACKEDMSFIRST +# CONFIG_NX_PACKEDMSFIRST # If a pixel depth of less than 8-bits is used, then NX needs # to know if the pixels pack from the MS to LS or from LS to MS # CONFIG_NX_MOUSE # Build in support for mouse input # CONFIG_NX_KBD # Build in support of keypad/keyboard input +# 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 +# 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_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 a visible portion of the window. +# CONFIG_NXFONTS_CHARBITS +# The number of bits in the character set. Current options are +# only 7 and 8. The default is 7. +# CONFIG_NXFONT_SANS +# At present, there is only one font. But if there were were more, +# then this option would select the sans serif font. # # NX Multi-user only options: # # CONFIG_NX_BLOCKING # Open the client message queues in blocking mode. In this case, -# nx_eventhandler() will never return. +# nx_eventhandler() will not return until a message is received and processed. # CONFIG_NX_MXSERVERMSGS and CONFIG_NX_MXCLIENTMSGS # Specifies the maximum number of messages that can fit in # the message queues. No additional resources are allocated, but # this can be set to prevent flooding of the client or server with # too many messages (CONFIG_PREALLOC_MQ_MSGS controls how many # messages are pre-allocated). -CONFIG_NXGRAPHICS=y +# +CONFIG_NX=y CONFIG_NX_MULTIUSER=n CONFIG_NX_NPLANES=1 -CONFIG_NXGLIB_DISABLE_1BPP=y -CONFIG_NXGLIB_DISABLE_2BPP=y -CONFIG_NXGLIB_DISABLE_4BPP=y -CONFIG_NXGLIB_DISABLE_8BPP=y -CONFIG_NXGLIB_DISABLE_16BPP=y -CONFIG_NXGLIB_DISABLE_24BPP=y -CONFIG_NXGLIB_DISABLE_32BPP=n -CONFIG_NXGL_PACKEDMSFIRST=n +CONFIG_NX_DISABLE_1BPP=y +CONFIG_NX_DISABLE_2BPP=y +CONFIG_NX_DISABLE_4BPP=y +CONFIG_NX_DISABLE_8BPP=y +CONFIG_NX_DISABLE_16BPP=y +CONFIG_NX_DISABLE_24BPP=y +CONFIG_NX_DISABLE_32BPP=n +CONFIG_NX_PACKEDMSFIRST=n CONFIG_NX_MOUSE=y CONFIG_NX_KBD=y +#CONFIG_NXTK_BORDERWIDTH=4 +#CONFIG_NXTK_BORDERCOLOR1 +#CONFIG_NXTK_BORDERCOLOR2 +CONFIG_NXTK_AUTORAISE=n +CONFIG_NXFONT_SANS=y +CONFIG_NXFONTS_CHARBITS=7 CONFIG_NX_BLOCKING=y CONFIG_NX_MXSERVERMSGS=32 CONFIG_NX_MXCLIENTMSGS=16