8a22ac3966
Initialize id, part two
9 years ago
7c06ef35de
Initialize ID
9 years ago
91c102a897
Merge pull request #393 from robotanarchy/musl-libc-compatibility
...
musl libc compatibility
9 years ago
c3e9ee5e43
replace non-standard qsort_r with qsort
...
I've tried to make as few changes, as possible.
Usually the reason for using qsort_r is, that you can pass an extra userdata pointer to the
compare function. However, in sway list_sort wrapped qsort_r and always called a wrapper
function for comparing, the wrapper function then had the real compare function as argument.
The only thing, that the wrapper function does, is dereferencing the 'left' and 'right' function
arguments before passing them to the real compare function.
I have renamed list_sort to list_qsort to avoid confusion (so nobody tries to use list_qsort like
list_sort) and removed the wrapper functionality. Now the dereferencing must be done in the
compare function, that gets passed.
Some compare functions were used in both list_sort and list_seq_find. To make the difference
clear, I've added a '_qsort' suffix to the compare functions, that are intended to be used with
the new list_qsort. (In other words: list_qsort is not compatible anymore with list_seq_find).
- Changed and renamed function (it isn't used anywhere but in commands.c, and only for sorting):
compare_set -> compare_set_qsort
- New wrapper functions:
sway_binding_cmp_qsort (for sway_binding_cmp)
sway_mouse_binding_cmp_qsort (for sway_mouse_binding_cmp)
9 years ago
50b04884b6
Trigger ipc_event_workspace in all cases
...
This makes sure that the workspace IPC event is triggered when needed.
Fixes #382 while making sure that the IPC event is only triggered once.
9 years ago
3dd2393797
remove unused execinfo.h include from debug_log.c
9 years ago
442a54c38b
Merge pull request #390 from mikkeloscar/workspace-ipc-event
...
Don't skip all clients on ipc_workspace_event.
9 years ago
42e5b4b032
Don't skip all clients on ipc_workspace_event.
...
Only clients not subcriped to the workspace event should be skipped.
9 years ago
c803b79764
Trigger event on bar mode|hidden_state commands
9 years ago
66c66c7304
Implement `barconfig_update` IPC event
9 years ago
a96a5e0013
Handle bar commands outside config file
...
Our initial implementation of `bar { }` assumed that the commands could
only be used in the config. This is not true for two commands:
* bar mode
* bar hidden_state
This patch makes it possible to issue these commands outside a bar
block, for instance through swaymsg
$ swaymsg bar mode hide bar-0
This does not implement the `barconfig_update` IPC event which should be
trigged from these commands. I have added TODO's where this should be
added once implemented.
9 years ago
fc71c6303c
Fix default swaybar font
9 years ago
f4b9c3856a
layout: Fix `edge_gaps off` with top/left panels.
...
Since x/y won't be zero when there's a top or left panel in place, we
need to take those coordinates into account too.
9 years ago
ce54b4ff2e
container: Fix inner gaps against screen edge.
9 years ago
3082245243
Merge pull request #373 from sce/per_panel_config
...
Per panel config
9 years ago
33fb648938
Merge pull request #372 from sce/fix_swaybar_output_name_test
...
config: load_swaybars: Fix name comparison.
9 years ago
e45fd9b6c5
extensions: Track panels by wl_resource, position per panel.
...
Track each panel separately via its wl_resource. `set_panel_position`
might be called before `set_panel`, so reuse panel config.
Place the position in panel_config so that each panel has its own
position.
9 years ago
6db0f6f80f
extensions: panel_config->resource => wl_surface_res.
...
Change the name to something less ambigious.
9 years ago
6ace37d0b1
config: load_swaybars: Fix name comparison.
9 years ago
2779559b15
config: free_bar: Check if outputs is NULL.
...
bar_config.outputs is NULL if no output is explicitly defined in config
(ie. use for for all outputs).
9 years ago
3282163f64
Implement compositor support for swaylock
...
This makes swaylock more or less work.
9 years ago
eefc93db43
Fix lock extension setup in compositor
9 years ago
253efad437
Merge pull request #361 from mikkeloscar/i3bar-command
...
Add support for running swaybar_command
9 years ago
207678e809
Add support for running swaybar_command
9 years ago
7647762bab
Fix default workspace name generation
...
This fixes the issue where workspace 10 ends up being the default.
9 years ago
2ab4e5676e
Merge pull request #360 from sce/fix_arrange_windows
...
Fix arrange windows
9 years ago
b9f14cee41
Merge pull request #359 from mikkeloscar/i3bar-command
...
Add bar option: swaybar_command <command>
9 years ago
9d7f1afdfb
Add bar option: swaybar_command <command>
9 years ago
f0b3ee6d84
layout: arrange_windows: Partially fix swaybar irregularties.
9 years ago
0ad5059b6f
layout: arrange_windows: Fix/better debug output.
9 years ago
90ff36cab8
Terminate children when freeing output container
9 years ago
ede27eabc5
Reload swaybar/swaybg on config reload.
...
This works by tracking the pids of the child processes in the related
output container and terminating the processes and spawning new ones on
a config reload.
Should solve: #347
9 years ago
7558a274fa
Add shims for swaylock on compositor
9 years ago
ed730db11b
layout: Keep output at the correct size, workspace can be smaller.
...
If the output is not at the correct size then that info must be queried
from wlc. The output size is used by e.g. seamless mouse to detect
output edges.
With this patch the output size is now correct and the workspace size is
adjusted according to any panels.
Without this patch seamless mouse would fail to detect outputs
above/below each other if there was a panel in between because the
output would offically end where the panel started, not at the actual
screen edge.
9 years ago
18a7afa1b3
focus: Fix moving last workspace.
...
If there's only one workspace on an output and it's moved to a different
output then active workspace will be NULL.
9 years ago
76c520a04b
sway: insert numbered workspaces in order
...
fixes #308
Ordered by number ascending, with insert before same numbers.
Workspaces without numbers are appended at the end of the list.
Example order:
1 2:named 3:the_second 3:the_first 9 FIRST_NAME SECOND_NAME ...
9 years ago
8f1ac1ef2c
sway: enable workspace selection by number
9 years ago
03787871d0
Fix bar invocation for multihead setup
9 years ago
1a365f19c9
Use system swaybar instead of local swaybar
9 years ago
60c204a09b
Invoke swaybar when an output matches a bar config
9 years ago
f6da4dda4b
Bring unmanaged windows to front on output arrange
...
Fixes #312
9 years ago
01798a5ae2
Merge pull request #338 from mikkeloscar/bar-separator-symbol
...
Implement bar option: separator_symbol
9 years ago
053fb09d1e
Use free_flat_list for simple char* list.
...
No need to reimplement free_flat_list functionality.
9 years ago
2fd7dd64ec
Implement bar option: separator_symbol
9 years ago
473ac4531f
[swaybar] Get bar config via IPC
9 years ago
efff8e5ba5
Merge pull request #335 from mikkeloscar/bar-font
...
Implement bar option: font <font>
9 years ago
9316851715
Implement bar option: font <font>
9 years ago
ded8919c69
Implement bar option: binding_mode_indicator <yes|no>
9 years ago
47f4aea9e7
Correctly free bindings list
9 years ago
f59f5d27aa
Implement bar option: output <output>
9 years ago
05e7334106
Fix active_workspace_border color definition
9 years ago
809c251df8
Merge pull request #328 from mikkeloscar/bar-height
...
Add bar height option (Airblader/i3)
9 years ago
6834a33290
Add bar height option (Airblader/i3)
9 years ago
432e3310f6
Fix crash from ipc_json_describe_workspace
...
destroying workspace '10'
Error: Signal 11. Printing backtrace
Backtrace: sway(error_handler+0x2f) [0x41478f]
Backtrace: /usr/lib/libc.so.6(+0x33680) [0x7f06d9a99680]
Backtrace: /usr/lib/libc.so.6(strlen+0x2a) [0x7f06d9ae70ca]
Backtrace: /usr/lib/libc.so.6(__strdup+0xe) [0x7f06d9ae6dfe]
Backtrace: /usr/lib/libjson-c.so.2(json_object_new_string+0x39) [0x7f06da01ffe9]
Backtrace: sway(ipc_json_describe_workspace+0xd8) [0x410408]
Backtrace: sway(ipc_event_workspace+0x38) [0x410618]
Backtrace: sway(set_focused_container+0x190) [0x40daf0]
Backtrace: sway(workspace_switch+0x1a1) [0x4142b1]
Backtrace: sway() [0x4096c6]
Backtrace: sway(handle_command+0x178) [0x405eb8]
Backtrace: sway() [0x40e6ee]
Backtrace: /usr/lib/libwlc.so.0(+0x19a1b) [0x7f06da6f0a1b]
Backtrace: /usr/lib/libwlc.so.0(+0x11b0c) [0x7f06da6e8b0c]
Backtrace: /usr/lib/libwayland-server.so.0(wl_event_loop_dispatch+0x72) [0x7f06d9e13242]
Backtrace: /usr/lib/libwayland-server.so.0(wl_display_run+0x25) [0x7f06d9e119a5]
Backtrace: /usr/lib/libwlc.so.0(wlc_run+0xfc) [0x7f06da6fda1c]
Backtrace: sway(main+0x25f) [0x4125cf]
Backtrace: /usr/lib/libc.so.6(__libc_start_main+0xf0) [0x7f06d9a86610]
Backtrace: sway(_start+0x29) [0x405bf9]
9 years ago
b76acbaf4f
Implement IPC_GET_BAR_CONFIG
9 years ago
de1f625c27
Add rgba support for bar colors
9 years ago
8c1d56812b
Implement bar option: colors {}
9 years ago
71a25d5da7
Remove a couple of unwanted spaces
9 years ago
242da783f4
Merge pull request #324 from mikkeloscar/free-bar-bindings
...
Free bar->bindings
9 years ago
7b0ea051c6
Merge pull request #325 from gpyh/bar_cmd_modifier
...
Added bar_cmd_modifier
9 years ago
0ead9324dc
Added bar_cmd_modifier
9 years ago
95de999922
Free bar->bindings
9 years ago
9db15e29b1
Merge pull request #323 from gpyh/bar_cmd_status_command
...
Added bar_cmd_status_command
9 years ago
5786fa7e35
Added bar_cmd_status_command
9 years ago
0513322c03
Move default bar config to bar creation.
...
Get rid of `config->bar` and define the default bar config options when
a bar is initialized.
9 years ago
87126a9fc2
Added bar_cmd_bindsym
...
Defined a sway_mouse_binding for clicks on the swaybar
9 years ago
42a85431ee
Merge pull request #320 from mikkeloscar/configure-mouse-btn2
...
Lookup dragging key when in dragging mode
9 years ago
82af08d8e9
Lookup dragging key when in dragging mode
...
Fixes bug introduced in 22916e9
9 years ago
0aeee6963d
Make mouse key used for drag/resize configurable
...
This makes it possible to define what mouse button key (left|right) to
use for dragging/resizing.
9 years ago
0d1eb5553c
Implement bar option: mode <dock|hide|invisible>
9 years ago
d6cd37d873
Implement bar option: hidden_state <hide|show>
9 years ago
401333e7c7
Implement bar option: id <custom-id>
...
If the id is defined by another bar it will just use the default id for
the bar. Typically `bar-x`.
If the id command is used multiple times within a bar block, the last
one will 'win'.
9 years ago
2be742d02d
Merge pull request #314 from mikkeloscar/bar-id
...
Add initial support for custom bar-id
9 years ago
2cedf88273
Add bar id to debug logs
9 years ago
c6b13163c9
Add initial support for custom bar-id
9 years ago
cf56c41c10
Move sway/util.c to common/util.c
9 years ago
774ffbe0d5
Detect proprietary AMD drivers too
9 years ago
b65e348233
Fix crash in bar { } blocks
9 years ago
45b959f601
Move numlen(1) to sway/util.c
9 years ago
211bc71599
Use tabs instead of spaces
9 years ago
0b2cf8b65c
Merge pull request #313 from mikkeloscar/bar-confing-subcommands
...
Bar confing subcommands
9 years ago
b00c106460
Add more debug logging to bar option parsing
9 years ago
bd0c58e85a
Implement bar option: position <top|bottom|left|right>
9 years ago
cc08daded4
Implement bar option: strip_workspace_numbers <yes|no>
9 years ago
4d17aa9919
Revert "Make mouse key used for drag/resize configurable"
...
This reverts commit 22916e9ebc
9 years ago
cb9b157e03
Add tray_output not supported warning
9 years ago
3ef6173c15
Merge pull request #311 from mikkeloscar/bar-config-parser
...
Implement bar { } config parsing
9 years ago
0a8ec26383
Implement bar option: tray_padding <px> [px]
9 years ago
b9e8accc51
Implement bar option: workspace_buttons <yes|no>
9 years ago
74152043f4
Implement 'bar { }' block parsing
9 years ago
64a183b23d
Fix dangling pointer on focus swap/describe WS
9 years ago
0b6949df08
Merge pull request #305 from mikkeloscar/fix-window-start
...
Don't reset x,y position before use.
9 years ago
7868e44d3f
Notify IPC on workspace changes more frequently
9 years ago
3891a7c73f
Don't reset x,y position before use.
...
The x and y position is calculated based on the position of the bar, we
don't want to reset these values when we need them.
9 years ago
d77d03ce84
Make destroy_workspace behave as expected
9 years ago
2f89b7084d
Correctly handle moving between fullscreen views
...
If focus would move in an output with a fullscreen view, it always
leaves the output. If focus would enter an output with a fullscreen
view, it always focuses the fullscreened view.
9 years ago
d361ce656d
Track the fullscreen view on a workspace swayc_t
9 years ago
6655534feb
Fullscreen on top of bar
9 years ago
af80b12add
Implement invoking `sway` as IPC client
...
As an alternative to invoking swaymsg.
9 years ago
19fd979af4
Merge pull request #300 from mikkeloscar/configure-mouse-btn
...
[RFC] Make mouse key used for drag/resize configurable
9 years ago
bffbe11e53
Fix config.c strlen error
9 years ago
f28a1d9183
Add floating_modifier extension to manpage
9 years ago
22916e9ebc
Make mouse key used for drag/resize configurable
...
This makes it possible to define what mouse button key (left|right) to
use for dragging/resizing.
9 years ago
762a78be3c
Merge pull request #292 from christophgysin/man
...
move manpages to subfolders
9 years ago
71afa38890
Add swaylock protocol, add resource destructors
...
This prevents sway crashing if swaybg or swaybar dies.
9 years ago
bf5244b49c
Fix using last output config if none matched
9 years ago
99af7e7c9c
move manpages to subfolders
9 years ago
cce9c338c0
cmake: build common code only once
...
This creates (static) libraries for protocols/, common/, and wayland/.
9 years ago
9b9d968cbf
Fix for_window [...] move scratchpad correctly
9 years ago
d098c620fe
Revert "Fix bug with for_window [...] move scratchpad"
...
This reverts commit 0796b0c475
9 years ago
0796b0c475
Fix bug with for_window [...] move scratchpad
9 years ago
98ff23b497
Fix busted install of /etc/sway/config
9 years ago
92a3538381
cmake: extract sway
9 years ago
3658777e47
Use wlc_point instead of deprecated wlc_origin
...
Struct was renamed in wlc, use the new name.
9 years ago
f3f77f9ff1
FALLBACK_CONFIG_DIR did not work. Fixed.
...
- Flag was ignored. Now it's taken into account.
- Missing trailing slashes in path now behaves properly.
9 years ago
09feef89ee
Can customize config fallback directory
...
CMake takes a `FALLBACK_CONFIG_DIR` flag which is the directory where the
standard configuration file `config` is copied at installation.
If loading from typical configuration directories fails, sway loads
FALLBACK_CONFIG_DIR/config (/etc/sway/config by default).
9 years ago
44d0f731c3
Add framework for switching command sets
...
This will allow the bar {} block to have a different command set (and
also bar { colors { } }.
9 years ago
4f89735fc4
Add bar config struct and defaults
9 years ago
3f950b6e52
Merge pull request #278 from christophgysin/merge
...
cmd_output: Merge instead of replace output config
9 years ago
b1bd3ae6f3
cmd_output: Merge instead of replace output config
9 years ago
ae7ed79573
config: Store 'enabled' as int
9 years ago
3c8763af22
cmd_output: check for missing subcommand arguments
9 years ago
5a369b3132
Only strip comments at the start of a line
...
This is necessary because i3 config files use CSS notation for colors
(i.e. #rrggbb).
9 years ago
ef91764bc7
Fix output adjustment for panels
9 years ago
e59cffcea2
Support desktop shell panels in compositor
9 years ago
9d2bbe2640
Merge pull request #274 from sce/fix_stray_floats
...
cmd_floating: Don't add non-float as sibling to float.
9 years ago
25ad3181f5
Merge pull request #276 from sce/earlier_logging
...
main: Setup logging before wlc_init.
9 years ago
c942f1624e
Merge pull request #275 from christophgysin/cmd_output
...
refactor cmd_output
9 years ago
0af15cc19e
Merge pull request #269 from christophgysin/usage
...
Add --help to print usage
9 years ago
c26a4b42cf
main: Setup logging before wlc_init.
...
If `wlc_init` fails the error message will never be logged or printed
anywhere.
9 years ago
7059eccaa1
cmd_output: Log enable/disable state
9 years ago
ffdfaaa985
apply_output_config: use list_seq_find() to find config
9 years ago
7d82cd9c0a
cmd_output: Use list_seq_find() to find matching config
9 years ago
88f372a22a
cmd_output: Cleanup cmd_output argument handling
9 years ago
badfb4bb43
cmd_floating: Don't add non-float as sibling to float.
...
When turning a float to a non-float, `get_focused_container` might
return another floating view, causing the active view to be inserted
into the floating list on its workspace instead of the normal child list
which it should. (Since it has `is_floating` as false the resulting
discrepency triggered other bad behaviour eventually leading sway to
crash.)
This patch fixes that by simply checking floating status before making
it a sibling.
9 years ago
923c3245ac
Fix option parsing
...
Using 'flag' results in duplicate code paths for short and long options.
This broke the -q short option in swaymsg, because there was:
{"quiet", no_argument, &quiet, 'q'}
Which will set quiet to 'q' and return 0, not 'q'.
9 years ago
2f2e1f3fc7
sway: Add --help option that prints usage
9 years ago
e48a16ce5e
sway: Print usage and exit on unknown options
9 years ago
3ba33321de
Use macros for exit values
9 years ago
c477bbf345
Add warnings about invalid output commands
...
This handles some cases where sway will crash if an output command is
invalid/missing an argument.
9 years ago
20cb390323
sway/main: Move wlc init to after args are handled.
...
First of all because it's not needed that early, and second of all
because there's a bug where calling `sway --get-socketpath` via `popen`
causes the child sway process to spin/hang instead of returning EOF.
(Specifically `(unset SWAYSOCK; swaymsg)` hangs.) This patch fixes that.
(Also note that this patch moves the "detailed review" comment, so I
guess this patch requires extra detailed review?)
9 years ago
1661edee28
Allow output config for output named *
...
Which will match any output.
9 years ago
2f192cceca
Improve config file loading
...
This also makes it so that your i3 config is used before
/etc/sway/config.
9 years ago
2d0f78c0d6
workspace: Learn sticky.
...
A floating window that's sticky will move to the new active workspace
whenever the workspace on the same output changes.
9 years ago
db642fc8c5
commands: code formatting: Sort list of commands by alphabet.
9 years ago
cbd7348704
Merge pull request #265 from sce/better_logging
...
debug_log: Improve container_log so that debug lines are aligned.
9 years ago
cad2694a3c
Merge pull request #264 from sce/fix_ws_next_name
...
workspace: Improve workspace_next_name.
9 years ago
c1d88acf72
debug_log: Improve container_log so that debug lines are aligned.
...
Makes the log easier to read, and the developers more happy (this one at
least).
9 years ago
0a78af0acc
workspace: Improve workspace_next_name.
...
This function looks for bound commands that start with `workspace` (ie.
the commands that change to a static workspace) and fetches the
workspace name.
However, if it's actually a list of commands, then the parsing will pick
up the delimiter ("," or ";") and also fail to recognize keywords
("next" etc).
This patch fixes that by properly separating with delimiters.
9 years ago
d9770cc243
cmd_floating: Support `enable` and `disable` commands too.
...
This is especially relevant in combination with `for_window`, e.g.:
`for_window [title="Terminal"] floating enable`.
9 years ago
Drew DeVault
robotanarchy
Mikkel Oscar Lyderik
S. Christoffer Eliesen
progandy
Yacine Hmito
Streetwalrus Einstein
Drew DeVault
Kevin Hamacher
Christoph Gysin