Ryan Dwyer
a120d4c79f
Make focus part of transactions
...
Rather than maintain copies of the entire focus stack, this PR
transactionises the focus by introducing two new properties to the
container state and using those when rendering.
* `bool focused` means this container has actual focus. Only one
container should have this equalling true in its current state.
* `struct sway_container *focus_inactive_child` points to the immediate
child that was most recently focused (eg. for tabbed and stacked
containers).
2018-07-15 22:08:26 +10:00
Ian Fan
23c1c26c3f
Add get_config message type to ipc
2018-07-10 12:37:37 +01:00
Ian Fan
5fd36164a0
Add get_binding_modes message type to ipc
2018-07-10 12:03:46 +01:00
emersion
63b4bf5000
Update for swaywm/wlroots#1126
2018-07-09 22:54:30 +01:00
emersion
b3c55dd909
Merge branch 'master' into leaks
2018-07-06 16:22:13 +01:00
Brian Ashworth
78c08fb0a2
Implement mode --pango_markup
2018-07-05 18:12:14 -04:00
Dominique Martinet
fe72e3b349
cmd_results_to_json: return copied string and properly free the json
...
The only user of this function would copy the string right away
to get rid of the const flag anyway, and freeing a const string
afterwards might work but is not meant to be done according to the
json-c API.
2018-07-05 13:11:02 +09:00
Dominique Martinet
ffe9de6e24
ipc-server: free clients at destroy
2018-07-05 08:13:10 +09:00
Dominique Martinet
b0918b1058
ipc-server: add display destroy listener and remove ipc_terminate
...
wl_event_source_remove() is illegal after display has been destroyed,
so just destroy everything when we still can.
==20392==ERROR: AddressSanitizer: heap-use-after-free on address 0x607000001240 at pc 0x00000048e86e bp 0x7ffe4b557e00 sp 0x7ffe4b557df0
READ of size 8 at 0x607000001240 thread T0
#0 0x48e86d in wl_list_insert ../common/list.c:149
#1 0x7fdf673d4d7d in wl_event_source_remove src/event-loop.c:487
#2 0x41b742 in ipc_terminate ../sway/ipc-server.c:94
#3 0x40b1ad in main ../sway/main.c:440
#4 0x7fdf6664c18a in __libc_start_main ../csu/libc-start.c:308
#5 0x409359 in _start (/opt/wayland/bin/sway+0x409359)
0x607000001240 is located 48 bytes inside of 72-byte region [0x607000001210,0x607000001258)
freed by thread T0 here:
#0 0x7fdf692c4880 in __interceptor_free (/lib64/libasan.so.5+0xee880)
#1 0x7fdf673d371a in wl_display_destroy src/wayland-server.c:1097
previously allocated by thread T0 here:
#0 0x7fdf692c4c48 in malloc (/lib64/libasan.so.5+0xeec48)
#1 0x7fdf673d4d9e in wl_event_loop_create src/event-loop.c:522
#2 0x40acb2 in main ../sway/main.c:363
#3 0x7fdf6664c18a in __libc_start_main ../csu/libc-start.c:308
2018-07-04 18:47:11 +09:00
Dominique Martinet
ebe69583c7
ipc-server: fix more use-after-frees on ipc_send_reply error
...
Since ipc_send_reply frees the client on error, we need to check the
return value properly as we access client later on
Found through static analysis.
2018-07-02 08:03:41 +09:00
Dominique Martinet
0ab04b7434
ipc-server: minor code cleanup
...
No logic change here, this one is mostly to please static analyzer:
- client->fd can never be -1 (and if it could, close() a few lines below
would have needed the same check)
- we never send permission denied error (dead code)
2018-07-02 08:03:41 +09:00
Dominique Martinet
546ddbcd5b
ipc-server: fix double-free on send error in ipc_send_event
...
ipc_send_reply already does client disconnect on error, so we shouldn't
do it again.
We also need to process current index again as disconnect removes client
from the list we currently are processing (this is an indexed "list")
Found through static analysis.
2018-07-02 08:03:41 +09:00
Brian Ashworth
e072fbc6d9
Switch output storing from list_t to wl_list
2018-06-06 20:11:24 -04:00
Brian Ashworth
a1b5b93d29
Store sway_outputs so that they can be reenabled
2018-06-06 20:11:24 -04:00
Brian Ashworth
7c810dc344
Make command block implementation generic
2018-06-02 08:07:44 -04:00
Brian Ashworth
a6d43ff746
Implement IPC_GET_MARKS
2018-05-22 17:35:39 -04:00
Ryan Dwyer
c72940837c
Implement IPC get_seats command
2018-05-12 18:17:36 +10:00
Dominique Martinet
25af959fe9
Fix gcc string truncation warnings
2018-04-13 22:47:27 +09:00
Tony Crisci
6b308dbeb7
address feedback
2018-04-05 22:50:10 -04:00
Tony Crisci
235798ff8e
dont send ipc events when there are no listeners
2018-04-05 19:01:03 -04:00
Tony Crisci
0828c77251
rename input-manager functions
2018-04-02 08:49:38 -04:00
Tony Crisci
e677c5b204
rename seat functions
2018-04-02 08:45:37 -04:00
Drew DeVault
e6fa7a722e
Merge pull request #1669 from emersion/workspace-pointer-events
...
Fix pointer events for hidden workspaces
2018-03-30 18:49:18 -04:00
emersion
eb716c6c43
Fix segfaults when focusing a workspace
2018-03-30 16:12:02 -04:00
Drew DeVault
b28e6d2369
IPC fixes
2018-03-30 13:56:31 -04:00
Drew DeVault
f26ecd9f58
Merge remote-tracking branch 'origin/wlroots' into swaybar-layers
2018-03-30 00:04:04 -04:00
Tony Crisci
dc8c9fbeb6
Revert "Merge pull request #1653 from swaywm/revert-1647-refactor-tree"
...
This reverts commit 472e81f35d
, reversing
changes made to 6b7841b11f
.
2018-03-29 23:41:33 -04:00
Drew DeVault
d0c7f66e95
Revert "Refactor tree"
2018-03-29 23:29:29 -04:00
Drew DeVault
dbda7bfbed
Move declaration into loop
2018-03-29 22:23:41 -04:00
Drew DeVault
ddc09940b1
Exit ipc_get_workspace_callback early
2018-03-29 22:16:43 -04:00
Drew DeVault
8efee109ad
Implement modes
2018-03-29 22:11:08 -04:00
Drew DeVault
f3fbf19312
Do some small cleanup
...
- Fix workspace events (security config isn't in use so it wasn't being
sent)
- Kill status bar process when swaybar exits
- Don't rearrange windows on every layer surface commit
2018-03-29 22:11:08 -04:00
Drew DeVault
bf7a4cd0eb
Add bar configuration commands
2018-03-29 22:11:08 -04:00
Drew DeVault
6836074fed
Implement enough IPC for swaybar to work
2018-03-29 22:11:08 -04:00
Tony Crisci
b90099b4b7
rename container functions
2018-03-29 16:40:40 -04:00
Tony Crisci
02804584e5
ipc new window event
2018-02-27 19:53:15 -05:00
Tony Crisci
ac8269d536
take seat param for handle_command and rename
2018-02-24 12:50:24 -05:00
Tony Crisci
52670c636c
basic focus (without direction)
2018-02-14 16:47:23 -05:00
Tony Crisci
38a1628a76
clear handler context before ipc command
2018-01-21 14:21:32 -05:00
Dominique Martinet
67985e9031
sway: change all sway_log to wlr_log
2018-01-05 23:39:46 +01:00
Tony Crisci
f2985000f3
ipc get_inputs
2017-12-18 14:27:38 -05:00
emersion
4e2ab53119
Add IPC get_outputs
2017-12-18 14:06:03 +01:00
Tony Crisci
421f49fe03
basic get_tree
2017-12-03 08:33:52 -05:00
Drew DeVault
7753a0ec75
Wire up IPC server
2017-11-22 21:37:07 -05:00
Drew DeVault
733993a651
Move everything to sway/old/
2017-11-18 11:22:02 -05:00
Drew DeVault
0f45fad18c
Establish sway input submodule
2017-11-11 09:09:17 -05:00
Drew DeVault
7c448b4081
Fire up the wlroots backend and run the event loop
2017-11-11 09:08:50 -05:00
Johannes Lundberg
5a63f0f57b
Fix build on FreeBSD adjusting/removing _XOPEN_SOURCE declaration.
2017-10-14 20:38:33 +02:00
Drew DeVault
6d83a59b46
Merge pull request #1263 from nyorain/master
...
Implement get_clipboard ipc message
2017-10-08 11:05:54 -04:00
lbonn
61005c3bda
ipc/window-event: fill "container" on close events
...
Also use the recursive description to include children as well
Careful: send the event before deleting the parent
2017-10-08 11:54:46 +02:00
Hummer12007
6f355c6ff7
Raise max ipc message size limit to 256 MB
2017-08-14 20:43:37 +03:00
Ilya Lukyanov
1c5a96c112
Implement nonblocking IO in IPC server
...
Added client write buffer and handler for writable status on client
socket.
2017-08-08 19:23:50 +03:00
nyorain
1cca551c6f
Add get_clipbard ipc errors; Adapt swaymsg
...
Also increase the get_clipboard timeout to 30 secs
2017-07-11 18:04:28 +02:00
nyorain
20888fbb5e
Close fd in clipboard request
2017-07-11 17:12:53 +02:00
nyorain
727215c907
Add timeout; Fix receive loop & style issues
2017-07-11 17:07:06 +02:00
nyorain
f0463dab32
Signal base64 in clipboard type; Reimplement loop
2017-07-07 23:34:58 +02:00
nyorain
1e894c1166
Handle x11 text atoms in get_clipboard ipc
2017-07-07 22:34:00 +02:00
nyorain
c0f2acce4e
Rework get_clipboard implementation
2017-07-07 21:51:34 +02:00
nyorain
42547cafb6
Fix/Simplify get_clipboard ipc-server impl
2017-07-07 15:46:17 +02:00
nyorain
02c75ebe37
Implement ipc get_clipboard
2017-07-07 15:38:45 +02:00
Jerzi Kaminsky
cf5e764c7f
Disambiguate get_*_policy() and get_*_policy_mask()
2017-04-16 17:09:53 +03:00
Drew DeVault
5d3a02a7c6
Merge branch 'master' into pretty-print-swaymsg
2017-04-10 07:17:47 -04:00
Calvin Lee
154c6718c1
Add -t get_marks
and use more i3-like marks
...
In i3 every mark is unique and one mark cannot be used in more than one
window, sway behavior has been amended to match this.
`swaymsg -t get_marks` will now return an array of all marks used in sway.
See #98
2017-04-07 11:37:51 -06:00
Scott Anderson
1b2cd93212
Removed explicitly setting file descriptors to -1
2017-04-08 00:45:31 +12:00
Drew DeVault
50a31a6c88
Fix dangling file descriptors ( fixes #1152 )
2017-04-07 07:55:35 -04:00
Drew DeVault
60ce81e06a
Add pretty printing to swaymsg
...
If stdout is a tty, it will pretty print unless -r (--raw) is given.
Sample outputs:
```
~/s/s/build > ./bin/swaymsg fullscreen toggle
Error: Permission denied for fullscreen toggle via IPC
~/s/s/build > ./bin/swaymsg -t get_workspaces
Workspace 3:三
Output: DVI-I-1
Layout: splith
Workspace 1:一 (off-screen)
Output: HDMI-A-1
Layout: splith
Workspace 5:五 (focused)
Output: HDMI-A-1
Layout: splith
~/s/s/build > ./bin/swaymsg -t get_inputs
Input device Metadot - Das Keyboard Das Keyboard
Type: Keyboard
Sway ID: 9456:320:Metadot_-_Das_Keyboard_Das_Keyb
Input device Wacom Intuos S 2 Pen
Type: Tablet tool
Sway ID: 1386:827:Wacom_Intuos_S_2
Input device Wacom Intuos S 2 Pad
Type: Tablet pad
Sway ID: 1386:827:Wacom_Intuos_S_2
Input device Logitech Gaming Mouse G502
Type: Keyboard, Mouse
Sway ID: 1133:49277:Logitech_Gaming_Mous
~/s/s/build > ./bin/swaymsg -t get_outputs
Output DVI-I-1
Geometry: 1920x1080 @ 3840,0
Scale factor: 1x
Workspace: 3:三
Output DVI-D-1
Geometry: 1920x1080 @ 0,0
Scale factor: 1x
Workspace: 4:四
Output HDMI-A-1
Geometry: 1920x1080 @ 1920,0
Scale factor: 1x
Workspace: 5:五
```
2017-04-03 07:27:25 -04:00
Drew DeVault
9aed9d9359
UnGNUify the codebase
2017-03-10 23:41:24 -05:00
Drew DeVault
126ce571da
Read configs from /etc/sway/security.d/*
2017-02-20 07:51:31 -05:00
Drew DeVault
1980a08358
Enforce new IPC policies
2017-02-20 06:33:04 -05:00
Drew DeVault
b10721b89e
Add initial support code for new IPC security
2017-02-20 06:11:56 -05:00
Drew DeVault
d859f825d3
Fix build error
2016-12-15 19:01:41 -05:00
Drew DeVault
31b002b6d5
Handle IPC server allocation failures
2016-12-15 19:01:41 -05:00
Drew DeVault
8cef81d6f2
Handle some more memory allocation failures
2016-12-15 19:01:41 -05:00
Greg V
da26d69cb1
Fix build on FreeBSD
...
- Make sure CMake always finds absolute paths for Cairo, Pango and GdkPixbuf
- Add forgotten json-c include path to swaymsg/CMakeLists.txt
- Disable -Werror because of assert warnings
- Add correct /proc/pid/file path for FreeBSD
- Use libepoll-shim on FreeBSD
- Only use Linux capabilities on, well, Linux
2016-12-09 19:32:07 +03:00
Drew DeVault
d93e53fd4b
Use return value of write
2016-12-06 09:10:16 -05:00
Drew DeVault
d353da248b
Add ipc connection feature policy controls
2016-12-02 18:09:19 -05:00
Drew DeVault
62dad7148f
Enforce IPC security policy
2016-12-02 17:55:03 -05:00
Drew DeVault
e9e1a6a409
Add IPC policy to config
...
Also reduces enum abuse, cc @minus7
2016-12-02 16:08:45 -05:00
Drew DeVault
0a1b211e09
Drop -Denable-binding-event
2016-12-02 16:01:33 -05:00
Drew DeVault
39cf9a82f7
Enforce command policies
2016-12-02 08:17:45 -05:00
Zandr Martin
0516dba3f6
implement "focused container" feature for swaygrab
2016-09-18 16:41:08 -05:00
Zandr Martin
e75217cfb1
fix get_workspaces json reply
2016-09-17 22:00:11 -05:00
Drew DeVault
416417a54c
Reorganize includes
2016-09-01 08:18:37 -04:00
Tony Crisci
4ab35df157
ipc: log sending of events
...
Log the sending of the events in the debug log. This makes ipc server events
easier to verify.
2016-08-04 21:48:20 -04:00
Tony Crisci
e1e15bb43e
ipc: recursive workspace containers in event
...
Recursively describe workspace containers in the workspace event. This is for
compatability with i3 and i3ipc libraries.
2016-08-04 21:26:39 -04:00
Mykyta Holubakha
cf8ef2aea2
Initialize client's subscribed events
2016-07-28 13:38:02 +00:00
Mykyta Holubakha
f52daa26c9
Unite describe_view and describe_window
2016-07-21 21:51:20 +03:00
Mykyta Holubakha
e5c7b019ff
Fix dispatching and assigning events
2016-07-21 21:51:20 +03:00
Mykyta Holubakha
2029fef6b8
More progress on window events
2016-07-21 21:51:20 +03:00
Mykyta Holubakha
976e48d79f
Initial work on window events
2016-07-21 21:51:20 +03:00
Zandr Martin
15a324b0d3
implement get_tree
command
2016-07-04 13:34:44 -05:00
Zandr Martin
1b4d61662c
fix swaybar problem in 08bef67
2016-05-31 09:25:54 -05:00
Eric Engestrom
08bef67f85
sway: refactor ipc_client_handle_command()
...
This fixes a few mem leaks, as well as remove a false-positive error msg
in IPC_GET_BAR_CONFIG
2016-05-31 00:44:07 +01:00
Eric Engestrom
9d7d73df7f
sway: fix IPC resource leak
2016-05-31 00:40:15 +01:00
Eric Engestrom
3d6a3413b8
sway: always terminate ipc path
2016-05-02 11:26:27 +01:00
Mykyta Holubakha
0f1cfdec61
Renamed to pango_markup
2016-04-24 20:35:21 +03:00
Mykyta Holubakha
2e6c43e62b
Added plaintext_markup to swaybar IPC
2016-04-24 20:14:02 +03:00
Mikkel Oscar Lyderik
f39034a55f
Use correct format string for x86_64 and i686
...
Fix #587
2016-04-17 16:51:33 +02:00
Mikkel Oscar Lyderik
212c6a18a2
Add outputs to bar_config ipc response
2016-02-27 22:12:35 +01:00
Mikkel Oscar Lyderik
6f7cbf2eac
Replace deprecated function wlc_output_get_pixels.
...
This makes IPC GET_PIXELS use the new `wlc_pixels_read` call instead of
the deprecated `wlc_output_get_pixels`.
The old version worked by passing a callback function to wlc which would
grab the pixels and send them to the IPC client.
The new version works by maintaining a list of clients who have
requested the pixels of some output and then grap and send the pixels in
the output_post_render hook of the `wlc_interface`.
2016-02-08 12:39:07 +01:00