Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Wayland support #278

Open
wants to merge 96 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
96 commits
Select commit Hold shift + click to select a range
7f958b2
i am trying, ok?
TheDrawingCoder-Gamer Nov 30, 2023
f3ec231
we've all sinned. some worse than others.
TheDrawingCoder-Gamer Dec 1, 2023
a10db21
OH MY, SO MANY CHANGES
TheDrawingCoder-Gamer Dec 3, 2023
4378e8c
It's trying, at least
TheDrawingCoder-Gamer Dec 3, 2023
ff1d84a
Try work on event loop?
TheDrawingCoder-Gamer Dec 4, 2023
26823f2
Try attach buffer (xdg didn't like that)
TheDrawingCoder-Gamer Dec 4, 2023
2831f68
It now segfaults
TheDrawingCoder-Gamer Dec 4, 2023
cc7f892
ok i'm trying
TheDrawingCoder-Gamer Dec 6, 2023
9c35576
IT SURE DOES OPEN
TheDrawingCoder-Gamer Dec 6, 2023
46d015e
Revert from public glue to private glue
TheDrawingCoder-Gamer Dec 6, 2023
84ec8e6
a whole lot of nothing
TheDrawingCoder-Gamer Dec 6, 2023
9c543c0
Start switch to libdecor (crashes)
TheDrawingCoder-Gamer Dec 7, 2023
7aa2820
Doesn't crash (doesn't render well)
TheDrawingCoder-Gamer Dec 7, 2023
e42583d
start input
TheDrawingCoder-Gamer Dec 8, 2023
db4c4d5
remove xdg-shell
TheDrawingCoder-Gamer Dec 8, 2023
101d7c0
screens, and other misc things
TheDrawingCoder-Gamer Dec 8, 2023
f7ba638
title/titlebar :)
TheDrawingCoder-Gamer Dec 8, 2023
62a8da1
Events for focus, maximize
TheDrawingCoder-Gamer Dec 8, 2023
863fab0
Partially working Raster
TheDrawingCoder-Gamer Dec 9, 2023
f6fd997
remove notify debug
TheDrawingCoder-Gamer Dec 9, 2023
abe4eac
More roundtrips : )
TheDrawingCoder-Gamer Dec 9, 2023
393e708
Don't commit if no window : )
TheDrawingCoder-Gamer Dec 9, 2023
366363f
Make current before resize
TheDrawingCoder-Gamer Dec 11, 2023
952c76c
Don't block on swap (fixes multiwindow render)
TheDrawingCoder-Gamer Dec 12, 2023
ebafae5
Make multiwindow work
TheDrawingCoder-Gamer Dec 12, 2023
eb4527c
forgot to revert to release build
TheDrawingCoder-Gamer Dec 12, 2023
7f6206a
Fully working rendering
TheDrawingCoder-Gamer Dec 12, 2023
78cd01f
Clean up, clipboard
TheDrawingCoder-Gamer Dec 12, 2023
460744e
Half-baked mouse cursors
TheDrawingCoder-Gamer Dec 13, 2023
cd600b0
Squash merge upstream/main into wayland
TheDrawingCoder-Gamer Dec 13, 2023
f03b9f1
Mouse works
TheDrawingCoder-Gamer Dec 14, 2023
535f8a4
LESS THREAD SAFETY
TheDrawingCoder-Gamer Dec 14, 2023
0909a74
do not load cursor on resize
TheDrawingCoder-Gamer Dec 14, 2023
8349eb4
scrolling
TheDrawingCoder-Gamer Dec 14, 2023
d9efd31
repeating (stalls)
TheDrawingCoder-Gamer Dec 15, 2023
8107786
lowercase keys
TheDrawingCoder-Gamer Dec 15, 2023
fd42b2f
Acceptable (lags)
TheDrawingCoder-Gamer Dec 15, 2023
05cf38b
compose
TheDrawingCoder-Gamer Dec 15, 2023
f6f8bd0
keycodes, scaling
TheDrawingCoder-Gamer Dec 16, 2023
22fd80a
Bump Skija version
TheDrawingCoder-Gamer Dec 17, 2023
dbad095
Merge remote-tracking branch 'upstream/main' into wayland
TheDrawingCoder-Gamer Dec 17, 2023
20a7a87
Repeat now not laggy (on GL)
TheDrawingCoder-Gamer Dec 17, 2023
5a5d611
nudge keyboard repeat
TheDrawingCoder-Gamer Dec 17, 2023
9eabca1
don't commit on detach
TheDrawingCoder-Gamer Dec 17, 2023
acc730d
fix clipboard?
TheDrawingCoder-Gamer Dec 17, 2023
7a6f95b
clipboard sauce
TheDrawingCoder-Gamer Dec 18, 2023
291adf3
Self clipboard pasting
TheDrawingCoder-Gamer Dec 18, 2023
bc0bd2c
change focus access to method
TheDrawingCoder-Gamer Dec 18, 2023
78ab64f
yank out pointer into class
TheDrawingCoder-Gamer Dec 18, 2023
adc9d35
check on deref
TheDrawingCoder-Gamer Dec 19, 2023
59c3082
no copy/move stuff in things w/ destructors
TheDrawingCoder-Gamer Dec 19, 2023
aff2790
clarify what detaching does
TheDrawingCoder-Gamer Dec 19, 2023
9748b97
various fixes, nvidia worksish
TheDrawingCoder-Gamer Dec 20, 2023
1d7fb1a
change how cursors are loaded
TheDrawingCoder-Gamer Dec 20, 2023
1b04091
More safety?
TheDrawingCoder-Gamer Dec 20, 2023
6e7fb7d
rework proxy tags, more checks
TheDrawingCoder-Gamer Dec 21, 2023
32a841d
Dont trust EGL size
TheDrawingCoder-Gamer Dec 23, 2023
7c95878
do memleak frame
TheDrawingCoder-Gamer Dec 23, 2023
980ad0d
grab pointer and keyboard as unique_ptr
TheDrawingCoder-Gamer Dec 23, 2023
ba5192e
scroll fix
TheDrawingCoder-Gamer Dec 23, 2023
aae5324
lock cursor
TheDrawingCoder-Gamer Dec 24, 2023
b2af1e5
Movement, request new lock
TheDrawingCoder-Gamer Dec 24, 2023
f6202e6
hide cursor, no primary screen
TheDrawingCoder-Gamer Dec 24, 2023
f09192d
Relative mouse movement
TheDrawingCoder-Gamer Dec 24, 2023
7917054
fix mouse scaling
TheDrawingCoder-Gamer Dec 25, 2023
26182c7
Really fix mouse
TheDrawingCoder-Gamer Dec 25, 2023
c041ebd
Fix jank related to resizing
TheDrawingCoder-Gamer Dec 26, 2023
6435c2f
Fix closing
TheDrawingCoder-Gamer Dec 26, 2023
ddff041
don't constantly set buffer size
TheDrawingCoder-Gamer Dec 30, 2023
96ed37d
fix layer swapping
TheDrawingCoder-Gamer Dec 31, 2023
38280f6
don't forget GL too
TheDrawingCoder-Gamer Dec 31, 2023
353d420
NO MORE LIBDECOR
TheDrawingCoder-Gamer Jan 3, 2024
b61b050
Don't crash on unmaximize
TheDrawingCoder-Gamer Jan 3, 2024
26f1bc7
Implement screen-state related items
TheDrawingCoder-Gamer Jan 3, 2024
02d4987
Merge remote-tracking branch 'upstream/main' into wayland
TheDrawingCoder-Gamer Jan 3, 2024
a4af84a
try fix build
TheDrawingCoder-Gamer Jan 3, 2024
25972d8
Hidden actually means just no title bar
TheDrawingCoder-Gamer Jan 4, 2024
94d4539
Thinner = better
TheDrawingCoder-Gamer Jan 4, 2024
ebf0c4c
Fix movement when titlebar is hidden
TheDrawingCoder-Gamer Jan 4, 2024
0a6f4ff
remove log
TheDrawingCoder-Gamer Jan 4, 2024
67ce6f9
Undo some unneeded changes
TheDrawingCoder-Gamer Jan 4, 2024
ff8827b
Combine border into one part
TheDrawingCoder-Gamer Jan 5, 2024
7c921ca
make title great again
TheDrawingCoder-Gamer Jan 6, 2024
a2c8a47
edit title bar grabbing
TheDrawingCoder-Gamer Jan 7, 2024
adef9ae
configure on first resize
TheDrawingCoder-Gamer Jan 7, 2024
d34bd62
always allow movement on border with ctrl
TheDrawingCoder-Gamer Jan 8, 2024
737857e
urgency/focus stealing
TheDrawingCoder-Gamer Jan 9, 2024
8f8842b
Add example code for focus
TheDrawingCoder-Gamer Jan 9, 2024
27ed307
slim decorations
TheDrawingCoder-Gamer Jan 9, 2024
ccd584f
constrain size of window
TheDrawingCoder-Gamer Jan 9, 2024
1c2f4be
Use var for protocols
TheDrawingCoder-Gamer Jan 14, 2024
a7f078f
Omit functions that are high version
TheDrawingCoder-Gamer Jan 14, 2024
d407cba
remove atoms
TheDrawingCoder-Gamer Jan 16, 2024
030cd7d
fix crash on close under sway
TheDrawingCoder-Gamer Jan 19, 2024
1f164c3
Merge remote-tracking branch 'upstream/main' into wayland
TheDrawingCoder-Gamer Jan 19, 2024
9baac61
NVIDIA JUST WORKS:tm:
TheDrawingCoder-Gamer Jan 19, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Undo some unneeded changes
  • Loading branch information
TheDrawingCoder-Gamer committed Jan 4, 2024
commit 67ce6f9de3b664b12a03bedad166a0d86fe6d6c5
1 change: 0 additions & 1 deletion linux/cc/ILayer.hh
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ public:
virtual void makeCurrentForced();
virtual void setVsyncMode(VSync v) = 0;
virtual void close() = 0;
virtual void resize(int width, int height) = 0;


static ILayer* _ourCurrentLayer;
Expand Down
3 changes: 1 addition & 2 deletions wayland/cc/LayerGLWayland.cc
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ namespace jwm {
// vsync? what vsync?
}

void resize(int width, int height) override {
void resize(int width, int height) {
if (!_surface || !_eglWindow) return;
// Make current to avoid artifacts in other windows
makeCurrentForced();
Expand All @@ -100,7 +100,6 @@ namespace jwm {
// HACK: make new window with new scale
// https://gitlab.freedesktop.org/mesa/mesa/-/issues/7217
if (fWindow->_scale != fWindow->_oldScale) {
fprintf(stderr, "HACK: remaking egl window\n");
detachBuffer();
attachBuffer();
wl_surface_set_buffer_scale(fWindow->_waylandWindow, fWindow->getIntScale());
Expand Down
2 changes: 1 addition & 1 deletion wayland/cc/LayerRasterWayland.cc
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ namespace jwm {
}
}

void resize(int width, int height) override {
void resize(int width, int height) {
// god is dead
_width = width;
_height = height;
Expand Down
2 changes: 1 addition & 1 deletion x11/cc/LayerGLX11.cc
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ namespace jwm {
}
}

void resize(int width, int height) override {
void resize(int width, int height) {
glClearStencil(0);
glClearColor(0, 0, 0, 255);
glStencilMask(0xffffffff);
Expand Down
2 changes: 1 addition & 1 deletion x11/cc/LayerRasterX11.cc
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ namespace jwm {
_graphicsContext = DefaultGC(d, DefaultScreen(d));
}

void resize(int width, int height) override {
void resize(int width, int height) {
Display* d = fWindow->_windowManager.getDisplay();
_width = width;
_height = height;
Expand Down
1 change: 1 addition & 0 deletions x11/cc/ScreenInfo.cc
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#include "ScreenInfo.hh"
#include "AppX11.hh"


jobject jwm::ScreenInfo::asJavaObject(JNIEnv* env) const {
return jwm::classes::Screen::make(env, id, isPrimary, bounds, bounds, jwm::app.getScale());
}
Loading