add support for multiple keymap/menufunc to km_dokey_event() #3954
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
lucilanga
added
type:enhancement
flatcap
force-pushed
the
devel/key-handling
branch
from
56deafd
to
5ec8d55
Compare
flatcap
force-pushed
the
devel/key-handling
branch
from
5ec8d55
to
c1f7bc8
Compare
flatcap
force-pushed
the
devel/key-handling
branch
from
c1f7bc8
to
dfc8298
Compare
| void *hsmap[] = { &Keymaps[MENU_ALIAS], &Keymaps[MENU_GENERIC], 0 }; | ||
| void *hsfuncs[] = { OpAlias, 0 }; | ||
| op = km_dokey2(hsmap, hsfuncs, GETCH_NO_FLAGS); | ||
| // op = km_dokey(MENU_ALIAS, GETCH_NO_FLAGS); |
Check notice
Code scanning / CodeQL
Commented-out code Note
| void *hsmap[] = { &Keymaps[MENU_FOLDER], &Keymaps[MENU_GENERIC], 0 }; | ||
| void *hsfuncs[] = { OpBrowser, OpGeneric, 0 }; | ||
| op = km_dokey2(hsmap, hsfuncs, GETCH_NO_FLAGS); | ||
| // op = km_dokey(MENU_FOLDER, GETCH_NO_FLAGS); |
Check notice
Code scanning / CodeQL
Commented-out code Note
| */ | ||
| struct KeymapSeq | ||
| { | ||
| // struct Keymaps *name; |
Check notice
Code scanning / CodeQL
Commented-out code Note
| void *hsmap[] = { &Keymaps[MENU_DIALOG], &Keymaps[MENU_GENERIC], 0 }; | ||
| void *hsfuncs[] = { OpDialog, OpGeneric, 0 }; | ||
| op = km_dokey2(hsmap, hsfuncs, GETCH_NO_FLAGS); | ||
| // op = km_dokey(MENU_DIALOG, GETCH_NO_FLAGS); |
Check notice
Code scanning / CodeQL
Commented-out code Note
| void *hsmap[] = { &Keymaps[MENU_PAGER], &Keymaps[MENU_GENERIC], 0 }; | ||
| void *hsfuncs[] = { OpPager, 0 }; | ||
| op = km_dokey2(hsmap, hsfuncs, GETCH_NO_FLAGS); | ||
| // op = km_dokey(MENU_PAGER, GETCH_NO_FLAGS); |
Check notice
Code scanning / CodeQL
Commented-out code Note
flatcap
force-pushed
the
devel/key-handling
branch
from
dfc8298
to
54c72ba
Compare
flatcap
force-pushed
the
devel/key-handling
branch
2 times, most recently
from
2f6b533
to
e33492e
Compare
flatcap
force-pushed
the
devel/key-handling
branch
2 times, most recently
from
9deb06f
to
d730e22
Compare
flatcap
force-pushed
the
devel/key-handling
branch
from
d730e22
to
780224e
Compare
flatcap
force-pushed
the
devel/key-handling
branch
3 times, most recently
from
57cec06
to
dff703f
Compare
flatcap
force-pushed
the
devel/key-handling
branch
from
dff703f
to
bece957
Compare
| void *hsmap[] = { &Keymaps[MENU_INDEX], &Keymaps[MENU_GENERIC], 0 }; | ||
| const void *hsfuncs[] = { OpIndex, OpGeneric, 0 }; | ||
| op = km_dokey2(hsmap, hsfuncs, GETCH_NO_FLAGS); | ||
| // op = km_dokey(MENU_INDEX, GETCH_NO_FLAGS); |
Check notice
Code scanning / CodeQL
Commented-out code Note
flatcap
force-pushed
the
devel/key-handling
branch
from
bece957
to
11c47de
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I just wanted to get the ball rolling on this.
On the long run, if this is going to fly I believe it requires a third component.
That is the menu domain we've been talking the last time.
I'm not fully certain how this is going to fall into place.
We were discussing having :
DomainPager = { OpPager, pager_function_dispatcher() }
but perhaps we can do a global domain table where we could find our dispatcher() based on the calling parameters.
obviously OpBrowser will trigger browser_function_dispatcher() and OpGeneric will trigger global dispatcher.
There is the matter of menu dispatcher called infrequently or index dispatcher for that matter, I'm not sure what to do about them.
Moving on, we import OpAlias, OpGeneric from functions.h but we have a local functions.h in each dialog's directory, perhaps we can move those to keymap.h.
I was setup to use structs for function prototypes but I'd fallen on void. I was not sure about the final prototype and wanted to avoid: { { param}, {param}, {0} }. I've kept the original prototypes in keymap.h though. Also I've made km_dokey_event2() as per your initial thought on this, it's easier to switch back.
Finally I've ignored mw_get_field() and the _notify part for that matter as well, I believe the whole PR is going to be in need for a makeover. Though the way I'm dragging things perhaps I should consider doing the sidebar things the way are right now and get it out of the way.
PS. If this is going to trigger build breakage I've no idea how to test 'em beforehand