changed to name

dev
keldu 2022-01-01 20:24:31 +01:00
parent 9f2a6025e0
commit 704351b459
10 changed files with 21 additions and 21 deletions

View File

@ -8,7 +8,7 @@
#include <map>
#include <vector>
#include "device.h"
#include "forstio/window/device.h"
#include "window_xcb.h"
namespace saw {

View File

@ -85,7 +85,7 @@ Own<GlWindow> XcbGlContext::createWindow(const VideoMode &video_mode,
if (!device) {
return nullptr;
}
gin::Own<XcbWindow> window =
Own<XcbWindow> window =
device->createXcbWindow(video_mode, title_view, visual_id);
if (!window) {
return nullptr;
@ -94,7 +94,7 @@ Own<GlWindow> XcbGlContext::createWindow(const VideoMode &video_mode,
::GLXWindow glx_window = glXCreateWindow(device->display, fb_config,
window->xcb_window, nullptr);
return gin::heap<XcbGlWindow>(std::move(window), *this, glx_window);
return heap<XcbGlWindow>(std::move(window), *this, glx_window);
}
void XcbGlContext::flush() {

View File

@ -5,7 +5,7 @@
#include <set>
#include <string_view>
#include "gl/gl_context.h"
#include "forstio/window/gl/gl_context.h"
namespace saw {
struct GlxLibraryExtensions {

View File

@ -3,7 +3,7 @@
#include <GL/glx.h>
#include <forstio/common.h>
#include "gl/gl_window.h"
#include "forstio/window/gl/gl_window.h"
namespace saw {
class XcbWindow;
@ -31,4 +31,4 @@ public:
Conveyor<Window::VariantEvent> onEvent() override;
};
} // namespace saw
} // namespace saw

View File

@ -4,7 +4,7 @@
#include "device_xcb.h"
namespace gin {
namespace saw {
XcbWindow::XcbWindow(XcbDevice &device, xcb_window_t xcb_window,
xcb_colormap_t xcb_colormap, const VideoMode &video_mode,
std::string_view title_view)
@ -107,4 +107,4 @@ void XcbWindow::keyboardEvent(int16_t x, int16_t y, uint32_t keycode,
}
}
} // namespace gin
} // namespace saw

View File

@ -6,9 +6,9 @@
#include <string>
#include "window.h"
#include "forstio/window/window.h"
namespace gin {
namespace saw {
class XcbDevice;
class XcbWindow final : public Window {
public:
@ -44,4 +44,4 @@ public:
void keyboardEvent(int16_t x, int16_t y, uint32_t keycode, bool pressed,
bool repeat);
};
} // namespace gin
} // namespace saw

View File

@ -6,7 +6,7 @@
#include "gl_window.h"
namespace gin {
namespace saw {
class GlSettings {
public:
uint8_t gl_major = 3;
@ -58,4 +58,4 @@ public:
class IoProvider;
Own<GlContext> createGlContext(IoProvider &, const GlSettings &);
} // namespace gin
} // namespace saw

View File

@ -7,7 +7,7 @@
#include <string_view>
namespace gin {
namespace saw {
class GlWindow {
public:
virtual ~GlWindow() = default;
@ -28,4 +28,4 @@ public:
virtual Conveyor<Window::VariantEvent> onEvent() = 0;
};
} // namespace gin
} // namespace saw

View File

@ -2,10 +2,10 @@
#include <cstddef>
namespace gin {
namespace saw {
class VideoMode {
public:
size_t width = 128;
size_t height = 128;
};
} // namespace gin
} // namespace saw

View File

@ -1,14 +1,14 @@
#pragma once
#include <kelgin/async.h>
#include <kelgin/common.h>
#include <forstio/async.h>
#include <forstio/common.h>
#include <string_view>
#include <variant>
#include "video_mode.h"
namespace gin {
namespace saw {
class Window {
public:
@ -54,4 +54,4 @@ public:
virtual Conveyor<VariantEvent> onEvent() = 0;
};
} // namespace gin
} // namespace saw