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

if wayland's gonna be disabled by default until it's finished then i'm just gonna develop it on master so that we don't have to worry about merge conflicts during any long periods where i don't feel like working on it #2

Merged
IoI_xD merged 8 commits from wayland-p2 into master 2025-12-18 11:13:59 +09:00
Conversation 0 Commits 8 Files changed 8 +13 -14
4 changed files with 13 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit bee6cb81ca - Show all commits

now ACTUALLY format

Prev Next
Nishi 2025-12-15 11:07:58 +09:00
commit bee6cb81ca
Signed by: nishi
GPG key ID: 27EF69B208EB9343

4
include/Mw/BaseTypes.h
View file

@ -58,8 +58,8 @@ typedef unsigned long MwU64;
#ifdef MW_OTHER_TYPES_DEFINED
#undef MW_OTHER_TYPES_DEFINED
#else
typedef int MwI32;
typedef unsigned int MwU32;
typedef int MwI32;
typedef unsigned int MwU32;
typedef short MwI16;
typedef unsigned short MwU16;

12
src/backend/wayland.c
View file

@ -38,18 +38,18 @@ static void new_protocol(void* data, struct wl_registry* registry,
/* `wl_registry.global_remove` callback */
static void protocol_removed(void* data,
struct wl_registry* registry,
MwU32 name){
MwU32 name) {
};
/* `wl_pointer.enter` callback */
static void pointer_enter(void* data, struct wl_pointer* wl_pointer, MwU32 serial,
struct wl_surface* surface, wl_fixed_t surface_x,
wl_fixed_t surface_y){};
wl_fixed_t surface_y) {};
/* `wl_pointer.leave` callback */
static void pointer_leave(void* data, struct wl_pointer* wl_pointer, MwU32 serial,
struct wl_surface* surface){};
struct wl_surface* surface) {};
/* `wl_pointer.motion` callback */
static void pointer_motion(void* data, struct wl_pointer* wl_pointer, MwU32 time,
@ -97,7 +97,7 @@ static void pointer_button(void* data, struct wl_pointer* wl_pointer, MwU32 seri
/* `wl_pointer.axis` callback */
static void pointer_axis(void* data, struct wl_pointer* wl_pointer, MwU32 time,
MwU32 axis, wl_fixed_t value){};
MwU32 axis, wl_fixed_t value) {};
struct wl_pointer_listener pointer_listener = {
.enter = pointer_enter,
@ -266,7 +266,7 @@ static void keyboard_modifiers(void* data,
MwU32 mods_depressed,
MwU32 mods_latched,
MwU32 mods_locked,
MwU32 group){};
MwU32 group) {};
struct wl_keyboard_listener keyboard_listener = {
.keymap = keyboard_keymap,
@ -278,7 +278,7 @@ struct wl_keyboard_listener keyboard_listener = {
/* `wl_seat.name` callback */
static void
wl_seat_name(void* data, struct wl_seat* wl_seat, const char* name){};
wl_seat_name(void* data, struct wl_seat* wl_seat, const char* name) {};
/* `wl_seat.capabilities` callback */
static void wl_seat_capabilities(void* data, struct wl_seat* wl_seat,

3
src/widget/opengl.c
View file

@ -89,8 +89,7 @@ static int create(MwWidget handle) {
attribs[3] = 24;
attribs[4] = None;
while(glpath[glincr] != NULL && (o->lib = MwDynamicOpen(glpath[glincr++])) == NULL)
;
while(glpath[glincr] != NULL && (o->lib = MwDynamicOpen(glpath[glincr++])) == NULL);
o->glXChooseVisual = (MWglXChooseVisual)MwDynamicSymbol(o->lib, "glXChooseVisual");
o->glXCreateContext = (MWglXCreateContext)MwDynamicSymbol(o->lib, "glXCreateContext");

8
src/widget/scrollbar.c
View file

@ -144,7 +144,7 @@ static void draw(MwWidget handle) {
}
static void mouse_move(MwWidget handle) {
int or = MwGetInteger(handle, MwNorientation);
int or = MwGetInteger(handle, MwNorientation);
scrollbar_t* scr = handle->internal;
if(!handle->pressed) return;
@ -172,9 +172,9 @@ static void mouse_move(MwWidget handle) {
}
static void mouse_down(MwWidget handle, void* ptr) {
int ww = MwGetInteger(handle, MwNwidth);
int wh = MwGetInteger(handle, MwNheight);
int or = MwGetInteger(handle, MwNorientation);
int ww = MwGetInteger(handle, MwNwidth);
int wh = MwGetInteger(handle, MwNheight);
int or = MwGetInteger(handle, MwNorientation);
scrollbar_t* scr = handle->internal;
MwLLMouse* m = ptr;