pyrite-dev/milsko
pyrite-dev/milsko
12
1
Fork 3
Code Issues 4 Pull requests Projects Releases 10 Packages Wiki Activity Actions

fix

Browse source 
git-svn-id: http://svn2.nishi.boats/svn/milsko/trunk@187 b9cfdab3-6d41-4d17-bbe4-086880011989
This commit is contained in:
Nishi 2025-10-07 02:15:06 +00:00
commit f70b20a6e6
7 changed files with 8013 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.gitattributes vendored
View file

@ -1,4 +1,5 @@
/src/stb_ds.h linguist-generated /src/stb_ds.h linguist-generated
/src/stb_image.h linguist-generated
/external/libjpeg/include/*.h linguist-generated /external/libjpeg/include/*.h linguist-generated
/external/libjpeg/src/*.c linguist-generated /external/libjpeg/src/*.c linguist-generated
/external/libjpeg/src/*.h linguist-generated /external/libjpeg/src/*.h linguist-generated

2
GNUmakefile
View file

@ -84,7 +84,7 @@ endif
SHARED = -shared SHARED = -shared
ifeq ($(UNIX),1) ifeq ($(UNIX),1)
L_CFLAGS += -DUSE_X11 L_CFLAGS += -DUSE_X11 -DUNIX
L_OBJS += src/backend/x11.o L_OBJS += src/backend/x11.o
L_LIBS += -lm -lX11 -lXrender -lXext -lXcursor L_LIBS += -lm -lX11 -lXrender -lXext -lXcursor

30
src/backend/mac/mac.c
View file

@ -5,21 +5,21 @@
#include "carbon.h" #include "carbon.h"
MwLL MwLLCreate(MwLL parent, int x, int y, int width, int height) { MwLL MwLLCreate(MwLL parent, int x, int y, int width, int height) {
// void* library; // void* library;
// MwLL r = malloc(sizeof(*r)); // MwLL r = malloc(sizeof(*r));
// MwLLCreateCommon(r); // MwLLCreateCommon(r);
// //
// library = dlopen("CarbonLib", RTLD_NOW); // library = dlopen("CarbonLib", RTLD_NOW);
// if(library != NULL) { // if(library != NULL) {
// dlclose(library); // dlclose(library);
// r->backend = getQuickDrawBackend(); // r->backend = getQuickDrawBackend();
// quickDrawBackendUserDataInit(r->userdata); // quickDrawBackendUserDataInit(r->userdata);
// return r; // return r;
// } // }
// //
// printf("ERROR: No supported UI library found. (Searched for: CarbonLib)\n"); // printf("ERROR: No supported UI library found. (Searched for: CarbonLib)\n");
// getchar(); // getchar();
// raise(SIGTRAP); // raise(SIGTRAP);
return NULL; return NULL;
}; };

2
src/backend/x11.c
View file

@ -389,5 +389,5 @@ void MwLLDetach(MwLL handle, MwPoint* point) {
XReparentWindow(handle->display, handle->window, RootWindow(handle->display, DefaultScreen(handle->display)), x + point->x, y + point->y); XReparentWindow(handle->display, handle->window, RootWindow(handle->display, DefaultScreen(handle->display)), x + point->x, y + point->y);
XMapWindow(handle->display, handle->window); XMapWindow(handle->display, handle->window);
XSetInputFocus(handle->display, handle->window, RevertToNone, CurrentTime); // XSetInputFocus(handle->display, handle->window, RevertToNone, CurrentTime);
} }

5
src/external/image.c vendored Normal file
View file

@ -0,0 +1,5 @@
/* $Id$ */
#ifdef USE_STB_IMAGE
#define STB_IMAGE_IMPLEMENTATION
#include "stb_image.h"
#endif

7988
src/external/stb_image.h vendored Normal file
View file

File diff suppressed because it is too large Load diff

1
src/widget/submenu.c
View file

@ -188,7 +188,6 @@ void MwSubMenuAppear(MwWidget handle, MwMenu menu, MwPoint* point) {
ShowWindow(handle->lowlevel->hWnd, SW_NORMAL); ShowWindow(handle->lowlevel->hWnd, SW_NORMAL);
SetFocus(handle->lowlevel->hWnd); SetFocus(handle->lowlevel->hWnd);
#else
#endif #endif
for(i = 0; i < arrlen(menu->sub); i++) { for(i = 0; i < arrlen(menu->sub); i++) {