r672 - trunk/game
black at icculus.org
black at icculus.org
Sun Mar 12 17:30:24 EST 2006
Author: black
Date: 2006-03-12 17:30:24 -0500 (Sun, 12 Mar 2006)
New Revision: 672
Modified:
trunk/game/m_menucore.c
trunk/game/m_menucore.h
Log:
Don't hate me for this:
Changed all item spefific functions to use their type as subnamespace instead of using it as suffix.
Modified: trunk/game/m_menucore.c
===================================================================
--- trunk/game/m_menucore.c 2006-03-12 22:11:29 UTC (rev 671)
+++ trunk/game/m_menucore.c 2006-03-12 22:30:24 UTC (rev 672)
@@ -152,9 +152,11 @@
Mem_Free(&item);
}
-Menu_Item *Menu_CreateGenericItem(Menu_SubMenu *parent, NSint x, NSint y, NUint bytes)
+Menu_Item *Menu_Generic_Create(Menu_SubMenu *parent, NSint x, NSint y, NUint bytes)
{
Menu_Item *item;
+ assert( bytes >= sizeof(Menu_Item) );
+
item = Mem_Alloc(Menu.menu_zone, bytes);
item->MouseMove = Menu_Generic_MouseMoveNonSelectable;
@@ -179,7 +181,7 @@
//text items
-void Menu_DrawTextItem(Menu_TextItem *item, Menu_Inheritance *inh)
+void Menu_Text_Draw(Menu_TextItem *item, Menu_Inheritance *inh)
{
R_SetBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
R_SetTexture(R.resource_font);
@@ -200,12 +202,12 @@
}
return false;
}
-Menu_TextItem *Menu_CreateTextItem(Menu_SubMenu *parent, NSint x, NSint y, char *text, void *command, void (*UseTextItem) (struct Menu_TextItem *item))
+Menu_TextItem *Menu_Text_Create(Menu_SubMenu *parent, NSint x, NSint y, char *text, void *command, void (*UseTextItem) (struct Menu_TextItem *item))
{
Menu_TextItem *it;
- it = (Menu_TextItem*)Menu_CreateGenericItem(parent, x, y, sizeof(Menu_TextItem));
+ it = (Menu_TextItem*)Menu_Generic_Create(parent, x, y, sizeof(Menu_TextItem));
- it->super.DrawMenu = Menu_DrawTextItem;
+ it->super.DrawMenu = Menu_Text_Draw;
if (command != NULL)
{
it->super.MouseMove = Menu_Generic_MouseMoveSelectable;
@@ -230,7 +232,7 @@
//text-edit fields
//fixme: only work with grabs?
-void Menu_DrawEditItem(Menu_EditItem *item, Menu_Inheritance *inh)
+void Menu_Edit_Draw(Menu_EditItem *item, Menu_Inheritance *inh)
{
R_SetBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
R_SetTexture(R.resource_font);
@@ -309,12 +311,12 @@
}
return false;
}
-Menu_EditItem *Menu_CreateEditItem(Menu_SubMenu *parent, NSint x, NSint y, char *text)
+Menu_EditItem *Menu_Edit_Create(Menu_SubMenu *parent, NSint x, NSint y, char *text)
{
Menu_EditItem *it;
- it = (Menu_EditItem*)Menu_CreateGenericItem(parent, x, y, sizeof(Menu_EditItem));
+ it = (Menu_EditItem*)Menu_Generic_Create(parent, x, y, sizeof(Menu_EditItem));
- it->super.DrawMenu = Menu_DrawEditItem;
+ it->super.DrawMenu = Menu_Edit_Draw;
it->super.MouseMove = Menu_Generic_MouseMoveSelectable;
it->super.KeyEvent = Menu_Edit_KeyPress;
it->super.size[0] = 8*strlen(text);
@@ -339,7 +341,7 @@
//combos
-void Menu_DrawComboItem(Menu_ComboItem *item, Menu_Inheritance *inh)
+void Menu_Combo_Draw(Menu_ComboItem *item, Menu_Inheritance *inh)
{
R_SetBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
R_SetTexture(R.resource_font);
@@ -369,12 +371,12 @@
Mem_Free(&oldtext);
}
-void Menu_ComboSlider (Menu_SliderItem *slider)
+void Menu_Combo_UseSlider (Menu_SliderItem *slider)
{
Menu_SubMenu *submenu = slider->data;
submenu->subwindow.pos[1] = -slider->value;
}
-void Menu_UseOption (Menu_TextItem *it)
+void Menu_Combo_UseOption (Menu_TextItem *it)
{
Menu_ComboItem *comboitem = (void*)it->command;
Menu_Combo_SetText(comboitem, it->text);
@@ -395,21 +397,21 @@
NSint pixels;
NUint i;
- item->popup = Menu_CreateMenu(&Menu.rootmenu);
+ item->popup = Menu_SubMenu_Create(&Menu.rootmenu);
Menu_BringToFront(item->popup);
- interior = Menu_CreateMenu(item->popup);
+ interior = Menu_SubMenu_Create(item->popup);
interior->allowclose = false;
Menu.grabs = &item->popup->super;
option = item->options;
for (i = 0; option; i+=8, option = option->next)
{
- txt = Menu_CreateTextItem(interior, 0, i, option->text, item, Menu_UseOption);
+ txt = Menu_Text_Create(interior, 0, i, option->text, item, Menu_Combo_UseOption);
txt->super.size[0] = item->super.size[0] - 8;
}
pixels = i-64;
if (pixels < 0)
pixels = 0;
- Menu_CreateVSliderItem(item->popup, item->super.size[0] - 8, 0, 8, ((i>64)?64:i), 0, pixels, 0, Menu_ComboSlider, NULL, interior);
+ Menu_VSlider_Create(item->popup, item->super.size[0] - 8, 0, 8, ((i>64)?64:i), 0, pixels, 0, Menu_Combo_UseSlider, NULL, interior);
item->popup->super.pos[0] = Input.mouse[0];
item->popup->super.pos[1] = Input.mouse[1];
@@ -431,13 +433,13 @@
Menu_Generic_Destroy(&item->super);
}
-Menu_ComboItem *Menu_CreateComboItem(Menu_SubMenu *parent, NSint x, NSint y, NUint w, char *defalt, char *list)
+Menu_ComboItem *Menu_Combo_Create(Menu_SubMenu *parent, NSint x, NSint y, NUint w, char *defalt, char *list)
{
//list is pipe-sperated
Menu_ComboItem *it;
- it = (Menu_ComboItem*)Menu_CreateGenericItem(parent, x, y, sizeof(Menu_ComboItem));
+ it = (Menu_ComboItem*)Menu_Generic_Create(parent, x, y, sizeof(Menu_ComboItem));
- it->super.DrawMenu = Menu_DrawComboItem;
+ it->super.DrawMenu = Menu_Combo_Draw;
it->super.MouseMove = Menu_Generic_MouseMoveSelectable;
it->super.KeyEvent = Menu_Combo_KeyPress;
it->super.Destroy = Menu_Combo_Destroy;
@@ -502,10 +504,10 @@
}
return false;
}
-Menu_PictureItem *Menu_CreatePictureItem(Menu_SubMenu *parent, NSint x, NSint y, NUint w, NUint h, char *imagename, char *command)
+Menu_PictureItem *Menu_Picture_Create(Menu_SubMenu *parent, NSint x, NSint y, NUint w, NUint h, char *imagename, char *command)
{
Menu_PictureItem *it;
- it = (Menu_PictureItem*)Menu_CreateGenericItem(parent, x, y, sizeof(Menu_PictureItem));
+ it = (Menu_PictureItem*)Menu_Generic_Create(parent, x, y, sizeof(Menu_PictureItem));
it->super.DrawMenu = Menu_Picture_Draw;
if (command != NULL)
@@ -531,7 +533,7 @@
//sliderh items
-void Menu_SliderH_Draw(Menu_SliderItem *item, Menu_Inheritance *inh)
+void Menu_HSlider_Draw(Menu_SliderItem *item, Menu_Inheritance *inh)
{
Nfloat frac;
@@ -601,12 +603,12 @@
}
return false;
}
-Menu_SliderItem *Menu_CreateHSliderItem(Menu_SubMenu *parent, NSint x, NSint y, NUint w, NUint h, Nfloat minv, Nfloat maxv, Nfloat defaultv, void (*ChangeNotification)(Menu_SliderItem*), void (*UpdateSlider)(Menu_SliderItem*), void *data)
+Menu_SliderItem *Menu_HSlider_Create(Menu_SubMenu *parent, NSint x, NSint y, NUint w, NUint h, Nfloat minv, Nfloat maxv, Nfloat defaultv, void (*ChangeNotification)(Menu_SliderItem*), void (*UpdateSlider)(Menu_SliderItem*), void *data)
{
Menu_SliderItem *it;
- it = (Menu_SliderItem*)Menu_CreateGenericItem(parent, x, y, sizeof(Menu_SliderItem));
+ it = (Menu_SliderItem*)Menu_Generic_Create(parent, x, y, sizeof(Menu_SliderItem));
- it->super.DrawMenu = Menu_SliderH_Draw;
+ it->super.DrawMenu = Menu_HSlider_Draw;
it->super.MouseMove = Menu_Generic_MouseMoveSelectable;
it->super.KeyEvent = Menu_Slider_KeyPress;
@@ -632,7 +634,7 @@
//sliderv items
-void Menu_SliderV_Draw(Menu_SliderItem *item, Menu_Inheritance *inh)
+void Menu_VSlider_Draw(Menu_SliderItem *item, Menu_Inheritance *inh)
{
Nfloat frac;
@@ -672,12 +674,12 @@
R_DrawString("A", 0, item->super.pos[0] + inh->addpos[0], item->super.pos[1] + inh->addpos[1], item->scale, item->scale, Console_DefaultColorTable, Console_DefaultColorTableSize, item->super.parent->selecteditem == &item->super);
R_DrawString("V", 0, item->super.pos[0] + inh->addpos[0], item->super.pos[1] + inh->addpos[1] - item->scale + (item->super.size[1]), item->scale, item->scale, Console_DefaultColorTable, Console_DefaultColorTableSize, item->super.parent->selecteditem == &item->super);
}
-Menu_SliderItem *Menu_CreateVSliderItem(Menu_SubMenu *parent, NSint x, NSint y, NUint w, NUint h, Nfloat minv, Nfloat maxv, Nfloat defaultv, void (*ChangeNotification)(Menu_SliderItem*), void (*UpdateSlider)(Menu_SliderItem*), void *data)
+Menu_SliderItem *Menu_VSlider_Create(Menu_SubMenu *parent, NSint x, NSint y, NUint w, NUint h, Nfloat minv, Nfloat maxv, Nfloat defaultv, void (*ChangeNotification)(Menu_SliderItem*), void (*UpdateSlider)(Menu_SliderItem*), void *data)
{
Menu_SliderItem *it;
- it = (Menu_SliderItem*)Menu_CreateGenericItem(parent, x, y, sizeof(Menu_SliderItem));
+ it = (Menu_SliderItem*)Menu_Generic_Create(parent, x, y, sizeof(Menu_SliderItem));
- it->super.DrawMenu = Menu_SliderV_Draw;
+ it->super.DrawMenu = Menu_VSlider_Draw;
it->super.MouseMove = Menu_Generic_MouseMoveSelectable;
it->super.KeyEvent = Menu_Slider_KeyPress;
@@ -705,7 +707,7 @@
//submenus
-void Menu_MouseMoveSubMenu(Menu_SubMenu *item, Menu_Inheritance *inh)
+void Menu_SubMenu_MouseMove(Menu_SubMenu *item, Menu_Inheritance *inh)
{
Menu_Item *subitem;
Menu_Inheritance ninh;
@@ -760,7 +762,7 @@
for (subitem = item->subitems; subitem; subitem = subitem->next)
subitem->MouseMove(subitem, &ninh);
}
-void Menu_DrawSubMenu(Menu_SubMenu *item, Menu_Inheritance *inh)
+void Menu_SubMenu_Draw(Menu_SubMenu *item, Menu_Inheritance *inh)
{
Menu_Item *subitem, *next;
Menu_Inheritance ninh;
@@ -799,7 +801,7 @@
R_SetScissor(inh->window.pos[0], inh->window.pos[1], inh->window.size[0], inh->window.size[1]);
}
-Nbool Menu_KeyEventSubMenu (Menu_SubMenu *item, NUint mod, NUint sym, NUint character, Nbool downevent)
+Nbool Menu_SubMenu_KeyEvent (Menu_SubMenu *item, NUint mod, NUint sym, NUint character, Nbool downevent)
{
Menu_Item *subitem;
@@ -871,19 +873,19 @@
Menu_Generic_Destroy(&item->super);
}
-Menu_SubMenu *Menu_CreateMenu(Menu_SubMenu *parent)
+Menu_SubMenu *Menu_SubMenu_Create(Menu_SubMenu *parent)
{
Menu_SubMenu *menu;
- menu = (Menu_SubMenu*) Menu_CreateGenericItem(NULL, 0, 0, sizeof(Menu_SubMenu));
+ menu = (Menu_SubMenu*) Menu_Generic_Create(NULL, 0, 0, sizeof(Menu_SubMenu));
if( parent ) {
Menu_AddAtFront(parent, &menu->super);
}
- menu->super.MouseMove = Menu_MouseMoveSubMenu;
- menu->super.DrawMenu = Menu_DrawSubMenu;
- menu->super.KeyEvent = Menu_KeyEventSubMenu;
+ menu->super.MouseMove = Menu_SubMenu_MouseMove;
+ menu->super.DrawMenu = Menu_SubMenu_Draw;
+ menu->super.KeyEvent = Menu_SubMenu_KeyEvent;
menu->super.Destroy = Menu_SubMenu_Destroy;
menu->allowclose = true;
@@ -891,6 +893,7 @@
return menu;
}
+// TODO: change this name, too
void Menu_FinishMenu(Menu_SubMenu *menu)
{
Menu_Item *subitem;
@@ -916,6 +919,7 @@
menu->subwindow.size[1] = maxpos[1];
}
+// TODO: change this name as well?
void Menu_ArrangeSubItems(Menu_SubMenu *menu, Nbool horizontal, NSint pad, Menu_ArrangeStyle arrange)
{
Menu_Item *sitem;
@@ -1047,25 +1051,25 @@
void Menu_Menu_Test(void)
{
//fixme: we still need to figure out how to do the parent's frames, so the subwindow doesn't appear outside the parent
- Menu_SubMenu *menu = Menu_CreateMenu(&Menu.rootmenu);
+ Menu_SubMenu *menu = Menu_SubMenu_Create(&Menu.rootmenu);
Menu_SubMenu *child;
- child = Menu_CreateMenu(menu);
+ child = Menu_SubMenu_Create(menu);
child->subwindow.pos[0] = sliderscale;
child->subwindow.pos[1] = sliderscale;
child->super.pos[0] = sliderscale;
child->super.pos[1] = sliderscale;
- Menu_CreateHSliderItem(menu, sliderscale, 0, windowsize, sliderscale, sliderscale, sliderscale-imagesize + windowsize, 0, MoveMenuH, UpdateMoveMenuH, child);
- Menu_CreateHSliderItem(menu, sliderscale, sliderscale+windowsize, windowsize, sliderscale, sliderscale, sliderscale-imagesize + windowsize, 0, MoveMenuH, UpdateMoveMenuH, child);
- Menu_CreateVSliderItem(menu, 0, sliderscale, sliderscale, windowsize, sliderscale, sliderscale-imagesize + windowsize, 0, MoveMenuV, UpdateMoveMenuV, child);
- Menu_CreateVSliderItem(menu, sliderscale+windowsize, sliderscale, sliderscale, windowsize, sliderscale, sliderscale-imagesize + windowsize, 0, MoveMenuV, UpdateMoveMenuV, child);
- Menu_CreatePictureItem(child, 0, 0, imagesize, imagesize, "lhfont.tga", NULL);
+ Menu_HSlider_Create(menu, sliderscale, 0, windowsize, sliderscale, sliderscale, sliderscale-imagesize + windowsize, 0, MoveMenuH, UpdateMoveMenuH, child);
+ Menu_HSlider_Create(menu, sliderscale, sliderscale+windowsize, windowsize, sliderscale, sliderscale, sliderscale-imagesize + windowsize, 0, MoveMenuH, UpdateMoveMenuH, child);
+ Menu_VSlider_Create(menu, 0, sliderscale, sliderscale, windowsize, sliderscale, sliderscale-imagesize + windowsize, 0, MoveMenuV, UpdateMoveMenuV, child);
+ Menu_VSlider_Create(menu, sliderscale+windowsize, sliderscale, sliderscale, windowsize, sliderscale, sliderscale-imagesize + windowsize, 0, MoveMenuV, UpdateMoveMenuV, child);
+ Menu_Picture_Create(child, 0, 0, imagesize, imagesize, "lhfont.tga", NULL);
Menu_FinishMenu(child);
child->allowclose = false;
- Menu_CreatePictureItem(child, 0, 0, child->super.size[0], child->super.size[1], "maps/test/skybox_ny.tga", NULL);
+ Menu_Picture_Create(child, 0, 0, child->super.size[0], child->super.size[1], "maps/test/skybox_ny.tga", NULL);
menu->dragable = true;
@@ -1073,7 +1077,7 @@
child->super.size[1] = windowsize;
Menu_FinishMenu(menu);
- Menu_CreatePictureItem(menu, 0, 0, menu->super.size[0], menu->super.size[1], "maps/test/skybox_ny.tga", NULL);
+ Menu_Picture_Create(menu, 0, 0, menu->super.size[0], menu->super.size[1], "maps/test/skybox_ny.tga", NULL);
}
static Shell_SymbolDecl Menu_Menu_Test_Decl = {
"menu_test",
@@ -1090,27 +1094,27 @@
void Menu_Main(void)
{
- Menu_SubMenu *menu = Menu_CreateMenu(&Menu.rootmenu);
+ Menu_SubMenu *menu = Menu_SubMenu_Create(&Menu.rootmenu);
menu->dragable = true;
- Menu_CreateTextItem(menu, 0, 0, "Main menu", NULL, NULL);
+ Menu_Text_Create(menu, 0, 0, "Main menu", NULL, NULL);
- Menu_CreateTextItem(menu, 0, 16, "Hello World", "echo Hello World\n", NULL);
- Menu_CreateTextItem(menu, 0, 24, "Start up test map", "map test\n", NULL);
- Menu_CreateTextItem(menu, 0, 32, "Go to the west!", "map west\n", NULL);
- Menu_CreateTextItem(menu, 0, 40, "quit", "menu_quit\n", NULL);
+ Menu_Text_Create(menu, 0, 16, "Hello World", "echo Hello World\n", NULL);
+ Menu_Text_Create(menu, 0, 24, "Start up test map", "map test\n", NULL);
+ Menu_Text_Create(menu, 0, 32, "Go to the west!", "map west\n", NULL);
+ Menu_Text_Create(menu, 0, 40, "quit", "menu_quit\n", NULL);
- Menu_CreateTextItem(menu, 0, 56, "Close menu", "menu_close\n", NULL);
+ Menu_Text_Create(menu, 0, 56, "Close menu", "menu_close\n", NULL);
- Menu_CreateTextItem(menu, 0, 56+16, "test menu", "menu_test\n", NULL);
+ Menu_Text_Create(menu, 0, 56+16, "test menu", "menu_test\n", NULL);
- Menu_CreateEditItem(menu, 0, 56, "EditItem");
- Menu_CreateComboItem(menu, 0, 56, 21*8, "ComboItem", "Option 1|Option 2|Option 3|Fuzzy Little Bunnies|Big Rocket Launcher|Children|Lightning Gun|Newborn Chicks|Grenade Launcher|Rodents|Nukes");
+ Menu_Edit_Create(menu, 0, 56, "EditItem");
+ Menu_Combo_Create(menu, 0, 56, 21*8, "ComboItem", "Option 1|Option 2|Option 3|Fuzzy Little Bunnies|Big Rocket Launcher|Children|Lightning Gun|Newborn Chicks|Grenade Launcher|Rodents|Nukes");
Menu_FinishMenu(menu);
Menu_ArrangeSubItems(menu, false, 0, MENU_ARRANGESTYLE_CENTER);
Menu_FinishMenu(menu);
- Menu_CreatePictureItem(menu, 0, 0, menu->super.size[0], menu->super.size[1], "maps/test/skybox_ny.tga", NULL);
+ Menu_Picture_Create(menu, 0, 0, menu->super.size[0], menu->super.size[1], "maps/test/skybox_ny.tga", NULL);
Menu_MoveToCenter(menu);
}
@@ -1144,17 +1148,17 @@
//The simple quit menu
void Menu_Menu_Quit(void)
{
- Menu_SubMenu *menu = Menu_CreateMenu(&Menu.rootmenu);
+ Menu_SubMenu *menu = Menu_SubMenu_Create(&Menu.rootmenu);
menu->dragable = true;
- Menu_CreateTextItem(menu, 0, 0, "Really Quit?", NULL, NULL);
+ Menu_Text_Create(menu, 0, 0, "Really Quit?", NULL, NULL);
- Menu_CreateTextItem(menu, 0, 16, "Yes, and wipe my harddrive too.", "quit\n", NULL);
- Menu_CreateTextItem(menu, 0, 24, "No. I want to keep playing this awesome game", "menu_close\n", NULL);
+ Menu_Text_Create(menu, 0, 16, "Yes, and wipe my harddrive too.", "quit\n", NULL);
+ Menu_Text_Create(menu, 0, 24, "No. I want to keep playing this awesome game", "menu_close\n", NULL);
Menu_FinishMenu(menu);
- Menu_CreatePictureItem(menu, 0, 0, menu->super.size[0], menu->super.size[1], "maps/test/skybox_ny.tga", NULL);
+ Menu_Picture_Create(menu, 0, 0, menu->super.size[0], menu->super.size[1], "maps/test/skybox_ny.tga", NULL);
Menu_MoveToCenter(menu);
}
@@ -1177,7 +1181,8 @@
Shell_Register(&Menu_Menu_Close_Decl, NULL);
// init the root menu
- Menu.rootmenu.super.MouseMove = Menu_MouseMoveSubMenu;
- Menu.rootmenu.super.DrawMenu = Menu_DrawSubMenu;
- Menu.rootmenu.super.KeyEvent = Menu_KeyEventSubMenu;
+ // FIXME: create the rootmenu using the normal submenu creation function instead?
+ Menu.rootmenu.super.MouseMove = Menu_SubMenu_MouseMove;
+ Menu.rootmenu.super.DrawMenu = Menu_SubMenu_Draw;
+ Menu.rootmenu.super.KeyEvent = Menu_SubMenu_KeyEvent;
}
Modified: trunk/game/m_menucore.h
===================================================================
--- trunk/game/m_menucore.h 2006-03-12 22:11:29 UTC (rev 671)
+++ trunk/game/m_menucore.h 2006-03-12 22:30:24 UTC (rev 672)
@@ -152,12 +152,12 @@
Nbool Menu_KeyEvent(NUint mod, NUint sym, UNUSED NUint character, Nbool downevent);
-Menu_SubMenu *Menu_CreateMenu(Menu_SubMenu *parent);
-Menu_SliderItem *Menu_CreateVSliderItem(Menu_SubMenu *parent, NSint x, NSint y, NUint w, NUint h, Nfloat minv, Nfloat maxv, Nfloat defaultv, void (*ChangeNotification)(Menu_SliderItem*), void (*UpdateSlider)(Menu_SliderItem*), void *data);//vertical scrolling bar
-Menu_SliderItem *Menu_CreateHSliderItem(Menu_SubMenu *parent, NSint x, NSint y, NUint w, NUint h, Nfloat minv, Nfloat maxv, Nfloat defaultv, void (*ChangeNotification)(Menu_SliderItem*), void (*UpdateSlider)(Menu_SliderItem*), void *data);//horizontal scrolling bar
-Menu_TextItem *Menu_CreateTextItem(Menu_SubMenu *parent, NSint x, NSint y, char *text, void *command, void (*UseTextItem) (struct Menu_TextItem *item)); //if usetextitem == null, interpret as a console command. if not null, command can be used as a magic cookie. If both null, item is non-selectable.
-Menu_EditItem *Menu_CreateEditItem(Menu_SubMenu *parent, NSint x, NSint y, char *text); //an item for editing text (fixme: needs callbacks and stuff)
-Menu_ComboItem *Menu_CreateComboItem(Menu_SubMenu *parent, NSint x, NSint y, NUint w, char *defalt, char *list);//a list of multiple choices.
-Menu_PictureItem *Menu_CreatePictureItem(Menu_SubMenu *parent, NSint x, NSint y, NUint w, NUint h, char *imagename, char *command); //just a simple picture. clicking it can give a console command (fixme: make like text)
+Menu_SubMenu *Menu_SubMenu_Create(Menu_SubMenu *parent);
+Menu_SliderItem *Menu_VSlider_Create(Menu_SubMenu *parent, NSint x, NSint y, NUint w, NUint h, Nfloat minv, Nfloat maxv, Nfloat defaultv, void (*ChangeNotification)(Menu_SliderItem*), void (*UpdateSlider)(Menu_SliderItem*), void *data);//vertical scrolling bar
+Menu_SliderItem *Menu_HSlider_Create(Menu_SubMenu *parent, NSint x, NSint y, NUint w, NUint h, Nfloat minv, Nfloat maxv, Nfloat defaultv, void (*ChangeNotification)(Menu_SliderItem*), void (*UpdateSlider)(Menu_SliderItem*), void *data);//horizontal scrolling bar
+Menu_TextItem *Menu_Text_Create(Menu_SubMenu *parent, NSint x, NSint y, char *text, void *command, void (*UseTextItem) (struct Menu_TextItem *item)); //if usetextitem == null, interpret as a console command. if not null, command can be used as a magic cookie. If both null, item is non-selectable.
+Menu_EditItem *Menu_Edit_Create(Menu_SubMenu *parent, NSint x, NSint y, char *text); //an item for editing text (fixme: needs callbacks and stuff)
+Menu_ComboItem *Menu_Combo_Create(Menu_SubMenu *parent, NSint x, NSint y, NUint w, char *defalt, char *list);//a list of multiple choices.
+Menu_PictureItem *Menu_Picture_Create(Menu_SubMenu *parent, NSint x, NSint y, NUint w, NUint h, char *imagename, char *command); //just a simple picture. clicking it can give a console command (fixme: make like text)
#endif
More information about the neither-commits
mailing list