This commit is contained in:
2024-05-08 22:15:28 -04:00
parent 52e1b6eb00
commit d3a971d598
4 changed files with 10 additions and 11 deletions

View File

@@ -18,7 +18,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
CPMAddPackage(
NAME J3ML
URL https://git.redacted.cc/josh/j3ml/archive/Release-1.zip
URL https://git.redacted.cc/josh/j3ml/archive/Release-2.zip
)
CPMAddPackage(

View File

@@ -25,6 +25,12 @@ namespace ReWindow
RightSide = XC_right_side,
Pencil = XC_pencil
};
class CursorStyle {
public:
X11CursorStyle X11Cursor;
CursorStyle(X11CursorStyle style) : X11Cursor(style) {}
};
namespace Cursors {
static const CursorStyle Default {X11CursorStyle::Default};
@@ -43,12 +49,6 @@ namespace ReWindow
static const CursorStyle RightSide {X11CursorStyle::RightSide};
static const CursorStyle Pencil {X11CursorStyle::Pencil};
}
class CursorStyle {
public:
X11CursorStyle X11Cursor;
CursorStyle(X11CursorStyle style) : X11Cursor(style) {}
};
#else
// https://learn.microsoft.com/en-us/windows/win32/menurc/about-cursors
enum class WindowsCursorStyle {

View File

@@ -19,7 +19,7 @@
#include <X11/Xutil.h>
#include <GL/gl.h>
#include <GL/glx.h>
#include <cursors.h>
#include <rewindow/types/cursors.h>
#endif
@@ -180,8 +180,7 @@ namespace ReWindow
}
#ifndef __linux___
void setRect (int nx, int ny, int nw, int nh) {
x = nx;
y = ny;
setPos(nx, ny);
width = nw;
height = nh;
}

View File

@@ -136,7 +136,7 @@ namespace ReWindow {
auto scancode = (X11Scancode) xev.xkey.keycode;
auto key = GetKeyFromX11Scancode(scancode);
pressKey (key);
eventLog.push_back(eventData);
//eventLog.push_back(eventData);
}
if (xev.type == ButtonRelease) {