Compare commits

...
64 Commits
Author SHA1 Message Date
Vincent Wei 1cfd25b317 fix minor bugs 2020-02-19 22:01:17 +08:00
Vincent Wei 2d5ad370f3 change link to licensing policy 2019-11-13 11:59:45 +08:00
Vincent Wei 684c4248d2 check AARCH64 and RISCV architectures 2019-11-04 08:49:38 +08:00
Vincent Wei 0373c77323 tune 2019-10-31 11:42:47 +08:00
Vincent Wei 56fd0a1050 release version 3.2.3 2019-10-31 11:28:20 +08:00
Vincent Wei fbba2ebd1a cleanup 2019-10-31 10:46:47 +08:00
Vincent Wei 33b3ad0bd3 clean code for 64-bit 2019-10-31 10:44:40 +08:00
Vincent Wei 9bee00cf9f remove targetname movidius 2019-10-31 10:26:14 +08:00
Vincent Wei aedcffacf7 cleanup 2019-10-31 10:23:12 +08:00
Vincent Wei c91eeddd2c cleanup 2019-10-31 10:15:42 +08:00
Vincent Wei 2ac54f9ee6 cleanup for new release 2019-10-31 10:02:18 +08:00
Vincent Wei 20f160074f Change version to 3.2.3 2019-10-31 09:55:06 +08:00
Vincent Wei 437769c1a4 use #ifdef instead of #if for HAVE_LIMITS_H 2019-10-31 09:53:26 +08:00
Vincent Wei 69eebf37e3 use HAVE_LIMITS_H for the system header <limits.h> 2019-10-31 09:50:09 +08:00
Vincent Wei 4ea6912024 clean up new code for supporting RTEMS 2019-10-31 09:38:25 +08:00
gengyue 6b2039c151 for rtems 2019-10-31 08:55:47 +08:00
gengyue d7eed07222 for rtems 2019-10-31 08:55:17 +08:00
gengyue 6f033d8e93 for rtems 2019-10-31 08:46:47 +08:00
gengyue 193f5e58b1 add socklen_t 2019-10-31 08:39:55 +08:00
Vincent Wei 75dabce7af tune for minigui-docs 2019-10-23 19:09:21 +08:00
Vincent Wei 2149a6aa5e restore build/rules-pc.linux and fix errors in makefile.ng files 2019-10-18 15:43:38 +08:00
Vincent Wei bf8a9fee5c remove standalone option 2019-10-17 16:41:47 +08:00
Vincent Wei 8556f15e36 Exception List Statement 2019-07-15 14:42:46 +08:00
Vincent Wei 57215b9e59 add *.in~ 2019-06-06 10:55:59 +08:00
Vincent Wei 6201664035 remove getpt from function checking list 2019-06-06 10:19:19 +08:00
Vincent Wei 7303f40b2e add static for inline function to avoid duplicated definitions when using old GCC 2019-06-06 10:18:35 +08:00
Vincent Wei 42b10aed6a optimize ThrowAwayMessages 2019-05-16 10:22:37 +08:00
Vincent Wei d9dc070698 change binary age to 2 2019-04-29 18:51:57 +08:00
Vincent Wei ee5a1f86a7 fixbug of FT2 subpixel glyph rendering 2019-04-29 17:34:45 +08:00
gengyue d335e008ad modified for rtems 2019-04-24 20:10:36 +08:00
gengyue 268695a94b modified for rtems 2019-04-24 19:56:20 +08:00
Vincent Wei 1d211ed855 cleanup 2019-04-15 16:28:50 +08:00
Vincent Wei a7eaab6d38 use inline functions for --disable-cursor instead of macros 2019-04-15 16:26:22 +08:00
Vincent Wei 7d671c8318 tune release notes for LoadDevFontFromFile 2019-04-15 15:57:58 +08:00
Vincent Wei 76f4bf3661 add const to INNER_RES 2019-04-15 15:54:39 +08:00
Vincent Wei 4f51baac32 tune 2019-04-15 10:12:25 +08:00
Vincent Wei 4fa002216e tune release notes 2019-04-12 15:49:42 +08:00
Vincent Wei 6dc8696c08 Remove char_type and bidi_type from GLYPHINFO 2019-04-12 15:41:23 +08:00
Vincent Wei 06c497d671 tune 2019-04-12 14:39:02 +08:00
Vincent Wei 79267be62c use sys/sysmacros.h for makedev 2019-04-11 17:36:02 +08:00
Vincent Wei 9475ff227f add LoadDevFontFromIncoreData 2019-04-09 10:57:30 +08:00
Vincent Wei f562661146 use 0xff for alpha of RGB2Pixel 2019-04-09 10:47:38 +08:00
Vincent Wei eca15c447d check li.bpp with the requested bpp 2019-04-08 13:48:16 +08:00
Vincent Wei 736a532b1a use standard pixel format for alpha_pixel_format 2019-04-07 17:16:53 +08:00
Vincent Wei 5a0fc2e74f tune 2019-04-07 16:25:43 +08:00
Vincent Wei 12106c036c tune 2019-04-07 16:13:17 +08:00
Vincent Wei debd8a3fdd introduce exstubs.h header file to define the interfaces for commlcd NEWGAL engine, comm IAL engine, and custom IAL engine 2019-04-07 16:09:39 +08:00
Vincent Wei ac6d4019d5 fix typo 2019-04-06 13:58:49 +08:00
Vincent Wei 61dd46f965 handle SIGINT 2019-04-06 13:55:19 +08:00
Vincent Wei 3f53804f62 fix bugs 2019-03-31 15:38:39 +08:00
Vincent Wei f8e9dea491 tune release notes 2019-03-04 17:07:03 +08:00
Vincent Wei 8943cc75ec italic enabled for subpixeled glyph 2019-03-04 17:01:08 +08:00
Vincent Wei ebf765f4ad only override BITMAP size for monobitmap 2019-03-04 16:58:08 +08:00
Vincent Wei 3b61f25bb5 merge some changes from dev-3-4 for fix some bugs about freetype2 font engine and vbf font engine. 2019-03-04 12:55:09 +08:00
Vincent Wei ea20032dae fix a potential bug: reserve key when creating logfont by calling CreateLogFontIndirect 2019-01-19 14:06:18 +08:00
Vincent Wei 9245091b87 tune 2019-01-15 17:17:48 +08:00
Vincent Wei 747894247b tune release notes 2019-01-15 16:18:45 +08:00
Vincent Wei 1ed5b44926 cleanup for 3.2.2 2019-01-15 15:13:50 +08:00
Vincent Wei 16287af2a6 fix the bug of wrong bbox handling for SUBPIXEL rendering of glyph 2019-01-15 14:53:57 +08:00
Vincent Wei c975fe5b8d tune release notes 2019-01-13 16:23:57 +08:00
Vincent Wei b4569adbd5 skipp null pixels for subpixel glyph 2019-01-13 16:22:34 +08:00
Vincent Wei 715a44beeb typo for pitch 2019-01-13 14:32:49 +08:00
Vincent Wei e6bb4fa05f tune RELEASE NOTES 2019-01-13 14:24:14 +08:00
Vincent Wei c436af69bb fixbug: No need to make the pitch of FT2 monobitmap is single-byte aligned 2019-01-13 14:22:54 +08:00
967 changed files with 3576 additions and 3604 deletions
+1
View File
@@ -22,4 +22,5 @@ Makefile.in
/*.pc /*.pc
/*config.h /*config.h
/*config.h.in /*config.h.in
/*config.h.in~
+35 -25
View File
@@ -2,7 +2,6 @@
A mature and proven cross-platform GUI system for embedded and smart IoT devices. A mature and proven cross-platform GUI system for embedded and smart IoT devices.
## TABLE OF CONTENTS ## TABLE OF CONTENTS
1. Introduction 1. Introduction
@@ -22,7 +21,7 @@ A mature and proven cross-platform GUI system for embedded and smart IoT devices
MiniGUI is a mature cross-platform windowing system and a GUI (Graphics MiniGUI is a mature cross-platform windowing system and a GUI (Graphics
User Interface) support system for embedded systems and smart IoT devices. User Interface) support system for embedded systems and smart IoT devices.
This is the version 3.2.x of MiniGUI maintained by WEI Yongming This is the version 3.2.x of MiniGUI maintained by WEI Yongming
(Vincent Wei, https://github.com/VincentWei). (Vincent Wei, <https://github.com/VincentWei>).
MiniGUI is released under GPLv3 and the dual-licensing applies to commercial MiniGUI is released under GPLv3 and the dual-licensing applies to commercial
use. use.
@@ -30,42 +29,36 @@ use.
MiniGUI aims to provide a fast, stable, full-featured, and cross-platform MiniGUI aims to provide a fast, stable, full-featured, and cross-platform
windowing and GUI support system, which is especially fit for windowing and GUI support system, which is especially fit for
embedded systems or smart IoT devices based-on Linux/uClinux, eCos, and other embedded systems or smart IoT devices based-on Linux/uClinux, eCos, and other
traditional RTOSes, such as VxWorks, ThreadX, Nucleus, pSOS, uC/OS-II, traditional RTOSes, such as RTEMS, VxWorks, ThreadX, Nucleus, pSOS, uC/OS-II,
and OSE. and OSE.
This is the MiniGUI core source tree, which provides windowing This is the MiniGUI core source tree, which provides windowing
and graphics interfaces as well as a lot of standard controls (tookit). and graphics interfaces as well as a lot of standard controls (toolkit).
Besides MiniGUI core, FMSoft also provides some components Besides MiniGUI core, FMSoft also provides some components
for the developers to develop app much easier: for the developers to develop app much easier:
* mGUtils: A MiniGUI component which contains miscellaneous utilities * mGUtils: A MiniGUI component which contains miscellaneous utilities
like ColorSelectionDialogBox, FileOpenDialogBox, and so on. like `ColorSelectionDialogBox`, `FileOpenDialogBox`, and so on.
* mGPlus: A MiniGUI component which provides support for advanced graphics * mGPlus: A MiniGUI component which provides support for advanced graphics
functions like path, gradient, anti-aliase stretch, and color combination. functions like path, gradient, anti-aliased stretch, and color combination.
* mGEff: mGEff provides an animation framework for MiniGUI app. * mGEff: mGEff provides an animation framework for MiniGUI app.
It also provides some popular UI/UE special effects. It also provides some popular UI/UE special effects.
* mGNCS: This component provides a new control set for MiniGUI app. * mGNCS: This component provides a new control set for MiniGUI app.
By using mGNCS, you can use miniStudio to develop MiniGUI app in By using mGNCS, you can use miniStudio to develop MiniGUI app in
WYSIWYG way. WYSIWYG way.
* mGNCS4Touch: This component provides some new controls, which are * mGNCS4Touch: This component provides some new controls, which are
compliant to the new control API spec of mGNCS, for devices with compliant to the new control API spec of mGNCS, for devices with
a touch screen. a touch screen.
There are also some legacy MiniGUI components. We will not maintain these There are also some legacy MiniGUI components. We will not maintain these
components for MiniGUI core v3.2: components for MiniGUI 3.2.x:
* mGi: An input method component for MiniGUI. This component provides * mGi: An input method component for MiniGUI. This component provides
some typical input methods (such as softkey, hand-writing, and predict some typical input methods (such as soft keyboard, hand-writing, and predict
text input for mobile phone) for MiniGUI apps. text input for mobile phone) for MiniGUI apps.
* mGp: A printing component for MiniGUI. By using mGp, you can print * mGp: A printing component for MiniGUI. By using mGp, you can print
out the graphics created by MiniGUI app to general-purpose printers. out the graphics created by MiniGUI app to general-purpose printers.
* mG3d: A simple three-dimension component for MiniGUI. This component * mG3d: A simple three-dimension component for MiniGUI. This component
provides a simple 3D API for app. You can use mG3d to create simple provides a simple 3D API for app. You can use mG3d to create simple
3D UI. 3D UI.
@@ -80,7 +73,7 @@ as a free software project.
You can download the source code tarball of MiniGUI and the dependent libraries You can download the source code tarball of MiniGUI and the dependent libraries
from the download zone of the site: from the download zone of the site:
http://www.minigui.com <http://www.minigui.com>
FMSoft also releases some open source apps for MiniGUI on the site above, FMSoft also releases some open source apps for MiniGUI on the site above,
for examples: for examples:
@@ -88,26 +81,26 @@ for examples:
* mDolphin, licensed under Apache 2.0, is a full-featured * mDolphin, licensed under Apache 2.0, is a full-featured
WEB/WAP browser, which is developed based on the open source browser WEB/WAP browser, which is developed based on the open source browser
core WebKit and uses MiniGUI as its underlying graphics support system. core WebKit and uses MiniGUI as its underlying graphics support system.
* mGallery, licensed under Apache 2.0, intends to * mGallery, licensed under Apache 2.0, intends to
provide a total solution for PMP (Portable Multimedia Player), provide a total solution for PMP (Portable Multimedia Player),
which uses MiniGUI as the graphics platform. which uses MiniGUI as the graphics platform.
* mSpider, licensed under GPL 3.0, intends to provide a * mSpider, licensed under GPL 3.0, intends to provide a
light-weight MiniGUI-based web browser (HTML 3.2 and part JavaScript) light-weight MiniGUI-based web browser (HTML 3.2 and part JavaScript)
* mEagle, licensed under GPL 3.0, is an embedded GIS development platform * mEagle, licensed under GPL 3.0, is an embedded GIS development platform
which addresses the needs of map browse, query, analysis, etc which addresses the needs of map browse, query, analysis, etc
FMSoft had created the public repositories for MiniGUI core, MiniGUI FMSoft had created the public repositories for MiniGUI core, MiniGUI
components, and other open source apps on GitHub. You can visit them on: components, and other open source apps on GitHub. You can visit them on:
https://github.com/VincentWei <https://github.com/VincentWei>
FMSoft also releases miniStudio, which is a WYSIWYG IDE for MiniGUI, as a shareware. and
You can also download it from the official site of MiniGUI.
http://www.minigui.com/en/download <https://github.com/FMSoftCN>
We now maintain all documents about MiniGUI on the following public repo:
<https://github.com/VincentWei/minigui-docs>
## A BRIEF BUILDING INSTRUCTION ## A BRIEF BUILDING INSTRUCTION
@@ -344,12 +337,12 @@ the commercial license of MiniGUI, please refer to the LICENSE-POLICY file.
We provide you the commercial license of MiniGUI according to the number We provide you the commercial license of MiniGUI according to the number
of the run-time binary copies of MiniGUI. If you are interested in of the run-time binary copies of MiniGUI. If you are interested in
the commercial license of MiniGUI, please write to sales@minigui.com. the commercial license of MiniGUI, please write to <sales@minigui.com>
## COPYING ## COPYING
Copyright (C) 2002~2018, Beijing FMSoft Technologies Co., Ltd. Copyright (C) 2002 ~ 2019, Beijing FMSoft Technologies Co., Ltd.
Copyright (C) 1998 ~ 2002, WEI Yongming Copyright (C) 1998 ~ 2002, WEI Yongming
This program is free software: you can redistribute it and/or modify This program is free software: you can redistribute it and/or modify
@@ -375,5 +368,22 @@ the commercial license of MiniGUI, please write to sales@minigui.com.
under the terms and conditions of the commercial license. under the terms and conditions of the commercial license.
For more information about the commercial license, please refer to For more information about the commercial license, please refer to
<http://www.minigui.com/en/about/licensing-policy/>. <http://www.minigui.com/blog/minigui-licensing-policy/>.
### Special Statement
The above open source or free software license does
not apply to any entity in the Exception List published by
Beijing FMSoft Technologies Co., Ltd.
If you are or the entity you represent is listed in the Exception List,
the above open source or free software license does not apply to you
or the entity you represent. Regardless of the purpose, you should not
use the software in any way whatsoever, including but not limited to
downloading, viewing, copying, distributing, compiling, and running.
If you have already downloaded it, you MUST destroy all of its copies.
The Exception List is published by FMSoft and may be updated
from time to time. For more information, please see
<https://www.fmsoft.cn/exception-list>.
+40 -13
View File
@@ -1,34 +1,55 @@
# Release Notes # Release Notes
## Version 3.2.1 ## Version 3.2.3
The MiniGUI development team announces the availability of MiniGUI 3.2.1. The MiniGUI development team announces the availability of MiniGUI 3.2.3.
All users of MiniGUI are recommended strongly to use this version. All users of MiniGUI are recommended strongly to use this version.
Please report any bugs and incompatibilities in Please report any bugs and incompatibilities in
https://github.com/VincentWei/minigui. <https://github.com/VincentWei/minigui/tree/rel-3-2>
### What's new in this version
* ENHANCEMENTS:
- Support for RTEMS operating system.
* BUGFIXES:
- Fixed errors in makefile.ng files.
* CLEANUP:
- `README.md` for correct markdown tags.
### What's new in this version
## Version 3.2.2
The MiniGUI development team announces the availability of MiniGUI 3.2.2.
All users of MiniGUI are recommended strongly to use this version.
Please report any bugs and incompatibilities in
<https://github.com/VincentWei/minigui>
### What's new in this version ### What's new in this version
* ENHANCEMENTS: * ENHANCEMENTS:
1. Add a new key `dpi` for NEWGAL engine to define the DPI of the screen.
If it is absent, use 96 as the default DPI.
1. Add an item for `GetGDCapability` to return DPI of the DC.
1. New API `InitSlaveScreenEx` to specify the DPI of slave screen.
Define `InitSlaveScreen` as an inline function calling `InitSlaveScreenEx`.
1. New API: `SyncUpdateDC`. You can use this function to synchronize 1. New API: `SyncUpdateDC`. You can use this function to synchronize
the update rectangles of a surface to screen, if the surface the update rectangles of a surface to screen, if the surface
represents the shadow frame buffer of the screen. represents the shadow frame buffer of the screen.
* configure option: `--enable-syncupdate` * configure option: `--enable-syncupdate`
* macro: `_MGUSE_SYNC_UPDATE` * macro: `_MGUSE_SYNC_UPDATE`
1. New API: `UpdateInvalidClient`. You can use this function to update 1. New API `UpdateInvalidClient`. You can use this function to update
the invalid client region of a window instantly. the invalid client region of a window instantly.
1. New API `LoadDevFontFromIncoreData`. You can use this function to load
a device font from incore data.
1. Use different colors for the output of `_DBG_PRINTF` and `_ERR_PRINTF`. 1. Use different colors for the output of `_DBG_PRINTF` and `_ERR_PRINTF`.
1. Add `__mg_save_jpg` function for storing MYBITMAP as JPEG file (10km). 1. Add `__mg_save_jpg` function for storing MYBITMAP as JPEG file (10km).
1. Modified logic for checking JPEG format (10km). 1. Modified logic for checking JPEG format (10km).
1. Support BIDI for UNICODE charsets and cleanup the implementation. 1. Support BIDI for UNICODE charsets and cleanup the implementation.
* New API: `GetGlyphBIDIType` to get the glyph type in BIDI. * New API: `GetGlyphBIDIType` to get the glyph type in BIDI.
* New DC attribute: BIDI flag. * New DC attribute: BIDI flag.
1. Add a new key `dpi` for NEWGAL engine to define the DPI of the screen.
If it is absent, use 96 as the default DPI.
1. Add an item for `GetGDCapability` to return DPI of the DC.
1. New API `InitSlaveScreenEx` to specify the DPI of slave screen.
Define `InitSlaveScreen` as an inline function calling `InitSlaveScreenEx`.
1. Enhance commlcd engint to support more pixel type and synchronously update. 1. Enhance commlcd engint to support more pixel type and synchronously update.
1. New USVFB IAL engine and NEWGAL engine for web display server. 1. New USVFB IAL engine and NEWGAL engine for web display server.
1. New type: `QDWORD` for a quauter of DWORD. This type is 16-bit long on 1. New type: `QDWORD` for a quauter of DWORD. This type is 16-bit long on
@@ -39,13 +60,19 @@ Please report any bugs and incompatibilities in
* `SECOND_QDWORD`: get the second (LSB) QDWORD from a DWORD. * `SECOND_QDWORD`: get the second (LSB) QDWORD from a DWORD.
* `THIRD_QDWORD`: get the third (LSB) QDWORD from a DWORD. * `THIRD_QDWORD`: get the third (LSB) QDWORD from a DWORD.
* `FOURTH_QDWORD`: get the fourth (LSB) QDWORD from a DWORD. * `FOURTH_QDWORD`: get the fourth (LSB) QDWORD from a DWORD.
1. New header for CommLCD NEWGAL engine and COMM IAL engine:
`<minigui/exstubs.h>`.
* BUGFIXING: * BUGFIXING:
1. handle `PNG_COLOR_TYPE_GRAY_ALPHA` color type of PNG files. 1. handle `PNG_COLOR_TYPE_GRAY_ALPHA` color type of PNG files.
1. Fix a bug to free a null pointer (ReleaseDC). 1. Fix a bug to free a null pointer (ReleaseDC).
1. No need to make the pitch of FT2 monobitmap is single-byte aligned.
* TUNNING: This bug may generate dirty dots for monobitmap glyph from TTF.
1. Tune GLYPHINFO structure and GetGlyphInfo to return BIDI glyph type. 1. Skip null pixels for SUBPIXEL glyphs. This bug will always show background
pixels of one SUBPIXEL glyph.
1. Fix the bug of wrong bounding box handling for SUBPIXEL rendering of glyph.
1. Tune cache implementation of FreeType2 font engine.
* Enable cache for rotated LOGFONT.
## Version 3.2.0 ## Version 3.2.0
@@ -53,7 +80,7 @@ The MiniGUI development team announces the availability of MiniGUI 3.2.0.
All users of MiniGUI are recommended strongly to use this version for new All users of MiniGUI are recommended strongly to use this version for new
MiniGUI apps. Please report any bugs and incompatibilities in MiniGUI apps. Please report any bugs and incompatibilities in
https://github.com/VincentWei/minigui. https://github.com/VincentWei/minigui
### What's new in this version ### What's new in this version
+2 -2
View File
@@ -1,4 +1,4 @@
Version 3.2.0 (2018/02/10) Version 3.2.3 (2019/10/31)
This release needs the following resource packages: This release needs the following resource packages:
@@ -6,4 +6,4 @@ This release needs the following resource packages:
The latest samples package is: The latest samples package is:
* mg-samples-3.2.0.tar.gz * mg-samples-3.2.2.tar.gz
+1
View File
@@ -1,6 +1,7 @@
#!/bin/sh #!/bin/sh
./configure \ ./configure \
--with-runmode=ths \
--disable-dblclk \ --disable-dblclk \
--disable-cursor \ --disable-cursor \
--disable-mousecalibrate \ --disable-mousecalibrate \
+44
View File
@@ -0,0 +1,44 @@
#!/bin/sh
RTEMS_DIR=/home/projects/movidius/m8_gui/tools/18.11.4/linux64/sparc-myriad-rtems-6.3.0
#RTEMS_GLOBAL_CFLAGS="-ffunction-sections -fdata-sections -fno-rtti -fno-exceptions -finit-priority"
rm -f config.cache config.status
CC=${RTEMS_DIR}/bin/sparc-myriad-rtems-gcc \
CFLAGS="-I${RTEMS_DIR}/sparc-myriad-rtems/include -I${RTEMS_DIR}/pnglib/include -I${RTEMS_DIR}/zlib/include" \
LDFLAGS="-L${RTEMS_DIR}/lib/gcc/sparc-myriad-rtems/6.3.0 -L${RTEMS_DIR}/pnglib/lib -L${RTEMS_DIR}/zlib/lib" \
./configure --prefix=/home/projects/movidius/m8_gui/tools/18.11.4/linux64/sparc-myriad-rtems-6.3.0/minigui \
--build=i686-linux \
--host=sparc-myriad-rtems \
--target=sparc-myriad-rtems \
--with-osname=rtems \
--with-runmode=ths \
--enable-miniguientry \
--enable-incoreres \
--disable-cursor \
--disable-videofbcon \
--disable-qvfbial \
--disable-vbfsupport \
--disable-qpfsupport \
--disable-latin9support \
--enable-gbksupport \
--disable-big5support \
--enable-unicodesupport \
--disable-savebitmap \
--disable-jpgsupport \
--disable-pngsupport \
--disable-aboutdlg \
--enable-adv2dapi \
--enable-videodummy \
--disable-consoleial \
--disable-videopcxvfb \
--with-targetname=external \
--enable-pngsupport \
--disable-develmode \
--disable-detaildebug \
--disable-tracemsg \
--enable-videocommlcd \
--enable-commial \
--disable-splash
+36
View File
@@ -0,0 +1,36 @@
# rules for pc-linux
# set your own targaet_os
TARGET_OS=linux
##################################################
# set your compile tool #
CC=gcc
CXX=g++
CPP=g++
AR=ar
AS=as
RANLIB=ranlib
MAKE=/usr/bin/make
##################################################
ARFLAGS=-rc
COFLAG=-c
OBJ=o
LIBA=a
##################################################
# if you don't want to create dynamic, delete it #
LIBSO=so
SOFLAGS=-fPIC -shared -o
##################################################
##################################################
# set your compile flags and install prefix path #
PREFIX=/usr/local
CFLAGS+=-g -Wall -fPIC `pkg-config --cflags freetype2`
LDFLAGS+=
##################################################
+18 -15
View File
@@ -1,6 +1,6 @@
dnl Process this file with autoconf to produce a configure script. dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.60) AC_PREREQ(2.60)
AC_INIT(libminigui, 3.2.0) AC_INIT(libminigui, 3.2.3)
AC_CONFIG_SRCDIR(src/main/main.c) AC_CONFIG_SRCDIR(src/main/main.c)
dnl Set various version strings - taken gratefully from the SDL sources dnl Set various version strings - taken gratefully from the SDL sources
@@ -16,9 +16,9 @@ dnl Set various version strings - taken gratefully from the SDL sources
# #
MINIGUI_MAJOR_VERSION=3 MINIGUI_MAJOR_VERSION=3
MINIGUI_MINOR_VERSION=2 MINIGUI_MINOR_VERSION=2
MINIGUI_MICRO_VERSION=1 MINIGUI_MICRO_VERSION=3
MINIGUI_INTERFACE_AGE=0 MINIGUI_INTERFACE_AGE=0
MINIGUI_BINARY_AGE=1 MINIGUI_BINARY_AGE=3
MINIGUI_VERSION=$MINIGUI_MAJOR_VERSION.$MINIGUI_MINOR_VERSION.$MINIGUI_MICRO_VERSION MINIGUI_VERSION=$MINIGUI_MAJOR_VERSION.$MINIGUI_MINOR_VERSION.$MINIGUI_MICRO_VERSION
AC_SUBST(MINIGUI_MAJOR_VERSION) AC_SUBST(MINIGUI_MAJOR_VERSION)
@@ -62,7 +62,7 @@ dnl ========================================================================
dnl Checks for header files. dnl Checks for header files.
AC_HEADER_STDC AC_HEADER_STDC
AC_HEADER_DIRENT AC_HEADER_DIRENT
AC_CHECK_HEADERS(sys/types.h sys/time.h termio.h unistd.h math.h locale.h) AC_CHECK_HEADERS(limits.h math.h locale.h unistd.h termio.h sys/types.h sys/time.h)
dnl Checks for typedefs, structures, and compiler characteristics. dnl Checks for typedefs, structures, and compiler characteristics.
AC_C_CONST AC_C_CONST
@@ -76,7 +76,7 @@ AC_FUNC_ALLOCA
AC_FUNC_MEMCMP AC_FUNC_MEMCMP
AC_FUNC_MMAP AC_FUNC_MMAP
AC_FUNC_VPRINTF AC_FUNC_VPRINTF
AC_CHECK_FUNCS(time mktime localtime strdup strcasecmp strncasecmp strerror setlocale getpt) AC_CHECK_FUNCS(time mktime localtime strdup strcasecmp strncasecmp strerror setlocale)
dnl ======================================================================== dnl ========================================================================
dnl User selectable options dnl User selectable options
@@ -89,8 +89,6 @@ message_string="no"
runtime_mode="procs" runtime_mode="procs"
stand_alone="no"
incore_res="no" incore_res="no"
use_miniguientry="no" use_miniguientry="no"
fixed_math="yes" fixed_math="yes"
@@ -304,10 +302,6 @@ AC_ARG_WITH(runmode,
[ --with-runmode=procs/ths/sa the MiniGUI runtime mode <default=procs>], [ --with-runmode=procs/ths/sa the MiniGUI runtime mode <default=procs>],
runtime_mode=$withval) runtime_mode=$withval)
AC_ARG_ENABLE(standalone,
[ --enable-standalone build MiniGUI-Standalone version <default=no>],
stand_alone=$enableval)
AC_ARG_ENABLE(incoreres, AC_ARG_ENABLE(incoreres,
[ --enable-incoreres use incore resource instead file IO to initialize MiniGUI <default=no>], [ --enable-incoreres use incore resource instead file IO to initialize MiniGUI <default=no>],
incore_res=$enableval) incore_res=$enableval)
@@ -732,9 +726,8 @@ AC_ARG_ENABLE(ctrlbidisledit,
[ --enable-ctrlbidisledit include Single-Line BIDI EDIT control <default=no>], [ --enable-ctrlbidisledit include Single-Line BIDI EDIT control <default=no>],
build_ctrl_bidisledit=$enableval) build_ctrl_bidisledit=$enableval)
dnl enable new textedit AC_ARG_ENABLE(ctrlnewtextedit,
AC_ARG_ENABLE(newtextedit, [ --disable-ctrlnewtextedit include the new implementation of TEXTEDIT control <default=yes>],
[ --enable-ctrlnewtextedit include the new implementation of TEXTEDIT control <default=yes>],
build_ctrl_textedit_new=$enableval) build_ctrl_textedit_new=$enableval)
AC_ARG_ENABLE(ctrllistbox, AC_ARG_ENABLE(ctrllistbox,
@@ -1404,12 +1397,18 @@ case "$with_libsuffix" in
esac esac
AC_ARG_WITH(osname, AC_ARG_WITH(osname,
[ --with-osname=linux/uclinux/ecos/ucos2/swlinux/vxworks/win32/darwin/threadx/cygwin/nucleus/ose/psos]) [ --with-osname=linux/uclinux/ecos/ucos2/swlinux/vxworks/win32/darwin/threadx/cygwin/nucleus/ose/psos/rtems])
dnl configure.in file is used only for the following OSes: linux/uclinux/swlinux/ecos/darwin/cygwin dnl configure.in file is used only for the following OSes: linux/uclinux/swlinux/ecos/darwin/cygwin
dnl for other OSes, you should use makefile.ng or else. dnl for other OSes, you should use makefile.ng or else.
case "$with_osname" in case "$with_osname" in
rtems)
AC_DEFINE(__RTEMS__, 1,
[Define if compile for rtems])
AC_DEFINE(__NOUNIX__, 1,
[Define if compile for non-UNIX like OS])
;;
uclinux) uclinux)
AC_DEFINE(__uClinux__, 1, AC_DEFINE(__uClinux__, 1,
[Define if compile for uClinux]) [Define if compile for uClinux])
@@ -1513,6 +1512,10 @@ AC_ARG_WITH(targetname,
S3C6410/S3C2440/S3C2410/hi3560a Define the target board name]) S3C6410/S3C2440/S3C2410/hi3560a Define the target board name])
case "$with_targetname" in case "$with_targetname" in
external)
AC_DEFINE(__TARGET_EXTERNAL__, 1,
[Define for targets which use GAL and/or IAL engines and define the interfaces externally])
;;
fmsoft) fmsoft)
AC_DEFINE(__TARGET_FMSOFT__, 1, AC_DEFINE(__TARGET_FMSOFT__, 1,
[Define for FMSoft internal use]) [Define for FMSoft internal use])
+1 -1
View File
@@ -11,7 +11,7 @@ COMM_HDRS = \
common.h endianrw.h fixedmath.h \ common.h endianrw.h fixedmath.h \
minigui.h gdi.h window.h control.h \ minigui.h gdi.h window.h control.h \
own_malloc.h own_stdio.h \ own_malloc.h own_stdio.h \
xvfb.h customial.h \ xvfb.h customial.h exstubs.h \
dti.c dti.c
UCOSII_HDRS=ucos2_pthread.h ucos2_semaphore.h UCOSII_HDRS=ucos2_pthread.h ucos2_semaphore.h
+4 -3
View File
@@ -38,7 +38,7 @@
under the terms and conditions of the commercial license. under the terms and conditions of the commercial license.
For more information about the commercial license, please refer to For more information about the commercial license, please refer to
<http://www.minigui.com/en/about/licensing-policy/>. <http://www.minigui.com/blog/minigui-licensing-policy/>.
\endverbatim \endverbatim
*/ */
@@ -262,7 +262,8 @@ MGUI_COMPILE_TIME_ASSERT(sint64, sizeof(Sint64) == 8);
*/ */
#if defined(__i386__) || defined(__ia64__) || defined(__x86_64__) || defined(__amd64) || \ #if defined(__i386__) || defined(__ia64__) || defined(__x86_64__) || defined(__amd64) || \
(defined(__alpha__) || defined(__alpha)) || \ (defined(__alpha__) || defined(__alpha)) || \
defined(__arm__) || \ defined(__arm__) || defined(__aarch64__) || \
defined(__riscv) || \
(defined(__CC_ARM) && !defined(__BIG_ENDIAN)) || \ (defined(__CC_ARM) && !defined(__BIG_ENDIAN)) || \
(defined(__mips__) && defined(__MIPSEL__)) || \ (defined(__mips__) && defined(__MIPSEL__)) || \
defined(__LITTLE_ENDIAN__) || \ defined(__LITTLE_ENDIAN__) || \
@@ -1701,7 +1702,7 @@ typedef struct _GAL_Rect {
#endif #endif
/* Commonly used definitions */ /* Commonly used definitions */
#if !defined(__NOUNIX__) || defined (__ECOS__) #ifdef HAVE_LIMITS_H
#include <limits.h> #include <limits.h>
#endif #endif
+1 -1
View File
@@ -37,7 +37,7 @@
under the terms and conditions of the commercial license. under the terms and conditions of the commercial license.
For more information about the commercial license, please refer to For more information about the commercial license, please refer to
<http://www.minigui.com/en/about/licensing-policy/>. <http://www.minigui.com/blog/minigui-licensing-policy/>.
\endverbatim \endverbatim
*/ */
+1 -1
View File
@@ -35,7 +35,7 @@
under the terms and conditions of the commercial license. under the terms and conditions of the commercial license.
For more information about the commercial license, please refer to For more information about the commercial license, please refer to
<http://www.minigui.com/en/about/licensing-policy/>. <http://www.minigui.com/blog/minigui-licensing-policy/>.
\endverbatim \endverbatim
*/ */
+1 -1
View File
@@ -35,7 +35,7 @@
under the terms and conditions of the commercial license. under the terms and conditions of the commercial license.
For more information about the commercial license, please refer to For more information about the commercial license, please refer to
<http://www.minigui.com/en/about/licensing-policy/>. <http://www.minigui.com/blog/minigui-licensing-policy/>.
\endverbatim \endverbatim
*/ */
+1 -1
View File
@@ -35,7 +35,7 @@
under the terms and conditions of the commercial license. under the terms and conditions of the commercial license.
For more information about the commercial license, please refer to For more information about the commercial license, please refer to
<http://www.minigui.com/en/about/licensing-policy/>. <http://www.minigui.com/blog/minigui-licensing-policy/>.
\endverbatim \endverbatim
*/ */
+1 -1
View File
@@ -35,7 +35,7 @@
under the terms and conditions of the commercial license. under the terms and conditions of the commercial license.
For more information about the commercial license, please refer to For more information about the commercial license, please refer to
<http://www.minigui.com/en/about/licensing-policy/>. <http://www.minigui.com/blog/minigui-licensing-policy/>.
\endverbatim \endverbatim
*/ */
+1 -1
View File
@@ -35,7 +35,7 @@
under the terms and conditions of the commercial license. under the terms and conditions of the commercial license.
For more information about the commercial license, please refer to For more information about the commercial license, please refer to
<http://www.minigui.com/en/about/licensing-policy/>. <http://www.minigui.com/blog/minigui-licensing-policy/>.
\endverbatim \endverbatim
*/ */
+1 -1
View File
@@ -35,7 +35,7 @@
under the terms and conditions of the commercial license. under the terms and conditions of the commercial license.
For more information about the commercial license, please refer to For more information about the commercial license, please refer to
<http://www.minigui.com/en/about/licensing-policy/>. <http://www.minigui.com/blog/minigui-licensing-policy/>.
\endverbatim \endverbatim
*/ */
+1 -1
View File
@@ -35,7 +35,7 @@
under the terms and conditions of the commercial license. under the terms and conditions of the commercial license.
For more information about the commercial license, please refer to For more information about the commercial license, please refer to
<http://www.minigui.com/en/about/licensing-policy/>. <http://www.minigui.com/blog/minigui-licensing-policy/>.
\endverbatim \endverbatim
*/ */
+1 -1
View File
@@ -35,7 +35,7 @@
under the terms and conditions of the commercial license. under the terms and conditions of the commercial license.
For more information about the commercial license, please refer to For more information about the commercial license, please refer to
<http://www.minigui.com/en/about/licensing-policy/>. <http://www.minigui.com/blog/minigui-licensing-policy/>.
\endverbatim \endverbatim
*/ */
+1 -1
View File
@@ -35,7 +35,7 @@
under the terms and conditions of the commercial license. under the terms and conditions of the commercial license.
For more information about the commercial license, please refer to For more information about the commercial license, please refer to
<http://www.minigui.com/en/about/licensing-policy/>. <http://www.minigui.com/blog/minigui-licensing-policy/>.
\endverbatim \endverbatim
*/ */
+2 -2
View File
@@ -35,7 +35,7 @@
under the terms and conditions of the commercial license. under the terms and conditions of the commercial license.
For more information about the commercial license, please refer to For more information about the commercial license, please refer to
<http://www.minigui.com/en/about/licensing-policy/>. <http://www.minigui.com/blog/minigui-licensing-policy/>.
\endverbatim \endverbatim
*/ */
@@ -871,7 +871,7 @@ typedef LVNM_ITEMRUP *PLVNM_ITEMRUP;
*/ */
#define LVM_GETITEMSTATE 0xF128 #define LVM_GETITEMSTATE 0xF128
/** /*
* \def LVM_GETSELECTEDCOLUMN * \def LVM_GETSELECTEDCOLUMN
* \brief Retrieves the index of the currently selected column of a listview. * \brief Retrieves the index of the currently selected column of a listview.
* *
+1 -1
View File
@@ -35,7 +35,7 @@
under the terms and conditions of the commercial license. under the terms and conditions of the commercial license.
For more information about the commercial license, please refer to For more information about the commercial license, please refer to
<http://www.minigui.com/en/about/licensing-policy/>. <http://www.minigui.com/blog/minigui-licensing-policy/>.
\endverbatim \endverbatim
*/ */
+1 -1
View File
@@ -35,7 +35,7 @@
under the terms and conditions of the commercial license. under the terms and conditions of the commercial license.
For more information about the commercial license, please refer to For more information about the commercial license, please refer to
<http://www.minigui.com/en/about/licensing-policy/>. <http://www.minigui.com/blog/minigui-licensing-policy/>.
\endverbatim \endverbatim
*/ */
+1 -1
View File
@@ -35,7 +35,7 @@
under the terms and conditions of the commercial license. under the terms and conditions of the commercial license.
For more information about the commercial license, please refer to For more information about the commercial license, please refer to
<http://www.minigui.com/en/about/licensing-policy/>. <http://www.minigui.com/blog/minigui-licensing-policy/>.
\endverbatim \endverbatim
*/ */
+1 -1
View File
@@ -35,7 +35,7 @@
under the terms and conditions of the commercial license. under the terms and conditions of the commercial license.
For more information about the commercial license, please refer to For more information about the commercial license, please refer to
<http://www.minigui.com/en/about/licensing-policy/>. <http://www.minigui.com/blog/minigui-licensing-policy/>.
\endverbatim \endverbatim
*/ */
+1 -1
View File
@@ -35,7 +35,7 @@
under the terms and conditions of the commercial license. under the terms and conditions of the commercial license.
For more information about the commercial license, please refer to For more information about the commercial license, please refer to
<http://www.minigui.com/en/about/licensing-policy/>. <http://www.minigui.com/blog/minigui-licensing-policy/>.
\endverbatim \endverbatim
*/ */
+1 -1
View File
@@ -35,7 +35,7 @@
under the terms and conditions of the commercial license. under the terms and conditions of the commercial license.
For more information about the commercial license, please refer to For more information about the commercial license, please refer to
<http://www.minigui.com/en/about/licensing-policy/>. <http://www.minigui.com/blog/minigui-licensing-policy/>.
\endverbatim \endverbatim
*/ */
+1 -1
View File
@@ -35,7 +35,7 @@
under the terms and conditions of the commercial license. under the terms and conditions of the commercial license.
For more information about the commercial license, please refer to For more information about the commercial license, please refer to
<http://www.minigui.com/en/about/licensing-policy/>. <http://www.minigui.com/blog/minigui-licensing-policy/>.
\endverbatim \endverbatim
*/ */
+1 -1
View File
@@ -35,7 +35,7 @@
under the terms and conditions of the commercial license. under the terms and conditions of the commercial license.
For more information about the commercial license, please refer to For more information about the commercial license, please refer to
<http://www.minigui.com/en/about/licensing-policy/>. <http://www.minigui.com/blog/minigui-licensing-policy/>.
\endverbatim \endverbatim
*/ */
+1 -1
View File
@@ -35,7 +35,7 @@
under the terms and conditions of the commercial license. under the terms and conditions of the commercial license.
For more information about the commercial license, please refer to For more information about the commercial license, please refer to
<http://www.minigui.com/en/about/licensing-policy/>. <http://www.minigui.com/blog/minigui-licensing-policy/>.
\endverbatim \endverbatim
*/ */
+1 -1
View File
@@ -35,7 +35,7 @@
under the terms and conditions of the commercial license. under the terms and conditions of the commercial license.
For more information about the commercial license, please refer to For more information about the commercial license, please refer to
<http://www.minigui.com/en/about/licensing-policy/>. <http://www.minigui.com/blog/minigui-licensing-policy/>.
\endverbatim \endverbatim
*/ */
+1 -1
View File
@@ -35,7 +35,7 @@
under the terms and conditions of the commercial license. under the terms and conditions of the commercial license.
For more information about the commercial license, please refer to For more information about the commercial license, please refer to
<http://www.minigui.com/en/about/licensing-policy/>. <http://www.minigui.com/blog/minigui-licensing-policy/>.
\endverbatim \endverbatim
*/ */
+1 -1
View File
@@ -35,7 +35,7 @@
under the terms and conditions of the commercial license. under the terms and conditions of the commercial license.
For more information about the commercial license, please refer to For more information about the commercial license, please refer to
<http://www.minigui.com/en/about/licensing-policy/>. <http://www.minigui.com/blog/minigui-licensing-policy/>.
\endverbatim \endverbatim
*/ */
+13 -13
View File
@@ -36,7 +36,7 @@
under the terms and conditions of the commercial license. under the terms and conditions of the commercial license.
For more information about the commercial license, please refer to For more information about the commercial license, please refer to
<http://www.minigui.com/en/about/licensing-policy/>. <http://www.minigui.com/blog/minigui-licensing-policy/>.
\endverbatim \endverbatim
*/ */
@@ -51,11 +51,6 @@
#ifndef GUI_IAL_CUSTOM_H #ifndef GUI_IAL_CUSTOM_H
#define GUI_IAL_CUSTOM_H #define GUI_IAL_CUSTOM_H
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
#define IAL_MOUSE_LEFTBUTTON 1 #define IAL_MOUSE_LEFTBUTTON 1
#define IAL_MOUSE_RIGHTBUTTON 2 #define IAL_MOUSE_RIGHTBUTTON 2
#define IAL_MOUSE_MIDDLEBUTTON 4 #define IAL_MOUSE_MIDDLEBUTTON 4
@@ -67,12 +62,12 @@ extern "C" {
#define IAL_MOUSEEVENT 1 #define IAL_MOUSEEVENT 1
#define IAL_KEYEVENT 2 #define IAL_KEYEVENT 2
typedef struct tagINPUT typedef struct tagINPUT {
{
char* id; char* id;
// Initialization and termination // Initialization and termination
BOOL (*init_input) (struct tagINPUT *input, const char* mdev, const char* mtype); BOOL (*init_input) (struct tagINPUT *input, const char* mdev,
const char* mtype);
void (*term_input) (void); void (*term_input) (void);
// Mouse operations // Mouse operations
@@ -99,14 +94,19 @@ typedef struct tagINPUT
} INPUT; } INPUT;
#ifdef _MGIAL_CUSTOM #ifdef _MGIAL_CUSTOM
extern BOOL InitCustomInput (INPUT* input, const char* mdev, const char* mtype);
extern void TermCustomInput (void); #ifdef __cplusplus
#endif extern "C" {
#endif /* __cplusplus */
BOOL InitCustomInput (INPUT* input, const char* mdev, const char* mtype);
void TermCustomInput (void);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif /* __cplusplus */ #endif /* __cplusplus */
#endif /* _MGIAL_CUSTOM */
#endif /* GUI_IAL_CUSTOM_H */ #endif /* GUI_IAL_CUSTOM_H */
+1 -1
View File
@@ -40,7 +40,7 @@
under the terms and conditions of the commercial license. under the terms and conditions of the commercial license.
For more information about the commercial license, please refer to For more information about the commercial license, please refer to
<http://www.minigui.com/en/about/licensing-policy/>. <http://www.minigui.com/blog/minigui-licensing-policy/>.
\endverbatim \endverbatim
*/ */
+114
View File
@@ -0,0 +1,114 @@
/**
* \file exstubs.h
* \author Wei Yongming <vincent@minigui.org>
* \date 2019/04/07
*
* \brief This file is the header for NEWGAL/IAL engines which should be
* implemented by an external module.
*
\verbatim
This file is part of MiniGUI, a mature cross-platform windowing
and Graphics User Interface (GUI) support system for embedded systems
and smart IoT devices.
Copyright (C) 2007~2018, Beijing FMSoft Technologies Co., Ltd.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
Or,
As this program is a library, any link to this program must follow
GNU General Public License version 3 (GPLv3). If you cannot accept
GPLv3, you need to be licensed from FMSoft.
If you have got a commercial license of this program, please use it
under the terms and conditions of the commercial license.
For more information about the commercial license, please refer to
<http://www.minigui.com/blog/minigui-licensing-policy/>.
\endverbatim
*/
/*
* MiniGUI for Linux/uClinux, eCos, uC/OS-II, VxWorks,
* pSOS, ThreadX, NuCleus, OSE, and Win32.
*/
#ifndef GUI_EXSTUBS_H
#define GUI_EXSTUBS_H
/* The pixel format defined by depth */
#define COMMLCD_PSEUDO_RGB332 1
#define COMMLCD_TRUE_RGB555 2
#define COMMLCD_TRUE_RGB565 3
#define COMMLCD_TRUE_RGB888 4
#define COMMLCD_TRUE_RGB0888 5
#define COMMLCD_TRUE_ARGB1555 6
#define COMMLCD_TRUE_ARGB8888 7
#define COMMLCD_TRUE_ABRG8888 8
#define COMMLCD_UPDATE_NONE 0
#define COMMLCD_UPDATE_SYNC 1
#define COMMLCD_UPDATE_ASYNC 2
struct commlcd_info {
int height; // vertical resolution of the screen
int width; // horinzontal resolution of the screen
int pitch; // Length of one scan line in bytes
int bpp; // Depth (bits-per-pixel)
int type; // Pixel type
int update_method; // Update method: none, asynchronously, or synchronously.
Uint8* fb; // Frame buffer
};
#define COMM_MOUSEINPUT 0x01
#define COMM_KBINPUT 0x02
#define COMM_MOUSELBUTTON 0x01
#define COMM_MOUSERBUTTON 0x04
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
/* external stubs for COMMLCD NEWGAL engine */
#ifdef _MGGAL_COMMLCD
int __commlcd_drv_init (void);
int __commlcd_drv_getinfo (struct commlcd_info *li,
int width, int height, int depth);
int __commlcd_drv_release (void);
int __commlcd_drv_setclut (int firstcolor, int ncolors, GAL_Color *colors);
int __commlcd_drv_update (const RECT* rc_dirty);
#endif /* _MGGAL_COMMLCD */
#ifdef _MGIAL_COMM
int __comminput_init (void);
int __comminput_ts_getdata (short *x, short *y, short *button);
int __comminput_kb_getdata (short *key, short *status);
int __comminput_wait_for_input (struct timeval *timeout);
void __comminput_deinit (void);
#endif /* _MGIAL_COMM */
#ifdef __cplusplus
}
#endif /* __cplusplus */
#endif /* GUI_EXSTUBS_H */
+1 -1
View File
@@ -37,7 +37,7 @@
under the terms and conditions of the commercial license. under the terms and conditions of the commercial license.
For more information about the commercial license, please refer to For more information about the commercial license, please refer to
<http://www.minigui.com/en/about/licensing-policy/>. <http://www.minigui.com/blog/minigui-licensing-policy/>.
\endverbatim \endverbatim
*/ */
+23 -18
View File
@@ -37,7 +37,7 @@
under the terms and conditions of the commercial license. under the terms and conditions of the commercial license.
For more information about the commercial license, please refer to For more information about the commercial license, please refer to
<http://www.minigui.com/en/about/licensing-policy/>. <http://www.minigui.com/blog/minigui-licensing-policy/>.
\endverbatim \endverbatim
*/ */
@@ -2769,7 +2769,7 @@ MG_EXPORT void GUIAPI RGB2Pixels (HDC hdc, const RGB* rgbs,
*/ */
static inline gal_pixel RGB2Pixel (HDC hdc, Uint8 r, Uint8 g, Uint8 b) static inline gal_pixel RGB2Pixel (HDC hdc, Uint8 r, Uint8 g, Uint8 b)
{ {
RGB rgb = {r, g, b, 0}; RGB rgb = {r, g, b, 0xFF};
gal_pixel pixel; gal_pixel pixel;
RGB2Pixels (hdc, &rgb, &pixel, 1); RGB2Pixels (hdc, &rgb, &pixel, 1);
@@ -6258,7 +6258,6 @@ MG_EXPORT BOOL GUIAPI ft2SetLcdFilter (LOGFONT* logfont, mg_FT_LcdFilter filter)
#endif #endif
#if defined(_MGFONT_QPF) || defined(_MGFONT_FT2) || defined(_MGFONT_TTF) || defined(_MGFONT_UPF)
/** /**
* \fn DEVFONT* GUIAPI LoadDevFontFromFile (const char* devfont_name, \ * \fn DEVFONT* GUIAPI LoadDevFontFromFile (const char* devfont_name, \
* const char* file_name) * const char* file_name)
@@ -6278,6 +6277,23 @@ MG_EXPORT BOOL GUIAPI ft2SetLcdFilter (LOGFONT* logfont, mg_FT_LcdFilter filter)
MG_EXPORT DEVFONT* GUIAPI LoadDevFontFromFile (const char *devfont_name, MG_EXPORT DEVFONT* GUIAPI LoadDevFontFromFile (const char *devfont_name,
const char *file_name); const char *file_name);
/**
* \fn DEVFONT* GUIAPI LoadDevFontFromIncoreData (const char* devfont_name, \
* const void* data)
* \brief Load device font from incore data.
*
* This function can be used to load device font from incore data.
*
* \param devfont_name The device font name.
* \param data The pointer to the incore font data.
*
* \return the pointer to the new device font on success, NULL on error.
*
* \sa GetNextDevFont, DestroyDynamicDevFont
*/
MG_EXPORT DEVFONT* GUIAPI LoadDevFontFromIncoreData (const char *devfont_name,
const void *data);
/** /**
* \fn void GUIAPI DestroyDynamicDevFont (DEVFONT **devfont) * \fn void GUIAPI DestroyDynamicDevFont (DEVFONT **devfont)
* \brief Destroy device font loaded dynamically from font file. * \brief Destroy device font loaded dynamically from font file.
@@ -6288,7 +6304,6 @@ MG_EXPORT DEVFONT* GUIAPI LoadDevFontFromFile (const char *devfont_name,
* \sa LoadDevFontFromFile * \sa LoadDevFontFromFile
*/ */
MG_EXPORT void GUIAPI DestroyDynamicDevFont (DEVFONT **devfont); MG_EXPORT void GUIAPI DestroyDynamicDevFont (DEVFONT **devfont);
#endif
/** @} end of font_fns */ /** @} end of font_fns */
@@ -8003,7 +8018,7 @@ MG_EXPORT HDC GUIAPI InitSlaveScreenEx (const char* name, const char* mode, int
* *
* \return Valid handle on success, HDC_INVALID on failure. * \return Valid handle on success, HDC_INVALID on failure.
*/ */
inline HDC InitSlaveScreen (const char* name, const char* mode) static inline HDC InitSlaveScreen (const char* name, const char* mode)
{ {
return InitSlaveScreenEx(name, mode, GDCAP_DPI_DEFAULT); return InitSlaveScreenEx(name, mode, GDCAP_DPI_DEFAULT);
} }
@@ -8760,10 +8775,8 @@ MG_EXPORT int GUIAPI DrawGlyph (HDC hdc, int x, int y, Glyph32 glyph_value,
MG_EXPORT int GUIAPI DrawGlyphString (HDC hdc, int x, int y, Glyph32* glyph_string, MG_EXPORT int GUIAPI DrawGlyphString (HDC hdc, int x, int y, Glyph32* glyph_string,
int len, int* adv_x, int* adv_y); int len, int* adv_x, int* adv_y);
#define GLYPH_INFO_TYPE 0x01 #define GLYPH_INFO_METRICS 0x01
#define GLYPH_INFO_BIDI_TYPE 0x02 #define GLYPH_INFO_BMP 0x02
#define GLYPH_INFO_METRICS 0x04
#define GLYPH_INFO_BMP 0x10
/*the type of glyph bitmap*/ /*the type of glyph bitmap*/
#define GLYPHBMP_TYPE_MONO 0x00 #define GLYPHBMP_TYPE_MONO 0x00
@@ -8780,18 +8793,10 @@ typedef struct _GLYPHINFO
/** /**
* The mask indicates if you want to get glyph type info, metrics, * The mask indicates if you want to get glyph type info, metrics,
* or bitmap infomation you want. Or'ed with the following values: * or bitmap infomation you want. Or'ed with the following values:
* - GLYPH_INFO_TYPE
* - GLYPH_INFO_BIDI_TYPE
* - GLYPH_INFO_METRICS * - GLYPH_INFO_METRICS
* - GLYPH_INFO_BMP * - GLYPH_INFO_BMP
*/ */
unsigned char mask; Uint32 mask;
/** The basic glyph type */
unsigned int glyph_type;
/** The BIDI glyph type */
unsigned int bidi_glyph_type;
/** The height of the glyph */ /** The height of the glyph */
int height; int height;
+73 -50
View File
@@ -37,7 +37,7 @@
under the terms and conditions of the commercial license. under the terms and conditions of the commercial license.
For more information about the commercial license, please refer to For more information about the commercial license, please refer to
<http://www.minigui.com/en/about/licensing-policy/>. <http://www.minigui.com/blog/minigui-licensing-policy/>.
\endverbatim \endverbatim
*/ */
@@ -2565,10 +2565,6 @@ MG_EXPORT void GUIAPI FreeFixStr (char* str);
* @{ * @{
*/ */
#ifndef _MGHAVE_CURSOR
static inline void do_nothing (void) { return; }
#endif
#ifdef _MGHAVE_CURSOR #ifdef _MGHAVE_CURSOR
/** /**
@@ -2730,12 +2726,34 @@ MG_EXPORT HCURSOR GUIAPI GetSystemCursor (int csrid);
* \return Handle to the current system cursor, zero means no current cursor. * \return Handle to the current system cursor, zero means no current cursor.
*/ */
MG_EXPORT HCURSOR GUIAPI GetCurrentCursor (void); MG_EXPORT HCURSOR GUIAPI GetCurrentCursor (void);
#else #else
#define LoadCursorFromFile(filename) (do_nothing(), 0)
#define CreateCursor(x, y, w, h, ANDbs, XORbs, cr) (do_nothing(), 0) static inline HCURSOR LoadCursorFromFile(const char* filename) {
#define DestroyCursor(hcsr) (do_nothing(), 0) return (HCURSOR)0;
#define GetSystemCursor(csrid) (do_nothing(), 0) }
#define GetCurrentCursor() (do_nothing(), 0)
static inline HCURSOR CreateCursor(int xhotspot, int yhotspot, int w, int h,
const BYTE* pANDBits, const BYTE* pXORBits, int colornum) {
return (HCURSOR)0;
}
static inline HCURSOR GUIAPI CopyCursor (HCURSOR hcsr) {
return (HCURSOR)0;
}
static inline BOOL DestroyCursor (HCURSOR hcsr) {
return TRUE;
}
static inline HCURSOR GetSystemCursor (int csrid) {
return (HCURSOR)0;
}
static inline HCURSOR GUIAPI GetCurrentCursor (void) {
return (HCURSOR)0;
}
#endif /* _MGHAVE_CURSOR */ #endif /* _MGHAVE_CURSOR */
#define MAX_SYSCURSORINDEX 22 #define MAX_SYSCURSORINDEX 22
@@ -2843,6 +2861,7 @@ MG_EXPORT void GUIAPI GetCursorPos (POINT* ppt);
MG_EXPORT void GUIAPI SetCursorPos (int x, int y); MG_EXPORT void GUIAPI SetCursorPos (int x, int y);
#ifdef _MGHAVE_CURSOR #ifdef _MGHAVE_CURSOR
/** /**
* \fn HCURSOR GUIAPI SetCursorEx (HCURSOR hcsr, BOOL set_def) * \fn HCURSOR GUIAPI SetCursorEx (HCURSOR hcsr, BOOL set_def)
* \brief Changes the current cursor. * \brief Changes the current cursor.
@@ -2863,6 +2882,50 @@ MG_EXPORT void GUIAPI SetCursorPos (int x, int y);
*/ */
MG_EXPORT HCURSOR GUIAPI SetCursorEx (HCURSOR hcsr, BOOL set_def); MG_EXPORT HCURSOR GUIAPI SetCursorEx (HCURSOR hcsr, BOOL set_def);
/**
* \fn HCURSOR GUIAPI GetDefaultCursor (void)
* \brief Gets the default cursor.
*
* This function gets the current default cursor.
*
* \return The current default cursor handle.
*
* \sa SetCursorEx, SetDefaultCursor
*/
MG_EXPORT HCURSOR GUIAPI GetDefaultCursor (void);
/**
* \fn int GUIAPI ShowCursor (BOOL fShow)
* \brief Shows or hides cursor.
*
* This function shows or hides cursor according to the argument \a fShow.
* Show cursor when \a fShow is TRUE, and hide cursor when \a fShow is FALSE.
* MiniGUI maintains a showing count value. Calling \a ShowCursor once, the
* count will increase when \a fShow is TRUE, or decrease one when FALSE.
* When the count is less than 0, the cursor will disapear actually.
*
* \param fShow Indicates show or hide the cursor.
*
* \return Cursor showing count value.
*/
MG_EXPORT int GUIAPI ShowCursor (BOOL fShow);
#else /* _MGHAVE_CURSOR */
static inline HCURSOR SetCursorEx(HCURSOR hcsr, BOOL set_def) {
return (HCURSOR)0;
}
static inline HCURSOR GetDefaultCursor(void) {
return (HCURSOR)0;
}
static inline int GUIAPI ShowCursor (BOOL fShow) {
return 0;
}
#endif /* !_MGHAVE_CURSOR */
/** /**
* \def SetCursor(hcsr) * \def SetCursor(hcsr)
* \brief Changes the current cursor. * \brief Changes the current cursor.
@@ -2896,46 +2959,6 @@ MG_EXPORT void GUIAPI SetCursorPos (int x, int y);
*/ */
#define SetDefaultCursor(hcsr) SetCursorEx (hcsr, TRUE) #define SetDefaultCursor(hcsr) SetCursorEx (hcsr, TRUE)
/**
* \fn HCURSOR GUIAPI GetDefaultCursor (void)
* \brief Gets the default cursor.
*
* This function gets the current default cursor.
*
* \return The current default cursor handle.
*
* \sa SetCursorEx, SetDefaultCursor
*/
MG_EXPORT HCURSOR GUIAPI GetDefaultCursor (void);
#else
#define SetCursorEx(hcsr, set_def) (do_nothing(), 0)
#define SetCursor(hcsr) (do_nothing(), 0)
#define SetDefaultCursor(hcsr) (do_nothing(), 0)
#define GetDefaultCursor() (do_nothing(), 0)
#endif /* _MGHAVE_CURSOR */
#ifdef _MGHAVE_CURSOR
/**
* \fn int GUIAPI ShowCursor (BOOL fShow)
* \brief Shows or hides cursor.
*
* This function shows or hides cursor according to the argument \a fShow.
* Show cursor when \a fShow is TRUE, and hide cursor when \a fShow is FALSE.
* MiniGUI maintains a showing count value. Calling \a ShowCursor once, the
* count will increase when \a fShow is TRUE, or decrease one when FALSE.
* When the count is less than 0, the cursor will disapear actually.
*
* \param fShow Indicates show or hide the cursor.
*
* \return Cursor showing count value.
*/
MG_EXPORT int GUIAPI ShowCursor (BOOL fShow);
#else
#define ShowCursor(fShow) (do_nothing(), 0)
#endif /* _MGHAVE_CURSOR */
/** @} end of cursor_fns */ /** @} end of cursor_fns */
/** /**
+1 -1
View File
@@ -42,7 +42,7 @@
under the terms and conditions of the commercial license. under the terms and conditions of the commercial license.
For more information about the commercial license, please refer to For more information about the commercial license, please refer to
<http://www.minigui.com/en/about/licensing-policy/>. <http://www.minigui.com/blog/minigui-licensing-policy/>.
\endverbatim \endverbatim
*/ */
+1 -1
View File
@@ -45,7 +45,7 @@
under the terms and conditions of the commercial license. under the terms and conditions of the commercial license.
For more information about the commercial license, please refer to For more information about the commercial license, please refer to
<http://www.minigui.com/en/about/licensing-policy/>. <http://www.minigui.com/blog/minigui-licensing-policy/>.
\endverbatim \endverbatim
*/ */
+1 -1
View File
@@ -45,7 +45,7 @@
under the terms and conditions of the commercial license. under the terms and conditions of the commercial license.
For more information about the commercial license, please refer to For more information about the commercial license, please refer to
<http://www.minigui.com/en/about/licensing-policy/>. <http://www.minigui.com/blog/minigui-licensing-policy/>.
\endverbatim \endverbatim
*/ */
+1 -1
View File
@@ -37,7 +37,7 @@
under the terms and conditions of the commercial license. under the terms and conditions of the commercial license.
For more information about the commercial license, please refer to For more information about the commercial license, please refer to
<http://www.minigui.com/en/about/licensing-policy/>. <http://www.minigui.com/blog/minigui-licensing-policy/>.
\endverbatim \endverbatim
*/ */
+1 -1
View File
@@ -37,7 +37,7 @@
under the terms and conditions of the commercial license. under the terms and conditions of the commercial license.
For more information about the commercial license, please refer to For more information about the commercial license, please refer to
<http://www.minigui.com/en/about/licensing-policy/>. <http://www.minigui.com/blog/minigui-licensing-policy/>.
\endverbatim \endverbatim
*/ */
+1 -1
View File
@@ -45,7 +45,7 @@
under the terms and conditions of the commercial license. under the terms and conditions of the commercial license.
For more information about the commercial license, please refer to For more information about the commercial license, please refer to
<http://www.minigui.com/en/about/licensing-policy/>. <http://www.minigui.com/blog/minigui-licensing-policy/>.
\endverbatim \endverbatim
*/ */
+1 -1
View File
@@ -45,7 +45,7 @@
under the terms and conditions of the commercial license. under the terms and conditions of the commercial license.
For more information about the commercial license, please refer to For more information about the commercial license, please refer to
<http://www.minigui.com/en/about/licensing-policy/>. <http://www.minigui.com/blog/minigui-licensing-policy/>.
\endverbatim \endverbatim
*/ */
+1 -1
View File
@@ -44,7 +44,7 @@
under the terms and conditions of the commercial license. under the terms and conditions of the commercial license.
For more information about the commercial license, please refer to For more information about the commercial license, please refer to
<http://www.minigui.com/en/about/licensing-policy/>. <http://www.minigui.com/blog/minigui-licensing-policy/>.
\endverbatim \endverbatim
*/ */
+1 -1
View File
@@ -44,7 +44,7 @@
under the terms and conditions of the commercial license. under the terms and conditions of the commercial license.
For more information about the commercial license, please refer to For more information about the commercial license, please refer to
<http://www.minigui.com/en/about/licensing-policy/>. <http://www.minigui.com/blog/minigui-licensing-policy/>.
\endverbatim \endverbatim
*/ */
+1 -1
View File
@@ -37,7 +37,7 @@
under the terms and conditions of the commercial license. under the terms and conditions of the commercial license.
For more information about the commercial license, please refer to For more information about the commercial license, please refer to
<http://www.minigui.com/en/about/licensing-policy/>. <http://www.minigui.com/blog/minigui-licensing-policy/>.
\endverbatim \endverbatim
*/ */
+1 -1
View File
@@ -38,7 +38,7 @@
under the terms and conditions of the commercial license. under the terms and conditions of the commercial license.
For more information about the commercial license, please refer to For more information about the commercial license, please refer to
<http://www.minigui.com/en/about/licensing-policy/>. <http://www.minigui.com/blog/minigui-licensing-policy/>.
\endverbatim \endverbatim
*/ */

Some files were not shown because too many files have changed in this diff Show More