e13d193346
correct variable name
2020-08-26 19:52:03 +02:00
ce7bc8125d
rename functions too
2020-08-26 19:51:08 +02:00
e69c3d7336
remove extra space
2020-08-26 19:16:13 +02:00
b35182f519
render layer surfaces
2020-08-26 19:04:30 +02:00
1e2dde6674
improve naming
...
rename Layer to LayerSurface; layer should refer to overlay, top, bottom
or background
LayerSurface variables are always called layersurface
wlr_layer_surface_v1 variables are always called wlr_layer_surface
2020-08-26 17:33:17 +02:00
05df9201b3
layer shell initial attempt
2020-08-24 07:04:34 +02:00
44ef698d6e
set up interfaces in same order as sway
...
This makes it easier to compare WAYLAND_DEBUG logs when troubleshooting.
2020-08-23 10:01:39 -05:00
1c9a0d8822
enable gamma control
2020-08-22 18:09:38 +02:00
620da43933
cleanup function to match dwm
2020-08-19 00:32:57 -05:00
8eb6fe8e9e
fix usage to match
2020-08-19 00:32:32 -05:00
3b1992ca91
we're not really using the log
2020-08-19 00:30:00 -05:00
f79746c578
this is technically barf too I guess?
2020-08-19 00:24:57 -05:00
f13227ebae
only call updatewindowtype for x11 windows
2020-08-19 00:23:54 -05:00
ad9b3bc65d
handle NULL return from backend_autocreate
...
Fixes #44 .
2020-08-18 19:43:42 -05:00
83f60e89b0
add macro for fatal errors
...
dwm lets the OS do cleanup if the program errors out
2020-08-18 19:39:34 -05:00
d615d3836c
Use SIGCHLD handler from dwm
...
Fixes #46 .
2020-08-18 18:22:44 -05:00
c0b05eddb8
make this marginally less ugly
2020-08-16 11:36:38 -05:00
41c3f91b03
wlr_session_change_vt is NULL safe
2020-08-16 11:32:45 -05:00
c970d97f85
_net_wm not needed outside xwayland
2020-08-16 01:14:54 -05:00
108ade0bbc
Merge pull request #37 from alex-courtis/31-independents-mouse-focus
...
31 independents mouse focus
2020-08-16 00:57:18 -05:00
c0608aa017
Declare commitnotify
2020-08-15 16:47:22 +02:00
4788baee8d
Merge branch 'master' into 31-independents-mouse-focus
2020-08-11 11:42:02 +10:00
2616812a7a
#24 ensure that xwayland cursor defaults to left_ptr
2020-08-11 11:29:32 +10:00
e7318f7623
Merge branch 'master' into 24-xwayland-cursor
2020-08-11 11:23:58 +10:00
e3e9504fcd
make XWayland support optional
2020-08-10 12:50:56 -05:00
5b464edf91
#31 independents retain focus while mouse is over them
2020-08-09 11:56:34 +10:00
9551568252
#31 independents retain focus while mouse is over them
2020-08-09 11:34:19 +10:00
9d138ac95a
#31 independents retain focus while mouse is over them
2020-08-06 15:41:04 +10:00
c08ea88c1f
#31 independents retain focus while mouse is over them
2020-08-06 15:32:55 +10:00
f593820ede
#24 ensure that xwayland cursor defaults to left_ptr
2020-08-04 11:53:23 +10:00
5a2d87fa6c
add monocle layout
2020-08-03 12:44:47 -05:00
27bbf9c14f
condense getatom and add note about error return
2020-08-03 12:22:02 -05:00
c12261d3a9
Merge branch 'master' of github:djpohly/dwl into master
2020-08-03 12:14:36 -05:00
8c95418334
Merge pull request #25 from geistesk/error-maybe-uninitialized
...
getatom: fix potential uninitialized atom variable
2020-08-03 12:14:27 -05:00
d89cf6b720
add some more hands-off protocols
2020-08-03 11:20:12 -05:00
0ac2f6616a
fix an editing mistake
2020-08-02 18:49:23 -05:00
59cd8dec94
focusclient checks whether oldsel == sel
...
No need to do it outside the call.
2020-08-02 18:46:34 -05:00
ef7a37649c
refactor focusclient
2020-08-02 18:43:29 -05:00
7856cdc1bf
abc
2020-08-02 18:40:33 -05:00
da5deab083
convert lastfocused() to focustop(m)
2020-08-02 18:39:48 -05:00
8a584d406d
pass previous focus to focusclient
2020-08-02 18:33:42 -05:00
e7e01e06f6
remove surface from focusclient function
...
Honestly not sure why a specific surface is focused rather than the
client figuring that out. Seems to work in a quick test, but we can
remember this commit if something breaks for, I dunno, mouse people.
2020-08-02 18:26:58 -05:00
17e525cc6c
C99 doesn't support anonymous unions
...
I'm cool with ->surface.xdg instead of ->xdg_surface though.
2020-08-02 09:16:07 -05:00
62339e7ab0
make setmon a bit more straightforward
2020-08-02 00:35:26 -05:00
e41ed53384
remove unneeded variable
2020-08-01 09:45:33 -05:00
2dbe5c6063
simplify pointerfocus
...
Similar to focusclient
2020-07-31 14:00:00 -05:00
90d80c0de9
simplify focusclient
...
This arranges the function into some logical tasks: deactivate the old
client, update wlroots' keyboard focus, update our data structures, and
activate the new client. The last two only need to be done when
focusing something new, so an early return saves some horizontal space.
2020-07-31 13:53:33 -05:00
0a59f47c18
remove now-unused variables in focusclient
2020-07-31 13:24:10 -05:00
50aa44c59b
add tag bitset check from dwm
2020-07-31 09:57:59 -05:00
744f20790c
getatom: fix potential uninitialized atom variable
...
The getatom function returns the atom variable, which is only
initialized in case of a success. This results in a maybe-uninitialized
warning/error. After this commit, now a zero value is returned in case
of error.
2020-07-31 12:53:46 +02:00
4e57dbd922
attach_render and commit are all that's needed
...
attach_render tells the output that a "new" buffer has been prepared
(even if we haven't changed it). We need to call that and then commit
it to keep the render loop going.
Software cursors will freeze momentarily during layout updates, but I
suspect that this is not as easily fixed as it sounds. You can force
software cursors by running:
WLR_NO_HARDWARE_CURSORS=1 ./dwl
2020-07-30 22:52:53 -05:00
21437b62af
style fixes
2020-07-30 21:55:49 -05:00
d6a18d69c0
do not render frames when any surface has uncommitted resizes
2020-07-30 21:52:09 -05:00
7499044a2b
tidy activate notify resource
2020-07-29 15:05:24 +10:00
d5fdd999ac
make border color selection concise
2020-07-26 19:27:49 -04:00
2fb3701c6e
Add support to change focused window's border color
2020-07-26 23:10:42 +02:00
e2887f2cfd
remove client.isx11 in favor of client.type
2020-07-25 12:03:08 -04:00
0e21cce803
ok, treat it like an enum
2020-07-25 11:57:47 -04:00
3e29ef1c7e
do managed/unmanaged check in map and unmap
2020-07-25 11:55:18 -04:00
f2d025d4e9
do managed check in activatex11
2020-07-25 11:48:47 -04:00
e5e170e420
add client.type field
...
Current options are XDGShell, X11Managed, and X11Unmanaged.
2020-07-25 11:46:12 -04:00
39f3b87f3a
rename activate to activatex11 for consistency
2020-07-25 11:46:12 -04:00
8b7cc8ada6
clarify createnotifyx11 function
2020-07-25 11:29:36 -04:00
c4cf78aadb
xwayland: unmanaged (dropdown menu) support
2020-07-25 11:29:02 -04:00
4bc7f2d8e4
remove n counter from zoom(), add comments
2020-07-24 17:35:19 -04:00
7b608da8c5
Add zoom
2020-07-24 17:30:45 +02:00
53798dfbff
fix WLR_SURFACE macro
2020-07-23 19:32:10 -04:00
5d66ea8a99
don't double-add new monitor to mons
...
this was a copy/paste error
2020-07-23 18:14:33 -04:00
d42d8bda42
add cleanup listener for keyboards
2020-07-23 18:13:42 -04:00
89e9a4be33
add monitor destroy listener
2020-07-23 18:03:13 -04:00
5ca1e22fef
reorder teardowns
2020-07-23 17:36:20 -04:00
8b13e42d3f
fix more unfreed memory
2020-07-23 17:34:50 -04:00
bc65c1a570
output_layout_manager not auto-destroyed
2020-07-23 17:20:23 -04:00
91000b5e76
xcursor_manager is not automatically destroyed
2020-07-23 17:16:02 -04:00
ea73221b45
Add killclient
2020-07-23 20:30:25 +02:00
4a4a261111
let xdg be the plain "createnotify"
...
use x11 suffix for other function to match isx11, also shorter
2020-07-22 20:54:39 -04:00
ce2c9e6660
xwayland is the exceptional case, let xdg be 0
2020-07-21 23:25:16 -04:00
a10357fae0
condense appid/title logic
2020-07-21 18:47:30 -04:00
a21c9378ee
fix segfault on xwayland "appid"
2020-07-21 18:43:26 -04:00
57fef50310
xwayland: add server and basic window functionality ( #10 )
...
* xwayland: add server and basic window functionality
* xwayland: add server and basic window functionality
* xwayland: add server and basic window functionality
* xwayland: add server and basic window functionality
2020-07-21 18:35:46 -04:00
91b18d4d4d
Add repeat delay and repeat rate to config.h ( #13 )
2020-07-02 15:41:12 -05:00
728e0e5d71
clear correct focus on keyboard leave
2020-06-15 09:22:43 -05:00
63f09d1f23
Don't pass NULL surfaces to wlr focus functions ( #8 )
...
Turns out that this will hit asserts that will abort dwl.
2020-06-14 04:05:21 -05:00
14063d58bb
Handle missing XDG_RUNTIME_DIR explicitly
...
Also update the documentation to indicate that this is a Wayland thing
and not dwl-specific.
2020-06-07 11:43:48 -05:00
f19d00b94a
move perrors earlier
...
Should come right after the erroring call so nothing else has a chance
to overwrite errno
2020-06-07 11:42:43 -05:00
da5b4d965d
Add startup errors, mention XDG_RUNTIME_DIR in README
...
It was just exiting with code 1 for me. The problem turned out to be
that you *need* to set XDG_RUNTIME_DIR or it won't work (I think e.g.
systemd does that for you, but on Void it's not set by default), so
mention that in the README.
2020-06-07 14:51:02 +08:00
8c0afa7c73
send xdg_decoration configure right after create
...
Thanks to @cedws for pointing this out!
2020-06-07 01:12:02 -05:00
2598100d53
Implement xdg-decoration protocol
...
Applications like alacritty which use this newer protocol will no longer
attempt to draw their own decoration.
2020-06-04 23:37:31 -05:00
5991cec0ff
Write something more intuitive for focusclient()
2020-06-03 19:45:40 -05:00
78187f5e65
document -qvd options
2020-06-03 15:05:12 -05:00
67299a18a5
make sure freed listeners are removed from list
2020-05-10 01:04:31 -05:00
c6833cf93e
add output manager protocol
2020-05-09 23:01:30 -05:00
59d16e491a
add screencopy support
...
While we're taking low-hanging fruit here...
2020-05-09 22:48:19 -05:00
0bd4eb8ff3
add primary selection support too!
2020-05-09 22:45:22 -05:00
0b0dd6b63c
handle request set selection
...
Ported from wlroots commit fa5d709
2020-05-09 22:30:20 -05:00
94bb68afe1
use wlr_xdg_surface.set_tiled correctly
...
Closes #2 . I'm guessing from sway that the idea of setting maximized
state so that windows cooperate is superseded by using set_tiled.
2020-05-09 14:50:31 -05:00
cad233b605
initialize global listeners statically
2020-05-09 10:10:02 -05:00
5817c917b6
abc
2020-05-03 13:18:53 -05:00
323092d3ce
remove vestigial listeners
2020-05-03 13:18:10 -05:00
7212da059c
no need for a line split here
2020-05-03 12:41:15 -05:00
1a30d9908d
no conditional needed for output modes
...
If the output backend doesn't support modes, get_preferred_mode will
return NULL, and set_mode will accept NULL.
2020-05-03 11:45:47 -05:00
b19afa10f3
use strstr for monrules
2020-05-03 11:39:48 -05:00
7afe152c47
add reminder comment
2020-05-03 11:38:34 -05:00
1b87831e00
inline xytosurface
2020-05-03 11:37:44 -05:00
f7d2524435
split xytoclient and xytosurface
2020-05-03 11:31:55 -05:00
835a46ef30
style
2020-05-03 11:23:51 -05:00
1d0350fa3d
refocus -> lastfocused
2020-05-03 11:23:39 -05:00
cf65fd8c9a
raise client on refocus
...
Might revisit this later, but this currently seems like the right
strategy.
2020-05-03 00:55:00 -05:00
86d8cb1804
add client rules
2020-05-03 00:49:02 -05:00
5de1cfbebf
allow setmon to specify alternate tags
2020-05-03 00:44:16 -05:00
b10ef0e80a
loop over array pointers directly
2020-05-03 00:41:37 -05:00
2e7b5310b4
includes: abc
2020-05-02 15:24:18 -05:00
3096d4eec1
set default cursor over window borders
2020-05-02 15:22:07 -05:00
ecdd012f6b
sacrifice 24 lines to suckless style :)
2020-05-02 15:21:36 -05:00
20ed6cb3d5
allow passing NULLs to xytoclient
...
For sx/sy, these are handled by the underlying call to
wlr_surface_surface_at.
2020-05-02 14:43:28 -05:00
8c80f74513
remove outdated/fixed comment
2020-05-02 14:33:32 -05:00
187d25e838
style: int instead of bool
2020-05-02 14:32:23 -05:00
d0df4d0d72
correct standard include for signal.h
...
Fixes #1 . Thanks @sdsddsd1!
2020-05-02 10:42:51 -05:00
87f8e6687b
include border in xytoclient
...
If there isn't an actual surface under the cursor, *surface will be set
to NULL, which is safe now that focus functions handle a NULL surface
safely.
2020-04-30 12:32:57 -05:00
2c134faa40
allow NULL surface with client in focus functions
2020-04-30 11:37:04 -05:00
33b0236858
make move-grab coords client-relative
2020-04-30 11:33:32 -05:00
3973ea5bfe
unify movemouse/resizemouse
2020-04-30 10:25:37 -05:00
53e71957f8
fix a long line
2020-04-26 22:19:48 -05:00
40d0d0f829
wait to get window geometry until map time
2020-04-26 22:18:39 -05:00
34d5045d84
use wlr_box for client geometry
2020-04-26 22:12:08 -05:00
a25ad1c327
call arrange only where needed
...
A few of these could probably even be more specific, but this is where
dwm's calls are.
2020-04-26 22:02:47 -05:00
499a43db74
funnel isfloating changes through setfloating()
2020-04-26 21:55:49 -05:00
ce5d116efd
move comment where it's more relevant
2020-04-26 21:42:45 -05:00
dd50a3ee04
mouse move now changes window monitor
2020-04-26 21:35:21 -05:00
19e712625f
options to select log level
2020-04-26 21:32:44 -05:00
b2960e53de
rename keyboardfocus() to focusclient()
2020-04-26 20:17:47 -05:00
7094bcc5e3
integrate raiseclient into keyboardfocus
2020-04-26 20:16:47 -05:00
6d5726e426
don't pass compositor button events to client
2020-04-26 20:12:54 -05:00
b025b7bdbd
render windows across monitors
2020-04-26 20:00:06 -05:00
aa7020b344
abc
2020-04-26 19:48:28 -05:00
8f02449cb4
funnel all monitor-moving through setmon()
2020-04-26 19:47:38 -05:00
847cd4c488
I'm good with changing the loglevel here...
2020-04-26 17:43:03 -05:00
309f6c96cf
hang some stuff on ->data
...
Sure it'll be useful at some point. Like here.
2020-04-26 17:42:10 -05:00
ab51576556
linesaver in pointerfocus
2020-04-26 14:47:23 -05:00
cd6683e6a1
fix refocus on sendmon
2020-04-26 14:11:44 -05:00
88f0ea343b
make sure windows always overlap with their monitor
2020-04-26 14:08:47 -05:00
48a8adb70a
track window width/height
2020-04-26 13:18:20 -05:00
5dd8a5f22f
use wlr_box for monitor regions
2020-04-26 12:41:33 -05:00
2fb9f53483
save lines in keyboardfocus
2020-04-26 12:01:08 -05:00
d34bf87dba
don't unfocus when mouse leaves a window
2020-04-26 12:01:00 -05:00
6cad698517
fix multi-dpi scaling
2020-04-25 01:18:28 -05:00
c00da5eeb0
clarify keyboardfocus vs pointerfocus
2020-04-24 00:12:58 -05:00
60f2c0b7de
draw window borders
...
Works with scaled/rotated displays too!
2020-04-23 23:55:29 -05:00
6254bcd033
factor out scalebox()
...
May switch to the version from sway if that seems like a good idea at
some point.
2020-04-23 23:52:27 -05:00
6e02b421cd
note about cursor init
2020-04-23 23:47:52 -05:00
ee2b3af1ca
configure monitor rotation/reflection
2020-04-23 23:44:54 -05:00
2cb526bbd9
add chvt function
...
It truly isn't just a window manager anymore :-|
2020-04-23 23:44:54 -05:00
1870187d62
make space for window borders
2020-04-23 23:35:54 -05:00
fb6b16aeee
change cursor during move and resize
2020-04-23 23:35:54 -05:00
2f21445761
style in buttonpress
2020-04-23 23:35:54 -05:00
288f6397fa
simplify move/resizemouse functions
2020-04-23 23:35:54 -05:00
073c35ae2f
funnel all resizing through resize()
2020-04-23 23:35:54 -05:00
60c887f3c0
use exit code macros everywhere
2020-04-23 23:35:54 -05:00
84da7b4470
some comments and reminders
2020-04-23 23:35:54 -05:00
275badc707
factor out renderclients
...
This will help once we get to implementing layer-shell
2020-04-23 23:16:56 -05:00
15ed82571b
don't autoraise
...
Still raise in buttonpress and focusstack of course. Focus models
honestly wouldn't be too hard to make into a config.h option.
2020-04-23 22:15:30 -05:00
e6bcf95e2e
use the focus stack to determine stacking order
...
Suddenly we have autoraise!
2020-04-23 22:11:52 -05:00
a5a7445dee
adopt a bit more dwm-like terseness
2020-04-23 22:11:52 -05:00
66bf55930f
change focus(NULL, NULL) to mean unfocus
...
"Focus the most recently focused window on selmon" is now refocus()
2020-04-23 22:11:52 -05:00
0d8f51e0a3
implement focusmon and tagmon
2020-04-23 22:11:52 -05:00
a87adfd77c
focus follows mouse
2020-04-23 22:11:52 -05:00
4eabe48fed
add incnmaster and setmfact commands
2020-04-23 22:11:52 -05:00
66054700cb
add toggletag and toggleview
2020-04-23 22:11:52 -05:00
35557ab042
don't detect non-visible clients under cursor
2020-04-23 22:11:52 -05:00
387dff81b3
add tag and view functions
2020-04-23 22:11:52 -05:00
fda58764ab
refocus if focused client is unmapped
...
focus(NULL, NULL) works like dwm's focus(NULL): focus the most recent
visible client on selmon, or clear the existing focus if there are none.
2020-04-23 22:11:48 -05:00
c03081d85d
implement floating windows
2020-04-23 19:48:00 -05:00
e447cd0215
load scaled cursor theme with each output
2020-04-23 19:12:58 -05:00
623867a367
turn focusnext into dwm's focusstack
2020-04-23 00:47:15 -05:00
59b09576b9
restrict focusnext to the same monitor
2020-04-23 00:38:09 -05:00
a634b3f2e4
style
2020-04-23 00:33:58 -05:00
9b2eec24c2
add selclient() helper
...
This may get inlined later, but it's nice for now. The focused client
if any should always be both at the top of fstack and visible on selmon.
2020-04-23 00:32:28 -05:00
3593da0e15
continue to focus monitor under mouse cursor
2020-04-22 22:56:24 -05:00
240be1af19
focus monitor under mouse cursor initially
2020-04-22 22:55:57 -05:00
f88a98327e
grabbed_client was too long a name
2020-04-22 22:38:14 -05:00
1595256341
inline moveresize
...
There were only two lines left in common
2020-04-22 22:34:11 -05:00
0a43197203
grabsx/y are only used by move now
2020-04-22 12:00:10 -05:00
749880cedd
calculate resize based just on cursor/window
...
This eliminates the need for grab_height and grab_width.
2020-04-22 11:59:52 -05:00
def3572117
add setlayout function
2020-04-22 11:20:23 -05:00
fdbe9ee29a
Don't change tiling order in focusnext()
...
Use the focus stack instead to determine which client is focused
2020-04-22 11:05:41 -05:00
10bf0ff566
add separate list of clients for focus order
...
Previously, clicking a client to focus it would change where it was in
the tiled layout as well.
2020-04-22 10:42:40 -05:00
3707e0115a
layouts: tile and floating
...
Behavior's still a little wonky but positioning is there.
2020-04-22 08:25:43 -05:00
6f9f1b9e05
"root" color was easy to make configurable
2020-04-21 21:58:13 -05:00
ffc19434ee
fix rendering on scaled monitors
...
I have no idea why this takes the raw unscaled resolution, and then we
have to multiply by the scale *again* in render(), but that's life.
2020-04-21 21:56:01 -05:00
1907ee3879
introduce rules for monitor configuration
...
(with dwm, this would already have been done by the X server)
2020-04-21 21:53:34 -05:00
97f29ec67f
no need to manage unmapped clients
...
is there?
2020-04-21 20:55:06 -05:00
c37aa00aec
consistent naming for coordinate variables
...
x and y are reserved (inasmuch as it's dwl's choice) for coordinates
relative to the layout. ox and oy are used for output-relative
coordinates. sx and sy are surface-relative. dx and dy are deltas.
figuring this out the first time was kind of a Thing... just don't pay
attention to what happens in render and you should be fine.
2020-04-21 19:42:21 -05:00
cdeff2475d
inline xytosurface in xytoclient
...
It was a simpler function than it looked
2020-04-21 19:17:44 -05:00
0e9bceb8b6
comment updates
2020-04-21 19:09:36 -05:00
552deb7026
split out setup() and run()
2020-04-21 18:57:04 -05:00
23924022c9
cherry-pick 25d0d1b from upstream
2020-04-21 17:45:44 -05:00
26714f172a
inline handlemove/handleresize
2020-04-21 17:45:44 -05:00
599bec5583
render_data only needs coordinates, not Client
2020-04-21 17:45:44 -05:00
7056fbe101
abc
2020-04-21 17:45:44 -05:00
1d2b0a7b35
give types some more dwm-like typedef names
2020-04-21 17:45:44 -05:00
bf58f7c0d2
use expressions in sizeof instead of type names
2020-04-21 17:45:44 -05:00
46ff18413f
no longer need resize_edges (always bottom right)
...
Also gets rid of the clunky move+resize code
2020-04-21 17:45:44 -05:00
1aa640d5f5
ditch the moverequest/resizerequest xdg stuff
...
dear window, you are not the window manager
2020-04-21 17:45:44 -05:00
8e9405688a
No need for struct dwl_server
...
the only use was to hold global state, which is now actually global
2020-04-21 17:45:39 -05:00
49c9e62ff4
make server a global
...
dwm isn't afraid of global variables
2020-04-21 17:44:59 -05:00
364b664a6c
dwm-style enum
2020-04-21 17:43:35 -05:00
2903d5180a
alphabetize functions
2020-04-21 17:43:33 -05:00
2c0bf57fcf
functions: dwm style and more dwm-like names
2020-04-21 17:42:16 -05:00
bc9049a11b
add spawn and termcmd
2020-04-12 00:59:29 -05:00
c82c000bd4
treat startup command as long-running
...
Not quite a perfect mirror of xinit, where the startup command execs the
window manager, and the termination of that process brings down the
windowing system, but it might be the Wayland analogue.
2020-04-11 22:44:34 -05:00
333528b2e2
fix typo in comment
2020-04-11 21:30:12 -05:00
edf90816b1
implement Button: movemouse, resizemouse
2020-04-11 21:29:27 -05:00
9240a40569
add CLEANMASK like dwm
2020-04-11 19:46:51 -05:00
21f42a86d7
make key mappings configurable in config.h
2020-04-11 19:41:32 -05:00
df1aaa4d15
start factoring Key actions into functions
2020-04-11 19:41:14 -05:00
94d82bf42f
Start with tinywl
...
Add a config.h into which configurables can be moved.
2020-04-11 17:27:19 -05:00
Guido Cella
Devin J. Pohly
Alexander Courtis
Alvar Penning
Michael Cardell Widerkrantz
Lauri Gustafsson
Shugyousha
Martin Tournoij