moving to snake_case
parent
898b6afbaa
commit
fdbe79c882
15
default.nix
15
default.nix
|
@ -1,8 +1,19 @@
|
|||
{ pkgs ? import <nixpkgs> {
|
||||
overlays = [
|
||||
(import ../overlays/default.nix)
|
||||
(import ((builtins.fetchGit {
|
||||
url = "gitea@git.keldu.de:nixos/kelducfg.git";
|
||||
ref = "master";
|
||||
}).outPath + "/overlays/default.nix"))
|
||||
];
|
||||
}
|
||||
}:
|
||||
|
||||
pkgs.callPackage ./.nix/derivation.nix {}
|
||||
let
|
||||
forstio = import ((builtins.fetchGit {
|
||||
url = "gitea@git.keldu.de:forstio/forstio.git";
|
||||
ref = "dev";
|
||||
}).outPath + "/default.nix") {};
|
||||
in
|
||||
pkgs.callPackage ./.nix/derivation.nix {
|
||||
inherit forstio;
|
||||
}
|
||||
|
|
|
@ -9,34 +9,34 @@
|
|||
#include "forstio/window/window.h"
|
||||
|
||||
namespace saw {
|
||||
class XcbDevice;
|
||||
class XcbWindow final : public Window {
|
||||
class xcb_device;
|
||||
class xcb_window final : public window {
|
||||
public:
|
||||
XcbDevice &device;
|
||||
xcb_device &device;
|
||||
|
||||
xcb_window_t xcb_window;
|
||||
xcb_colormap_t xcb_colormap;
|
||||
|
||||
VideoMode video_mode;
|
||||
video_mode video_mode;
|
||||
std::string window_title;
|
||||
|
||||
Own<ConveyorFeeder<Window::VariantEvent>> event_feeder = nullptr;
|
||||
own<conveyor_feeder<window::variant_event>> event_feeder = nullptr;
|
||||
|
||||
public:
|
||||
XcbWindow(XcbDevice &device, xcb_window_t xcb_window,
|
||||
xcb_colormap_t xcb_colormap, const VideoMode &video_mode,
|
||||
xcb_window(xcb_device &device, xcb_window_t xcb_window,
|
||||
xcb_colormap_t xcb_colormap, const video_mode &video_mode,
|
||||
std::string_view title_view);
|
||||
~XcbWindow();
|
||||
~xcb_window();
|
||||
|
||||
void show() override;
|
||||
void hide() override;
|
||||
|
||||
const VideoMode &videoMode() const override;
|
||||
const video_mode &videoMode() const override;
|
||||
const std::string_view title() const override;
|
||||
|
||||
void resize(size_t width, size_t height) override;
|
||||
|
||||
Conveyor<Window::VariantEvent> onEvent() override;
|
||||
conveyor<window::variant_event> onEvent() override;
|
||||
|
||||
void resizeEvent(size_t x, size_t y, size_t width, size_t height);
|
||||
void mouseEvent(int16_t x, int16_t y, uint16_t state, bool pressed);
|
||||
|
|
Loading…
Reference in New Issue