interesting
/
libui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Wrote up the actual HMENU creation code on Windows. That just leaves the event handling.

This commit is contained in:
Pietro Gagliardi 2015-04-24 15:44:29 -04:00
parent d28d5c8d3e
commit 88bbdc4805
2 changed files with 62 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
new/windows/menu.c
View File

@ -26,7 +26,6 @@ struct menuItem {
void *onClickedData; void *onClickedData;
BOOL disabled; // template for new instances; kept in sync with everything else BOOL disabled; // template for new instances; kept in sync with everything else
BOOL checked; BOOL checked;
HWND *hwnds;
HMENU *hmenus; HMENU *hmenus;
uintmax_t len; uintmax_t len;
uintmax_t cap; uintmax_t cap;
@ -135,6 +134,8 @@ static uiMenuItem *newItem(struct menu *m, int type, const char *name)
item->name = toUTF16("About"); item->name = toUTF16("About");
break; break;
case typeSeparator: case typeSeparator:
// TODO this shouldn't be necessary, but uiRealloc() doesn't yet zero out new bytes
item->name = NULL;
break; break;
default: default:
item->name = toUTF16(name); item->name = toUTF16(name);
@ -154,7 +155,6 @@ static uiMenuItem *newItem(struct menu *m, int type, const char *name)
// TODO this shouldn't be necessary, but uiRealloc() doesn't yet zero out new bytes // TODO this shouldn't be necessary, but uiRealloc() doesn't yet zero out new bytes
item->disabled = FALSE; item->disabled = FALSE;
item->checked = FALSE; item->checked = FALSE;
item->hwnds = NULL;
item->hmenus = NULL; item->hmenus = NULL;
item->len = 0; item->len = 0;
item->cap = 0; item->cap = 0;
@ -240,3 +240,61 @@ uiMenu *uiNewMenu(const char *name)
return uiMenu(m); return uiMenu(m);
} }
static void appendMenuItem(HMENU menu, struct menuItem *item)
{
UINT uFlags;
uFlags = MF_SEPARATOR;
if (item->type != typeSeparator) {
uFlags = MF_STRING;
if (item->disabled)
uFlags |= MF_DISABLED | MF_GRAYED;
if (item->checked)
uFlags |= MF_CHECKED;
}
if (AppendMenuW(menu, uFlags, item->id, item->name) == 0)
logLastError("error appending menu item in appendMenuItem()");
if (item->len >= item->cap) {
item->cap += grow;
item->hmenus = (HMENU *) uiRealloc(item->hmenus, item->cap * sizeof (HMENU), "HMENU[]");
}
item->hmenus[item->len] = menu;
item->len++;
}
static HMENU makeMenu(struct menu *m)
{
HMENU menu;
uintmax_t i;
menu = CreatePopupMenu();
if (menu == NULL)
logLastError("error creating menu in makeMenu()");
for (i = 0; i < m->len; i++)
appendMenuItem(menu, &(m->items[i]));
return menu;
}
// TODO should this return a zero-height widget (or NULL) if there are no menus defined?
HMENU makeMenubar(void)
{
HMENU menubar;
HMENU menu;
uintmax_t i;
menusFinalized = TRUE;
menubar = CreateMenu();
if (menubar == NULL)
logLastError("error creating menubar in makeMenubar()");
for (i = 0; i < len; i++) {
menu = makeMenu(&menus[i]);
if (AppendMenuW(menubar, MF_POPUP | MF_STRING, (UINT_PTR) menu, menus[i].name) == 0)
logLastError("error appending menu to menubar in makeMenubar()");
}
return menubar;
}

4
new/windows/window.c
View File

@ -230,11 +230,11 @@ uiWindow *uiNewWindow(const char *title, int width, int height, int hasMenubar)
w->content = uiNewOSContainer((uintptr_t) (w->hwnd)); w->content = uiNewOSContainer((uintptr_t) (w->hwnd));
/*TODO if (hasMenubar) { if (hasMenubar) {
hmenu = makeMenubar(); hmenu = makeMenubar();
if (SetMenu(w->hwnd, hmenu) == 0) if (SetMenu(w->hwnd, hmenu) == 0)
logLastError("error giving menu to window in uiNewWindow()"); logLastError("error giving menu to window in uiNewWindow()");
}*/ }
uiWindow(w)->Destroy = windowDestroy; uiWindow(w)->Destroy = windowDestroy;
uiWindow(w)->Handle = windowHandle; uiWindow(w)->Handle = windowHandle;