solve merge conflict

This commit is contained in:
IoIxD 2025-12-05 23:05:10 -07:00
commit 3f6a77f890
171 changed files with 730 additions and 926 deletions

View file

@ -1,5 +1,4 @@
--- ---
# $Id$
Language: Cpp Language: Cpp
UseTab: Always UseTab: Always
TabWidth: 8 TabWidth: 8

1
BorMakefile generated
View file

@ -1,4 +1,3 @@
# $Id$
CC = bcc32 -c CC = bcc32 -c
LD = bcc32 LD = bcc32

View file

@ -1,4 +1,3 @@
# $Id$
cmake_minimum_required(VERSION 3.25) cmake_minimum_required(VERSION 3.25)
project( project(
milsko milsko

View file

@ -1,4 +1,3 @@
# $Id$
PROJECT_LOGO = resource/logo/logo64.png PROJECT_LOGO = resource/logo/logo64.png
PROJECT_NAME = Milsko PROJECT_NAME = Milsko
PROJECT_BRIEF = "Lightweight and fast GUI toolkit" PROJECT_BRIEF = "Lightweight and fast GUI toolkit"

View file

@ -1,4 +1,3 @@
# $Id$
# vim: syntax=tcl # vim: syntax=tcl
proc run {project_name} { proc run {project_name} {

View file

@ -1,5 +1,4 @@
#!/usr/bin/env perl #!/usr/bin/env perl
# $Id$
our $target = `uname -s`; our $target = `uname -s`;
$target =~ s/\r?\n$//; $target =~ s/\r?\n$//;

1
NTMakefile generated
View file

@ -1,4 +1,3 @@
# $Id$
CC = cl /TC /c /nologo CC = cl /TC /c /nologo
LD = link /nologo LD = link /nologo

1
WatMakefile generated
View file

@ -1,4 +1,3 @@
# $Id$
CC = wcc386 -bt=nt -q -bd CC = wcc386 -bt=nt -q -bd
LD = wlink option quiet LD = wlink option quiet

View file

@ -1,2 +1 @@
# $Id$
add_subdirectory(basic) add_subdirectory(basic)

View file

@ -1,4 +1,3 @@
# $Id$
file( file(
GLOB GLOB
EXAMPLES_BASIC_SOURCES EXAMPLES_BASIC_SOURCES

View file

@ -1,4 +1,3 @@
/* $Id$ */
#include <Mw/Milsko.h> #include <Mw/Milsko.h>
int main() { int main() {

View file

@ -1,4 +1,3 @@
/* $Id$ */
#include <Mw/Milsko.h> #include <Mw/Milsko.h>

View file

@ -1,4 +1,3 @@
/* $Id$ */
#include <Mw/Milsko.h> #include <Mw/Milsko.h>
int main(){ int main(){

View file

@ -1,4 +1,3 @@
/* $Id$ */
#include <Mw/Milsko.h> #include <Mw/Milsko.h>
MwWidget window, menu, button, button2, button3, button4; MwWidget window, menu, button, button2, button3, button4;

View file

@ -1,4 +1,3 @@
/* $Id$ */
#include <Mw/Milsko.h> #include <Mw/Milsko.h>
int main() { int main() {

View file

@ -1,4 +1,3 @@
/* $Id$ */
#include <Mw/Milsko.h> #include <Mw/Milsko.h>
#include "../harvard.c" #include "../harvard.c"

View file

@ -1,4 +1,3 @@
/* $Id$ */
#include <Mw/Milsko.h> #include <Mw/Milsko.h>
void ok(MwWidget handle, void* user, void* call) { void ok(MwWidget handle, void* user, void* call) {

View file

@ -1,4 +1,3 @@
/* $Id$ */
#include <Mw/Milsko.h> #include <Mw/Milsko.h>
int main() { int main() {

View file

@ -1,4 +1,3 @@
/* $Id$ */
/* this demo does not work well on windows */ /* this demo does not work well on windows */
#include <Mw/Milsko.h> #include <Mw/Milsko.h>

View file

@ -1,4 +1,3 @@
/* $Id$ */
#include <Mw/Milsko.h> #include <Mw/Milsko.h>

View file

@ -1,4 +1,3 @@
/* $Id$ */
#include <Mw/Milsko.h> #include <Mw/Milsko.h>
MwWidget vp; MwWidget vp;

View file

@ -1,4 +1,3 @@
/* $Id$ */
#define TITLE "boing" #define TITLE "boing"
#include "glutlayer.c" #include "glutlayer.c"

View file

@ -1,4 +1,3 @@
/* $Id$ */
#include <Mw/Milsko.h> #include <Mw/Milsko.h>
#include <Mw/Widget/OpenGL.h> #include <Mw/Widget/OpenGL.h>

View file

@ -1,4 +1,3 @@
/* $Id$ */
#define TITLE "cube" #define TITLE "cube"
#include "glutlayer.c" #include "glutlayer.c"

View file

@ -1,4 +1,3 @@
/* $Id$ */
#define TITLE "gears" #define TITLE "gears"
#include "glutlayer.c" #include "glutlayer.c"

View file

@ -1,4 +1,3 @@
/* $Id$ */
#include <Mw/Milsko.h> #include <Mw/Milsko.h>
#include <Mw/Widget/OpenGL.h> #include <Mw/Widget/OpenGL.h>

View file

@ -1,4 +1,3 @@
/* $Id$ */
#include <Mw/Milsko.h> #include <Mw/Milsko.h>
#include <Mw/Widget/OpenGL.h> #include <Mw/Widget/OpenGL.h>

View file

@ -1,5 +1,3 @@
/* $Id$ */
const char* harvard[] = { const char* harvard[] = {
"The birch canoe slid on the smooth planks. ", "The birch canoe slid on the smooth planks. ",
"Glue the sheet to the dark blue background.", "Glue the sheet to the dark blue background.",
@ -721,4 +719,5 @@ const char* harvard[] = {
"A severe storm tore down the barn.", "A severe storm tore down the barn.",
"She called his name many times.", "She called his name many times.",
"When you hear the bell, come quickly.", "When you hear the bell, come quickly.",
NULL}; NULL
};

View file

@ -1,4 +1,3 @@
/* $Id$ */
/** /**
* this example is quite minimal, you may need to modify it if your graphics card is more esoteric * this example is quite minimal, you may need to modify it if your graphics card is more esoteric

1
external/stb_ds.c generated vendored
View file

@ -1,3 +1,2 @@
/* $Id$ */
#define STB_DS_IMPLEMENTATION #define STB_DS_IMPLEMENTATION
#include "stb_ds.h" #include "stb_ds.h"

1
external/stb_image.c generated vendored
View file

@ -1,4 +1,3 @@
/* $Id$ */
#ifdef USE_STB_IMAGE #ifdef USE_STB_IMAGE
#define STB_IMAGE_IMPLEMENTATION #define STB_IMAGE_IMPLEMENTATION
#include "stb_image.h" #include "stb_image.h"

1
external/stb_truetype.c generated vendored
View file

@ -1,4 +1,3 @@
/* $Id$ */
#ifdef USE_STB_TRUETYPE #ifdef USE_STB_TRUETYPE
#define STB_TRUETYPE_IMPLEMENTATION #define STB_TRUETYPE_IMPLEMENTATION
#include "stb_truetype.h" #include "stb_truetype.h"

View file

@ -1,4 +1,3 @@
/* $Id$ */
/*! /*!
* @file Mw/Abstract/Directory.h * @file Mw/Abstract/Directory.h
* @brief Directory functions * @brief Directory functions

View file

@ -1,4 +1,3 @@
/* $Id$ */
/*! /*!
* @file Mw/Abstract/Dynamic.h * @file Mw/Abstract/Dynamic.h
* @brief Dynamic library * @brief Dynamic library

View file

@ -1,4 +1,3 @@
/* $Id$ */
/*! /*!
* @file Mw/Abstract/Time.h * @file Mw/Abstract/Time.h
* @brief Time * @brief Time

View file

@ -1,4 +1,3 @@
/* $Id$ */
/*! /*!
* @file Mw/BaseTypes.h * @file Mw/BaseTypes.h
* @brief Base type definitions * @brief Base type definitions

View file

@ -1,4 +1,3 @@
/* $Id$ */
/*! /*!
* @file Mw/Constants.h * @file Mw/Constants.h
* @brief Constants * @brief Constants

View file

@ -1,4 +1,3 @@
/* $Id$ */
/*! /*!
* @file Mw/Core.h * @file Mw/Core.h
* @brief Core * @brief Core

View file

@ -1,4 +1,3 @@
/* $Id$ */
/*! /*!
* @file Mw/Default.h * @file Mw/Default.h
* @brief Default properties * @brief Default properties

View file

@ -1,4 +1,3 @@
/* $Id$ */
/*! /*!
* @file Mw/Dialog/ColorPicker.h * @file Mw/Dialog/ColorPicker.h
* @brief Color picker * @brief Color picker

View file

@ -1,4 +1,3 @@
/* $Id$ */
/*! /*!
* @file Mw/Dialog/DirectoryChooser.h * @file Mw/Dialog/DirectoryChooser.h
* @brief Directory chooser * @brief Directory chooser

View file

@ -1,4 +1,3 @@
/* $Id$ */
/*! /*!
* @file Mw/Dialog/FileChooser.h * @file Mw/Dialog/FileChooser.h
* @brief File chooser * @brief File chooser

View file

@ -1,4 +1,3 @@
/* $Id$ */
/*! /*!
* @file Mw/Dialog/MessageBox.h * @file Mw/Dialog/MessageBox.h
* @brief Message box * @brief Message box

View file

@ -1,4 +1,3 @@
/* $Id$ */
/*! /*!
* @file Mw/Draw.h * @file Mw/Draw.h
* @brief Common drawing API * @brief Common drawing API

View file

@ -1,4 +1,3 @@
/* $Id$ */
/*! /*!
* @file Mw/Error.h * @file Mw/Error.h
* @brief Error codes * @brief Error codes

View file

@ -1,4 +1,3 @@
/* $Id$ */
/*! /*!
* @file Mw/Font.h * @file Mw/Font.h
* @brief Font * @brief Font

View file

@ -1,4 +1,3 @@
/* $Id$ */
/*! /*!
* @file Mw/LowLevel.h * @file Mw/LowLevel.h
* @brief Low-level drawing API * @brief Low-level drawing API

View file

@ -1,4 +1,3 @@
/* $Id$ */
/*! /*!
* @file Mw/LowLevel/GDI.h * @file Mw/LowLevel/GDI.h
* @brief GDI Backend * @brief GDI Backend

View file

@ -1,4 +1,3 @@
/* $Id$ */
/*! /*!
* @file Mw/LowLevel/X11.h * @file Mw/LowLevel/X11.h
* @brief X11 Backend * @brief X11 Backend
@ -34,6 +33,7 @@ struct _MwLLX11 {
XIC xic; XIC xic;
int top; int top;
int toplevel;
int grabbed; int grabbed;
int force_render; int force_render;

View file

@ -1,4 +1,3 @@
/* $Id$ */
/*! /*!
* @file Mw/MachDep.h * @file Mw/MachDep.h
* @brief Machine dependent headers and macros * @brief Machine dependent headers and macros

View file

@ -1,4 +1,3 @@
/* $Id$ */
/*! /*!
* @file Mw/Milsko.h * @file Mw/Milsko.h
* @brief Includes all headers * @brief Includes all headers

View file

@ -1,4 +1,3 @@
/* $Id$ */
/*! /*!
* @file Mw/Resource/Cursor.h * @file Mw/Resource/Cursor.h
* @brief Cursor externs * @brief Cursor externs

View file

@ -1,4 +1,3 @@
/* $Id$ */
/*! /*!
* @file Mw/Resource/Font.h * @file Mw/Resource/Font.h
* @brief Default font resources * @brief Default font resources

View file

@ -1,4 +1,3 @@
/* $Id$ */
/*! /*!
* @file Mw/Resource/Icon.h * @file Mw/Resource/Icon.h
* @brief Icon * @brief Icon

View file

@ -1,4 +1,3 @@
/* $Id$ */
/*! /*!
* @file Mw/String.h * @file Mw/String.h
* @brief String utilities * @brief String utilities

View file

@ -1,4 +1,3 @@
/* $Id$ */
/*! /*!
* @file Mw/StringDefs.h * @file Mw/StringDefs.h
* @brief String definitions for property * @brief String definitions for property

View file

@ -1,4 +1,3 @@
/* $Id$ */
/*! /*!
* @file Mw/TypeDefs.h * @file Mw/TypeDefs.h
* @brief Type definitions * @brief Type definitions

View file

@ -1,4 +1,3 @@
/* $Id$ */
/*! /*!
* @file Mw/Unicode.h * @file Mw/Unicode.h
* @brief Handles UTF8 stuff * @brief Handles UTF8 stuff

View file

@ -1,4 +1,3 @@
/* $Id$ */
/*! /*!
* @file Mw/Version.h * @file Mw/Version.h
* @brief Version informations * @brief Version informations

View file

@ -1,4 +1,3 @@
/* $Id$ */
/*! /*!
* @file Mw/Widget/Button.h * @file Mw/Widget/Button.h
* @brief Button widget * @brief Button widget

View file

@ -1,4 +1,3 @@
/* $Id: CheckBox.h 206 2025-10-07 15:10:46Z nishi $ */
/*! /*!
* @file Mw/Widget/CheckBox.h * @file Mw/Widget/CheckBox.h
* @brief CheckBox widget * @brief CheckBox widget

View file

@ -1,4 +1,3 @@
/* $Id: ComboBox.h 206 2025-10-07 15:10:46Z nishi $ */
/*! /*!
* @file Mw/Widget/ComboBox.h * @file Mw/Widget/ComboBox.h
* @brief ComboBox widget * @brief ComboBox widget

View file

@ -1,4 +1,3 @@
/* $Id$ */
/*! /*!
* @file Mw/Widget/Entry.h * @file Mw/Widget/Entry.h
* @brief Entry widget * @brief Entry widget

View file

@ -1,4 +1,3 @@
/* $Id$ */
/*! /*!
* @file Mw/Widget/Frame.h * @file Mw/Widget/Frame.h
* @brief Frame widget * @brief Frame widget

View file

@ -1,4 +1,3 @@
/* $Id$ */
/*! /*!
* @file Mw/Widget/Image.h * @file Mw/Widget/Image.h
* @brief Image widget * @brief Image widget

View file

@ -1,4 +1,3 @@
/* $Id$ */
/*! /*!
* @file Mw/Widget/Label.h * @file Mw/Widget/Label.h
* @brief Label widget * @brief Label widget

View file

@ -1,4 +1,3 @@
/* $Id$ */
/*! /*!
* @file Mw/Widget/ListBox.h * @file Mw/Widget/ListBox.h
* @brief ListBox widget * @brief ListBox widget

View file

@ -1,4 +1,3 @@
/* $Id$ */
/*! /*!
* @file Mw/Widget/Menu.h * @file Mw/Widget/Menu.h
* @brief Menu widget * @brief Menu widget

View file

@ -1,4 +1,3 @@
/* $Id$ */
/*! /*!
* @file Mw/Widget/NumberEntry.h * @file Mw/Widget/NumberEntry.h
* @brief NumberEntry widget * @brief NumberEntry widget

View file

@ -1,4 +1,3 @@
/* $Id$ */
/*! /*!
* @file Mw/Widget/OpenGL.h * @file Mw/Widget/OpenGL.h
* @brief OpenGL widget * @brief OpenGL widget

View file

@ -1,4 +1,3 @@
/* $Id$ */
/*! /*!
* @file Mw/Widget/ProgressBar.h * @file Mw/Widget/ProgressBar.h
* @brief ProgressBar widget * @brief ProgressBar widget

View file

@ -1,4 +1,3 @@
/* $Id: RadioBox.h 206 2025-10-07 15:10:46Z nishi $ */
/*! /*!
* @file Mw/Widget/RadioBox.h * @file Mw/Widget/RadioBox.h
* @brief RadioBox widget * @brief RadioBox widget

View file

@ -1,4 +1,3 @@
/* $Id$ */
/*! /*!
* @file Mw/Widget/ScrollBar.h * @file Mw/Widget/ScrollBar.h
* @brief ScrollBar widget * @brief ScrollBar widget

View file

@ -1,4 +1,3 @@
/* $Id$ */
/*! /*!
* @file Mw/Widget/Separator.h * @file Mw/Widget/Separator.h
* @brief Separator widget * @brief Separator widget

View file

@ -1,4 +1,3 @@
/* $Id$ */
/*! /*!
* @file Mw/Widget/SubMenu.h * @file Mw/Widget/SubMenu.h
* @brief SubMenu widget * @brief SubMenu widget

View file

@ -1,4 +1,3 @@
/* $Id$ */
/*! /*!
* @file Mw/Widget/TreeView.h * @file Mw/Widget/TreeView.h
* @brief TreeView widget * @brief TreeView widget

View file

@ -1,4 +1,3 @@
/* $Id$ */
/*! /*!
* @file Mw/Widget/Viewport.h * @file Mw/Widget/Viewport.h
* @brief Viewport widget * @brief Viewport widget

View file

@ -1,4 +1,3 @@
/* $Id$ */
/*! /*!
* @file Mw/Widget/Vulkan.h * @file Mw/Widget/Vulkan.h
* @brief Vulkan widget * @brief Vulkan widget

View file

@ -1,4 +1,3 @@
/* $Id$ */
/*! /*!
* @file Mw/Widget/Window.h * @file Mw/Widget/Window.h
* @brief Window widget * @brief Window widget

View file

@ -1,5 +1,4 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<!-- $Id$ -->
<!-- <!--
Basically, you have to implement 10+n types: Basically, you have to implement 10+n types:
- Integer (int) - Integer (int)

View file

@ -1,5 +1,3 @@
# $Id$
if(system("wayland-scanner -v >/dev/null 2>&1") == 0){ if(system("wayland-scanner -v >/dev/null 2>&1") == 0){
use_backend("wayland", "x11"); use_backend("wayland", "x11");
} else { } else {

View file

@ -1,4 +1,3 @@
# $Id$
add_incdir("-I/usr/X11R7/include -I/usr/pkg/include"); add_incdir("-I/usr/X11R7/include -I/usr/pkg/include");
add_libdir( add_libdir(
"-L/usr/X11R7/lib -Wl,-R/usr/X11R7/lib -L/usr/pkg/lib -Wl,-R/usr/pkg/lib"); "-L/usr/X11R7/lib -Wl,-R/usr/X11R7/lib -L/usr/pkg/lib -Wl,-R/usr/pkg/lib");

View file

@ -1,4 +1,3 @@
# $Id$
use_backend("x11"); use_backend("x11");
1; 1;

View file

@ -1,4 +1,3 @@
# $Id$
add_libs("-lsocket -lnsl"); add_libs("-lsocket -lnsl");
use_backend("x11"); use_backend("x11");

View file

@ -1,4 +1,3 @@
# $Id$
$library_prefix = ""; $library_prefix = "";
$library_suffix = ".dll"; $library_suffix = ".dll";
$executable_suffix = ".exe"; $executable_suffix = ".exe";

View file

@ -1,4 +1,3 @@
# $Id$
new_object("src/*.c"); new_object("src/*.c");
my $gl_libs = ""; my $gl_libs = "";

View file

@ -1,4 +1,3 @@
# $Id$
sub add_incdir { sub add_incdir {
my $input = $_[0]; my $input = $_[0];
$input =~ s/\r?\n/ /g; $input =~ s/\r?\n/ /g;

View file

@ -1,4 +1,3 @@
/* $Id $*/
#declare FAR = 2.25; #declare FAR = 2.25;
#declare Y = -0.5; #declare Y = -0.5;

View file

@ -1,4 +1,3 @@
/* $Id$ */
#declare BASE = 1; #declare BASE = 1;
#include "resource/logo/logo.pov" #include "resource/logo/logo.pov"

View file

@ -1,4 +1,3 @@
// $Id$
#include "shapes.inc" #include "shapes.inc"
#include "colors.inc" #include "colors.inc"
#include "textures.inc" #include "textures.inc"

View file

@ -1,4 +1,3 @@
/* $Id$ */
#include <Mw/Milsko.h> #include <Mw/Milsko.h>
#ifdef _WIN32 #ifdef _WIN32

View file

@ -1,4 +1,3 @@
/* $Id$ */
#include <Mw/Milsko.h> #include <Mw/Milsko.h>
#if defined(_WIN32) #if defined(_WIN32)

View file

@ -1,4 +1,3 @@
/* $Id$ */
#include <Mw/Milsko.h> #include <Mw/Milsko.h>
#if defined(_WIN32) #if defined(_WIN32)

View file

@ -1,4 +1,3 @@
/* $Id$ */
/* This file gets included by backend */ /* This file gets included by backend */
#define CALL(NAME) \ #define CALL(NAME) \
int MwLL##NAME##CallInit(void) { \ int MwLL##NAME##CallInit(void) { \

View file

@ -1,4 +1,3 @@
/* $Id$ */
#include <Mw/Milsko.h> #include <Mw/Milsko.h>
typedef struct userdata { typedef struct userdata {

View file

@ -1,4 +1,3 @@
/* $Id$ */
#include <Mw/Milsko.h> #include <Mw/Milsko.h>
#include "../../external/stb_ds.h" #include "../../external/stb_ds.h"
@ -152,10 +151,12 @@ static MwLL MwLLCreateImpl(MwLL parent, int x, int y, int width, int height) {
r->x11.display = XOpenDisplay(NULL); r->x11.display = XOpenDisplay(NULL);
p = XRootWindow(r->x11.display, XDefaultScreen(r->x11.display)); p = XRootWindow(r->x11.display, XDefaultScreen(r->x11.display));
r->x11.top = 1; r->x11.top = 1;
r->x11.toplevel = 1;
} else { } else {
r->x11.display = parent->x11.display; r->x11.display = parent->x11.display;
p = parent->x11.window; p = parent->x11.window;
r->x11.top = 0; r->x11.top = 0;
r->x11.toplevel = 0;
} }
r->x11.window = XCreateSimpleWindow(r->x11.display, p, px, py, width, height, 0, 0, WhitePixel(r->x11.display, DefaultScreen(r->x11.display))); r->x11.window = XCreateSimpleWindow(r->x11.display, p, px, py, width, height, 0, 0, WhitePixel(r->x11.display, DefaultScreen(r->x11.display)));
sh.flags = PWinGravity; sh.flags = PWinGravity;
@ -253,6 +254,8 @@ static void MwLLDestroyImpl(MwLL handle) {
XSync(handle->x11.display, False); XSync(handle->x11.display, False);
if(handle->x11.toplevel) XCloseDisplay(handle->x11.display);
free(handle); free(handle);
} }

View file

@ -1,4 +1,3 @@
/* $Id$ */
#include <Mw/Milsko.h> #include <Mw/Milsko.h>
MwLLColor MwParseColorName(MwWidget handle, const char* color) { MwLLColor MwParseColorName(MwWidget handle, const char* color) {

View file

@ -1,4 +1,3 @@
/* $Id$ */
#include <Mw/Milsko.h> #include <Mw/Milsko.h>
#include <wayland-util.h> #include <wayland-util.h>

View file

@ -1,4 +1,3 @@
/* $Id$ */
#include <Mw/Milsko.h> #include <Mw/Milsko.h>
/** /**

View file

@ -1,4 +1,3 @@
/* $Id$ */
#include <Mw/Milsko.h> #include <Mw/Milsko.h>
/** /**

Some files were not shown because too many files have changed in this diff Show more