* include/grub/gui.h (grub_fixed_sfs_divide): Round rather than
truncate. (grub_fixed_fsf_divide): Likewise.
This commit is contained in:
Vladimir Serbinenko
parent
d06de6c871
commit
d6d8e9a93e
3 changed files with 49 additions and 23 deletions
|
|
@ -1,3 +1,9 @@
|
|||
2013-11-08 Vladimir Serbinenko <phcoder@gmail.com>
|
||||
|
||||
* include/grub/gui.h (grub_fixed_sfs_divide): Round rather than
|
||||
truncate.
|
||||
(grub_fixed_fsf_divide): Likewise.
|
||||
|
||||
2013-11-08 Vladimir Serbinenko <phcoder@gmail.com>
|
||||
|
||||
* grub-core/gfxmenu/gui_list.c (draw_scrollbar): Avoid
|
||||
|
|
|
|||
|
|
@ -60,36 +60,36 @@
|
|||
{ "gfxterm_menu", 640, 480, 0x1, 256, 32, 4, 0, 8, 8, 8, 16, 8, 24, 8 /* 640x480xbgra8888 */, (grub_uint32_t []) { 0x9813a416, 0x9a418b1d, 0x6fb2a19a, 0x9a418b1d, 0x3c3e7993, 0x9813a416, 0x9813a416, 0xe85391b9, 0xe85391b9, 0xe85391b9, 0xda81995d, 0xda81995d, 0xda81995d, 0xe9064220, 0xe9064220, 0xe9064220, 0x9813a416, 0x3c3e7993, 0x3c3e7993, 0x9813a416, }, 20 },
|
||||
{ "gfxterm_menu", 800, 600, 0x1, 256, 32, 4, 0, 8, 8, 8, 16, 8, 24, 8 /* 800x600xbgra8888 */, (grub_uint32_t []) { 0x5fcf013d, 0x66cb2267, 0xb90e9f13, 0x66cb2267, 0x79874749, 0x5fcf013d, 0x5fcf013d, 0x55ffe784, 0x55ffe784, 0x55ffe784, 0x2c6d082c, 0x2c6d082c, 0x2c6d082c, 0xed8bba6b, 0xed8bba6b, 0xed8bba6b, 0x5fcf013d, 0x79874749, 0x79874749, 0x5fcf013d, }, 20 },
|
||||
{ "gfxterm_menu", 1024, 768, 0x1, 256, 32, 4, 0, 8, 8, 8, 16, 8, 24, 8 /* 1024x768xbgra8888 */, (grub_uint32_t []) { 0xdd28f52b, 0xd3d2838d, 0x3c2e7a96, 0xd3d2838d, 0x993b0962, 0xdd28f52b, 0xdd28f52b, 0xa719aebf, 0xa719aebf, 0xa719aebf, 0xcd8b1348, 0xcd8b1348, 0xcd8b1348, 0x1b91449d, 0x1b91449d, 0x1b91449d, 0xdd28f52b, 0x993b0962, 0x993b0962, 0xdd28f52b, }, 20 },
|
||||
{ "gfxmenu", 640, 480, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 640x480xi16 */, (grub_uint32_t []) { 0x59c36f00, 0x1dac528a, 0x611ddb2f, 0x1dac528a, 0xb9ae6371, 0x9a2e0d26, 0xbef55ac6, 0xbef55ac6, 0xbef55ac6, 0x18012606, 0x18012606, 0x18012606, 0xe4507cda, 0xe4507cda, 0xe4507cda, 0x59c36f00, 0xb9ae6371, 0xb9ae6371, }, 18 },
|
||||
{ "gfxmenu", 800, 600, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 800x600xi16 */, (grub_uint32_t []) { 0xaa4593fe, 0x7a48026, 0x3ed53b94, 0x7a48026, 0x24cc5a9f, 0xbc06c96d, 0x364f887, 0x364f887, 0x364f887, 0xb5a9f9fd, 0xb5a9f9fd, 0xb5a9f9fd, 0x18a57fae, 0x18a57fae, 0x18a57fae, 0xaa4593fe, 0x24cc5a9f, 0x24cc5a9f, }, 18 },
|
||||
{ "gfxmenu", 640, 480, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 640x480xi16 */, (grub_uint32_t []) { 0x59c36f00, 0x28e6b07d, 0xf54b3d6a, 0x28e6b07d, 0x7d0bdbfb, 0x9a2e0d26, 0xbef55ac6, 0xbef55ac6, 0xbef55ac6, 0x18012606, 0x18012606, 0x18012606, 0xe4507cda, 0xe4507cda, 0xe4507cda, 0x59c36f00, 0x7d0bdbfb, 0x7d0bdbfb, }, 18 },
|
||||
{ "gfxmenu", 800, 600, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 800x600xi16 */, (grub_uint32_t []) { 0xaa4593fe, 0x15bb581c, 0x7da084c6, 0x15bb581c, 0xcedba42f, 0xbc06c96d, 0x364f887, 0x364f887, 0x364f887, 0xb5a9f9fd, 0xb5a9f9fd, 0xb5a9f9fd, 0x18a57fae, 0x18a57fae, 0x18a57fae, 0xaa4593fe, 0xcedba42f, 0xcedba42f, }, 18 },
|
||||
{ "gfxmenu", 1024, 768, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 1024x768xi16 */, (grub_uint32_t []) { 0xc9cbf769, 0x817e5fe2, 0x134e87ff, 0x817e5fe2, 0xb83ddd98, 0xdcd8c986, 0xc41035b1, 0xc41035b1, 0xc41035b1, 0xf1a1bb53, 0xf1a1bb53, 0xf1a1bb53, 0x484edfc1, 0x484edfc1, 0x484edfc1, 0xc9cbf769, 0xb83ddd98, 0xb83ddd98, }, 18 },
|
||||
{ "gfxmenu", 640, 480, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 640x480xrgba8888 */, (grub_uint32_t []) { 0x1c3742c9, 0xa13c4462, 0xae363f3a, 0xa13c4462, 0x7bb5db9e, 0x740d78cf, 0x5ff06c85, 0x5ff06c85, 0x5ff06c85, 0xf43025ce, 0xf43025ce, 0xf43025ce, 0x6665df93, 0x6665df93, 0x6665df93, 0x1c3742c9, 0x7bb5db9e, 0x7bb5db9e, }, 18 },
|
||||
{ "gfxmenu", 800, 600, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 800x600xrgba8888 */, (grub_uint32_t []) { 0xcc5a7bed, 0xb104d1e4, 0x83e46d4b, 0xb104d1e4, 0x1da1af30, 0xe925e70d, 0x2c610bd8, 0x2c610bd8, 0x2c610bd8, 0xa2ef6169, 0xa2ef6169, 0xa2ef6169, 0xd321285f, 0xd321285f, 0xd321285f, 0xcc5a7bed, 0x1da1af30, 0x1da1af30, }, 18 },
|
||||
{ "gfxmenu", 640, 480, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 640x480xrgba8888 */, (grub_uint32_t []) { 0x1c3742c9, 0x95048302, 0x9f5bac7c, 0x95048302, 0x28413b7c, 0x740d78cf, 0x5ff06c85, 0x5ff06c85, 0x5ff06c85, 0xf43025ce, 0xf43025ce, 0xf43025ce, 0x6665df93, 0x6665df93, 0x6665df93, 0x1c3742c9, 0x28413b7c, 0x28413b7c, }, 18 },
|
||||
{ "gfxmenu", 800, 600, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 800x600xrgba8888 */, (grub_uint32_t []) { 0xcc5a7bed, 0x6cf38a7e, 0x35fcd6e8, 0x6cf38a7e, 0x618c203c, 0xe925e70d, 0x2c610bd8, 0x2c610bd8, 0x2c610bd8, 0xa2ef6169, 0xa2ef6169, 0xa2ef6169, 0xd321285f, 0xd321285f, 0xd321285f, 0xcc5a7bed, 0x618c203c, 0x618c203c, }, 18 },
|
||||
{ "gfxmenu", 1024, 768, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 1024x768xrgba8888 */, (grub_uint32_t []) { 0xef4a3312, 0xd610d630, 0x98774981, 0xd610d630, 0x4469957c, 0x9869130b, 0x5c4c70f2, 0x5c4c70f2, 0x5c4c70f2, 0xf06ea314, 0xf06ea314, 0xf06ea314, 0xaf278d15, 0xaf278d15, 0xaf278d15, 0xef4a3312, 0x4469957c, 0x4469957c, }, 18 },
|
||||
{ "gfxmenu", 2560, 1440, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 2560x1440xrgba8888 */, (grub_uint32_t []) { 0x54e48d80, 0xfe1f4c90, 0x3df0834a, 0xfe1f4c90, 0x22967f00, 0xb70885b0, 0x520b159, 0x520b159, 0x520b159, 0x5a1175be, 0x5a1175be, 0x5a1175be, 0xb19cd2b, 0xb19cd2b, 0xb19cd2b, 0x54e48d80, 0x22967f00, 0x22967f00, }, 18 },
|
||||
{ "gfxmenu", 640, 480, 0x2, 256, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 640x480xi256 */, (grub_uint32_t []) { 0x59c36f00, 0xfd820267, 0x25eafe4a, 0xfd820267, 0xaf3a53fd, 0x42b837cf, 0x6663602f, 0x6663602f, 0x6663602f, 0xc0971cef, 0xc0971cef, 0xc0971cef, 0x3cc64633, 0x3cc64633, 0x3cc64633, 0x59c36f00, 0xaf3a53fd, 0xaf3a53fd, }, 18 },
|
||||
{ "gfxmenu", 800, 600, 0x2, 256, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 800x600xi256 */, (grub_uint32_t []) { 0xaa4593fe, 0xd13e6572, 0xea561a48, 0xd13e6572, 0x3b706eaa, 0xd7e75590, 0x6885647a, 0x6885647a, 0x6885647a, 0xde486500, 0xde486500, 0xde486500, 0x7344e353, 0x7344e353, 0x7344e353, 0xaa4593fe, 0x3b706eaa, 0x3b706eaa, }, 18 },
|
||||
{ "gfxmenu", 2560, 1440, 0x1, 256, 32, 4, 16, 8, 8, 8, 0, 8, 24, 8 /* 2560x1440xrgba8888 */, (grub_uint32_t []) { 0x54e48d80, 0xf5c7a904, 0xaf9e8139, 0xf5c7a904, 0xf108ef6b, 0x91c7d0fe, 0x23efe417, 0x23efe417, 0x23efe417, 0x7cde20f0, 0x7cde20f0, 0x7cde20f0, 0x2dd69865, 0x2dd69865, 0x2dd69865, 0x54e48d80, 0xf108ef6b, 0xf108ef6b, }, 18 },
|
||||
{ "gfxmenu", 640, 480, 0x2, 256, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 640x480xi256 */, (grub_uint32_t []) { 0x59c36f00, 0xff8ab96b, 0x72a93e7f, 0xff8ab96b, 0x47d54a82, 0x42b837cf, 0x6663602f, 0x6663602f, 0x6663602f, 0xc0971cef, 0xc0971cef, 0xc0971cef, 0x3cc64633, 0x3cc64633, 0x3cc64633, 0x59c36f00, 0x47d54a82, 0x47d54a82, }, 18 },
|
||||
{ "gfxmenu", 800, 600, 0x2, 256, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 800x600xi256 */, (grub_uint32_t []) { 0xaa4593fe, 0x73ad05f, 0x8434d91c, 0x73ad05f, 0x5316d3c6, 0xd7e75590, 0x6885647a, 0x6885647a, 0x6885647a, 0xde486500, 0xde486500, 0xde486500, 0x7344e353, 0x7344e353, 0x7344e353, 0xaa4593fe, 0x5316d3c6, 0x5316d3c6, }, 18 },
|
||||
{ "gfxmenu", 1024, 768, 0x2, 256, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 1024x768xi256 */, (grub_uint32_t []) { 0xc9cbf769, 0x83e29007, 0xd4329e28, 0x83e29007, 0x8c37fac6, 0x97d4f246, 0x8f1c0e71, 0x8f1c0e71, 0x8f1c0e71, 0xbaad8093, 0xbaad8093, 0xbaad8093, 0x342e401, 0x342e401, 0x342e401, 0xc9cbf769, 0x8c37fac6, 0x8c37fac6, }, 18 },
|
||||
{ "gfxmenu", 640, 480, 0x1, 256, 15, 2, 10, 5, 5, 5, 0, 5, 0, 0 /* 640x480xrgba5550 */, (grub_uint32_t []) { 0x5387d57f, 0x6a8c404b, 0xaf0771ee, 0x6a8c404b, 0xd56e46a1, 0x7c892c8d, 0xe4a3b497, 0xe4a3b497, 0xe4a3b497, 0xf839b5ce, 0xf839b5ce, 0xf839b5ce, 0xcef38b56, 0xcef38b56, 0xcef38b56, 0x5387d57f, 0xd56e46a1, 0xd56e46a1, }, 18 },
|
||||
{ "gfxmenu", 800, 600, 0x1, 256, 15, 2, 10, 5, 5, 5, 0, 5, 0, 0 /* 800x600xrgba5550 */, (grub_uint32_t []) { 0xf83ee7aa, 0xc95b46dc, 0x42389b46, 0xc95b46dc, 0x3da99e44, 0x36353d2b, 0x54eb5fa9, 0x54eb5fa9, 0x54eb5fa9, 0x7598e512, 0x7598e512, 0x7598e512, 0x75ac2d95, 0x75ac2d95, 0x75ac2d95, 0xf83ee7aa, 0x3da99e44, 0x3da99e44, }, 18 },
|
||||
{ "gfxmenu", 640, 480, 0x1, 256, 15, 2, 10, 5, 5, 5, 0, 5, 0, 0 /* 640x480xrgba5550 */, (grub_uint32_t []) { 0x5387d57f, 0xe535f843, 0x39fb9c6c, 0xe535f843, 0x2fbd1b9, 0x7c892c8d, 0xe4a3b497, 0xe4a3b497, 0xe4a3b497, 0xf839b5ce, 0xf839b5ce, 0xf839b5ce, 0xcef38b56, 0xcef38b56, 0xcef38b56, 0x5387d57f, 0x2fbd1b9, 0x2fbd1b9, }, 18 },
|
||||
{ "gfxmenu", 800, 600, 0x1, 256, 15, 2, 10, 5, 5, 5, 0, 5, 0, 0 /* 800x600xrgba5550 */, (grub_uint32_t []) { 0xf83ee7aa, 0x8f8338d3, 0xdcad6ccd, 0x8f8338d3, 0x30c612d8, 0x36353d2b, 0x54eb5fa9, 0x54eb5fa9, 0x54eb5fa9, 0x7598e512, 0x7598e512, 0x7598e512, 0x75ac2d95, 0x75ac2d95, 0x75ac2d95, 0xf83ee7aa, 0x30c612d8, 0x30c612d8, }, 18 },
|
||||
{ "gfxmenu", 1024, 768, 0x1, 256, 15, 2, 10, 5, 5, 5, 0, 5, 0, 0 /* 1024x768xrgba5550 */, (grub_uint32_t []) { 0x724366e5, 0xb7a13882, 0x68141e3a, 0xb7a13882, 0x65f6d15, 0x3101c32f, 0x71819147, 0x71819147, 0x71819147, 0x937cae67, 0x937cae67, 0x937cae67, 0x5f98a12c, 0x5f98a12c, 0x5f98a12c, 0x724366e5, 0x65f6d15, 0x65f6d15, }, 18 },
|
||||
{ "gfxmenu", 640, 480, 0x1, 256, 16, 2, 11, 5, 5, 6, 0, 5, 0, 0 /* 640x480xrgba5650 */, (grub_uint32_t []) { 0x5387d57f, 0xba3a9cec, 0x6c371a08, 0xba3a9cec, 0x3a69d4c2, 0x9f8ae196, 0x124b1168, 0x124b1168, 0x124b1168, 0x3098734c, 0x3098734c, 0x3098734c, 0x49a4dc55, 0x49a4dc55, 0x49a4dc55, 0x5387d57f, 0x3a69d4c2, 0x3a69d4c2, }, 18 },
|
||||
{ "gfxmenu", 800, 600, 0x1, 256, 16, 2, 11, 5, 5, 6, 0, 5, 0, 0 /* 800x600xrgba5650 */, (grub_uint32_t []) { 0xf83ee7aa, 0x293c89fc, 0x53081671, 0x293c89fc, 0x5b528b57, 0xf9023dca, 0xe318794e, 0xe318794e, 0xe318794e, 0x33f458a5, 0x33f458a5, 0x33f458a5, 0x5aad1cff, 0x5aad1cff, 0x5aad1cff, 0xf83ee7aa, 0x5b528b57, 0x5b528b57, }, 18 },
|
||||
{ "gfxmenu", 640, 480, 0x1, 256, 16, 2, 11, 5, 5, 6, 0, 5, 0, 0 /* 640x480xrgba5650 */, (grub_uint32_t []) { 0x5387d57f, 0x88a3c3aa, 0x8eade265, 0x88a3c3aa, 0xa5bf47d6, 0x9f8ae196, 0x124b1168, 0x124b1168, 0x124b1168, 0x3098734c, 0x3098734c, 0x3098734c, 0x49a4dc55, 0x49a4dc55, 0x49a4dc55, 0x5387d57f, 0xa5bf47d6, 0xa5bf47d6, }, 18 },
|
||||
{ "gfxmenu", 800, 600, 0x1, 256, 16, 2, 11, 5, 5, 6, 0, 5, 0, 0 /* 800x600xrgba5650 */, (grub_uint32_t []) { 0xf83ee7aa, 0x8452c39c, 0x65759f4c, 0x8452c39c, 0x7459c042, 0xf9023dca, 0xe318794e, 0xe318794e, 0xe318794e, 0x33f458a5, 0x33f458a5, 0x33f458a5, 0x5aad1cff, 0x5aad1cff, 0x5aad1cff, 0xf83ee7aa, 0x7459c042, 0x7459c042, }, 18 },
|
||||
{ "gfxmenu", 1024, 768, 0x1, 256, 16, 2, 11, 5, 5, 6, 0, 5, 0, 0 /* 1024x768xrgba5650 */, (grub_uint32_t []) { 0x724366e5, 0x938d42a2, 0x709bc8ab, 0x938d42a2, 0x4db0e2de, 0xd710f4c, 0x87e95949, 0x87e95949, 0x87e95949, 0x85e2ee32, 0x85e2ee32, 0x85e2ee32, 0x21eb46f8, 0x21eb46f8, 0x21eb46f8, 0x724366e5, 0x4db0e2de, 0x4db0e2de, }, 18 },
|
||||
{ "gfxmenu", 640, 480, 0x1, 256, 24, 3, 16, 8, 8, 8, 0, 8, 0, 0 /* 640x480xrgba8880 */, (grub_uint32_t []) { 0x1c955882, 0xa45a33e5, 0x4681008b, 0xa45a33e5, 0x58ecfab4, 0xe97d0978, 0x182cf280, 0x182cf280, 0x182cf280, 0x6ac29d31, 0x6ac29d31, 0x6ac29d31, 0xf1873cf0, 0xf1873cf0, 0xf1873cf0, 0x1c955882, 0x58ecfab4, 0x58ecfab4, }, 18 },
|
||||
{ "gfxmenu", 800, 600, 0x1, 256, 24, 3, 16, 8, 8, 8, 0, 8, 0, 0 /* 800x600xrgba8880 */, (grub_uint32_t []) { 0x4d266f7a, 0x4d8f0da0, 0x53c652a, 0x4d8f0da0, 0x3e407de8, 0xed0808ad, 0x2cd02aaf, 0x2cd02aaf, 0x2cd02aaf, 0xc0ea7cc4, 0xc0ea7cc4, 0xc0ea7cc4, 0x32d39755, 0x32d39755, 0x32d39755, 0x4d266f7a, 0x3e407de8, 0x3e407de8, }, 18 },
|
||||
{ "gfxmenu", 640, 480, 0x1, 256, 24, 3, 16, 8, 8, 8, 0, 8, 0, 0 /* 640x480xrgba8880 */, (grub_uint32_t []) { 0x1c955882, 0xc060102b, 0x960bef0c, 0xc060102b, 0x1589677a, 0xe97d0978, 0x182cf280, 0x182cf280, 0x182cf280, 0x6ac29d31, 0x6ac29d31, 0x6ac29d31, 0xf1873cf0, 0xf1873cf0, 0xf1873cf0, 0x1c955882, 0x1589677a, 0x1589677a, }, 18 },
|
||||
{ "gfxmenu", 800, 600, 0x1, 256, 24, 3, 16, 8, 8, 8, 0, 8, 0, 0 /* 800x600xrgba8880 */, (grub_uint32_t []) { 0x4d266f7a, 0x6a4b2b8d, 0x274440b, 0x6a4b2b8d, 0xdef115d2, 0xed0808ad, 0x2cd02aaf, 0x2cd02aaf, 0x2cd02aaf, 0xc0ea7cc4, 0xc0ea7cc4, 0xc0ea7cc4, 0x32d39755, 0x32d39755, 0x32d39755, 0x4d266f7a, 0xdef115d2, 0xdef115d2, }, 18 },
|
||||
{ "gfxmenu", 1024, 768, 0x1, 256, 24, 3, 16, 8, 8, 8, 0, 8, 0, 0 /* 1024x768xrgba8880 */, (grub_uint32_t []) { 0x1ed9d731, 0xdb8085be, 0x51d897c7, 0xdb8085be, 0xa3ce0221, 0x30fbd5f9, 0x251832a3, 0x251832a3, 0x251832a3, 0x2fc77bf, 0x2fc77bf, 0x2fc77bf, 0x9ecd025b, 0x9ecd025b, 0x9ecd025b, 0x1ed9d731, 0xa3ce0221, 0xa3ce0221, }, 18 },
|
||||
{ "gfxmenu", 640, 480, 0x1, 256, 15, 2, 0, 5, 5, 5, 10, 5, 0, 0 /* 640x480xbgra5550 */, (grub_uint32_t []) { 0x5387d57f, 0xb2b3e1b6, 0xc5890b54, 0xb2b3e1b6, 0x2507a26e, 0x311b5810, 0xa931c00a, 0xa931c00a, 0xa931c00a, 0xb5abc153, 0xb5abc153, 0xb5abc153, 0x8361ffcb, 0x8361ffcb, 0x8361ffcb, 0x5387d57f, 0x2507a26e, 0x2507a26e, }, 18 },
|
||||
{ "gfxmenu", 800, 600, 0x1, 256, 15, 2, 0, 5, 5, 5, 10, 5, 0, 0 /* 800x600xbgra5550 */, (grub_uint32_t []) { 0xf83ee7aa, 0xccb9dff4, 0x3b202cfc, 0xccb9dff4, 0x8049625d, 0x783d77de, 0x1ae3155c, 0x1ae3155c, 0x1ae3155c, 0x3b90afe7, 0x3b90afe7, 0x3b90afe7, 0x3ba46760, 0x3ba46760, 0x3ba46760, 0xf83ee7aa, 0x8049625d, 0x8049625d, }, 18 },
|
||||
{ "gfxmenu", 640, 480, 0x1, 256, 15, 2, 0, 5, 5, 5, 10, 5, 0, 0 /* 640x480xbgra5550 */, (grub_uint32_t []) { 0x5387d57f, 0x475beaa4, 0xa62db977, 0x475beaa4, 0x3a62be0, 0x311b5810, 0xa931c00a, 0xa931c00a, 0xa931c00a, 0xb5abc153, 0xb5abc153, 0xb5abc153, 0x8361ffcb, 0x8361ffcb, 0x8361ffcb, 0x5387d57f, 0x3a62be0, 0x3a62be0, }, 18 },
|
||||
{ "gfxmenu", 800, 600, 0x1, 256, 15, 2, 0, 5, 5, 5, 10, 5, 0, 0 /* 800x600xbgra5550 */, (grub_uint32_t []) { 0xf83ee7aa, 0x5788a7ac, 0xd4336209, 0x5788a7ac, 0x354678e9, 0x783d77de, 0x1ae3155c, 0x1ae3155c, 0x1ae3155c, 0x3b90afe7, 0x3b90afe7, 0x3b90afe7, 0x3ba46760, 0x3ba46760, 0x3ba46760, 0xf83ee7aa, 0x354678e9, 0x354678e9, }, 18 },
|
||||
{ "gfxmenu", 1024, 768, 0x1, 256, 15, 2, 0, 5, 5, 5, 10, 5, 0, 0 /* 1024x768xbgra5550 */, (grub_uint32_t []) { 0x724366e5, 0xd1f64ea0, 0x4abd595a, 0xd1f64ea0, 0x97a6bea1, 0xf22a4cdb, 0xb2aa1eb3, 0xb2aa1eb3, 0xb2aa1eb3, 0x50572193, 0x50572193, 0x50572193, 0x9cb32ed8, 0x9cb32ed8, 0x9cb32ed8, 0x724366e5, 0x97a6bea1, 0x97a6bea1, }, 18 },
|
||||
{ "gfxmenu", 640, 480, 0x1, 256, 16, 2, 0, 5, 5, 6, 11, 5, 0, 0 /* 640x480xbgra5650 */, (grub_uint32_t []) { 0x5387d57f, 0xb7ad0a79, 0x130b2ee3, 0xb7ad0a79, 0xd90fba64, 0x84467c83, 0x9878c7d, 0x9878c7d, 0x9878c7d, 0x2b54ee59, 0x2b54ee59, 0x2b54ee59, 0x52684140, 0x52684140, 0x52684140, 0x5387d57f, 0xd90fba64, 0xd90fba64, }, 18 },
|
||||
{ "gfxmenu", 800, 600, 0x1, 256, 16, 2, 0, 5, 5, 6, 11, 5, 0, 0 /* 800x600xbgra5650 */, (grub_uint32_t []) { 0xf83ee7aa, 0x6febc215, 0x265cfafd, 0x6febc215, 0xdf74ef9b, 0x61b241cd, 0x7ba80549, 0x7ba80549, 0x7ba80549, 0xab4424a2, 0xab4424a2, 0xab4424a2, 0xc21d60f8, 0xc21d60f8, 0xc21d60f8, 0xf83ee7aa, 0xdf74ef9b, 0xdf74ef9b, }, 18 },
|
||||
{ "gfxmenu", 640, 480, 0x1, 256, 16, 2, 0, 5, 5, 6, 11, 5, 0, 0 /* 640x480xbgra5650 */, (grub_uint32_t []) { 0x5387d57f, 0xfcd5f4bb, 0x36d1826d, 0xfcd5f4bb, 0x43d7de40, 0x84467c83, 0x9878c7d, 0x9878c7d, 0x9878c7d, 0x2b54ee59, 0x2b54ee59, 0x2b54ee59, 0x52684140, 0x52684140, 0x52684140, 0x5387d57f, 0x43d7de40, 0x43d7de40, }, 18 },
|
||||
{ "gfxmenu", 800, 600, 0x1, 256, 16, 2, 0, 5, 5, 6, 11, 5, 0, 0 /* 800x600xbgra5650 */, (grub_uint32_t []) { 0xf83ee7aa, 0x21e820a3, 0x2f9bf273, 0x21e820a3, 0xaa229449, 0x61b241cd, 0x7ba80549, 0x7ba80549, 0x7ba80549, 0xab4424a2, 0xab4424a2, 0xab4424a2, 0xc21d60f8, 0xc21d60f8, 0xc21d60f8, 0xf83ee7aa, 0xaa229449, 0xaa229449, }, 18 },
|
||||
{ "gfxmenu", 1024, 768, 0x1, 256, 16, 2, 0, 5, 5, 6, 11, 5, 0, 0 /* 1024x768xbgra5650 */, (grub_uint32_t []) { 0x724366e5, 0x6fe66840, 0x64229598, 0x6fe66840, 0xedc02d98, 0x7131f7aa, 0xfba9a1af, 0xfba9a1af, 0xfba9a1af, 0xf9a216d4, 0xf9a216d4, 0xf9a216d4, 0x5dabbe1e, 0x5dabbe1e, 0x5dabbe1e, 0x724366e5, 0xedc02d98, 0xedc02d98, }, 18 },
|
||||
{ "gfxmenu", 640, 480, 0x1, 256, 24, 3, 0, 8, 8, 8, 16, 8, 0, 0 /* 640x480xbgra8880 */, (grub_uint32_t []) { 0x1c955882, 0x3ce54b83, 0x6f1d392c, 0x3ce54b83, 0x5d6f4d45, 0x573454, 0xf106cfac, 0xf106cfac, 0xf106cfac, 0x83e8a01d, 0x83e8a01d, 0x83e8a01d, 0x18ad01dc, 0x18ad01dc, 0x18ad01dc, 0x1c955882, 0x5d6f4d45, 0x5d6f4d45, }, 18 },
|
||||
{ "gfxmenu", 800, 600, 0x1, 256, 24, 3, 0, 8, 8, 8, 16, 8, 0, 0 /* 800x600xbgra8880 */, (grub_uint32_t []) { 0x4d266f7a, 0xcd317dde, 0xb5a369e7, 0xcd317dde, 0x1fd7486d, 0xe763cddd, 0x26bbefdf, 0x26bbefdf, 0x26bbefdf, 0xca81b9b4, 0xca81b9b4, 0xca81b9b4, 0x38b85225, 0x38b85225, 0x38b85225, 0x4d266f7a, 0x1fd7486d, 0x1fd7486d, }, 18 },
|
||||
{ "gfxmenu", 640, 480, 0x1, 256, 24, 3, 0, 8, 8, 8, 16, 8, 0, 0 /* 640x480xbgra8880 */, (grub_uint32_t []) { 0x1c955882, 0xdb159e45, 0x9b1475c9, 0xdb159e45, 0xaee6597b, 0x573454, 0xf106cfac, 0xf106cfac, 0xf106cfac, 0x83e8a01d, 0x83e8a01d, 0x83e8a01d, 0x18ad01dc, 0x18ad01dc, 0x18ad01dc, 0x1c955882, 0xaee6597b, 0xaee6597b, }, 18 },
|
||||
{ "gfxmenu", 800, 600, 0x1, 256, 24, 3, 0, 8, 8, 8, 16, 8, 0, 0 /* 800x600xbgra8880 */, (grub_uint32_t []) { 0x4d266f7a, 0x9a43dfc6, 0x67153087, 0x9a43dfc6, 0xe9bd482c, 0xe763cddd, 0x26bbefdf, 0x26bbefdf, 0x26bbefdf, 0xca81b9b4, 0xca81b9b4, 0xca81b9b4, 0x38b85225, 0x38b85225, 0x38b85225, 0x4d266f7a, 0xe9bd482c, 0xe9bd482c, }, 18 },
|
||||
{ "gfxmenu", 1024, 768, 0x1, 256, 24, 3, 0, 8, 8, 8, 16, 8, 0, 0 /* 1024x768xbgra8880 */, (grub_uint32_t []) { 0x1ed9d731, 0x78bf287, 0x8e68ddb4, 0x78bf287, 0xb2b0d4a4, 0xcb49fd6e, 0xdeaa1a34, 0xdeaa1a34, 0xdeaa1a34, 0xf94e5f28, 0xf94e5f28, 0xf94e5f28, 0x657f2acc, 0x657f2acc, 0x657f2acc, 0x1ed9d731, 0xb2b0d4a4, 0xb2b0d4a4, }, 18 },
|
||||
{ "gfxmenu", 640, 480, 0x1, 256, 32, 4, 0, 8, 8, 8, 16, 8, 24, 8 /* 640x480xbgra8888 */, (grub_uint32_t []) { 0x1c3742c9, 0x562060c4, 0xf361406d, 0x562060c4, 0xd311d62b, 0x83d93b90, 0xa8242fda, 0xa8242fda, 0xa8242fda, 0x3e46691, 0x3e46691, 0x3e46691, 0x91b19ccc, 0x91b19ccc, 0x91b19ccc, 0x1c3742c9, 0xd311d62b, 0xd311d62b, }, 18 },
|
||||
{ "gfxmenu", 800, 600, 0x1, 256, 32, 4, 0, 8, 8, 8, 16, 8, 24, 8 /* 800x600xbgra8888 */, (grub_uint32_t []) { 0xcc5a7bed, 0x5cad0ea2, 0x5b7557b, 0x5cad0ea2, 0x3bb3181a, 0x1c0b0f02, 0xd94fe3d7, 0xd94fe3d7, 0xd94fe3d7, 0x57c18966, 0x57c18966, 0x57c18966, 0x260fc050, 0x260fc050, 0x260fc050, 0xcc5a7bed, 0x3bb3181a, 0x3bb3181a, }, 18 },
|
||||
{ "gfxmenu", 640, 480, 0x1, 256, 32, 4, 0, 8, 8, 8, 16, 8, 24, 8 /* 640x480xbgra8888 */, (grub_uint32_t []) { 0x1c3742c9, 0xb7ccf7ca, 0xfe517937, 0xb7ccf7ca, 0xfa1f93fd, 0x83d93b90, 0xa8242fda, 0xa8242fda, 0xa8242fda, 0x3e46691, 0x3e46691, 0x3e46691, 0x91b19ccc, 0x91b19ccc, 0x91b19ccc, 0x1c3742c9, 0xfa1f93fd, 0xfa1f93fd, }, 18 },
|
||||
{ "gfxmenu", 800, 600, 0x1, 256, 32, 4, 0, 8, 8, 8, 16, 8, 24, 8 /* 800x600xbgra8888 */, (grub_uint32_t []) { 0xcc5a7bed, 0x663d292a, 0xa008c39, 0x663d292a, 0xcd82113f, 0x1c0b0f02, 0xd94fe3d7, 0xd94fe3d7, 0xd94fe3d7, 0x57c18966, 0x57c18966, 0x57c18966, 0x260fc050, 0x260fc050, 0x260fc050, 0xcc5a7bed, 0xcd82113f, 0xcd82113f, }, 18 },
|
||||
{ "gfxmenu", 1024, 768, 0x1, 256, 32, 4, 0, 8, 8, 8, 16, 8, 24, 8 /* 1024x768xbgra8888 */, (grub_uint32_t []) { 0xef4a3312, 0xfc2f0ab1, 0x6861f25e, 0xfc2f0ab1, 0x11b6b6f7, 0xcd618f3f, 0x944ecc6, 0x944ecc6, 0x944ecc6, 0xa5663f20, 0xa5663f20, 0xa5663f20, 0xfa2f1121, 0xfa2f1121, 0xfa2f1121, 0xef4a3312, 0x11b6b6f7, 0x11b6b6f7, }, 18 },
|
||||
{ "gfxterm_ar", 640, 480, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 640x480xi16 */, (grub_uint32_t []) { 0x59c36f00, 0x3458f737, 0x9f683632, 0x3458f737, 0xc406e533, 0x59c36f00, 0x59c36f00, 0x487ab5e4, 0x487ab5e4, 0x487ab5e4, 0x7fd259c4, 0x7fd259c4, 0x7fd259c4, 0x9e9c916, 0x9e9c916, 0x9e9c916, 0x59c36f00, 0xc406e533, 0xc406e533, 0x59c36f00, }, 20 },
|
||||
{ "gfxterm_ar", 800, 600, 0x2, 16, 8, 1, 0, 0, 0, 0, 0, 0, 0, 0 /* 800x600xi16 */, (grub_uint32_t []) { 0xaa4593fe, 0xf69b4ddf, 0xe4bbd034, 0xf69b4ddf, 0x11f6f535, 0xaa4593fe, 0xaa4593fe, 0x5f72cd5e, 0x5f72cd5e, 0x5f72cd5e, 0x2d53a3c0, 0x2d53a3c0, 0x2d53a3c0, 0xc354a564, 0xc354a564, 0xc354a564, 0xaa4593fe, 0x11f6f535, 0x11f6f535, 0xaa4593fe, }, 20 },
|
||||
|
|
|
|||
|
|
@ -120,16 +120,36 @@ grub_gfxmenu_timeout_unregister (grub_gui_component_t self)
|
|||
typedef signed grub_fixed_signed_t;
|
||||
#define GRUB_FIXED_1 0x10000
|
||||
|
||||
/* Special care is taken to round to nearest integer and not just truncate. */
|
||||
static inline signed
|
||||
grub_divide_round (signed a, signed b)
|
||||
{
|
||||
int neg = 0;
|
||||
signed ret;
|
||||
if (b < 0)
|
||||
{
|
||||
b = -b;
|
||||
neg = !neg;
|
||||
}
|
||||
if (a < 0)
|
||||
{
|
||||
a = -a;
|
||||
neg = !neg;
|
||||
}
|
||||
ret = (unsigned) (a + b / 2) / (unsigned) b;
|
||||
return neg ? -ret : ret;
|
||||
}
|
||||
|
||||
static inline signed
|
||||
grub_fixed_sfs_divide (signed a, grub_fixed_signed_t b)
|
||||
{
|
||||
return (a * GRUB_FIXED_1) / b;
|
||||
return grub_divide_round (a * GRUB_FIXED_1, b);
|
||||
}
|
||||
|
||||
static inline grub_fixed_signed_t
|
||||
grub_fixed_fsf_divide (grub_fixed_signed_t a, signed b)
|
||||
{
|
||||
return a / b;
|
||||
return grub_divide_round (a, b);
|
||||
}
|
||||
|
||||
static inline signed
|
||||
|
|
|
|||
Loading…
Reference in a new issue