nishi/milsko
1
Fork 0
mirror of https://gitea.nishi.boats/pyrite-dev/milsko synced 2026-01-14 13:23:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

ansi-fication

Browse Source 
git-svn-id: http://svn2.nishi.boats/svn/milsko/trunk@575 b9cfdab3-6d41-4d17-bbe4-086880011989
This commit is contained in:
NishiOwO
2025-11-02 21:03:50 +00:00
parent ac93bac2b7
commit da118dfdf0
13 changed files with 110 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/backend/x11.h
View File

@@ -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

101
src/color_picker/color_picker.c → src/color_picker.c
View File

@@ -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;

56
src/color_picker/color_picker.h
View File

@@ -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

2
src/error.c
View File

@@ -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) {

10
src/error_internal.h
View File

@@ -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>

18
src/widget/vulkan.c
View File

@@ -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,