AstralTransRocketries/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-09-17 19:45:23 -04:00
Code Issues Packages Projects Releases Wiki Activity

C client: minor cleanup of GUI code

Browse Source
This commit is contained in:
UnknownShadow200 2018-09-09 22:19:23 +10:00
parent c3558da9a9
commit ce2924cf4c
4 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Gui.c
View File

@ -18,12 +18,6 @@ void Gui_DefaultRecreate(void* elem) {
Elem_Free(e); Elem_Init(e);
}
bool Gui_DefaultMouse(void* elem, Int32 x, Int32 y, MouseButton btn) { return false; }
bool Gui_DefaultKey(void* elem, Key key) { return false; }
bool Gui_DefaultKeyPress(void* elem, char keyChar) { return false; }
bool Gui_DefaultMouseMove(void* elem, Int32 x, Int32 y) { return false; }
bool Gui_DefaultMouseScroll(void* elem, Real32 delta) { return false; }
void Screen_CommonInit(void* screen) {
struct Screen* s = screen;
Event_RegisterVoid(&GfxEvents_ContextLost, s, s->VTABLE->ContextLost);

6
src/Gui.h
View File

@ -29,13 +29,7 @@ struct GuiElem;
struct GuiElemVTABLE { GuiElemVTABLE_Layout() };
struct GuiElem { struct GuiElemVTABLE* VTABLE; };
void Gui_DefaultRecreate(void* elem);
bool Gui_DefaultMouse(void* elem, Int32 x, Int32 y, MouseButton btn);
bool Gui_DefaultKey(void* elem, Key key);
bool Gui_DefaultKeyPress(void* elem, char keyChar);
bool Gui_DefaultMouseMove(void* elem, Int32 x, Int32 y);
bool Gui_DefaultMouseScroll(void* elem, Real32 delta);
struct ScreenVTABLE {

24
src/Screens.c
View File

@ -105,6 +105,9 @@ struct DisconnectScreen {
String TitleStr, MessageStr;
};
static bool Screen_Mouse(void* elem, Int32 x, Int32 y, MouseButton btn) { return false; }
static bool Screen_MouseMove(void* elem, Int32 x, Int32 y) { return false; }
/*########################################################################################################################*
*-----------------------------------------------------InventoryScreen-----------------------------------------------------*
@ -197,6 +200,7 @@ static bool InventoryScreen_KeyDown(void* screen, Key key) {
return true;
}
static bool InventoryScreen_KeyPress(void* elem, char keyChar) { return true; }
static bool InventoryScreen_KeyUp(void* screen, Key key) {
struct InventoryScreen* s = screen;
if (key == KeyBind_Get(KeyBind_Inventory)) {
@ -244,7 +248,7 @@ static bool InventoryScreen_MouseScroll(void* screen, Real32 delta) {
struct ScreenVTABLE InventoryScreen_VTABLE = {
InventoryScreen_Init, InventoryScreen_Render, InventoryScreen_Free, Gui_DefaultRecreate,
InventoryScreen_KeyDown, InventoryScreen_KeyUp, Gui_DefaultKeyPress,
InventoryScreen_KeyDown, InventoryScreen_KeyUp, InventoryScreen_KeyPress,
InventoryScreen_MouseDown, InventoryScreen_MouseUp, InventoryScreen_MouseMove, InventoryScreen_MouseScroll,
InventoryScreen_OnResize, InventoryScreen_ContextLost, InventoryScreen_ContextRecreated,
};
@ -384,6 +388,10 @@ static void StatusScreen_ContextRecreated(void* screen) {
StatusScreen_UpdateHackState(s);
}
static bool StatusScreen_Key(void* elem, Key key) { return false; }
static bool StatusScreen_KeyPress(void* elem, char keyChar) { return false; }
static bool StatusScreen_MouseScroll(void* elem, Real32 delta) { return false; }
static void StatusScreen_Init(void* screen) {
struct StatusScreen* s = screen;
Font_Make(&s->Font, &Game_FontName, 16, FONT_STYLE_NORMAL);
@ -415,9 +423,9 @@ static void StatusScreen_Free(void* screen) {
}
struct ScreenVTABLE StatusScreen_VTABLE = {
StatusScreen_Init, StatusScreen_Render, StatusScreen_Free, Gui_DefaultRecreate,
Gui_DefaultKey, Gui_DefaultKey, Gui_DefaultKeyPress,
Gui_DefaultMouse, Gui_DefaultMouse, Gui_DefaultMouseMove, Gui_DefaultMouseScroll,
StatusScreen_Init, StatusScreen_Render, StatusScreen_Free, Gui_DefaultRecreate,
StatusScreen_Key, StatusScreen_Key, StatusScreen_KeyPress,
Screen_Mouse, Screen_Mouse, Screen_MouseMove, StatusScreen_MouseScroll,
StatusScreen_OnResize, StatusScreen_ContextLost, StatusScreen_ContextRecreated,
};
struct Screen* StatusScreen_MakeInstance(void) {
@ -1147,9 +1155,9 @@ static void ChatScreen_Free(void* screen) {
}
struct ScreenVTABLE ChatScreen_VTABLE = {
ChatScreen_Init, ChatScreen_Render, ChatScreen_Free, Gui_DefaultRecreate,
ChatScreen_Init, ChatScreen_Render, ChatScreen_Free, Gui_DefaultRecreate,
ChatScreen_KeyDown, ChatScreen_KeyUp, ChatScreen_KeyPress,
ChatScreen_MouseDown, Gui_DefaultMouse, Gui_DefaultMouseMove, ChatScreen_MouseScroll,
ChatScreen_MouseDown, Screen_Mouse, Screen_MouseMove, ChatScreen_MouseScroll,
ChatScreen_OnResize, ChatScreen_ContextLost, ChatScreen_ContextRecreated,
};
struct Screen* ChatScreen_MakeInstance(void) {
@ -1322,9 +1330,9 @@ static void HUDScreen_Free(void* screen) {
}
struct ScreenVTABLE HUDScreen_VTABLE = {
HUDScreen_Init, HUDScreen_Render, HUDScreen_Free, Gui_DefaultRecreate,
HUDScreen_Init, HUDScreen_Render, HUDScreen_Free, Gui_DefaultRecreate,
HUDScreen_KeyDown, HUDScreen_KeyUp, HUDScreen_KeyPress,
HUDScreen_MouseDown, Gui_DefaultMouse, Gui_DefaultMouseMove, HUDScreen_MouseScroll,
HUDScreen_MouseDown, Screen_Mouse, Screen_MouseMove, HUDScreen_MouseScroll,
HUDScreen_OnResize, HUDScreen_ContextLost, HUDScreen_ContextRecreated,
};
struct Screen* HUDScreen_MakeInstance(void) {

42
src/Widgets.c
View File

@ -19,7 +19,11 @@
#define WIDGET_UV(u1,v1, u2,v2) u1/256.0f,v1/256.0f, u2/256.0f,v2/256.0f
static void Widget_NullFunc(void* widget) { }
static bool Widget_Mouse(void* elem, Int32 x, Int32 y, MouseButton btn) { return false; }
static bool Widget_Key(void* elem, Key key) { return false; }
static bool Widget_KeyPress(void* elem, char keyChar) { return false; }
static bool Widget_MouseMove(void* elem, Int32 x, Int32 y) { return false; }
static bool Widget_MouseScroll(void* elem, Real32 delta) { return false; }
/*########################################################################################################################*
*-------------------------------------------------------TextWidget--------------------------------------------------------*
@ -44,9 +48,9 @@ static void TextWidget_Reposition(void* widget) {
}
struct WidgetVTABLE TextWidget_VTABLE = {
Widget_NullFunc, TextWidget_Render, TextWidget_Free, Gui_DefaultRecreate,
Gui_DefaultKey, Gui_DefaultKey, Gui_DefaultKeyPress,
Gui_DefaultMouse, Gui_DefaultMouse, Gui_DefaultMouseMove, Gui_DefaultMouseScroll,
Widget_NullFunc, TextWidget_Render, TextWidget_Free, Gui_DefaultRecreate,
Widget_Key, Widget_Key, Widget_KeyPress,
Widget_Mouse, Widget_Mouse, Widget_MouseMove, Widget_MouseScroll,
TextWidget_Reposition,
};
void TextWidget_Make(struct TextWidget* w) {
@ -142,9 +146,9 @@ static void ButtonWidget_Render(void* widget, Real64 delta) {
}
struct WidgetVTABLE ButtonWidget_VTABLE = {
Widget_NullFunc, ButtonWidget_Render, ButtonWidget_Free, Gui_DefaultRecreate,
Gui_DefaultKey, Gui_DefaultKey, Gui_DefaultKeyPress,
Gui_DefaultMouse, Gui_DefaultMouse, Gui_DefaultMouseMove, Gui_DefaultMouseScroll,
Widget_NullFunc, ButtonWidget_Render, ButtonWidget_Free, Gui_DefaultRecreate,
Widget_Key, Widget_Key, Widget_KeyPress,
Widget_Mouse, Widget_Mouse, Widget_MouseMove, Widget_MouseScroll,
ButtonWidget_Reposition,
};
void ButtonWidget_Create(struct ButtonWidget* w, Int32 minWidth, STRING_PURE String* text, struct FontDesc* font, Widget_LeftClick onClick) {
@ -280,7 +284,7 @@ static bool ScrollbarWidget_MouseMove(void* widget, Int32 x, Int32 y) {
struct WidgetVTABLE ScrollbarWidget_VTABLE = {
Widget_NullFunc, ScrollbarWidget_Render, Widget_NullFunc, Gui_DefaultRecreate,
Gui_DefaultKey, Gui_DefaultKey, Gui_DefaultKeyPress,
Widget_Key, Widget_Key, Widget_KeyPress,
ScrollbarWidget_MouseDown, ScrollbarWidget_MouseUp, ScrollbarWidget_MouseMove, ScrollbarWidget_MouseScroll,
Widget_CalcPosition,
};
@ -459,8 +463,8 @@ static bool HotbarWidget_MouseScroll(void* widget, Real32 delta) {
struct WidgetVTABLE HotbarWidget_VTABLE = {
HotbarWidget_Init, HotbarWidget_Render, Widget_NullFunc, Gui_DefaultRecreate,
HotbarWidget_KeyDown, HotbarWidget_KeyUp, Gui_DefaultKeyPress,
HotbarWidget_MouseDown, Gui_DefaultMouse, Gui_DefaultMouseMove, HotbarWidget_MouseScroll,
HotbarWidget_KeyDown, HotbarWidget_KeyUp, Widget_KeyPress,
HotbarWidget_MouseDown, Widget_Mouse, Widget_MouseMove, HotbarWidget_MouseScroll,
HotbarWidget_Reposition,
};
void HotbarWidget_Create(struct HotbarWidget* w) {
@ -806,7 +810,7 @@ static bool TableWidget_KeyDown(void* widget, Key key) {
struct WidgetVTABLE TableWidget_VTABLE = {
TableWidget_Init, TableWidget_Render, TableWidget_Free, TableWidget_Recreate,
TableWidget_KeyDown, Gui_DefaultKey, Gui_DefaultKeyPress,
TableWidget_KeyDown, Widget_Key, Widget_KeyPress,
TableWidget_MouseDown, TableWidget_MouseUp, TableWidget_MouseMove, TableWidget_MouseScroll,
TableWidget_Reposition,
};
@ -1502,7 +1506,7 @@ static Int32 MenuInputWidget_GetMaxLines(void) { return 1; }
struct WidgetVTABLE MenuInputWidget_VTABLE = {
InputWidget_Init, MenuInputWidget_Render, InputWidget_Free, InputWidget_Recreate,
InputWidget_KeyDown, InputWidget_KeyUp, InputWidget_KeyPress,
InputWidget_MouseDown, Gui_DefaultMouse, Gui_DefaultMouseMove, Gui_DefaultMouseScroll,
InputWidget_MouseDown, Widget_Mouse, Widget_MouseMove, Widget_MouseScroll,
InputWidget_Reposition,
};
void MenuInputWidget_Create(struct MenuInputWidget* w, Int32 width, Int32 height, STRING_PURE String* text, struct FontDesc* font, struct MenuInputValidator* validator) {
@ -1751,7 +1755,7 @@ static Int32 ChatInputWidget_GetMaxLines(void) {
struct WidgetVTABLE ChatInputWidget_VTABLE = {
InputWidget_Init, ChatInputWidget_Render, InputWidget_Free, InputWidget_Recreate,
ChatInputWidget_KeyDown, InputWidget_KeyUp, InputWidget_KeyPress,
InputWidget_MouseDown, Gui_DefaultMouse, Gui_DefaultMouseMove, Gui_DefaultMouseScroll,
InputWidget_MouseDown, Widget_Mouse, Widget_MouseMove, Widget_MouseScroll,
InputWidget_Reposition,
};
void ChatInputWidget_Create(struct ChatInputWidget* w, struct FontDesc* font) {
@ -2128,8 +2132,8 @@ static void PlayerListWidget_Free(void* widget) {
struct WidgetVTABLE PlayerListWidget_VTABLE = {
PlayerListWidget_Init, PlayerListWidget_Render, PlayerListWidget_Free, Gui_DefaultRecreate,
Gui_DefaultKey, Gui_DefaultKey, Gui_DefaultKeyPress,
Gui_DefaultMouse, Gui_DefaultMouse, Gui_DefaultMouseMove, Gui_DefaultMouseScroll,
Widget_Key, Widget_Key, Widget_KeyPress,
Widget_Mouse, Widget_Mouse, Widget_MouseMove, Widget_MouseScroll,
PlayerListWidget_Reposition,
};
void PlayerListWidget_Create(struct PlayerListWidget* w, struct FontDesc* font, bool classic) {
@ -2540,8 +2544,8 @@ static void TextGroupWidget_Free(void* widget) {
struct WidgetVTABLE TextGroupWidget_VTABLE = {
TextGroupWidget_Init, TextGroupWidget_Render, TextGroupWidget_Free, Gui_DefaultRecreate,
Gui_DefaultKey, Gui_DefaultKey, Gui_DefaultKeyPress,
Gui_DefaultMouse, Gui_DefaultMouse, Gui_DefaultMouseMove, Gui_DefaultMouseScroll,
Widget_Key, Widget_Key, Widget_KeyPress,
Widget_Mouse, Widget_Mouse, Widget_MouseMove, Widget_MouseScroll,
TextGroupWidget_Reposition,
};
void TextGroupWidget_Create(struct TextGroupWidget* w, Int32 linesCount, struct FontDesc* font, struct FontDesc* underlineFont, STRING_REF struct Texture* textures, STRING_REF char* buffer) {
@ -2790,8 +2794,8 @@ void SpecialInputWidget_SetActive(struct SpecialInputWidget* w, bool active) {
struct WidgetVTABLE SpecialInputWidget_VTABLE = {
SpecialInputWidget_Init, SpecialInputWidget_Render, SpecialInputWidget_Free, Gui_DefaultRecreate,
Gui_DefaultKey, Gui_DefaultKey, Gui_DefaultKeyPress,
SpecialInputWidget_MouseDown, Gui_DefaultMouse, Gui_DefaultMouseMove, Gui_DefaultMouseScroll,
Widget_Key, Widget_Key, Widget_KeyPress,
SpecialInputWidget_MouseDown, Widget_Mouse, Widget_MouseMove, Widget_MouseScroll,
Widget_CalcPosition,
};
void SpecialInputWidget_Create(struct SpecialInputWidget* w, struct FontDesc* font, struct InputWidget* appendObj) {