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

merge conflict

Browse source
This commit is contained in:
IoI_xD 2026-03-30 11:31:40 -07:00
commit 9560c4fd92
20 changed files with 589 additions and 313 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/Mw/BaseTypes.h
View file

@ -32,7 +32,7 @@ typedef int8_t MwI8;
typedef uint8_t MwU8;
#define MW_OTHER_TYPES_DEFINED
#elif __GNUC__ > 2
#elif !defined(__STRICT_ANSI__) && (defined(__GNUC__) || defined(__clang__))
typedef long long MwI64;
typedef unsigned long long MwU64;
#elif defined(_MSC_VER) || defined(__BORLANDC__) || defined(__WATCOMC__)

21
include/Mw/LowLevel/Wayland.h
View file

@ -289,6 +289,7 @@ MwInline int wayland_load_funcs() {
#include "Wayland/cursor-shape-client-protocol.h"
#include "Wayland/primary-selection-client-protocol.h"
#include "Wayland/pointer-constraints-client-protocol.h"
#include "Wayland/relative-pointer-client-protocol.h"
#include "Wayland/xdg-toplevel-icon-client-protocol.h"
#endif
@ -311,10 +312,6 @@ struct _MwLLWaylandTopLevel {
struct xdg_toplevel_listener xdg_toplevel_listener;
struct xdg_surface_listener xdg_surface_listener;
struct xkb_context* xkb_context;
struct xkb_keymap* xkb_keymap;
struct xkb_state* xkb_state;
MwBool compositor_created;
MwBool xdg_wm_base_created;
MwBool xdg_surface_created;
@ -416,6 +413,10 @@ struct _MwLLWayland {
MwBool has_decorations;
char title[255];
struct xkb_context* xkb_context;
struct xkb_keymap* xkb_keymap;
struct xkb_state* xkb_state;
struct wl_display* display;
struct wl_registry* registry;
struct wl_compositor* compositor;
@ -426,10 +427,12 @@ struct _MwLLWayland {
struct wp_viewport* vp;
MwBool do_lock_pointer;
struct zwp_pointer_constraints_v1* pointer_constraints;
struct zwp_locked_pointer_v1* locked_pointer;
MwBool pointer_constrained;
MwBool do_lock_pointer;
struct zwp_pointer_constraints_v1* pointer_constraints;
struct zwp_relative_pointer_manager_v1* relative_pointer_manager;
struct zwp_relative_pointer_v1* relative_pointer;
struct zwp_locked_pointer_v1* locked_pointer;
MwBool pointer_constrained;
/* clipboard related stuff.
* Note that unlike most interfaces, we don't keep zwp_primary_selection stuff in a wayland_protocol_t because we use wl_data_device as a fallback and want to have it share memory space.*/
@ -475,6 +478,8 @@ struct _MwLLWayland {
MwBool force_render;
MwBool did_event_loop_early;
MwBool dispatching_resize;
struct _MwLLWaylandShmBuffer framebuffer;
struct _MwLLWaylandShmBuffer backbuffer;
struct _MwLLWaylandShmBuffer cursor;

8
include/Mw/String.h
View file

@ -42,12 +42,20 @@ MWDECL void MwStringSize(char* out, MwOffset size);
MWDECL void MwStringTime(char* out, time_t t);
/*!
<<<<<<< HEAD
* @brief Prints up to n characters into a bufferMwStringPrintIntoBuffer.
* @note On compilers that support C99, this uses vsnprintf to safely print into a buffer; on compilers that don't, vsprintf is used.
* @param out Buffer
* @param size Max size
*/
MWDECL void MwStringPrintIntoBuffer(char* out, MwU32 size, const char* fmt, ...);
=======
* @brief Check if the given key is UTF8
* @param key Input
* @return whether its utf8
*/
MWDECL MwBool MwIsKeyUTF8(MwU32 key);
>>>>>>> master
#ifdef __cplusplus
}

2
include/Mw/TypeDefs.h
View file

@ -27,7 +27,7 @@ typedef struct _MwListBoxEntry MwListBoxEntry;
typedef struct _MwTreeViewEntry MwTreeViewEntry;
typedef struct _MwDirectoryEntry MwDirectoryEntry;
typedef struct _MwListBoxPacket MwListBoxPacket;
typedef struct _MwBox* MwBox;
typedef struct _MwBox* MwBox;
#ifdef _MILSKO
typedef struct _MwWidget* MwWidget;
#else