mirrors/Nuklear
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

removed clang -Weverything warnings

Browse Source
This commit is contained in:
vurtun 2016-01-05 12:54:23 +01:00
parent 8945d97eae
commit 9a52c86548
9 changed files with 35 additions and 156 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
demo/allegro5_complex/allegro.c
View File

@ -30,13 +30,10 @@
#include <allegro5/allegro_primitives.h>
/* macros */
#define DTIME 33
#define MAX_DRAW_COMMAND_MEMORY (4 * 1024)
#define MAX_VERTEX_MEMORY 128 * 1024
#define MAX_ELEMENT_MEMORY 64 * 1024
#include "../../zahnrad.h"
#include "../demo.c"
struct device {
@ -317,17 +314,10 @@ static void mem_free(zr_handle unused, void *ptr)
int
main(int argc, char *argv[])
{
/* Platform */
const char *font_path;
int win_width, win_height;
int width = 0, height = 0;
int running = 1;
/* GUI */
struct device dev;
struct demo gui;
font_path = argv[1];
int running = 1;
const char *font_path = argv[1];
if (argc < 2)
die("Missing TTF Font file argument!");

11
demo/allegro5_simple/allegro.c
View File

@ -32,13 +32,7 @@
#include <allegro5/allegro_ttf.h>
/* macros */
#define DTIME 33
#define MAX_DRAW_COMMAND_MEMORY (4 * 1024)
#define MAX_VERTEX_MEMORY 128 * 1024
#define MAX_ELEMENT_MEMORY 64 * 1024
#include "../../zahnrad.h"
#include "../demo.c"
static void
@ -68,9 +62,7 @@ draw(struct zr_context *ctx, int width, int height)
al_draw_line(l->begin.x, l->begin.y, l->end.x, l->end.y,
al_map_rgba(l->color.r, l->color.g, l->color.g, l->color.a), 1.0f);
} break;
case ZR_COMMAND_CURVE: {
const struct zr_command_curve *q = zr_command(curve, cmd);
} break;
case ZR_COMMAND_CURVE: break;
case ZR_COMMAND_RECT: {
const struct zr_command_rect *r = zr_command(rect, cmd);
al_draw_filled_rounded_rectangle(r->x, r->y, r->x + r->w, r->y + r->h,
@ -165,7 +157,6 @@ main(int argc, char *argv[])
{
/* Platform */
const char *font_path;
int win_width, win_height;
int width = 0, height = 0;
int running = 1;

14
demo/glfw/glfw.c
View File

@ -32,22 +32,14 @@
#include <GLFW/glfw3.h>
/* macros */
#define DTIME 33
#define MAX_DRAW_COMMAND_MEMORY (4 * 1024)
#define MAX_VERTEX_MEMORY 128 * 1024
#define MAX_ELEMENT_MEMORY 64 * 1024
#include "../../zahnrad.h"
static GLFWwindow *win;
static void clipboard_set(const char *text){glfwSetClipboardString(win, text);}
static int clipboard_is_filled(void) {return glfwGetClipboardString(win) != NULL;}
static const char* clipboard_get(void){return glfwGetClipboardString(win);}
#include "../demo.c"
/* FUCK CALLBACKS */
/* sign: is there any way to pass a user pointer to glfw? */
static GLFWwindow *win;
static int mouse_pos_x = 0;
static int mouse_pos_y = 0;
static struct demo gui;
@ -450,7 +442,6 @@ main(int argc, char *argv[])
{
/* Platform */
const char *font_path;
int win_width, win_height;
int width = 0, height = 0;
int running = 1;
@ -520,7 +511,6 @@ main(int argc, char *argv[])
glfwSwapBuffers(win);
}
cleanup:
/* Cleanup */
free(font.glyphs);
zr_free(&gui.ctx);

18
demo/linuxgl/linuxgl.c
View File

@ -41,31 +41,15 @@
#endif
#include "../../zahnrad.h"
#define UNUSED(a) ((void)(a))
static void clipboard_set(const char *text){UNUSED(text);}
static int clipboard_is_filled(void){return zr_false;}
static const char* clipboard_get(void) {return NULL;}
#include "../demo.c"
#define RAD(a) ((a) * (FPI / 180.0f))
#define DEG(a) ((a) * (180.0f / FPI))
#define MIN(a,b) ((a) < (b) ? (a) : (b))
#define MAX(a,b) ((a) < (b) ? (b) : (a))
#define ABS(x) (((a) < 0) ? (-(a)) : (a))
#define SIGN(x) (((x) > 0) - ((x) < 0))
#define CLAMP(i,v,x) (MAX(MIN(v,x), i))
#define LEN(a) (sizeof(a)/sizeof(a)[0])
#define UNUSED(a) ((void)(a))
/* prefered OpenGL version */
#define OGL_MAJOR_VERSION 3
#define OGL_MINOR_VERSION 0
#define MAX_DRAW_COMMAND_MEMORY (4 * 1024)
#define MAX_VERTEX_MEMORY 128 * 1024
#define MAX_ELEMENT_MEMORY 64 * 1024
#define UNUSED(a) ((void)(a))
typedef GLXContext(*glxCreateContext)(Display*, GLXFBConfig, GLXContext, Bool, const int*);
/* GL_ARB_vertex_buffer_object */

17
demo/nanovg/nanovg.c
View File

@ -40,21 +40,7 @@
#include "dep/nanovg.c"
/* macros */
#define DTIME 30
#include "../../zahnrad.h"
static void
clipboard_set(const char *text)
{SDL_SetClipboardText(text);}
static int
clipboard_is_filled(void)
{return SDL_HasClipboardText();}
static const char*
clipboard_get(void)
{return SDL_GetClipboardText();}
#include "../demo.c"
static void
@ -298,9 +284,6 @@ main(int argc, char *argv[])
/* Input */
int ret;
SDL_Event evt;
uint64_t dt, started = SDL_GetTicks();
zr_input_begin(&gui.ctx);
if (!poll) {
ret = SDL_WaitEvent(&evt);

7
demo/sdl/sdl.c
View File

@ -32,17 +32,10 @@
#include <SDL2/SDL.h>
/* macros */
#define DTIME 33
#define MAX_DRAW_COMMAND_MEMORY (4 * 1024)
#define MAX_VERTEX_MEMORY 128 * 1024
#define MAX_ELEMENT_MEMORY 64 * 1024
#include "../../zahnrad.h"
static void clipboard_set(const char *text){SDL_SetClipboardText(text);}
static int clipboard_is_filled(void) {return SDL_HasClipboardText();}
static const char* clipboard_get(void){return SDL_GetClipboardText();}
#include "../demo.c"
/* ==============================================================

13
demo/x11/xlib.c
View File

@ -33,12 +33,6 @@
/* macros */
#define DTIME 16
#include "../../zahnrad.h"
#define UNUSED(a) ((void)(a))
static void clipboard_set(const char *text){UNUSED(text);}
static int clipboard_is_filled(void){return zr_false;}
static const char* clipboard_get(void) {return NULL;}
#include "../demo.c"
typedef struct XFont XFont;
@ -154,7 +148,6 @@ font_get_text_width(zr_handle handle, float height, const char *text, zr_size le
{
XFont *font = (XFont*)handle.ptr;
XRectangle r;
zr_size width;
if(!font || !text)
return 0;
@ -162,11 +155,7 @@ font_get_text_width(zr_handle handle, float height, const char *text, zr_size le
if(font->set) {
XmbTextExtents(font->set, (const char*)text, (int)len, NULL, &r);
return r.width;
}
else {
return (zr_size)XTextWidth(font->xfont, (const char*)text, (int)len);
}
return width;
} else return (zr_size)XTextWidth(font->xfont, (const char*)text, (int)len);
}
static void

2
example/filex/filex.c
View File

@ -482,12 +482,12 @@ file_browser_run(struct file_browser *browser, struct zr_context *ctx, int width
zr_menubar_end(ctx);
/* window layout */
zr_push_property(ctx, ZR_PROPERTY_ITEM_SPACING, zr_vec2(0, 4));
total_space = zr_window_get_content_region(ctx);
row_layout[0] = (total_space.w - 8) * browser->ratio_sel;
row_layout[1] = 8;
row_layout[2] = (total_space.w - 8) * browser->ratio_dir;
zr_layout_row(ctx, ZR_STATIC, total_space.h, 3, row_layout);
zr_push_property(ctx, ZR_PROPERTY_ITEM_SPACING, zr_vec2(0, 4));
/* output special important directory list in own window */
/* TODO: maybe allow to add current directory into list? */

95
zahnrad.c
View File

@ -201,14 +201,10 @@ struct zr_pool {
#endif
#define ZR_PI 3.141592654f
#define ZR_PI2 (ZR_PI * 2.0f)
#define ZR_4_DIV_PI (1.27323954f)
#define ZR_4_DIV_PI_SQRT (0.405284735f)
#define ZR_UTF_INVALID 0xFFFD
#define ZR_MAX_FLOAT_PRECISION 2
#define ZR_UNUSED(x) ((void)(x))
#define ZR_LERP(a, b, t) ((a) + ((b) - (a)) * (t))
#define ZR_SATURATE(x) (MAX(0, MIN(1.0f, x)))
#define ZR_LEN(a) (sizeof(a)/sizeof(a)[0])
#define ZR_ABS(a) (((a) < 0) ? -(a) : (a))
@ -223,9 +219,7 @@ struct zr_pool {
#define zr_vec2_sub(a, b) zr_vec2((a).x - (b).x, (a).y - (b).y)
#define zr_vec2_add(a, b) zr_vec2((a).x + (b).x, (a).y + (b).y)
#define zr_vec2_len_sqr(a) ((a).x*(a).x+(a).y*(a).y)
#define zr_vec2_inv_len(a) zr_inv_sqrt(zr_vec2_len_sqr(a))
#define zr_vec2_muls(a, t) zr_vec2((a).x * (t), (a).y * (t))
#define zr_vec2_lerp(a, b, t) zr_vec2(ZR_LERP((a).x, (b).x, t), ZR_LERP((a).y, (b).y, t))
enum zr_tree_node_symbol {ZR_TREE_NODE_BULLET, ZR_TREE_NODE_TRIANGLE};
static const struct zr_rect zr_null_rect = {-8192.0f, -8192.0f, 16384, 16384};
@ -249,20 +243,11 @@ static const double double_PRECISION = 0.00000000000001;
# define ZR_PTR_TO_UINT(x) ((zr_size)(x))
#endif
#define ZR_MIN(a,b) (((a)<(b))?(a):(b))
#define ZR_MAX(a,b) (((a)>(b))?(a):(b))
#define ZR_ALIGN(x, mask) ((x) + (mask-1)) & ~(mask-1)
#define ZR_ALIGN_PTR(x, mask)\
(ZR_UINT_TO_PTR((ZR_PTR_TO_UINT((zr_byte*)(x) + (mask-1)) & ~(mask-1))))
#define ZR_ALIGN_PTR_BACK(x, mask)\
(ZR_UINT_TO_PTR((ZR_PTR_TO_UINT((zr_byte*)(x)) & ~(mask-1))))
#define ZR_OFFSETOF(st, m) ((zr_size)(&((st *)0)->m))
#define ZR_CONTAINER_OF_CONST(ptr, type, member)\
((const type*)((const void*)((const zr_byte*)ptr - ZR_OFFSETOF(type, member))))
#define ZR_CONTAINER_OF(ptr, type, member)\
((type*)((void*)((zr_byte*)ptr - ZR_OFFSETOF(type, member))))
#ifdef __cplusplus
template<typename T> struct zr_alignof;
template<typename T, int size_diff> struct zr_helper{enum {value = size_diff};};
@ -578,10 +563,10 @@ zr_log10(double n)
static zr_size
zr_dtos(char *s, double n)
{
int useExp;
int digit, m, m1;
int useExp = 0;
int digit = 0, m = 0, m1 = 0;
char *c = s;
int neg;
int neg = 0;
if (zr_isnan(n)) {
s[0] = 'n'; s[1] = 'a'; s[2] = 'n'; s[3] = '\0';
@ -3895,8 +3880,8 @@ zr_draw_symbol(struct zr_command_buffer *out, enum zr_symbol symbol,
zr_draw_triangle(out, points[0].x, points[0].y,
points[1].x, points[1].y, points[2].x, points[2].y, foreground);
} break;
case ZR_SYMBOL_MAX:
default: break;
default:
case ZR_SYMBOL_MAX: break;
}
}
@ -4907,7 +4892,7 @@ zr_widget_edit_box(struct zr_command_buffer *out, struct zr_rect r,
zr_size offset = 0, glyph_off = 0;
zr_size row_len;
float space = total_width;
float text_width;
float text_width = 0;
while (text_len) {
total_rows++;
@ -5066,7 +5051,7 @@ zr_widget_edit_box(struct zr_command_buffer *out, struct zr_rect r,
zr_size row_len = 0;
zr_size glyphs = 0;
zr_size glyph_off = 0;
float text_width;
float text_width = 0;
struct zr_rect scissor;
struct zr_rect clip;
@ -6105,11 +6090,8 @@ zr_reset_font_height(struct zr_context *ctx)
void
zr_reset(struct zr_context *ctx)
{
struct zr_style *style;
ZR_ASSERT(ctx);
if (!ctx) return;
style = &ctx->style;
zr_reset_colors(ctx);
zr_reset_properties(ctx);
zr_reset_font(ctx);
@ -7769,15 +7751,9 @@ zr_layout_space_begin(struct zr_context *ctx,
win = ctx->current;
layout = win->layout;
zr_panel_layout(ctx, win, height, widget_count);
if (fmt == ZR_STATIC) {
/* calculate bounds of the free to use panel space */
struct zr_rect space;
space.x = layout->at_x;
space.y = layout->at_y;
space.w = layout->width;
space.h = layout->row.height;
if (fmt == ZR_STATIC)
layout->row.type = ZR_LAYOUT_STATIC_FREE;
} else layout->row.type = ZR_LAYOUT_DYNAMIC_FREE;
else layout->row.type = ZR_LAYOUT_DYNAMIC_FREE;
layout->row.ratio = 0;
layout->row.item_width = 0;
@ -7912,7 +7888,6 @@ static void
zr_panel_alloc_row(const struct zr_context *ctx, struct zr_window *win)
{
struct zr_layout *layout = win->layout;
const struct zr_style *c = &ctx->style;
struct zr_vec2 spacing = zr_get_property(ctx, ZR_PROPERTY_ITEM_SPACING);
const float row_height = layout->row.height - spacing.y;
zr_panel_layout(ctx, win, row_height, layout->row.columns);
@ -7922,7 +7897,6 @@ static void
zr_layout_widget_space(struct zr_rect *bounds, const struct zr_context *ctx,
struct zr_window *win, int modify)
{
const struct zr_style *config;
float panel_padding, panel_spacing, panel_space;
float item_offset = 0, item_width = 0, item_spacing = 0;
struct zr_vec2 spacing, padding;
@ -7938,7 +7912,6 @@ zr_layout_widget_space(struct zr_rect *bounds, const struct zr_context *ctx,
ZR_ASSERT(bounds);
/* cache some configuration data */
config = &ctx->style;
spacing = zr_get_property(ctx, ZR_PROPERTY_ITEM_SPACING);
padding = zr_get_property(ctx, ZR_PROPERTY_PADDING);
@ -7975,7 +7948,7 @@ zr_layout_widget_space(struct zr_rect *bounds, const struct zr_context *ctx,
bounds->w = layout->width * layout->row.item.w;
bounds->h = layout->row.height * layout->row.item.h;
return;
} break;
};
case ZR_LAYOUT_DYNAMIC: {
/* scaling arrays of panel width ratios for every widget */
float ratio;
@ -8021,7 +7994,7 @@ zr_layout_widget_space(struct zr_rect *bounds, const struct zr_context *ctx,
bounds->y -= layout->offset->y;
bounds->h = layout->row.item.h;
return;
} break;
};
case ZR_LAYOUT_STATIC: {
/* non-scaling array of panel pixel width for every widget */
item_spacing = (float)layout->row.index * spacing.x;
@ -8029,7 +8002,7 @@ zr_layout_widget_space(struct zr_rect *bounds, const struct zr_context *ctx,
item_offset = layout->row.item_offset;
if (modify) layout->row.item_offset += item_width + spacing.x;
} break;
default: break;
default: ZR_ASSERT(0); break;
};
/* set the bounds of the newly allocated widget */
@ -8200,11 +8173,9 @@ zr_layout_push(struct zr_context *ctx, enum zr_layout_node_type type, const char
void
zr_layout_pop(struct zr_context *ctx)
{
const struct zr_style *config;
struct zr_vec2 panel_padding;
struct zr_window *win;
struct zr_layout *layout;
struct zr_window *win = 0;
struct zr_layout *layout = 0;
ZR_ASSERT(ctx);
ZR_ASSERT(ctx->current);
@ -8213,7 +8184,6 @@ zr_layout_pop(struct zr_context *ctx)
win = ctx->current;
layout = win->layout;
config = &ctx->style;
panel_padding = zr_get_property(ctx, ZR_PROPERTY_PADDING);
layout->at_x -= panel_padding.x;
layout->width += 2 * panel_padding.x;
@ -8426,7 +8396,6 @@ zr_label_colored_wrap(struct zr_context *ctx, const char *str, struct zr_color c
void
zr_image(struct zr_context *ctx, struct zr_image img)
{
const struct zr_style *config;
struct zr_vec2 item_padding;
struct zr_rect bounds;
@ -8441,7 +8410,6 @@ zr_image(struct zr_context *ctx, struct zr_image img)
if (!zr_widget(&bounds, ctx))
return;
config = &ctx->style;
item_padding = zr_get_property(ctx, ZR_PROPERTY_ITEM_PADDING);
bounds.x += item_padding.x;
bounds.y += item_padding.y;
@ -8450,11 +8418,19 @@ zr_image(struct zr_context *ctx, struct zr_image img)
zr_draw_image(&win->buffer, bounds, &img);
}
static void
zr_fill_button(const struct zr_context *ctx, struct zr_button *button)
enum zr_button_alloc {ZR_BUTTON_NORMAL, ZR_BUTTON_FITTING};
static enum zr_widget_state
zr_button(struct zr_button *button, struct zr_rect *bounds,
struct zr_context *ctx, enum zr_button_alloc type)
{
enum zr_widget_state state;
struct zr_vec2 item_padding;
const struct zr_style *config = &ctx->style;
if (type == ZR_BUTTON_NORMAL)
state = zr_widget(bounds, ctx);
else state = zr_widget_fitting(bounds, ctx);
if (!state) return state;
zr_zero(button, sizeof(*button));
item_padding = zr_get_property(ctx, ZR_PROPERTY_ITEM_PADDING);
button->rounding = config->rounding[ZR_ROUNDING_BUTTON];
@ -8462,26 +8438,9 @@ zr_fill_button(const struct zr_context *ctx, struct zr_button *button)
button->hover = config->colors[ZR_COLOR_BUTTON_HOVER];
button->active = config->colors[ZR_COLOR_BUTTON_ACTIVE];
button->border = config->colors[ZR_COLOR_BORDER];
button->border_width = 1;
button->padding.x = item_padding.x;
button->padding.y = item_padding.y;
}
enum zr_button_alloc {ZR_BUTTON_NORMAL, ZR_BUTTON_FITTING};
static enum zr_widget_state
zr_button(struct zr_button *button, struct zr_rect *bounds,
struct zr_context *ctx, enum zr_button_alloc type)
{
const struct zr_style *config;
enum zr_widget_state state;
if (type == ZR_BUTTON_NORMAL)
state = zr_widget(bounds, ctx);
else state = zr_widget_fitting(bounds, ctx);
if (!state) return state;
zr_zero(button, sizeof(*button));
config = &ctx->style;
zr_fill_button(ctx, button);
button->border_width = 1;
return state;
}
@ -9408,8 +9367,9 @@ zr_chart_push(struct zr_context *ctx, float value)
return zr_chart_push_line(ctx, win, &win->layout->chart, value);
case ZR_CHART_COLUMN:
return zr_chart_push_column(ctx, win, &win->layout->chart, value);
default:
case ZR_CHART_MAX:
default: return zr_false;
return zr_false;
}
}
@ -10311,7 +10271,6 @@ zr_menu_begin(struct zr_layout *layout, struct zr_context *ctx, struct zr_window
/* calculate the maximum height of the combo box*/
int is_open = 0;
int is_active = 0;
int is_valid = 0;
struct zr_rect body;
struct zr_window *popup;
zr_hash hash = zr_murmur_hash(id, (int)zr_strsiz(id), ZR_WINDOW_MENU);