loic/Noise-generator
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

edit: window manager and add keyhook

Browse source
This commit is contained in:
loic 2024-12-13 02:53:00 +01:00
parent 46deb59efd
commit 18c4896be4
4 changed files with 66 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
TODO Normal file
View file

@ -0,0 +1 @@
TODO: error handling in WindowManager.cpp

23
includes/windowManager/WindowManager.hpp
View file

@ -12,14 +12,21 @@ public:
void loop(); void loop();
private: private:
Display *_display; int WindowX;
int _screen; int WindowY;
Window root; int WindowWidth;
Window win; int WindowHeight;
XEvent event; int BorderWidth;
int _width; int WindowDepth;
int _height; int WindowClass;
Visual *WindowVisual;
int AttributeValueMask;
XSetWindowAttributes WindowAttributes;
Window MainWindow;
Display *MainDisplay;
Window RootWindow;
Atom wmDelete;
bool isWindowOpen;
}; };
#endif //NOISE_GENERATOR_WINDOWMANAGER_HPP #endif //NOISE_GENERATOR_WINDOWMANAGER_HPP

1
srcs/main.cpp
View file

@ -6,7 +6,6 @@
int main() { int main() {
WindowManager window(WIDTH, HEIGHT); WindowManager window(WIDTH, HEIGHT);
window.loop(); window.loop();
return 0; return 0;

63
srcs/windowManager/WindowManager.cpp
View file

@ -1,23 +1,60 @@
#include "windowManager/WindowManager.hpp" #include "windowManager/WindowManager.hpp"
#include <string.h>
#include <X11/Xutil.h>
#include <iostream>
#include <X11/Xlib.h>
WindowManager::WindowManager(int width, int height) : _width(width), _height(height) { WindowManager::WindowManager(int width, int height) :
_display = XOpenDisplay(NULL); WindowX(0), WindowY(0),
if (NULL == _display) errx(2, "unable to open display"); WindowWidth(width), WindowHeight(height),
_screen = DefaultScreen(_display); BorderWidth(0),
root = RootWindow(_display, _screen); WindowDepth(CopyFromParent),
win = XCreateSimpleWindow(_display, root, 0, 0, _width, _height, 10, WindowClass(CopyFromParent),
0, 0x0f0f0f); WindowVisual(CopyFromParent),
AttributeValueMask(CWBackPixel | CWEventMask)
{
MainDisplay = XOpenDisplay(0);
RootWindow = XDefaultRootWindow(MainDisplay);
bzero(&WindowAttributes, sizeof(XSetWindowAttributes));
WindowAttributes.background_pixel = 0xffafe9af;
WindowAttributes.event_mask = StructureNotifyMask | KeyPressMask | KeyReleaseMask | ExposureMask;
XMapWindow(_display, win); MainWindow = XCreateWindow(MainDisplay, RootWindow,
XFlush(_display); WindowX, WindowY, WindowWidth, WindowHeight,
BorderWidth, WindowDepth, WindowClass, WindowVisual,
AttributeValueMask, &WindowAttributes);
XMapWindow(MainDisplay, MainWindow);
wmDelete = XInternAtom(MainDisplay, "WM_DELETE_WINDOW", false);
XSetWMProtocols(MainDisplay, MainWindow, &wmDelete, 1);
isWindowOpen = true;
} }
WindowManager::~WindowManager() { WindowManager::~WindowManager() {
XUnmapWindow(_display, win); XUnmapWindow(this->MainDisplay, this->MainWindow);
XDestroyWindow(_display, win); XDestroyWindow(this->MainDisplay, this->MainWindow);
XCloseDisplay(_display); XCloseDisplay(this->MainDisplay);
} }
void WindowManager::loop() { void WindowManager::loop() {
while (XNextEvent(_display, &event) != 0); while (isWindowOpen) {
XEvent GeneralEvent = {};
XNextEvent(this->MainDisplay, &GeneralEvent);
switch(GeneralEvent.type) {
case KeyPress:
case KeyRelease:
{
XKeyPressedEvent *event = (XKeyPressedEvent *)&GeneralEvent;
if (event->keycode == XKeysymToKeycode(this->MainDisplay, XK_Escape)) {
this->isWindowOpen = false;
}
} break;
case ClientMessage: {
if (static_cast<Atom>(GeneralEvent.xclient.data.l[0]) == this->wmDelete) {
this->isWindowOpen = false;
}
} break;
}
}
} }