Upstream/CloverBootloader
1
0
Fork 0
mirror of https://github.com/CloverHackyColor/CloverBootloader.git synced 2024-12-10 14:23:31 +01:00
Code Issues Packages Projects Releases Wiki Activity
1,290 Commits 9 Branches 75 Tags 227 MiB
c87858c5f0
Commit Graph

298 Commits

Author SHA1 Message Date
Sergey Isakov
3433041756 use char8 for KPATIConnectorsController 
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
 2020-04-11 18:36:40 +03:00
Jief L
84f956714f Some prototypes cleaning. 2020-04-11 09:21:06 +03:00
Sergey Isakov
ba80bb4f4d use embedded logo, drive image priorities changed 
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
 2020-04-10 22:29:51 +03:00
Sergey Isakov
6039faefa2 improve oem string, refactor font name 
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
 2020-04-10 20:00:37 +03:00
Sergey Isakov
3ef56cd78d improve smbios information 
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
 2020-04-10 17:35:24 +03:00
Jief L
6d54a4c0b6 Get rid of AsciiPrintf used with %d 2020-04-10 15:35:25 +03:00
Sergey Isakov
84a320ba5d big cleanup to XTHEME 
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
 2020-04-10 13:04:21 +03:00
Sergey Isakov
d74b431b6f repaired system info 
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
 2020-04-10 10:15:36 +03:00
Sergey Isakov
92ecdbf630 repair vector themes 
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
 2020-04-10 06:11:00 +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
91b0145ab9 Disable automatic conversion of XString to wchar_t*. 2020-04-09 19:32:46 +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
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
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
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
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
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
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
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
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
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
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
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
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