mirror of
https://gitea.nishi.boats/pyrite-dev/milsko
synced 2025-12-31 06:30:52 +00:00
ansi-fication
git-svn-id: http://svn2.nishi.boats/svn/milsko/trunk@575 b9cfdab3-6d41-4d17-bbe4-086880011989
This commit is contained in:
NishiOwO
6
BorMakefile
generated
6
BorMakefile
generated
@@ -18,6 +18,7 @@ clean:
|
||||
del /f /q src\unicode.obj
|
||||
del /f /q src\color.obj
|
||||
del /f /q src\directory.obj
|
||||
del /f /q src\color_picker.obj
|
||||
del /f /q src\messagebox.obj
|
||||
del /f /q external\stb_ds.obj
|
||||
del /f /q external\stb_image.obj
|
||||
@@ -61,12 +62,11 @@ clean:
|
||||
del /f /q src\font\ttf.obj
|
||||
del /f /q src\font\boldfont.obj
|
||||
del /f /q src\font\font.obj
|
||||
del /f /q src\color_picker\color_picker.obj
|
||||
del /f /q src\backend\gdi.obj
|
||||
del /f /q src\Mw.dll
|
||||
|
||||
src\Mw.dll: src\core.obj src\text.obj src\string.obj src\draw.obj src\default.obj src\filechooser.obj src\lowlevel.obj src\error.obj src\unicode.obj src\color.obj src\directory.obj src\messagebox.obj external\stb_ds.obj external\stb_image.obj external\stb_truetype.obj src\icon\info.obj src\icon\note.obj src\icon\warning.obj src\icon\error.obj src\icon\news.obj src\icon\directory.obj src\icon\file.obj src\icon\back.obj src\icon\forward.obj src\icon\up.obj src\icon\computer.obj src\icon\search.obj src\icon\down.obj src\icon\left.obj src\icon\right.obj src\cursor\default.obj src\cursor\cross.obj src\cursor\text.obj src\cursor\hidden.obj src\widget\button.obj src\widget\frame.obj src\widget\opengl.obj src\widget\window.obj src\widget\menu.obj src\widget\entry.obj src\widget\submenu.obj src\widget\viewport.obj src\widget\image.obj src\widget\scrollbar.obj src\widget\checkbox.obj src\widget\label.obj src\widget\listbox.obj src\widget\numberentry.obj src\widget\progressbar.obj src\widget\radiobox.obj src\font\boldttf.obj src\font\ttf.obj src\font\boldfont.obj src\font\font.obj src\color_picker\color_picker.obj src\backend\gdi.obj
|
||||
$(LD) $(LDFLAGS) -e$@ src\core.obj src\text.obj src\string.obj src\draw.obj src\default.obj src\filechooser.obj src\lowlevel.obj src\error.obj src\unicode.obj src\color.obj src\directory.obj src\messagebox.obj external\stb_ds.obj external\stb_image.obj external\stb_truetype.obj src\icon\info.obj src\icon\note.obj src\icon\warning.obj src\icon\error.obj src\icon\news.obj src\icon\directory.obj src\icon\file.obj src\icon\back.obj src\icon\forward.obj src\icon\up.obj src\icon\computer.obj src\icon\search.obj src\icon\down.obj src\icon\left.obj src\icon\right.obj src\cursor\default.obj src\cursor\cross.obj src\cursor\text.obj src\cursor\hidden.obj src\widget\button.obj src\widget\frame.obj src\widget\opengl.obj src\widget\window.obj src\widget\menu.obj src\widget\entry.obj src\widget\submenu.obj src\widget\viewport.obj src\widget\image.obj src\widget\scrollbar.obj src\widget\checkbox.obj src\widget\label.obj src\widget\listbox.obj src\widget\numberentry.obj src\widget\progressbar.obj src\widget\radiobox.obj src\font\boldttf.obj src\font\ttf.obj src\font\boldfont.obj src\font\font.obj src\color_picker\color_picker.obj src\backend\gdi.obj -lopengl32.lib -lgdi32.lib -luser32.lib
|
||||
src\Mw.dll: src\core.obj src\text.obj src\string.obj src\draw.obj src\default.obj src\filechooser.obj src\lowlevel.obj src\error.obj src\unicode.obj src\color.obj src\directory.obj src\color_picker.obj src\messagebox.obj external\stb_ds.obj external\stb_image.obj external\stb_truetype.obj src\icon\info.obj src\icon\note.obj src\icon\warning.obj src\icon\error.obj src\icon\news.obj src\icon\directory.obj src\icon\file.obj src\icon\back.obj src\icon\forward.obj src\icon\up.obj src\icon\computer.obj src\icon\search.obj src\icon\down.obj src\icon\left.obj src\icon\right.obj src\cursor\default.obj src\cursor\cross.obj src\cursor\text.obj src\cursor\hidden.obj src\widget\button.obj src\widget\frame.obj src\widget\opengl.obj src\widget\window.obj src\widget\menu.obj src\widget\entry.obj src\widget\submenu.obj src\widget\viewport.obj src\widget\image.obj src\widget\scrollbar.obj src\widget\checkbox.obj src\widget\label.obj src\widget\listbox.obj src\widget\numberentry.obj src\widget\progressbar.obj src\widget\radiobox.obj src\font\boldttf.obj src\font\ttf.obj src\font\boldfont.obj src\font\font.obj src\backend\gdi.obj
|
||||
$(LD) $(LDFLAGS) -e$@ src\core.obj src\text.obj src\string.obj src\draw.obj src\default.obj src\filechooser.obj src\lowlevel.obj src\error.obj src\unicode.obj src\color.obj src\directory.obj src\color_picker.obj src\messagebox.obj external\stb_ds.obj external\stb_image.obj external\stb_truetype.obj src\icon\info.obj src\icon\note.obj src\icon\warning.obj src\icon\error.obj src\icon\news.obj src\icon\directory.obj src\icon\file.obj src\icon\back.obj src\icon\forward.obj src\icon\up.obj src\icon\computer.obj src\icon\search.obj src\icon\down.obj src\icon\left.obj src\icon\right.obj src\cursor\default.obj src\cursor\cross.obj src\cursor\text.obj src\cursor\hidden.obj src\widget\button.obj src\widget\frame.obj src\widget\opengl.obj src\widget\window.obj src\widget\menu.obj src\widget\entry.obj src\widget\submenu.obj src\widget\viewport.obj src\widget\image.obj src\widget\scrollbar.obj src\widget\checkbox.obj src\widget\label.obj src\widget\listbox.obj src\widget\numberentry.obj src\widget\progressbar.obj src\widget\radiobox.obj src\font\boldttf.obj src\font\ttf.obj src\font\boldfont.obj src\font\font.obj src\backend\gdi.obj -lopengl32.lib -lgdi32.lib -luser32.lib
|
||||
implib src\Mw.lib src\Mw.dll
|
||||
|
||||
.c.obj:
|
||||
|
||||
@@ -23,7 +23,7 @@ L_CFLAGS = $(DEPINC) $(CFLAGS) -fPIC -D_MILSKO
|
||||
L_LDFLAGS = $(LDFLAGS)
|
||||
L_LIBS = $(LIBS)
|
||||
|
||||
L_OBJS = src/core.o src/default.o src/draw.o src/lowlevel.o src/error.o src/unicode.o src/color.o src/messagebox.o src/directory.o src/string.o src/filechooser.o src/color_picker/color_picker.o src/text.o
|
||||
L_OBJS = src/core.o src/default.o src/draw.o src/lowlevel.o src/error.o src/unicode.o src/color.o src/messagebox.o src/directory.o src/string.o src/filechooser.o src/color_picker.o src/text.o
|
||||
L_OBJS += external/stb_ds.o external/stb_image.o external/stb_truetype.o
|
||||
L_OBJS += src/widget/window.o src/widget/button.o src/widget/frame.o src/widget/menu.o src/widget/submenu.o src/widget/image.o src/widget/scrollbar.o src/widget/checkbox.o src/widget/label.o src/widget/entry.o src/widget/numberentry.o src/widget/viewport.o src/widget/listbox.o src/widget/progressbar.o src/widget/radiobox.o
|
||||
L_OBJS += src/cursor/hidden.o src/cursor/default.o src/cursor/cross.o src/cursor/text.o
|
||||
|
||||
6
NTMakefile
generated
6
NTMakefile
generated
@@ -18,6 +18,7 @@ clean:
|
||||
del /f /q src\unicode.obj
|
||||
del /f /q src\color.obj
|
||||
del /f /q src\directory.obj
|
||||
del /f /q src\color_picker.obj
|
||||
del /f /q src\messagebox.obj
|
||||
del /f /q external\stb_ds.obj
|
||||
del /f /q external\stb_image.obj
|
||||
@@ -61,12 +62,11 @@ clean:
|
||||
del /f /q src\font\ttf.obj
|
||||
del /f /q src\font\boldfont.obj
|
||||
del /f /q src\font\font.obj
|
||||
del /f /q src\color_picker\color_picker.obj
|
||||
del /f /q src\backend\gdi.obj
|
||||
del /f /q src\Mw.dll
|
||||
|
||||
src\Mw.dll: src\core.obj src\text.obj src\string.obj src\draw.obj src\default.obj src\filechooser.obj src\lowlevel.obj src\error.obj src\unicode.obj src\color.obj src\directory.obj src\messagebox.obj external\stb_ds.obj external\stb_image.obj external\stb_truetype.obj src\icon\info.obj src\icon\note.obj src\icon\warning.obj src\icon\error.obj src\icon\news.obj src\icon\directory.obj src\icon\file.obj src\icon\back.obj src\icon\forward.obj src\icon\up.obj src\icon\computer.obj src\icon\search.obj src\icon\down.obj src\icon\left.obj src\icon\right.obj src\cursor\default.obj src\cursor\cross.obj src\cursor\text.obj src\cursor\hidden.obj src\widget\button.obj src\widget\frame.obj src\widget\opengl.obj src\widget\window.obj src\widget\menu.obj src\widget\entry.obj src\widget\submenu.obj src\widget\viewport.obj src\widget\image.obj src\widget\scrollbar.obj src\widget\checkbox.obj src\widget\label.obj src\widget\listbox.obj src\widget\numberentry.obj src\widget\progressbar.obj src\widget\radiobox.obj src\font\boldttf.obj src\font\ttf.obj src\font\boldfont.obj src\font\font.obj src\color_picker\color_picker.obj src\backend\gdi.obj
|
||||
$(LD) $(LDFLAGS) /OUT:$@ src\core.obj src\text.obj src\string.obj src\draw.obj src\default.obj src\filechooser.obj src\lowlevel.obj src\error.obj src\unicode.obj src\color.obj src\directory.obj src\messagebox.obj external\stb_ds.obj external\stb_image.obj external\stb_truetype.obj src\icon\info.obj src\icon\note.obj src\icon\warning.obj src\icon\error.obj src\icon\news.obj src\icon\directory.obj src\icon\file.obj src\icon\back.obj src\icon\forward.obj src\icon\up.obj src\icon\computer.obj src\icon\search.obj src\icon\down.obj src\icon\left.obj src\icon\right.obj src\cursor\default.obj src\cursor\cross.obj src\cursor\text.obj src\cursor\hidden.obj src\widget\button.obj src\widget\frame.obj src\widget\opengl.obj src\widget\window.obj src\widget\menu.obj src\widget\entry.obj src\widget\submenu.obj src\widget\viewport.obj src\widget\image.obj src\widget\scrollbar.obj src\widget\checkbox.obj src\widget\label.obj src\widget\listbox.obj src\widget\numberentry.obj src\widget\progressbar.obj src\widget\radiobox.obj src\font\boldttf.obj src\font\ttf.obj src\font\boldfont.obj src\font\font.obj src\color_picker\color_picker.obj src\backend\gdi.obj opengl32.lib gdi32.lib user32.lib
|
||||
src\Mw.dll: src\core.obj src\text.obj src\string.obj src\draw.obj src\default.obj src\filechooser.obj src\lowlevel.obj src\error.obj src\unicode.obj src\color.obj src\directory.obj src\color_picker.obj src\messagebox.obj external\stb_ds.obj external\stb_image.obj external\stb_truetype.obj src\icon\info.obj src\icon\note.obj src\icon\warning.obj src\icon\error.obj src\icon\news.obj src\icon\directory.obj src\icon\file.obj src\icon\back.obj src\icon\forward.obj src\icon\up.obj src\icon\computer.obj src\icon\search.obj src\icon\down.obj src\icon\left.obj src\icon\right.obj src\cursor\default.obj src\cursor\cross.obj src\cursor\text.obj src\cursor\hidden.obj src\widget\button.obj src\widget\frame.obj src\widget\opengl.obj src\widget\window.obj src\widget\menu.obj src\widget\entry.obj src\widget\submenu.obj src\widget\viewport.obj src\widget\image.obj src\widget\scrollbar.obj src\widget\checkbox.obj src\widget\label.obj src\widget\listbox.obj src\widget\numberentry.obj src\widget\progressbar.obj src\widget\radiobox.obj src\font\boldttf.obj src\font\ttf.obj src\font\boldfont.obj src\font\font.obj src\backend\gdi.obj
|
||||
$(LD) $(LDFLAGS) /OUT:$@ src\core.obj src\text.obj src\string.obj src\draw.obj src\default.obj src\filechooser.obj src\lowlevel.obj src\error.obj src\unicode.obj src\color.obj src\directory.obj src\color_picker.obj src\messagebox.obj external\stb_ds.obj external\stb_image.obj external\stb_truetype.obj src\icon\info.obj src\icon\note.obj src\icon\warning.obj src\icon\error.obj src\icon\news.obj src\icon\directory.obj src\icon\file.obj src\icon\back.obj src\icon\forward.obj src\icon\up.obj src\icon\computer.obj src\icon\search.obj src\icon\down.obj src\icon\left.obj src\icon\right.obj src\cursor\default.obj src\cursor\cross.obj src\cursor\text.obj src\cursor\hidden.obj src\widget\button.obj src\widget\frame.obj src\widget\opengl.obj src\widget\window.obj src\widget\menu.obj src\widget\entry.obj src\widget\submenu.obj src\widget\viewport.obj src\widget\image.obj src\widget\scrollbar.obj src\widget\checkbox.obj src\widget\label.obj src\widget\listbox.obj src\widget\numberentry.obj src\widget\progressbar.obj src\widget\radiobox.obj src\font\boldttf.obj src\font\ttf.obj src\font\boldfont.obj src\font\font.obj src\backend\gdi.obj opengl32.lib gdi32.lib user32.lib
|
||||
|
||||
|
||||
.c.obj:
|
||||
|
||||
10
WatMakefile
generated
10
WatMakefile
generated
@@ -17,6 +17,7 @@ clean: .SYMBOLIC
|
||||
%erase src/unicode.obj
|
||||
%erase src/color.obj
|
||||
%erase src/directory.obj
|
||||
%erase src/color_picker.obj
|
||||
%erase src/messagebox.obj
|
||||
%erase external/stb_ds.obj
|
||||
%erase external/stb_image.obj
|
||||
@@ -60,12 +61,11 @@ clean: .SYMBOLIC
|
||||
%erase src/font/ttf.obj
|
||||
%erase src/font/boldfont.obj
|
||||
%erase src/font/font.obj
|
||||
%erase src/color_picker/color_picker.obj
|
||||
%erase src/backend/gdi.obj
|
||||
%erase src/Mw.dll
|
||||
|
||||
src/Mw.dll: src/core.obj src/text.obj src/string.obj src/draw.obj src/default.obj src/filechooser.obj src/lowlevel.obj src/error.obj src/unicode.obj src/color.obj src/directory.obj src/messagebox.obj external/stb_ds.obj external/stb_image.obj external/stb_truetype.obj src/icon/info.obj src/icon/note.obj src/icon/warning.obj src/icon/error.obj src/icon/news.obj src/icon/directory.obj src/icon/file.obj src/icon/back.obj src/icon/forward.obj src/icon/up.obj src/icon/computer.obj src/icon/search.obj src/icon/down.obj src/icon/left.obj src/icon/right.obj src/cursor/default.obj src/cursor/cross.obj src/cursor/text.obj src/cursor/hidden.obj src/widget/button.obj src/widget/frame.obj src/widget/opengl.obj src/widget/window.obj src/widget/menu.obj src/widget/entry.obj src/widget/submenu.obj src/widget/viewport.obj src/widget/image.obj src/widget/scrollbar.obj src/widget/checkbox.obj src/widget/label.obj src/widget/listbox.obj src/widget/numberentry.obj src/widget/progressbar.obj src/widget/radiobox.obj src/font/boldttf.obj src/font/ttf.obj src/font/boldfont.obj src/font/font.obj src/color_picker/color_picker.obj src/backend/gdi.obj
|
||||
$(LD) $(LDFLAGS) option implib=src/Mw.lib name $@ file src/core.obj file src/text.obj file src/string.obj file src/draw.obj file src/default.obj file src/filechooser.obj file src/lowlevel.obj file src/error.obj file src/unicode.obj file src/color.obj file src/directory.obj file src/messagebox.obj file external/stb_ds.obj file external/stb_image.obj file external/stb_truetype.obj file src/icon/info.obj file src/icon/note.obj file src/icon/warning.obj file src/icon/error.obj file src/icon/news.obj file src/icon/directory.obj file src/icon/file.obj file src/icon/back.obj file src/icon/forward.obj file src/icon/up.obj file src/icon/computer.obj file src/icon/search.obj file src/icon/down.obj file src/icon/left.obj file src/icon/right.obj file src/cursor/default.obj file src/cursor/cross.obj file src/cursor/text.obj file src/cursor/hidden.obj file src/widget/button.obj file src/widget/frame.obj file src/widget/opengl.obj file src/widget/window.obj file src/widget/menu.obj file src/widget/entry.obj file src/widget/submenu.obj file src/widget/viewport.obj file src/widget/image.obj file src/widget/scrollbar.obj file src/widget/checkbox.obj file src/widget/label.obj file src/widget/listbox.obj file src/widget/numberentry.obj file src/widget/progressbar.obj file src/widget/radiobox.obj file src/font/boldttf.obj file src/font/ttf.obj file src/font/boldfont.obj file src/font/font.obj file src/color_picker/color_picker.obj file src/backend/gdi.obj library clib3r.lib library opengl32.lib library gdi32.lib library user32.lib
|
||||
src/Mw.dll: src/core.obj src/text.obj src/string.obj src/draw.obj src/default.obj src/filechooser.obj src/lowlevel.obj src/error.obj src/unicode.obj src/color.obj src/directory.obj src/color_picker.obj src/messagebox.obj external/stb_ds.obj external/stb_image.obj external/stb_truetype.obj src/icon/info.obj src/icon/note.obj src/icon/warning.obj src/icon/error.obj src/icon/news.obj src/icon/directory.obj src/icon/file.obj src/icon/back.obj src/icon/forward.obj src/icon/up.obj src/icon/computer.obj src/icon/search.obj src/icon/down.obj src/icon/left.obj src/icon/right.obj src/cursor/default.obj src/cursor/cross.obj src/cursor/text.obj src/cursor/hidden.obj src/widget/button.obj src/widget/frame.obj src/widget/opengl.obj src/widget/window.obj src/widget/menu.obj src/widget/entry.obj src/widget/submenu.obj src/widget/viewport.obj src/widget/image.obj src/widget/scrollbar.obj src/widget/checkbox.obj src/widget/label.obj src/widget/listbox.obj src/widget/numberentry.obj src/widget/progressbar.obj src/widget/radiobox.obj src/font/boldttf.obj src/font/ttf.obj src/font/boldfont.obj src/font/font.obj src/backend/gdi.obj
|
||||
$(LD) $(LDFLAGS) option implib=src/Mw.lib name $@ file src/core.obj file src/text.obj file src/string.obj file src/draw.obj file src/default.obj file src/filechooser.obj file src/lowlevel.obj file src/error.obj file src/unicode.obj file src/color.obj file src/directory.obj file src/color_picker.obj file src/messagebox.obj file external/stb_ds.obj file external/stb_image.obj file external/stb_truetype.obj file src/icon/info.obj file src/icon/note.obj file src/icon/warning.obj file src/icon/error.obj file src/icon/news.obj file src/icon/directory.obj file src/icon/file.obj file src/icon/back.obj file src/icon/forward.obj file src/icon/up.obj file src/icon/computer.obj file src/icon/search.obj file src/icon/down.obj file src/icon/left.obj file src/icon/right.obj file src/cursor/default.obj file src/cursor/cross.obj file src/cursor/text.obj file src/cursor/hidden.obj file src/widget/button.obj file src/widget/frame.obj file src/widget/opengl.obj file src/widget/window.obj file src/widget/menu.obj file src/widget/entry.obj file src/widget/submenu.obj file src/widget/viewport.obj file src/widget/image.obj file src/widget/scrollbar.obj file src/widget/checkbox.obj file src/widget/label.obj file src/widget/listbox.obj file src/widget/numberentry.obj file src/widget/progressbar.obj file src/widget/radiobox.obj file src/font/boldttf.obj file src/font/ttf.obj file src/font/boldfont.obj file src/font/font.obj file src/backend/gdi.obj library clib3r.lib library opengl32.lib library gdi32.lib library user32.lib
|
||||
|
||||
|
||||
|
||||
@@ -91,6 +91,8 @@ src/color.obj: src/color.c
|
||||
$(CC) $(CFLAGS) -fo=$@ $<
|
||||
src/directory.obj: src/directory.c
|
||||
$(CC) $(CFLAGS) -fo=$@ $<
|
||||
src/color_picker.obj: src/color_picker.c
|
||||
$(CC) $(CFLAGS) -fo=$@ $<
|
||||
src/messagebox.obj: src/messagebox.c
|
||||
$(CC) $(CFLAGS) -fo=$@ $<
|
||||
external/stb_ds.obj: external/stb_ds.c
|
||||
@@ -177,7 +179,5 @@ src/font/boldfont.obj: src/font/boldfont.c
|
||||
$(CC) $(CFLAGS) -fo=$@ $<
|
||||
src/font/font.obj: src/font/font.c
|
||||
$(CC) $(CFLAGS) -fo=$@ $<
|
||||
src/color_picker/color_picker.obj: src/color_picker/color_picker.c
|
||||
$(CC) $(CFLAGS) -fo=$@ $<
|
||||
src/backend/gdi.obj: src/backend/gdi.c
|
||||
$(CC) $(CFLAGS) -fo=$@ $<
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
/* $Id$ */
|
||||
|
||||
/*!
|
||||
* @file Mw/ColorPicker.h
|
||||
* @brief Color picker
|
||||
|
||||
@@ -13,6 +13,12 @@
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
/*!
|
||||
* @brief Creates a file chooser
|
||||
* @param handle Widget
|
||||
* @param title Title text
|
||||
* @return Widget
|
||||
*/
|
||||
MWDECL MwWidget MwFileChooser(MwWidget handle, const char* title);
|
||||
|
||||
#ifdef __cplusplus
|
||||
|
||||
@@ -56,13 +56,13 @@ struct _MwLLPixmap {
|
||||
int height;
|
||||
unsigned char* raw;
|
||||
|
||||
int depth;
|
||||
int depth;
|
||||
unsigned char* data;
|
||||
MwLL handle;
|
||||
int use_render;
|
||||
Display* display;
|
||||
XImage* image;
|
||||
XImage* mask;
|
||||
MwLL handle;
|
||||
int use_render;
|
||||
Display* display;
|
||||
XImage* image;
|
||||
XImage* mask;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
@@ -1,7 +1,46 @@
|
||||
/* $Id$ */
|
||||
#include <Mw/Milsko.h>
|
||||
|
||||
#include "color_picker.h"
|
||||
#define WIN_SIZE 512
|
||||
#define PICKER_SIZE 360
|
||||
#define IMG_POS_X(w) ((w - PICKER_SIZE) / 2)
|
||||
#define IMG_POS_Y(h) ((h - PICKER_SIZE) / 2)
|
||||
#define SCROLL_BAR_WIDTH 12
|
||||
#define MARGIN (PICKER_SIZE / 32)
|
||||
#define COLOR_DISPLAY_HEIGHT 12
|
||||
|
||||
#define HSV_HUE_SEXTANT 256.
|
||||
#define HSV_HUE_STEPS (6. * HSV_HUE_SEXTANT)
|
||||
|
||||
#define HSV_HUE_MIN 0.
|
||||
#define HSV_HUE_MAX (HSV_HUE_STEPS - 1.)
|
||||
#define HSV_SAT_MIN 0.
|
||||
#define HSV_SAT_MAX 255.
|
||||
#define HSV_VAL_MIN 0.
|
||||
#define HSV_VAL_MAX 255.
|
||||
|
||||
typedef struct _MwHSV {
|
||||
double h; /* angle in degrees */
|
||||
double s; /* a fraction between 0 and 1 */
|
||||
double v; /* a fraction between 0 and 1 */
|
||||
MwBool generated;
|
||||
} MwHSV;
|
||||
|
||||
typedef struct color_picker {
|
||||
MwWidget parent;
|
||||
MwWidget color_picker_img;
|
||||
MwWidget value_slider;
|
||||
MwWidget color_display;
|
||||
MwWidget color_display_text;
|
||||
MwWidget finish;
|
||||
MwLLPixmap color_picker_pixmap;
|
||||
double value;
|
||||
unsigned char* color_picker_image_data;
|
||||
MwPoint point;
|
||||
double dist_table[PICKER_SIZE][PICKER_SIZE];
|
||||
MwHSV hue_table[PICKER_SIZE][PICKER_SIZE];
|
||||
MwRGB chosen_color;
|
||||
} color_picker_t;
|
||||
|
||||
static void hsv2rgb(MwU32 h, MwU32 s, MwU32 v, MwU32* r, MwU32* g, MwU32* b) {
|
||||
MwU8 sextant = h >> 8;
|
||||
@@ -32,34 +71,34 @@ static void hsv2rgb(MwU32 h, MwU32 s, MwU32 v, MwU32* r, MwU32* g, MwU32* b) {
|
||||
}
|
||||
}
|
||||
|
||||
*g = v; // Top level
|
||||
*g = v; /* Top level */
|
||||
|
||||
// Perform actual calculations
|
||||
/* Perform actual calculations */
|
||||
|
||||
/*
|
||||
/**
|
||||
* Bottom level: v * (1.0 - s)
|
||||
* --> (v * (255 - s) + error_corr + 1) / 256
|
||||
*/
|
||||
ww = v * (255 - (s)); // We don't use ~s to prevent size-promotion side effects
|
||||
ww += 1; // Error correction
|
||||
ww += ww >> 8; // Error correction
|
||||
ww = v * (255 - (s)); /* We don't use ~s to prevent size-promotion side effects */
|
||||
ww += 1; /* Error correction */
|
||||
ww += ww >> 8; /* Error correction */
|
||||
*b = ww >> 8;
|
||||
|
||||
h_fraction = h & 0xff; // 0...255
|
||||
h_fraction = h & 0xff; /* 0...255 */
|
||||
|
||||
if(!(sextant & 1)) {
|
||||
// *r = ...slope_up...;
|
||||
/* *r = ...slope_up...; */
|
||||
d = v * (MwU32)((0xff << 8) - (MwU16)(s * (0xff - h_fraction)));
|
||||
*r = d >> 16;
|
||||
} else {
|
||||
// *r = ...slope_down...;
|
||||
/* *r = ...slope_down...; */
|
||||
d = v * (MwU32)((0xff << 8) - (MwU16)(s * h_fraction));
|
||||
*r = d >> 16;
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
static void color_picker_image_update(color_picker* picker) {
|
||||
static void color_picker_image_update(color_picker_t* picker) {
|
||||
int y, x;
|
||||
for(y = 0; y < PICKER_SIZE; y++) {
|
||||
for(x = 0; x < PICKER_SIZE; x++) {
|
||||
@@ -121,12 +160,12 @@ static void color_picker_image_update(color_picker* picker) {
|
||||
}
|
||||
|
||||
static void color_picker_click(MwWidget handle, void* user, void* call) {
|
||||
color_picker* picker = (color_picker*)user;
|
||||
MwLLMouse* mouse = (MwLLMouse*)call;
|
||||
char hexColor[8];
|
||||
int i;
|
||||
char fgColor[8];
|
||||
int fr, fg, fb;
|
||||
color_picker_t* picker = user;
|
||||
MwLLMouse* mouse = call;
|
||||
char hexColor[8];
|
||||
int i;
|
||||
char fgColor[8];
|
||||
int fr, fg, fb;
|
||||
|
||||
(void)handle;
|
||||
(void)user;
|
||||
@@ -155,7 +194,7 @@ static void color_picker_click(MwWidget handle, void* user, void* call) {
|
||||
}
|
||||
static void color_picker_on_change_value(MwWidget handle, void* user,
|
||||
void* call) {
|
||||
color_picker* picker = (color_picker*)user;
|
||||
color_picker_t* picker = user;
|
||||
|
||||
int value = MwGetInteger(handle, MwNvalue);
|
||||
int diff = MwGetInteger(handle, MwNchangedBy);
|
||||
@@ -168,14 +207,14 @@ static void color_picker_on_change_value(MwWidget handle, void* user,
|
||||
color_picker_image_update(picker);
|
||||
}
|
||||
|
||||
static void color_picker_destroy(color_picker* picker) {
|
||||
static void color_picker_destroy(color_picker_t* picker) {
|
||||
free(picker->color_picker_image_data);
|
||||
MwLLDestroyPixmap(picker->color_picker_pixmap);
|
||||
}
|
||||
|
||||
static void color_picker_close(MwWidget handle, void* user,
|
||||
void* call) {
|
||||
color_picker* picker = (color_picker*)user;
|
||||
color_picker_t* picker = user;
|
||||
|
||||
(void)call;
|
||||
|
||||
@@ -185,7 +224,7 @@ static void color_picker_close(MwWidget handle, void* user,
|
||||
|
||||
static void color_picker_finish(MwWidget handle, void* user,
|
||||
void* call) {
|
||||
color_picker* picker = (color_picker*)user;
|
||||
color_picker_t* picker = user;
|
||||
|
||||
(void)call;
|
||||
|
||||
@@ -195,9 +234,9 @@ static void color_picker_finish(MwWidget handle, void* user,
|
||||
MwDestroyWidget(handle->parent);
|
||||
}
|
||||
|
||||
color_picker* color_picker_setup(MwWidget parent, int w, int h) {
|
||||
color_picker* picker = malloc(sizeof(color_picker));
|
||||
memset(picker, 0, sizeof(color_picker));
|
||||
color_picker_t* color_picker_setup(MwWidget parent, int w, int h) {
|
||||
color_picker_t* picker = malloc(sizeof(*picker));
|
||||
memset(picker, 0, sizeof(*picker));
|
||||
|
||||
picker->parent = parent;
|
||||
|
||||
@@ -232,16 +271,16 @@ color_picker* color_picker_setup(MwWidget parent, int w, int h) {
|
||||
|
||||
picker->value_slider = MwVaCreateWidget(
|
||||
MwScrollBarClass, "value-slider", picker->parent,
|
||||
// x
|
||||
/* x */
|
||||
IMG_POS_X(w) + PICKER_SIZE + MARGIN,
|
||||
|
||||
// y
|
||||
/* y */
|
||||
IMG_POS_Y(h),
|
||||
|
||||
// width
|
||||
/* width */
|
||||
SCROLL_BAR_WIDTH,
|
||||
|
||||
// height
|
||||
/* height */
|
||||
PICKER_SIZE,
|
||||
|
||||
MwNorientation, MwVERTICAL, MwNminValue, 0, MwNmaxValue, 1024, NULL);
|
||||
@@ -266,9 +305,9 @@ color_picker* color_picker_setup(MwWidget parent, int w, int h) {
|
||||
}
|
||||
|
||||
MwWidget MwColorPicker(MwWidget handle, const char* title) {
|
||||
MwPoint p;
|
||||
color_picker* wheel;
|
||||
MwWidget window;
|
||||
MwPoint p;
|
||||
color_picker_t* wheel;
|
||||
MwWidget window;
|
||||
|
||||
p.x = p.y = 0;
|
||||
|
||||
@@ -1,56 +0,0 @@
|
||||
/* $Id$ */
|
||||
|
||||
#ifndef __MW_INTERNAL_COLOR_PICKER_H
|
||||
#define __MW_INTERNAL_COLOR_PICKER_H
|
||||
|
||||
#include <Mw/ColorPicker.h>
|
||||
#include <Mw/Milsko.h>
|
||||
|
||||
#define WIN_SIZE 512
|
||||
#define PICKER_SIZE 360
|
||||
#define IMG_POS_X(w) ((w - PICKER_SIZE) / 2)
|
||||
#define IMG_POS_Y(h) ((h - PICKER_SIZE) / 2)
|
||||
#define SCROLL_BAR_WIDTH 12
|
||||
#define MARGIN (PICKER_SIZE / 32)
|
||||
#define COLOR_DISPLAY_HEIGHT 12
|
||||
|
||||
#define HSV_HUE_SEXTANT 256.
|
||||
#define HSV_HUE_STEPS (6. * HSV_HUE_SEXTANT)
|
||||
|
||||
#define HSV_HUE_MIN 0.
|
||||
#define HSV_HUE_MAX (HSV_HUE_STEPS - 1.)
|
||||
#define HSV_SAT_MIN 0.
|
||||
#define HSV_SAT_MAX 255.
|
||||
#define HSV_VAL_MIN 0.
|
||||
#define HSV_VAL_MAX 255.
|
||||
|
||||
typedef struct _color_picker color_picker;
|
||||
typedef struct _color_picker_vtable color_picker_vtable;
|
||||
typedef struct _MwHSV MwHSV;
|
||||
|
||||
struct _MwHSV {
|
||||
double h; // angle in degrees
|
||||
double s; // a fraction between 0 and 1
|
||||
double v; // a fraction between 0 and 1
|
||||
MwBool generated;
|
||||
};
|
||||
|
||||
struct _color_picker {
|
||||
MwWidget parent;
|
||||
MwWidget color_picker_img;
|
||||
MwWidget value_slider;
|
||||
MwWidget color_display;
|
||||
MwWidget color_display_text;
|
||||
MwWidget finish;
|
||||
MwLLPixmap color_picker_pixmap;
|
||||
double value;
|
||||
unsigned char* color_picker_image_data;
|
||||
MwPoint point;
|
||||
double dist_table[PICKER_SIZE][PICKER_SIZE];
|
||||
MwHSV hue_table[PICKER_SIZE][PICKER_SIZE];
|
||||
MwRGB chosen_color;
|
||||
};
|
||||
|
||||
color_picker* color_picker_setup(MwWidget parent, int w, int h);
|
||||
|
||||
#endif
|
||||
@@ -4,7 +4,7 @@
|
||||
|
||||
#define MAX_ERROR_LEN 512
|
||||
|
||||
// buffer for holding the error. +1 to ensure there's always a null terminator.
|
||||
/* buffer for holding the error. +1 to ensure there's always a null terminator. */
|
||||
char error[MAX_ERROR_LEN + 1] = {0};
|
||||
|
||||
const char* MwGetLastError(void) {
|
||||
|
||||
@@ -3,10 +3,12 @@
|
||||
#ifndef __MW_ERROR_INTERNAL_H__
|
||||
#define __MW_ERROR_INTERNAL_H__
|
||||
|
||||
// This is not to be documented or exposed publically.
|
||||
// This contains an internal function for setting the error,
|
||||
// something the user shouldn't want to do and thus we don't want them to.
|
||||
// (hence also, its placement in the src directory)
|
||||
/**
|
||||
* This is not to be documented or exposed publically.
|
||||
* This contains an internal function for setting the error,
|
||||
* something the user shouldn't want to do and thus we don't want them to.
|
||||
* (hence also, its placement in the src directory)
|
||||
*/
|
||||
|
||||
#include <Mw/Error.h>
|
||||
|
||||
|
||||
@@ -51,7 +51,7 @@ MwVulkanConfig vulkan_config = {
|
||||
#define LIB_CLOSE(a) FreeLibrary(a)
|
||||
#endif
|
||||
|
||||
// convienence macro for handling vulkan errors
|
||||
/* convienence macro for handling vulkan errors */
|
||||
#ifdef HAS_VK_ENUM_STRING_HELPER
|
||||
#define VK_CMD(func) \
|
||||
vk_res = func; \
|
||||
@@ -68,12 +68,12 @@ MwVulkanConfig vulkan_config = {
|
||||
}
|
||||
#endif
|
||||
|
||||
// convienence macro for loading a vulkan function pointer into memory
|
||||
/* convienence macro for loading a vulkan function pointer into memory */
|
||||
#define LOAD_VK_FUNCTION(name) \
|
||||
PFN_##name _##name = (PFN_##name)o->vkGetInstanceProcAddr(o->vkInstance, #name); \
|
||||
VK_ASSERT(_##name);
|
||||
|
||||
// convienence macro to return an error if an assert goes wrong
|
||||
/* convienence macro to return an error if an assert goes wrong */
|
||||
#define VK_ASSERT(val) \
|
||||
if(!val) { \
|
||||
setLastError("Vulkan error (%s:%d): Assertion Failed (%s != NULL)\n", __FILE__, __LINE__, #val); \
|
||||
@@ -202,7 +202,7 @@ static MwErrorEnum vulkan_instance_setup(MwWidget handle, vulkan_t* o) {
|
||||
|
||||
VkResult vk_res;
|
||||
|
||||
// Load Vulkan and any other function pointers we need.
|
||||
/* Load Vulkan and any other function pointers we need. */
|
||||
o->vulkanLibrary = vulkan_lib_load();
|
||||
if(!o->vulkanLibrary) {
|
||||
vulkan_supported = VULKAN_SUPPORTED_NO;
|
||||
@@ -220,7 +220,7 @@ static MwErrorEnum vulkan_instance_setup(MwWidget handle, vulkan_t* o) {
|
||||
_vkCreateInstance = LIB_SYM(o->vulkanLibrary, "vkCreateInstance");
|
||||
VK_ASSERT(_vkCreateInstance);
|
||||
|
||||
// setup enabled extensions
|
||||
/* setup enabled extensions */
|
||||
arrput(enabledExtensions, VK_KHR_SURFACE_EXTENSION_NAME);
|
||||
#if defined(_WIN32)
|
||||
arrput(enabledExtensions, VK_KHR_WIN32_SURFACE_EXTENSION_NAME);
|
||||
@@ -228,7 +228,7 @@ static MwErrorEnum vulkan_instance_setup(MwWidget handle, vulkan_t* o) {
|
||||
arrput(enabledExtensions, VK_KHR_XLIB_SURFACE_EXTENSION_NAME);
|
||||
#endif
|
||||
|
||||
// passing null gives us all the extensions provided by the current vulkan implementation
|
||||
/* passing null gives us all the extensions provided by the current vulkan implementation */
|
||||
VK_CMD(_vkEnumerateInstanceExtensionProperties(NULL, &extension_count, NULL));
|
||||
ext_props = malloc(sizeof(VkExtensionProperties) * extension_count);
|
||||
VK_CMD(_vkEnumerateInstanceExtensionProperties(NULL, &extension_count, ext_props));
|
||||
@@ -346,7 +346,7 @@ static MwErrorEnum vulkan_devices_setup(MwWidget handle, vulkan_t* o) {
|
||||
LOAD_VK_FUNCTION(vkGetPhysicalDeviceSurfaceSupportKHR);
|
||||
LOAD_VK_FUNCTION(vkEnumerateDeviceExtensionProperties);
|
||||
|
||||
// create the physical device
|
||||
/* create the physical device */
|
||||
VK_CMD(_vkEnumeratePhysicalDevices(o->vkInstance, &deviceCount, NULL));
|
||||
devices = malloc(sizeof(VkPhysicalDevice) * deviceCount);
|
||||
VK_CMD(_vkEnumeratePhysicalDevices(o->vkInstance, &deviceCount, devices));
|
||||
@@ -376,12 +376,12 @@ static MwErrorEnum vulkan_devices_setup(MwWidget handle, vulkan_t* o) {
|
||||
free(family_props);
|
||||
}
|
||||
if(!has_graphics && !has_present) {
|
||||
// rare, yes, but idk maybe some shitty drivers will present this dillema idk.
|
||||
/* rare, yes, but idk maybe some shitty drivers will present this dillema idk. */
|
||||
setLastError("There were no devices with either a graphics or presentation queue.\n");
|
||||
return MwEerror;
|
||||
}
|
||||
|
||||
// create the logical device
|
||||
/* create the logical device */
|
||||
queueCreateInfos[queueCreateCount] = (VkDeviceQueueCreateInfo){
|
||||
.sType = VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO,
|
||||
.pNext = NULL,
|
||||
|
||||
@@ -150,7 +150,6 @@ scan("src/cursor");
|
||||
scan("src/widget");
|
||||
scan("src/text");
|
||||
scan("src/font");
|
||||
scan("src/color_picker");
|
||||
push(@cfiles, "src/backend/gdi.c");
|
||||
|
||||
generate("BorMakefile", "Borland");
|
||||
|
||||
Reference in New Issue
Block a user