X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=ui.h;h=1f20e185700e26a7e30935fbf93c3872f45fd6c8;hp=5d58c6ddf0ad5a443556a530c373252774ea3cc8;hb=7bfd42caf9c58b7b79591ce6d5d30c14097be306;hpb=8468ffaf8162a4fe8361127385c40141c375661d

diff --git a/ui.h b/ui.h
index 5d58c6dd..1f20e185 100644
--- a/ui.h
+++ b/ui.h
@@ -1,55 +1,173 @@
 
-#define MAX_UI_COUNT 16
-#define MAX_UI_ITEMS 256
-
-typedef struct
-{
-	char name[32];
-	int flags;
-	qpic_t *draw_pic;
-	int draw_x, draw_y;
-	int click_x, click_y, click_x2, click_y2;
-	void(*leftkey)(void *nativedata1, void *nativedata2, float data1, float data2);
-	void(*rightkey)(void *nativedata1, void *nativedata2, float data1, float data2);
-	void(*enterkey)(void *nativedata1, void *nativedata2, float data1, float data2);
-	void(*mouseclick)(void *nativedata1, void *nativedata2, float data1, float data2, float xfrac, float yfrac);
-	void *nativedata1, *nativedata2;
-	float data1, data2;
-}
-ui_item_t;
-
-typedef struct
-{
-	int item_count;
-	int pad;
-	ui_item_t items[MAX_UI_ITEMS];
-}
-ui_t;
-
-void ui_init(void);
-void ui_mouseupdate(float x, float y);
-void ui_mouseupdaterelative(float x, float y);
-ui_t *ui_create(void);
-void ui_free(ui_t *ui);
-void ui_clear(ui_t *ui);
-void ui_item
-(
-	ui_t *ui, char *basename, int number,
-	float x, float y, qpic_t *pic,
-	float left, float top, float width, float height,
-	void(*leftkey)(void *nativedata1, void *nativedata2, float data1, float data2),
-	void(*rightkey)(void *nativedata1, void *nativedata2, float data1, float data2),
-	void(*enterkey)(void *nativedata1, void *nativedata2, float data1, float data2),
-	void(*mouseclick)(void *nativedata1, void *nativedata2, float data1, float data2, float xfrac, float yfrac),
-	void *nativedata1, void *nativedata2, float data1, float data2
-);
-void ui_item_remove(ui_t *ui, char *basename, int number);
-int ui_uiactive(ui_t *ui);
-void ui_activate(ui_t *ui, int yes);
-void ui_leftkeyupdate(int pressed);
-void ui_rightkeyupdate(int pressed);
-void ui_upkeyupdate(int pressed);
-void ui_downkeyupdate(int pressed);
-void ui_mousebuttonupdate(int button, int pressed);
-void ui_update(void);
-void ui_draw(void);
+#ifndef UI_H
+#define UI_H
+
+// AK: new passive ui (like the menu stuff)
+/* some ideas:
+1. two different structs (one for the ui core code and one for the rest)
+2. each item has a size field
+*/
+
+#define UI_EVENT_QUEUE_SIZE 32
+
+typedef enum { UI_BUTTON, UI_LABEL } ui_control_type;
+
+typedef struct ui_message_s			ui_message_t;
+typedef struct ui_item_s			*ui_item_t;
+typedef struct ui_itemlist_s		*ui_itemlist_t;
+typedef struct ui_message_queue_s	ui_message_queue_t;
+
+struct ui_item_s
+{
+	unsigned int size;
+
+	ui_control_type	type;
+
+	const char *name; // used for debugging purposes and to identify an object
+
+//private:
+	// used to build the item list
+	struct ui_item_s *prev, *next; // items are allowed to be freed everywhere
+
+	// called for system events (true means message processed) 
+	int	(*eventhandler)(ui_itemlist_t list, ui_item_t self, ui_message_t *in, ui_message_queue_t *out);
+
+	// z-order (the higher, the later it is drawn)
+	unsigned int zorder;
+
+	// called to draw the object
+	void (*draw)(ui_itemlist_t list, struct ui_item_s * self);
+
+};
+
+struct ui_message_s;
+
+struct ui_itemlist_s
+{
+	float org_x, org_y;
+
+	ui_item_t selected;
+
+	void (*eventhandler)(struct ui_itemlist_s * list, struct ui_message_s *msg);
+
+// private:
+	ui_item_t	list;
+};
+
+// this is structure contains *all* possible messages
+enum ui_message_type_e { UI_EVENT_FRAME, UI_EVENT_KEY, UI_EVENT_MOUSE, UI_BUTTON_PRESSED };
+
+struct ui_ev_key_s
+{
+	int key, ascii;
+};
+
+// in_mouse_x and in_mouse_y can be also used...
+struct ui_ev_mouse_s
+{
+	float x, y;
+};
+
+union ui_message_data_u
+{
+	unsigned char reserved;
+	struct ui_ev_key_s key;
+	struct ui_ev_mouse_s mouse;
+};
+
+struct ui_message_s
+{
+	// empty for input messages, but contains a valid item for all other events
+	ui_item_t				target;
+
+	// used to determine which data struct was used
+	enum ui_message_type_e	type;
+
+	union ui_message_data_u data;
+};
+
+struct ui_message_queue_s
+{
+	unsigned int used;
+	ui_message_t queue[UI_EVENT_QUEUE_SIZE];
+};
+
+void UI_Init(void);
+
+#define UI_MOUSEEVENT	1
+#define UI_KEYEVENT		2
+#define UI_FRAME		4
+void UI_Draw(ui_itemlist_t list);
+
+void UI_Mouse(ui_itemlist_t list, float x, float y);
+void UI_Key(ui_itemlist_t list, int key, int ascii);
+
+// item stuff
+#define UI_ITEM(item)	((ui_item_t*)item)
+
+ui_item_t UI_CloneItem(ui_item_t);
+
+ui_item_t UI_FindItemByName(ui_itemlist_t, const char *);
+
+void UI_FreeItem(ui_itemlist_t, ui_item_t);
+void UI_FreeItemByName(ui_itemlist_t, const char *);
+
+// itemlist stuff
+ui_itemlist_t UI_CreateItemList();
+ui_itemlist_t UI_CloneItemList(ui_itemlist_t);
+void UI_FreeItemList(ui_itemlist_t);
+
+void UI_AddItem(ui_itemlist_t list, ui_item_t item);
+
+// controls
+#define UI_TEXT_DEFAULT_LENGTH 255
+
+typedef struct ui_button_s	*ui_button_t;
+typedef struct ui_label_s	*ui_label_t;
+typedef struct ui_text_s	*ui_text_t;
+
+struct ui_label_t
+{
+	struct ui_item_s item;
+
+	const char *text;
+	float x, y;
+	float r, g, b, a, f;
+};
+
+struct ui_button
+{
+	struct ui_item_s item;
+
+	const char *caption;
+};
+
+ui_item_t UI_CreateButton(void); 
+ui_item_t UI_CreateLabel(void);
+ui_item_t UI_CreateText(void);
+
+// AK: new callback system
+#define UI_MAX_CALLBACK_COUNT 10
+
+#define UI_SLOTUSED	1
+typedef struct ui_callback_s
+{
+	unsigned int flag;
+	void (*keydown) (int num, char ascii);
+	void (*draw)	(void);
+} ui_callback_t;
+
+// functions which should be used
+void UI_Callback_Init(void);
+void UI_Callback_Reset(void);
+
+void UI_Callback_SetupSlot(int slotnr, void(*keydownf)(int num, char ascii), void(*drawf)(void));
+void UI_Callback_ResetSlot(int slotnr);
+int  UI_Callback_GetFreeSlot(void);
+int	 UI_Callback_IsSlotUsed(int slotnr);
+
+void UI_Callback_Draw(void);
+void UI_Callback_KeyDown(int num, char ascii);
+
+#endif
+