Hartmut/pixwerx
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

WiP

Browse source
This commit is contained in:
Hartmut Seichter 2020-12-02 15:22:39 +01:00
parent 0cd3c99119
commit bf41ce9544
3 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/deps/glfw-3.3.2/src/x11_window.c
View file

@ -1557,7 +1557,7 @@ static void processEvent(XEvent *event)
// the position into root (screen) coordinates // the position into root (screen) coordinates
if (!event->xany.send_event && window->x11.parent != _glfw.x11.root) if (!event->xany.send_event && window->x11.parent != _glfw.x11.root)
{ {
Window dummy; Window dummy = 0;
XTranslateCoordinates(_glfw.x11.display, XTranslateCoordinates(_glfw.x11.display,
window->x11.parent, window->x11.parent,
_glfw.x11.root, _glfw.x11.root,

2
src/scripts/demos/simple_000.lua
View file

@ -8,7 +8,7 @@ pw.script:load_all()
print("hello pixwerx!") print("hello pixwerx!")
local w = pw.window.new() local w = pw.window.new()
w.visible = false --w.visible = false
-- set title -- set title
w.title = "pixwerx 0.1" w.title = "pixwerx 0.1"

9
src/system/src/window.cpp
View file

@ -146,8 +146,16 @@ struct window::impl {
if (!glfwInit()) if (!glfwInit())
{ {
debug::e() << "Initalization error"; debug::e() << "Initalization error";
} }
int glfw_major, glfx_minor,glfw_rev;
glfwGetVersion(&glfw_major,&glfx_minor,&glfw_rev);
debug::d() << "GLFW " << glfw_major << "." << glfx_minor << "." << glfw_rev;
debug::d() << "GLFW header " << GLFW_VERSION_MAJOR << "." << GLFW_VERSION_MINOR << "." << GLFW_VERSION_REVISION;
update_display_list(); update_display_list();
// request specific version 3.3 // request specific version 3.3
@ -206,7 +214,6 @@ struct window::impl {
{ {
if (_window && !glfwWindowShouldClose(_window)) if (_window && !glfwWindowShouldClose(_window))
{ {
input::get().reset(); input::get().reset();
// get new events // get new events