Commit Graph

586 Commits

Author SHA1 Message Date
Sergey Isakov
fc567c71c0 Merge branch 'master' of https://github.com/CloverHackyColor/CloverBootloader 2020-04-09 21:04:57 +03:00
Sergey Isakov
fd2547c281 safe draw
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-04-09 21:04:35 +03:00
Jief L
43bf62431e Merge branch 'master' of https://github.com/CloverHackyColor/CloverBootloader 2020-04-09 20:09:30 +03:00
Jief L
2d11da499e Silence warnings. 2020-04-09 20:07:32 +03:00
Sergey Isakov
dc52af47f0 Merge branch 'master' of https://github.com/CloverHackyColor/CloverBootloader 2020-04-09 20:01:30 +03:00
Sergey Isakov
c995284c06 some pointer copy must be replaced by value copy
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-04-09 20:01:23 +03:00
Jief L
a7e897706c Quick fix of a crash. 2020-04-09 19:51:49 +03:00
Jief L
91b0145ab9 Disable automatic conversion of XString to wchar_t*. 2020-04-09 19:32:46 +03:00
Jief L
751fcfb8df Git rid of unused XStringWP. 2020-04-09 18:53:21 +03:00
Jief L
7ad745cfa1 Replace utf8Conversion by unicode_conversions. 2020-04-09 18:46:17 +03:00
Jief L
da5dc56504 Add a test in XStringW. 2020-04-09 18:12:48 +03:00
Sergey Isakov
97d1d23eb0 repaired font handling
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-04-09 16:04:12 +03:00
Sergey Isakov
790fedbdc6 initial support for cinema
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-04-09 09:04:21 +03:00
Sergey Isakov
13588fb67c allow triple os name like chrome,grub,linux
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-04-09 06:32:57 +03:00
Jief L
879b0c2961 DontStopAtPanic helper, XUINTN remove, PRIuPTR and few warnings. 2020-04-08 13:49:00 +03:00
Sergey Isakov
b245ea17d4 some cleanup
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-04-08 13:04:54 +03:00
Sergey Isakov
4be33ca401 correct codepage for help screen
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-04-08 12:45:36 +03:00
Sergey Isakov
91ba53fd1c fix compose, fix badge position
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-04-08 10:32:26 +03:00
Sergey Isakov
75427f2d83 refactoring text handling
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-04-07 22:48:36 +03:00
Sergey Isakov
5a85883180 update linux list
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-04-06 20:06:48 +03:00
Sergey Isakov
0a3f4c3575 fix uninitialized disk type
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-04-06 18:40:45 +03:00
Sergey Isakov
7635c0ca3b cache embedded images
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-04-06 15:26:16 +03:00
Sergey Isakov
3ba2ecd0fc use builtin icons when not theme provided
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-04-06 12:15:36 +03:00
Sergey Isakov
2971779ddf load os icons for legacy
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-04-06 00:14:27 +03:00
Sergey Isakov
1f2832897e Merge branch 'master' of https://github.com/CloverHackyColor/CloverBootloader 2020-04-05 21:57:00 +03:00
Sergey Isakov
c12f59a551 change type of scanvolumedefault
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-04-05 21:56:36 +03:00
asava
ed86b5eabf add missing files to refit.inf 2020-04-05 21:36:40 +03:00
Sergey Isakov
f1c72d752e simplify drawBCS
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-04-05 20:06:09 +03:00
Sergey Isakov
ac789c25aa Merge branch 'master' of https://github.com/CloverHackyColor/CloverBootloader 2020-04-05 18:55:38 +03:00
Sergey Isakov
4d9c1efd0c take optional os icons
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-04-05 18:54:10 +03:00
Jief L
83cd92cb9f Remove floating point as bool warning. 2020-04-05 18:23:51 +03:00
Sergey Isakov
7b173d7f08 do not recalculate background and draw it twice
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-04-05 17:27:42 +03:00
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
Jief L
875bda8a56 Delete REFIT_MENU_SCREEN.cpp 2020-04-04 13:01:49 +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
f638ad999a correct add legacy entry
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-04-04 06:46:41 +03:00
Sergey Isakov
f61d46411b x,y have to be signed int
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-04-04 05:59:17 +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
Jief L
418b4f4cc3 Get SelectionImage to work. 2020-04-02 22:27:10 +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
Jief L
8b806cf4e7 Example of UTF16 conversion with XString. 2020-03-31 10:27:50 +03:00
Jief L
876ed07554 Cleanup panic() function. 2020-03-31 09:10:47 +03:00
asava
6c816f8595 add cast to previous commit 2020-03-31 03:16:18 +03:00
asava
e149dafe4d Correct mistake with nvidia inject name 2020-03-31 03:09:53 +03:00
Jief L
2cb912ca74 Fix XImage assignment operator a better way. 2020-03-31 00:42:58 +03:00
Jief L
cdf5913c24 Fix XImage assignment operator in case other is empty. 2020-03-31 00:28:12 +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
fb901fa1a0 dont commit USE_XTHEME
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-03-30 18:53:11 +03:00
Sergey Isakov
1397ffe580 Merge branch 'master' of https://github.com/CloverHackyColor/CloverBootloader 2020-03-30 18:32:00 +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
Sherlocks
6d19576520 Update KernelXCPM for 10.15.4 2020-03-30 23:11:18 +09: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
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
5006d33c5d Get rid of AsciiPrint. 2020-03-29 15:47:04 +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
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
fab5d07b37 Merge branch 'master' of https://github.com/CloverHackyColor/CloverBootloader 2020-03-28 21:34:37 +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
324b0608e6 Move operator (ctor and =). 2020-03-28 19:17:02 +03:00
Jief L
1cb19148e5 Forgot to update refit.inf 2020-03-28 18:54:53 +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
SergeySlice
20124ba433 reduce timeout after OS start caused by debug.log with dsdt patching
Signed-off-by: SergeySlice <sergey.slice@gmail.com>
2020-03-27 20:35:39 +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
e5beea2f1b exclude tests for VS
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-03-27 11:29:38 +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
0af69ed7a3 Merge branch 'master' of https://github.com/CloverHackyColor/CloverBootloader 2020-03-24 18:17:22 +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
Sherlocks
83da928616 Correct common 0xE2 prologue patterns for KernelPM patch info 2020-03-24 22:23:05 +09:00
Sherlocks
26166b6aec Change DBG to DBG_RT for essential kernel patch to trace patch easily 2020-03-24 21:55:35 +09: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
73b9eabd22 Merge branch 'master' of https://github.com/CloverHackyColor/CloverBootloader 2020-03-23 17:51:32 +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
Sherlocks
af8a84f478 Add missed return 2020-03-23 23:11:27 +09:00
Sherlocks
425a71629c Fix previous commit that KernelPM patch 2020-03-23 22:49:06 +09:00
Sherlocks
d62ea4f7f6 Fix KernelPM Patch for 10.14.6 beta 6
Add debug line for trace
2020-03-23 22:31:04 +09: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
asava
ceb6ffbd2f Omit debug to console in printf_lite tests 2020-03-21 23:36:24 +02: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
asava
3f1eb9a02e add missing files to inf 2020-03-21 18:38:20 +02:00
asava
18a38138e4 Fix hang before Clover GUI caused by the use of freepool to free alligned pages 2020-03-21 18:02:01 +02:00
Jief L
14cdfe29c7 MemLogf and MemLogfVA. Not used yet in Clover. 2020-03-21 16:12:26 +03:00
Jief L
35e2eec3cc Some (not all) compilation issues fixed. 2020-03-21 14:43:45 +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
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
23ba4b218e reduce dbg messages
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-03-20 05:54:20 +03:00
Sergey Isakov
3c9332b833 fix fonts release
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
2020-03-20 05:47:58 +03:00
asava
4d07a7376b add missing files in refit.inf 2020-03-19 23:03:24 +02:00
asava
2f01155383 Correct mask handling mixup between KextPatches/KernelPatches/BootPatches 2020-03-19 22:40:27 +02:00