Commit Graph

287 Commits

Author SHA1 Message Date
Sergey Isakov
1c69fccb7a exclude InitSelection as it done during theme init
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-04-05 17:04:39 +03:00
Jief L
b8bb76d51e Refactor LoadOptions as XString. 2020-04-05 15:25:39 +03:00
Sergey Isakov
e9bf5703f6 merge changes
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-04-05 10:24:04 +03:00
Sergey Isakov
94d8d05c39 Merge branch 'master' of https://github.com/CloverHackyColor/CloverBootloader 2020-04-05 10:20:14 +03:00
Sergey Isakov
682fea296e a possibility to switch themes
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-04-05 10:20:00 +03:00
Jief L
16da915f82 Theme switching. 2020-04-05 09:44:47 +03:00
Sergey Isakov
317cf43107 cleanup messy menu
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-04-05 07:35:55 +03:00
Sergey Isakov
dc558d04aa resolve conflict between menu and menu
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-04-05 06:44:27 +03:00
Sergey Isakov
c163748486 resolve some conflicts
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-04-04 20:05:57 +03:00
Sergey Isakov
26795329fe clean place under buttons
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-04-04 20:02:30 +03:00
Jief L
0bcabfe9e3 Remove a hundred of PoolPrint. 2020-04-04 19:22:07 +03:00
Jief L
1c1db57638 Get rid of UnicodeSPrint. 2020-04-04 16:50:13 +03:00
Jief L
3cac160b6d Put functions back in menu.cpp 2020-04-04 15:27:02 +03:00
Jief L
0449bb7335 Fixes after rename. 2020-04-04 13:13:34 +03:00
Jief L
ad10842a18 Rename menu.cpp to REFIT_MENU_SCREEN.cpp 2020-04-04 13:04:59 +03:00
Sergey Isakov
314acac5ab reduce messages
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-04-04 08:50:30 +03:00
Sergey Isakov
8b5ec83c6a refactoring menu entries
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-04-03 23:00:42 +03:00
asava
ed196e10c8 Correct missouts preventing compilation 2020-04-03 01:54:03 +03:00
Sergey Isakov
ddccb001e6 repair scroll position
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-04-02 17:03:58 +03:00
Sergey Isakov
0dacc1df4c repair text menu
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-04-02 11:44:42 +03:00
Sergey Isakov
0c6dc2f45e repair text draw
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-04-02 09:50:44 +03:00
Sergey Isakov
3ff4a9d730 dont commit USE_XTHEME
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-04-01 21:03:26 +03:00
Sergey Isakov
5b84f64f61 pixel operations
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-04-01 20:07:57 +03:00
Sergey Isakov
5f037cc29a correct ximage compose
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-04-01 17:59:58 +03:00
Sergey Isakov
f70c4e14d2 refactoring DrawText and Pixels
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-04-01 15:57:32 +03:00
Jief L
fbfc206a41 Renamed SPrintf to SWPrintf for XStringW 2020-03-31 19:10:30 +03:00
Jief L
6f64681239 Fix includes and refit.inf 2020-03-31 19:05:34 +03:00
Jief L
0b19538bee Merge branch 'master' of https://github.com/CloverHackyColor/CloverBootloader 2020-03-31 18:59:42 +03:00
Jief L
23b45d569a Get rid of XStringWP + few cleanings. 2020-03-31 18:59:35 +03:00
Sergey Isakov
a37196ab8c repair background draw
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-03-31 17:25:07 +03:00
Sergey Isakov
0c62865b22 eliminate mouse edge effect
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-03-31 15:35:04 +03:00
asava
e149dafe4d Correct mistake with nvidia inject name 2020-03-31 03:09:53 +03:00
Sergey Isakov
35103e3126 move data when create ximage from png
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-03-30 23:31:34 +03:00
Sergey Isakov
6dc43d9d8e a possibility to use wchar in icon names
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-03-30 18:31:52 +03:00
Sergey Isakov
f7254f53e6 load icons as in xtheme
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-03-30 11:34:16 +03:00
asava
17c92d9526 Correct mistake in FileDevicePathToStr 2020-03-30 02:21:38 +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
SergeySlice
76900d6350 Merge branch 'master' of https://github.com/CloverHackyColor/CloverBootloader 2020-03-29 10:14:26 +03:00
SergeySlice
38319f70bc correct font handling
Signed-off-by: SergeySlice <sergey.slice@gmail.com>
2020-03-29 10:14:14 +03:00
Jief L
d093af9b01 Merge branch 'master' of https://github.com/CloverHackyColor/CloverBootloader 2020-03-29 09:54:31 +03:00
Jief L
2100401c4e Fix include in screen.h & .cpp 2020-03-29 09:54:13 +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
Jief L
651f7a02c6 Get rid of Print() calls. 2020-03-28 18:14:18 +03:00
jief
020fe5a2f0 Do not use Print() anymore. 2020-03-28 09:36:07 +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
b58bcf7270 more text procedures
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-03-26 23:32:31 +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
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
Jief L
e8fd94bb8f Switch to new printf format for DebugLog. 2020-03-25 21:32:44 +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
8b8b8452b6 fix compilation
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-03-23 19:57:09 +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
Sergey Isakov
13667ae8f8 current changes moving to xtheme
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-03-21 22:52:28 +03:00
Jief L
14cdfe29c7 MemLogf and MemLogfVA. Not used yet in Clover. 2020-03-21 16:12:26 +03:00
Sergey Isakov
38d061d970 Merge branch 'master' of https://github.com/CloverHackyColor/CloverBootloader 2020-03-21 10:34:40 +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
asava
932b218617 strip line endings from .VolumeLabel.txt 2020-03-21 09:02:48 +02: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
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
6236f85a79 avoid memset generation
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-03-16 10:31:59 +03:00
SergeySlice
449fa1c6d1 fix debug-log by tluck
Signed-off-by: SergeySlice <sergey.slice@gmail.com>
2020-03-15 23:14:33 +03:00
SergeySlice
23fae194bd a step to xtheme
Signed-off-by: SergeySlice <sergey.slice@gmail.com>
2020-03-15 23:05:59 +03:00
SergeySlice
b6d3ddb28f optimize debug.log
Signed-off-by: SergeySlice <sergey.slice@gmail.com>
2020-03-15 16:42:45 +03:00
SergeySlice
9ab5a63908 support for VolumeIcon.icns
Signed-off-by: SergeySlice <sergey.slice@gmail.com>
2020-03-15 14:06:04 +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
a4d07ef335 Even better : a AddMenuInfo_f that takes printf like vararg. That avoid
the allocation of a temporary XStringW !
2020-03-12 21:23:32 +03:00
Jief L
d1a66122d3 Start to switch UTF16 litteral to utf8. 2020-03-12 20:45:28 +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
8a7950d99a Allow NULL title in NewEntry_. 2020-03-11 19:41:20 +03:00
jief
51711c1004 Disable assign & ctor with char* and wchar_t* parameter. 2020-03-10 19:50:55 +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
7256a868e5 REFIT_ABSTRACT_MENU_ENTRY.Title to XStringW 2020-03-10 14:51:04 +03:00
jief
a33bcb45d3 Switch struct EG_RECT to a class.
Define basic operators.
2020-03-10 13:27:05 +03:00
jief
41c49267a5 Clean the menu item hierarchy. 2020-03-10 12:45:17 +03:00
Sergey Isakov
956009f8ea files for qemu
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-03-10 07:32:08 +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
Sergey Isakov
c5f8b7df7b update russian localization
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-03-08 08:09:20 +03:00
Sergey Isakov
aea5deed32 Merge branch 'master' of https://github.com/CloverHackyColor/CloverBootloader 2020-03-06 18:30:12 +03:00
Sergey Isakov
328ede88f0 update About menu
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-03-06 18:30:07 +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
797b5638d6 exclude old pointer
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-03-05 18:58:08 +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
75f33a759b NULL check added. 2020-03-05 10:37:50 +03:00
jief
640da74dd2 Merge branch 'master' of https://github.com/CloverHackyColor/CloverBootloader 2020-03-05 09:44:12 +03:00
jief
f8bf956a39 Check pointer before using it. 2020-03-05 09:42:50 +03:00
SergeySlice
69a65db69b some security checks
Signed-off-by: SergeySlice <sergey.slice@gmail.com>
2020-03-05 06:37:21 +03:00
jief
c6a59f85f9 Caught few access to address 0 2020-03-05 00:54:59 +03:00
jief
d549733729 A bit of debug code to keep. 2020-03-04 22:19:44 +03:00
jief
6417348844 Fix bad object allocation, remove some REFIT_MENU_SCREEN ctors. 2020-03-04 18:27:41 +03:00
Sergey Isakov
11bf50dc3a eliminate VS2017 warnings
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-03-04 12:50:43 +03:00
jief
4bec5cab80 Use new instead of Allocate for objects. 2020-03-04 09:21:43 +03:00
Sergey Isakov
ab6d11f473 fix InputDialog with style function
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-03-04 06:40:49 +03:00
Sergey Isakov
4e63e897cb auto merge
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-03-03 23:55:37 +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
fd327e2b1f Fix unresolved external. 2020-03-03 23:18:21 +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
jief
ab391cd1cc 2 details that didn't compile. 2020-03-03 14:41:00 +03:00
Sergey Isakov
24e779c6f8 refactoring menu
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-03-03 12:45:07 +03:00
jief
416fb4aa77 Use ptr for IN parameter. Use ref in method body. 2020-03-03 00:04:09 +03:00
Sergey Isakov
2021c9b51d use &Screen instead of *Screen
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-03-02 22:54:19 +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
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
Sergey Isakov
a260cbad92 some remarks
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-03-01 11:46:12 +03:00
jief
2de3b84957 Moved DriveImage and BadgeImage down the hierarchy because only loader
use them.
2020-02-29 15:56:36 +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
5709ec8c2c quirky but working
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-02-28 22:41:03 +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
jief
c77802d200 Refactor of "Volumes" global var as an XObjArray. 2020-02-27 17:34:29 +03:00
jief
56ca2c3e67 Import XArray and XObjArray.
Create a basic unit test of C++ classes.
2020-02-23 14:21:28 +03:00
jief
0d110b4b72 JIEF_DEBUG instead of CLOVER_DEBUG 2020-02-23 14:20:22 +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
Jief L
82aaf09e74 VC2017 compilation 2020-02-21 12:44:15 +03:00
Jief L
c6499afa83 Fix AddListElement
Remove non-const casts
2020-02-21 08:29:22 +03:00
Jief L
241a55ce69 Fixing some CONST. 2020-02-21 08:22:09 +03:00
Sergey Isakov
eb26300fd6 some more fixes
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-02-21 06:54:01 +03:00
Sergey Isakov
127b035930 fix GCC53 compilation
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-02-20 19:24:30 +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
f8098a8336 some adoptation to VS2017
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-02-20 15:53:27 +03:00
Sergey Isakov
20237d492a cleanup
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-02-18 21:49:54 +03:00
jief
c59da4d55a Debug message to enable real time debugging. 2020-02-18 09:03:14 +03:00
jief
15c1c82a6d Fix build of clover-genconfig 2020-02-18 08:58:56 +03:00