diff options
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/local.mk | 3 | ||||
| -rw-r--r-- | src/tk.h | 46 | ||||
| -rw-r--r-- | src/tk/local.mk | 3 | ||||
| -rw-r--r-- | src/tk/widget.c | 88 | ||||
| -rw-r--r-- | src/tk/widget.h | 39 |
6 files changed, 180 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index b96c677..5ef2231 100644 --- a/configure.ac +++ b/configure.ac @@ -39,7 +39,7 @@ funcs_missing=false AC_CHECK_FUNCS( [\ calloc dirname free malloc memcpy rand realpath srand strcmp \ - strlen + strerror strlen ], [], [funcs_missing=true]) diff --git a/src/local.mk b/src/local.mk index 647e371..7d12189 100644 --- a/src/local.mk +++ b/src/local.mk @@ -7,7 +7,10 @@ mazefight_SOURCES += \ %reldir%/maze.h \ %reldir%/splash.c \ %reldir%/splash.h \ + %reldir%/tk.h \ %reldir%/util.c \ %reldir%/util.h \ %reldir%/widget.c \ %reldir%/widget.h + +include %reldir%/tk/local.mk diff --git a/src/tk.h b/src/tk.h new file mode 100644 index 0000000..3c08090 --- /dev/null +++ b/src/tk.h @@ -0,0 +1,46 @@ +/* + * Copyright (C) 2021 P. J. McDermott + * + * This file is part of Maze Fight + * + * Maze Fight is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Maze Fight is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Maze Fight. If not, see <http://www.gnu.org/licenses/>. + */ + +#ifndef MFTK_H_ +#define MFTK_H_ + +#include <SDL.h> + +struct mftk_widget; + +void +mftk_widget_set_visible(struct mftk_widget *w, int v); + +int +mftk_widget_get_visible(struct mftk_widget *w) + __attribute__((__pure__)); + +void +mftk_widget_layout(struct mftk_widget *w); + +int +mftk_widget_event(struct mftk_widget *w, SDL_Event *e); + +int +mftk_widget_render(struct mftk_widget *w, SDL_Renderer *renderer, int x, int y); + +void +mftk_widget_destroy(struct mftk_widget **w); + +#endif /* MFTK_H_ */ diff --git a/src/tk/local.mk b/src/tk/local.mk new file mode 100644 index 0000000..39b1226 --- /dev/null +++ b/src/tk/local.mk @@ -0,0 +1,3 @@ +mazefight_SOURCES += \ + %reldir%/widget.c \ + %reldir%/widget.h diff --git a/src/tk/widget.c b/src/tk/widget.c new file mode 100644 index 0000000..1bf9407 --- /dev/null +++ b/src/tk/widget.c @@ -0,0 +1,88 @@ +/* + * Copyright (C) 2021 P. J. McDermott + * + * This file is part of Maze Fight + * + * Maze Fight is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Maze Fight is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Maze Fight. If not, see <http://www.gnu.org/licenses/>. + */ + +#include <SDL.h> +#include <errno.h> +#include <stdlib.h> +#include <string.h> +#include "../tk.h" +#include "widget.h" + +struct mftk_widget * +mftk_widget_new(size_t size) +{ + struct mftk_widget *w; + + w = calloc(1, size); + if (w == NULL) { + SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, + "Couldn't create widget: %s", + strerror(errno)); + return NULL; + } + + w->vis = SDL_TRUE; + + return w; +} + +void +mftk_widget_set_visible(struct mftk_widget *w, int v) +{ + w->vis = v; +} + +int +mftk_widget_get_visible(struct mftk_widget *w) +{ + return w->vis; +} + +void +mftk_widget_layout(struct mftk_widget *w) +{ + w->layout(w); +} + +int +mftk_widget_event(struct mftk_widget *w, SDL_Event *e) +{ + return w->event(w, e); +} + +int +mftk_widget_render(struct mftk_widget *w, SDL_Renderer *renderer, int x, int y) +{ + return w->render(w, renderer, x, y); +} + +void +mftk_widget_destroy(struct mftk_widget **w_p) +{ + struct mftk_widget *w; + + if (w_p == NULL || *w_p == NULL) { + return; + } + w = *w_p; + + w->destroy(w); + free(w); + w = NULL; +} diff --git a/src/tk/widget.h b/src/tk/widget.h new file mode 100644 index 0000000..2336388 --- /dev/null +++ b/src/tk/widget.h @@ -0,0 +1,39 @@ +/* + * Copyright (C) 2021 P. J. McDermott + * + * This file is part of Maze Fight + * + * Maze Fight is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Maze Fight is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Maze Fight. If not, see <http://www.gnu.org/licenses/>. + */ + +#ifndef MFTK_WIDGET_H_ +#define MFTK_WIDGET_H_ + +#include <SDL.h> + +struct mftk_widget { + int w; + int h; + int vis; + int can_focus; + void (*layout)(struct mftk_widget *); + int (*event)(struct mftk_widget *, SDL_Event *); + int (*render)(struct mftk_widget *, SDL_Renderer *, int, int); + void (*destroy)(struct mftk_widget *); +}; + +struct mftk_widget * +mftk_widget_new(size_t size); + +#endif /* MFTK_WIDGET_H_ */ |