Commit Graph

342 Commits

Author SHA1 Message Date
asava
7e747613a9 Change arithmetics order to allow mouse movement in cases with high mouse resolution 2020-03-29 21:02:54 +03:00
Sergey Isakov
941244d894 merge conflict
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-03-29 19:19:08 +03:00
Sergey Isakov
4a541a5469 include parseXthem to xtheme class
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-03-29 19:17:27 +03:00
Jief L
e734530b9b Get rid of AsciiSPrint. 2020-03-29 16:44:08 +03:00
Jief L
3e58b71ea6 USE_XTHEME=0 for now. Cast in lodepng to avoid VS2017 warnings. 2020-03-29 14:42:17 +03:00
Jief L
b605d0d3bb Use size_t for Width and Height to conform eglodepng_decode prototype. 2020-03-29 13:35:09 +03:00
Jief L
22b9a6013b Fix compilation of getIcon methods 2020-03-29 13:19:05 +03:00
Jief L
6f46b07534 Operator _XS. Fix to VectorGraphics I've misunderstood. 2020-03-29 12:40:13 +03:00
Jief L
1eac7bacfb Some compile errors. 2020-03-29 12:06:34 +03:00
SergeySlice
6ca8e4426b some string corrections
Signed-off-by: SergeySlice <sergey.slice@gmail.com>
2020-03-29 11:07:59 +03:00
SergeySlice
443ad8ee3e dont commit USE_XTHEME
Signed-off-by: SergeySlice <sergey.slice@gmail.com>
2020-03-29 10:18:00 +03:00
SergeySlice
38319f70bc correct font handling
Signed-off-by: SergeySlice <sergey.slice@gmail.com>
2020-03-29 10:14:14 +03:00
Sergey Isakov
e59f205afc some comments around vector theme
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-03-29 08:42:33 +03:00
SergeySlice
cf61a01b03 parse svg xtheme, not verified
Signed-off-by: SergeySlice <sergey.slice@gmail.com>
2020-03-28 21:34:23 +03:00
SergeySlice
ace46a5646 correct more variables
Signed-off-by: SergeySlice <sergey.slice@gmail.com>
2020-03-27 22:47:06 +03:00
Sergey Isakov
8f2c4b5efd separate data in global config
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-03-27 19:50:17 +03:00
Sergey Isakov
b74b57b7dd use local cycle index
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-03-27 10:46:04 +03:00
Sergey Isakov
381487d324 rewrite graphics menu style
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-03-27 08:54:41 +03:00
Sergey Isakov
01e8807236 dont commit USE_XTHEME
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-03-26 23:35:12 +03:00
Sergey Isakov
b58bcf7270 more text procedures
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-03-26 23:32:31 +03:00
Sergey Isakov
8e42d69706 Merge branch 'master' of https://github.com/CloverHackyColor/CloverBootloader 2020-03-26 20:00:58 +03:00
Sergey Isakov
a65aa874a2 move types declarations
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-03-26 20:00:53 +03:00
Jief L
95f3123235 Remove PoolPrintFloat, adapt format litteral. 2020-03-26 19:49:10 +03:00
Sergey Isakov
9b85ac2a5b merge
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-03-26 17:25:49 +03:00
Sergey Isakov
1abcd07489 apply theme settings to xtheme
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-03-26 17:24:20 +03:00
Jief L
ee6124bd10 Bye bye PoolPrintFloat. 2020-03-26 15:59:20 +03:00
Sergey Isakov
a1d4a74efb update GUI settings for xtheme
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-03-26 11:18:28 +03:00
Jief L
84306ecbd8 Merge branch 'master' of https://github.com/CloverHackyColor/CloverBootloader 2020-03-25 21:33:21 +03:00
Jief L
e8fd94bb8f Switch to new printf format for DebugLog. 2020-03-25 21:32:44 +03:00
Sergey Isakov
6db46bffc3 repair mouse events
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-03-25 21:22:34 +03:00
Sergey Isakov
4b1c81b7f9 repair scroll
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-03-25 20:49:01 +03:00
Sergey Isakov
91ab997f5f xtheme support is mostly working
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-03-24 18:17:12 +03:00
Sergey Isakov
446b3cc6f6 revert build_rule
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-03-24 07:36:39 +03:00
Sergey Isakov
a3f3053c30 rewrite render text
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-03-23 22:10:16 +03:00
Sergey Isakov
d7e93a96e5 adopt DrawMainMenu to XTheme
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-03-23 17:51:20 +03:00
Sergey Isakov
ddba966e94 advance menu codes for use xtheme
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-03-22 13:48:13 +03:00
Jief L
35e2eec3cc Some (not all) compilation issues fixed. 2020-03-21 14:43:45 +03:00
Sergey Isakov
9ec0c457f5 some advance in xtheme support
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-03-21 10:34:28 +03:00
Sergey Isakov
16947ddbe4 advance vector graphics for xtheme
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-03-20 23:10:08 +03:00
Sergey Isakov
f1d136e013 make scrolls for xtheme
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-03-20 20:48:19 +03:00
Sergey Isakov
054898eef3 implemented LoadXImage
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-03-19 21:35:58 +03:00
Sergey Isakov
c64788a19e improve setSizeInPixels
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-03-19 09:56:31 +03:00
Sergey Isakov
ce86d7f6b8 ensure image size
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-03-19 07:15:08 +03:00
SergeySlice
eac40c312e begin fill theme with images
Signed-off-by: SergeySlice <sergey.slice@gmail.com>
2020-03-18 17:11:56 +03:00
Sergey Isakov
2d82d317e3 init selections and buttons
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-03-18 12:07:34 +03:00
jief
255c331069 Fix compilation. 2020-03-18 09:39:11 +03:00
SergeySlice
5ed385d3fa introduce loadImage
Signed-off-by: SergeySlice <sergey.slice@gmail.com>
2020-03-17 22:43:58 +03:00
Sergey Isakov
0eb9528089 some screen operations for xtheme
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-03-17 07:25:38 +03:00
SergeySlice
81f2b91b15 clear screen in xtheme
Signed-off-by: SergeySlice <sergey.slice@gmail.com>
2020-03-16 22:47:02 +03:00
Sergey Isakov
02db12d8c3 fill theme by embedded images
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-03-16 14:15:25 +03:00
Sergey Isakov
a239da8d61 Merge branch 'master' of https://github.com/CloverHackyColor/CloverBootloader 2020-03-16 10:19:39 +03:00
SergeySlice
9ab5a63908 support for VolumeIcon.icns
Signed-off-by: SergeySlice <sergey.slice@gmail.com>
2020-03-15 14:06:04 +03:00
Sergey Isakov
ac829bd589 merge conflicts
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-03-13 16:38:52 +03:00
Sergey Isakov
d79dcb5f9e advance xtheme invention
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-03-13 16:34:36 +03:00
jief
0484955f0b New platform Posix. Replace strlen, strcmp implementation. 2020-03-13 16:11:58 +03:00
Sergey Isakov
81286c08b1 dont double fonts in chain
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-03-13 15:13:08 +03:00
Sergey Isakov
07f5c88a8f fix delete fonts
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-03-13 11:44:45 +03:00
Jief L
d1a66122d3 Start to switch UTF16 litteral to utf8. 2020-03-12 20:45:28 +03:00
jief
b920b9f8fb Introducing a UTF8 XString 2020-03-12 17:40:38 +03:00
Sergey Isakov
59dd1913b8 make initializing of xtheme
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-03-12 17:00:36 +03:00
Sergey Isakov
2e1ad593df template for theme class
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-03-12 12:47:59 +03:00
Sergey Isakov
8d75c1909e update about menu
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-03-12 12:09:33 +03:00
jief
8931f35eb8 Forgot again the __ after __typeof 2020-03-11 18:36:08 +03:00
jief
19cfe2831a Warning removal. New class XUINTN (not yet used). 2020-03-11 17:23:58 +03:00
Sergey Isakov
61cab50a09 fix mistake with deleteParser
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-03-11 14:52:40 +03:00
Sergey Isakov
2e598c0046 Merge branch 'master' of https://github.com/CloverHackyColor/CloverBootloader 2020-03-11 08:55:35 +03:00
Sergey Isakov
edd13a1ae6 unused argument
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-03-11 08:55:10 +03:00
jief
9d0ad9966d underscore forgotten in #ifdef __cplusplus 2020-03-11 07:48:40 +03:00
Sergey Isakov
bdee69a7ef header compatibility with Clover.app
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-03-10 22:08:52 +03:00
jief
51711c1004 Disable assign & ctor with char* and wchar_t* parameter. 2020-03-10 19:50:55 +03:00
Sergey Isakov
e602853ba3 cancel svg debug
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-03-10 17:06:16 +03:00
Sergey Isakov
24dec8435c fix svg fonts handling
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-03-10 17:05:39 +03:00
Sergey Isakov
48c89ce4d8 Merge branch 'master' of https://github.com/CloverHackyColor/CloverBootloader 2020-03-10 16:00:09 +03:00
Sergey Isakov
d8dfe555d2 separate fonts in fontChain
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-03-10 16:00:02 +03:00
jief
a33bcb45d3 Switch struct EG_RECT to a class.
Define basic operators.
2020-03-10 13:27:05 +03:00
Sergey Isakov
e39c53e831 vs dont like __typeof
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-03-10 11:05:37 +03:00
jief
8ebb863d4f Alive member initialization. 2020-03-09 12:35:14 +03:00
jief
c355af81f4 Draw2 renamed to DrawWithoutCompose. Improved. 2020-03-09 11:14:05 +03:00
jief
1cb7b4e69e Few cleaning in XImage. XPointer improvement.
Renamed some method in XArray XObjArray and XStringW.
2020-03-09 04:12:24 +03:00
jief
89ea36f6cc Support for ICNS in image.cpp was commented out. 2020-03-08 19:19:54 +03:00
Sergey Isakov
a00e148510 exclude debug messages
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-03-07 09:43:50 +03:00
Sergey Isakov
6c592d8004 working mouse pointer and ximage.draw
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-03-07 09:37:19 +03:00
Sergey Isakov
c3103859b6 draw in non-working state
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-03-07 00:08:04 +03:00
Sergey Isakov
5dbf1e0360 always create cloverx64.efi
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-03-06 22:56:32 +03:00
Sergey Isakov
d71acbb41d testing draw, not working
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-03-06 17:02:06 +03:00
jief
564a3ca06c Make XPointer a shared instance. Fixed some unallocated memory with
XArray.
2020-03-06 10:55:52 +03:00
Sergey Isakov
b5dc9e1b7f testing mouse
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-03-05 21:23:21 +03:00
Sergey Isakov
b735290ad2 some cleanup
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-03-05 16:59:17 +03:00
jief
2a106ef602 typo. 2020-03-04 23:45:36 +03:00
jief
5ddb6c1d79 Handle NULL in ctor. 2020-03-04 23:39:48 +03:00
Sergey Isakov
c1f6e8137a refactoring menu entries
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-03-03 23:44:07 +03:00
jief
fc2f226e8d Resolve conflicts. Compile, but unresolved external. 2020-03-03 17:43:23 +03:00
Sergey Isakov
b3e48e0547 merge conflicts
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-03-03 17:21:48 +03:00
Sergey Isakov
8ff35c6295 improved XPoitner and XImage, menu advance
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-03-03 17:17:39 +03:00
jief
99c79d0f94 Using pointer-to-member. 2020-03-03 16:52:23 +03:00
Sergey Isakov
3b49178480 merge conflicts
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-03-02 22:02:28 +03:00
Sergey Isakov
c0df0f8787 some update for using pointer and scroll
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-03-02 22:00:01 +03:00
jief
5b1c65486c XPointer revisited. 2020-03-02 18:43:54 +03:00
Sergey Isakov
dcdd8cc091 avoid memset generation
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-03-02 16:46:30 +03:00
Sergey Isakov
1acd6a43b4 first implementation of XPointer class
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-03-02 15:00:24 +03:00
jief
dec25e954e Start refactoring includes. Make gen-config compile. 2020-02-29 10:30:21 +03:00
jief
e05286e4a4 Big big refactoring of REFIT_MENU structs. They are now objects.
There is some cleaning to do
in the hierarchy of REFIT_ABSTRACT_MENU_ENTRY.
2020-02-28 23:28:33 +03:00
Sergey Isakov
bdc977d14f make genconfig happy
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-02-28 21:12:57 +03:00
Sergey Isakov
b6f2478cff create XImage from svg
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-02-28 17:08:40 +03:00
Sergey Isakov
a2534ee4f8 more strict type conversion in cpp
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-02-28 15:09:32 +03:00
Sergey Isakov
7999d10b9c update lodepng to version 20200219
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-02-28 14:26:24 +03:00
Sergey Isakov
4b4d1bb9d5 implement smooth image scaling
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-02-27 17:02:43 +03:00
Sergey Isakov
6c6fe90842 use isEmpty and setEmpty
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-02-27 15:32:14 +03:00
Sergey Isakov
4be169f058 full lodecpp features
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-02-27 12:49:02 +03:00
Sergey Isakov
d1043e2673 modify XArray and lodepng to compile as cpp
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-02-27 12:17:50 +03:00
Sergey Isakov
8dbd938bf3 replace std::vector with XArray
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-02-27 08:20:15 +03:00
Sergey Isakov
02108d8f48 fix mistake with x instead of y
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-02-26 23:57:58 +03:00
Sergey Isakov
297b3601bf current changes to ximage
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-02-26 22:44:16 +03:00
Sergey Isakov
d6885d3f2a more image functions
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-02-26 16:59:10 +03:00
Sergey Isakov
f4457dc741 few polish of png functions
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-02-26 09:13:03 +03:00
Sergey Isakov
1946bf5838 implement PNG coding in ximage
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-02-26 09:05:14 +03:00
jief
8727ae6f54 Refactor of XImage to use XArray and create accessor for pixel. 2020-02-26 00:28:36 +03:00
jief
9ac41a3c9d Added const in XImage 2020-02-25 23:57:23 +03:00
Sergey Isakov
a0b40c06dc created XImage::Compose
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-02-25 23:19:39 +03:00
Sergey Isakov
a4952d32de preliminary introduce image class
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-02-25 16:55:39 +03:00
Sergey Isakov
c35f9aa052 fix signess, optimize codes
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-02-23 08:53:21 +03:00
Sergey Isakov
3933f80eb2 correct sorting
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-02-22 17:07:46 +03:00
Jief L
8199d9b75c Remove unecessary cast. Some cleanups. 2020-02-22 00:22:30 +03:00
Sergey Isakov
8cb786d57e Merge branch 'master' of https://github.com/CloverHackyColor/CloverBootloader 2020-02-20 18:49:24 +03:00
Sergey Isakov
57e21d5a60 replace memset with SetMem because of compiler
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-02-20 18:49:18 +03:00
Sergey Isakov
5b02b51273 more type casting fixes
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-02-20 17:28:24 +03:00
Sergey Isakov
db08c98366 speedup png by using quicksort
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-02-19 20:36:26 +03:00
jief
15c1c82a6d Fix build of clover-genconfig 2020-02-18 08:58:56 +03:00
jief
7fa464fde0 Final switch to C++ compiler 2020-02-17 23:41:09 +03:00
Sergey Isakov
d836611308 cpp will be only compilation mode
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-02-16 13:53:12 +03:00
Sergey Isakov
d2ac4d7de9 merge master and c++_globals
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-02-15 17:29:59 +03:00
Sergey Isakov
82347b1e8d use own implementation for CopyMem and SetMem instead of BIOS
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-02-14 07:15:10 +03:00
jief
a79acfcd24 Fix void* cast and enum cast (prepa C++) 2019-12-27 18:09:07 +01:00
jief
2d4a9a77c5 Fix CONST warnings (prepa C++) 2019-12-27 17:12:28 +01:00
jief
9b01a6fe58 Add cast to return value of memory allocation functions (prepa c++) 2019-12-27 15:21:40 +01:00
jief
91793ca5ba Remove unused includes for C++ 2019-12-20 16:03:49 +01:00
jief
38204b0b4c Rename 'class' parameter because it's reserved in C++ 2019-12-20 15:54:11 +01:00
jief
28886d3b6f Fix prototype. 2019-12-20 15:52:56 +01:00
Sergey Isakov
ad0eb1988d dont show Clover boot volume if it commented out
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2019-12-20 14:47:02 +03:00
SergeySlice
0979cd808a use unified DeviceTreeLib
Signed-off-by: Сергей Исаков <sergey@Sergejs-iMac.local>
2019-12-18 20:34:26 +03:00
Sergey Isakov
d49c68ae80 check for zero size allocation 2019-09-19 22:14:57 +03:00
Sergey Isakov
7c0aa811ec initial commit Clover sources 5061 and modules from EDK2 latest with legacy codes from UDK2018
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2019-09-03 12:58:42 +03:00