Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
dadigang
Ventoy
Commits
f683bcbd
Commit
f683bcbd
authored
Mar 30, 2022
by
longpanda
Browse files
update for scroll menu text
parent
15b8b1f3
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
28 additions
and
9 deletions
+28
-9
GRUB2/MOD_SRC/grub-2.04/grub-core/fs/fshelp.c
GRUB2/MOD_SRC/grub-2.04/grub-core/fs/fshelp.c
+1
-1
GRUB2/MOD_SRC/grub-2.04/grub-core/gfxmenu/view.c
GRUB2/MOD_SRC/grub-2.04/grub-core/gfxmenu/view.c
+9
-4
GRUB2/MOD_SRC/grub-2.04/grub-core/kern/disk.c
GRUB2/MOD_SRC/grub-2.04/grub-core/kern/disk.c
+1
-1
GRUB2/MOD_SRC/grub-2.04/grub-core/normal/menu.c
GRUB2/MOD_SRC/grub-2.04/grub-core/normal/menu.c
+6
-0
GRUB2/MOD_SRC/grub-2.04/grub-core/term/efi/mouse.c
GRUB2/MOD_SRC/grub-2.04/grub-core/term/efi/mouse.c
+10
-2
GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/ventoy_cmd.c
GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/ventoy_cmd.c
+1
-1
No files found.
GRUB2/MOD_SRC/grub-2.04/grub-core/fs/fshelp.c
View file @
f683bcbd
...
...
@@ -426,7 +426,7 @@ grub_fshelp_read_file (grub_disk_t disk, grub_fshelp_node_t node,
if
(
grub_errno
)
return
-
1
;
}
else
if
(
read_hook
!=
(
void
*
)
grub_disk_blocklist_read
)
else
if
(
read_hook
!=
(
grub_disk_read_hook_t
)
grub_disk_blocklist_read
)
grub_memset
(
buf
,
0
,
blockend
);
buf
+=
blocksize
-
skipfirst
;
...
...
GRUB2/MOD_SRC/grub-2.04/grub-core/gfxmenu/view.c
View file @
f683bcbd
...
...
@@ -437,16 +437,21 @@ grub_gfxmenu_scroll_chosen_entry (void *data, int diren)
grub_gfxmenu_view_t
view
=
data
;
const
char
*
item_title
;
int
off
;
int
max
;
if
(
!
view
->
menu
->
size
)
return
;
item_title
=
grub_menu_get_entry
(
view
->
menu
,
view
->
selected
)
->
title
;
off
=
view
->
menu_title_offset
[
view
->
selected
]
+
diren
;
if
(
off
<
0
||
off
>
grub_utf8_get_num_code
(
item_title
,
grub_strlen
(
item_title
)))
return
;
max
=
grub_utf8_get_num_code
(
item_title
,
grub_strlen
(
item_title
));
if
(
diren
==
1000000
)
off
=
(
max
>=
20
)
?
(
max
-
20
)
:
0
;
else
if
(
off
<
0
)
off
=
0
;
else
if
(
off
>
max
)
off
=
max
;
view
->
menu_title_offset
[
view
->
selected
]
=
off
;
grub_gfxmenu_redraw_menu
(
view
);
...
...
GRUB2/MOD_SRC/grub-2.04/grub-core/kern/disk.c
View file @
f683bcbd
...
...
@@ -471,7 +471,7 @@ grub_err_t
grub_disk_read
(
grub_disk_t
disk
,
grub_disk_addr_t
sector
,
grub_off_t
offset
,
grub_size_t
size
,
void
*
buf
)
{
if
(
disk
->
read_hook
==
(
void
*
)
grub_disk_blocklist_read
)
if
(
disk
->
read_hook
==
(
grub_disk_read_hook_t
)
grub_disk_blocklist_read
)
{
return
grub_disk_blocklist_read
((
ventoy_img_chunk_list
*
)
disk
->
read_hook_data
,
sector
,
size
,
disk
->
log_sector_size
);
}
...
...
GRUB2/MOD_SRC/grub-2.04/grub-core/normal/menu.c
View file @
f683bcbd
...
...
@@ -861,6 +861,12 @@ run_menu (grub_menu_t menu, int nested, int *auto_boot)
case
GRUB_TERM_KEY_LEFT
:
menu_scroll_chosen_entry
(
-
1
);
break
;
case
GRUB_TERM_CTRL
|
GRUB_TERM_KEY_RIGHT
:
menu_scroll_chosen_entry
(
1000000
);
break
;
case
GRUB_TERM_CTRL
|
GRUB_TERM_KEY_LEFT
:
menu_scroll_chosen_entry
(
-
1000000
);
break
;
case
'\n'
:
case
'\r'
:
...
...
GRUB2/MOD_SRC/grub-2.04/grub-core/term/efi/mouse.c
View file @
f683bcbd
...
...
@@ -23,6 +23,7 @@
#include <grub/command.h>
#include <grub/i18n.h>
#include <grub/err.h>
#include <grub/env.h>
#include <grub/efi/efi.h>
#include <grub/efi/api.h>
...
...
@@ -159,9 +160,16 @@ grub_mouse_getkey (struct grub_term_input *term)
grub_efi_mouse_prot_t
*
mouse
=
term
->
data
;
//int x;
int
y
;
int
delta
=
0
;
const
char
*
env
;
grub_efi_uintn_t
i
;
if
(
!
mouse
)
return
GRUB_TERM_NO_KEY
;
env
=
grub_env_get
(
"mouse_delta"
);
if
(
env
)
delta
=
(
int
)
grub_strtol
(
env
,
NULL
,
10
);
for
(
i
=
0
;
i
<
mouse
->
count
;
i
++
)
{
efi_call_2
(
mouse
->
mouse
[
i
]
->
get_state
,
mouse
->
mouse
[
i
],
&
cur
);
...
...
@@ -172,9 +180,9 @@ grub_mouse_getkey (struct grub_term_input *term)
return
0x0d
;
if
(
cur
.
right
)
return
GRUB_TERM_ESC
;
if
(
y
>
0
)
if
(
y
>
delta
)
return
GRUB_TERM_KEY_DOWN
;
if
(
y
<
0
)
if
(
y
<
-
delta
)
return
GRUB_TERM_KEY_UP
;
}
}
...
...
GRUB2/MOD_SRC/grub-2.04/grub-core/ventoy/ventoy_cmd.c
View file @
f683bcbd
...
...
@@ -3152,7 +3152,7 @@ int ventoy_get_block_list(grub_file_t file, ventoy_img_chunk_list *chunklist, gr
}
else
{
file
->
read_hook
=
(
void
*
)
grub_disk_blocklist_read
;
file
->
read_hook
=
(
grub_disk_read_hook_t
)
grub_disk_blocklist_read
;
file
->
read_hook_data
=
chunklist
;
for
(
size
=
file
->
size
;
size
>
0
;
size
-=
read
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment