Mikkel Oscar Lyderik
e15a8a0376
Improve how swaybars are spawned
2016-02-27 22:12:35 +01:00
Mikkel Oscar Lyderik
212c6a18a2
Add outputs to bar_config ipc response
2016-02-27 22:12:35 +01:00
Mikkel Oscar Lyderik
bad4e22f3b
Make sway spawn only one bar per bar config
2016-02-27 22:12:35 +01:00
Mikkel Oscar Lyderik
5ff3fb1c04
Set pointer pos before focusing view under it
2016-02-27 13:18:55 +01:00
Mikkel Oscar Lyderik
5e253fdd9a
Correctly exit sway on errors.
...
Calling `exit` in sway_terminate prevents sway from correctly shutting
down (freeing data, cleanly terminating the ipc server, etc.).
A better way is to exit straight away if the failure occurs before
`wlc_run` and use sway_abort as usual if it occur when wlc is running.
2016-02-26 09:42:21 +01:00
Yacine Hmito
c400ca8f88
Fix for when sway_abort doesn't exit
...
sway_terminate does an exit in case wlc_terminate doesn't
2016-02-25 23:46:27 +01:00
Yacine Hmito
8db417fafe
Fixed swaymsg command name in sway(5) doc
2016-02-25 23:05:38 +01:00
Yacine Hmito
e239fbbd88
No options when using sway as IPC client
...
Sway used to attempt sending an IPC command composed of every argument
after the first non-option argument encountered.
Now, raises an error if an option is encountered before the intended command.
Some options such as -h or -v take effect when parsing, so they still
apply.
2016-02-25 23:04:59 +01:00
Yacine Hmito
179192e222
Removed p as a valid CLI option
...
The get-socketpath long option had an undocumented short alternative
as `p`. It has been removed.
However, the code in the options array is still the 'p' char.
2016-02-25 21:50:24 +01:00
Mikkel Oscar Lyderik
89bb6a4a42
Don't rearrange views behind swaylock.
...
Fix #481
2016-02-25 14:42:48 +01:00
Mikkel Oscar Lyderik
c9d9dd7516
Check for empty ws on view destroyed.
...
In some cases destroying a view can result in an empty and inactive
workspace, which should be destroyed.
This handles those cases.
2016-02-25 13:36:25 +01:00
Mikkel Oscar Lyderik
ee32bc3aef
Send workspace ICP event on ws destroy/empty.
...
There is no 'destroy' change type in the i3 IPC so this uses `empty` to
notify about empty workspaces (which will be destroyed from sway right
after).
2016-02-25 12:59:22 +01:00
Mikkel Oscar Lyderik
739ba902e0
Prevent crash when showing scratchpad on new ws.
...
Fix #469
2016-02-25 11:43:07 +01:00
Mikkel Oscar Lyderik
016a77424a
Prefer named output config over wildcard config.
...
This makes sure that a named output config is applied before the
general wildcard config when a new output is created. This ensures that
the config:
output * ...
output NAME ...
behaves the same way as:
output NAME ...
output * ...
2016-02-12 13:45:47 +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
Mikkel Oscar Lyderik
be6455b295
Squash trailing whitespace
2016-02-08 12:31:13 +01:00
Mikkel Oscar Lyderik
bacd40d6db
Fix clang warnings
2016-02-08 12:30:42 +01:00
Drew DeVault
4546ce1188
Add wlc-render.h to handlers.c
2016-02-08 12:20:24 +01:00
crondog
7916eb70b9
commands: move position mouse
...
Bounds checking works ok except it overlaps the bar. Just like with
normal floating. Should be fixed once swaybar is fixed.
2016-01-28 22:10:56 +11:00
crondog
0ee5547406
font: Allow adding font to the config. In prep for border titles
...
v2: Give default font and make bar use it if no bar font
2016-01-27 20:53:31 +11:00
Drew DeVault
f1f4791a3b
Fix returning to sway after swaylock completes
2016-01-26 18:33:50 -05:00
Mikkel Oscar Lyderik
32ae26e519
Add quotes to multiword arguments.
...
This adds quotes around multiword arguments before they are passed to
`/bin/sh -c` in an exec command.
Example:
I connect to irc like this:
exec termite -e "mosh server tmux a"
Without this patch the arguments are passed to sh as:
termite -e mosh server tmux a
When it should be:
termite -e "mosh server tmux a"
For the command to work.
2016-01-25 00:14:13 +01:00
Drew DeVault
fe35ea633a
Merge pull request #457 from mikkeloscar/move-view-fix
...
Fix rendering of view when moving to new workspace
2016-01-23 16:48:00 -05:00
Drew DeVault
ef407559e2
Add new wlc thing to views
2016-01-23 16:35:39 -05:00
Drew DeVault
a416715372
Revert "s/numlen/log10/g"
...
This reverts commit 038bb8cc7c
.
2016-01-23 16:35:32 -05:00
Drew DeVault
038bb8cc7c
s/numlen/log10/g
2016-01-23 15:51:38 -05:00
Quentin Glidic
449617f104
commands: Fix memory allocation in assign
...
Also use the safer snprintf since we just computed the size.
Signed-off-by: Quentin Glidic <sardemff7+git@sardemff7.net>
2016-01-23 20:22:51 +01:00
Quentin Glidic
43483d8fee
commands: Fix usage of arrow in assign
...
Signed-off-by: Quentin Glidic <sardemff7+git@sardemff7.net>
2016-01-23 20:22:51 +01:00
Christoph Gysin
2341ae64ad
sway-input: fix typo
2016-01-23 14:08:52 +02:00
Mikkel Oscar Lyderik
102719c7dd
manpage: fix sway-input layout
2016-01-22 19:26:13 +01:00
Mikkel Oscar Lyderik
54111839a4
manpage: add references sway.5 <-> sway-input.5
2016-01-22 19:26:13 +01:00
Mikkel Oscar Lyderik
e953f634d9
Fix generating sway-input.5 manpage
2016-01-22 19:26:13 +01:00
Mikkel Oscar Lyderik
4cbb09d566
cmake: fix libinput include dirs
2016-01-22 05:17:33 +01:00
crondog
cd0eaf00da
Prevent ipc from crashing sway
2016-01-22 12:29:18 +11:00
Mikkel Oscar Lyderik
fa0526f3df
Fix rendering of view when moving to new workspace
...
This is a possible fix for #384 .
To be honest I don't fully understand why this bug is happening, but I
have narrowed it down to the view stack in wlc and how sway orders views
in very specific situations (those described in #384 ).
Anyway this should fix the problem by eliminating the call to
`wlc_view_bring_to_front` which isn't really needed anyway since sending
all invisible views to the back is the same as bringing all visible
views to the front (rotating the view stack).
2016-01-21 22:28:26 +01:00
Mikkel Oscar Lyderik
2c43bd2ac8
Only update visibility if WS isn't destroyed after
...
No need to update visibility if the workspace will be destroyed right
after.
2016-01-21 22:05:06 +01:00
Yacine Hmito
c487cf71a5
Fix issue #455
...
CMAKE_INSTALL_FULL_SYSCONFIG is not actually passed to
the C preprocessor. I remember it working, so I must have
messed up somewhere last time I touched this.
This is fixed by manually passing its value to the C preprocessor
through the SYSCONFDIR definition
2016-01-21 21:08:18 +01:00
Drew DeVault
d969a1dec0
Fix memory leak in config.c
...
Thanks @jollywho
2016-01-21 11:18:13 -05:00
Mikkel Oscar Lyderik
ac740271a5
Strip stray whitespace
2016-01-21 17:03:21 +01:00
Cole Mickens
28081b7689
libinput
2016-01-19 06:51:36 -08:00
crondog
81caf89ff8
cmd_assign
...
This implements cmd_assign. Basically a copy and paste from
cmd_for_window however it has → handling and injects a `move container to
workspace`
2016-01-15 16:03:34 +11:00
Mikkel Oscar Lyderik
0ba3f08f52
Strip quotes from workspace name v2
...
This is a more general fix for #444
This reverts part of commit 222f0d44fc
.
2016-01-11 03:42:45 +01:00
Mikkel Oscar Lyderik
fc8e5703a5
Strip quotes of each argv when handling command
2016-01-11 03:39:34 +01:00
Mikkel Oscar Lyderik
222f0d44fc
Strip quotes from workspace name.
...
Fix #444
This is a temporary fix, the real fix is to store the commands as a
formatted argv array, so they don't have to be reformatted all over the
place.
2016-01-11 03:13:36 +01:00
Mikkel Oscar Lyderik
15621ea8ff
Add backwards compatability for binding event
2016-01-09 20:56:42 +01:00
Mikkel Oscar Lyderik
e3ddcaabc4
Add bindcode to binding events.
2016-01-09 20:31:18 +01:00
Mikkel Oscar Lyderik
f8b260d4a1
Add support for bincode command
...
If a bindsym and bincode maps to the same combination, the last one will
overwrite any previous mappings.
2016-01-09 18:07:47 +01:00
Mikkel Oscar Lyderik
cb8ac7fd4a
Unescape string after doing var replacement
...
Fix #426
2016-01-08 23:30:18 +01:00
Mikkel Oscar Lyderik
15cbc53a77
Make IPC binding event support a compile time opt.
2016-01-08 15:03:25 +01:00
Mikkel Oscar Lyderik
14147ac056
Reduce duplicate code
2016-01-08 14:27:41 +01:00
Mikkel Oscar Lyderik
6392abe35b
Implement IPC binding event (keyboard)
...
This implements the IPC binding event for keyboard bindings. It is
slightly different from the i3 implementation [1] since sway supports
more than one non-modifier key in a binding. Thus the json interface has
been changed from:
{
...
"symbol": "t",
...
}
to:
{
...
"symbols": [ "t" ],
...
}
[1] http://i3wm.org/docs/ipc.html#_binding_event
2016-01-08 03:03:55 +01:00
Mikkel Oscar Lyderik
32cd3f70eb
Add function for duplication a sway_binding
2016-01-08 03:03:55 +01:00
Mikkel Oscar Lyderik
55f63935ab
Implement bindsym --release
...
This is a "simple" version of --release (same as i3) that only supports
a binding that contain one normal key. e.g.:
bindsym --release $mod+x exec somthing-fun
I didn't bother implementing it for a combination like `$mod+x+z` since
it is a bit tricky to get right and also a bit weird to actually do on a
keyboard.
2016-01-07 21:43:00 +01:00
Drew DeVault
8f5de70c93
Merge pull request #434 from mikkeloscar/detect-modifier
...
Send IPC modifier event on bar_modifier up/down
2016-01-06 07:26:54 -05:00
Mikkel Oscar Lyderik
9186455a3c
Merge branch 'master' of github.com:SirCmpwn/sway
2016-01-05 23:44:03 +01:00
Mikkel Oscar Lyderik
364e37a1eb
Fix whitespace issues.
2016-01-05 23:42:40 +01:00
Mikkel Oscar Lyderik
843e2ad2c1
Only send modifier event once for active modifiers
...
This makes sure that a modifier event is only sent for active bar
modifiers, and that it is only sent once for each of those modifiers.
An active bar modifier is a modifier defined for a bar with `mode hide`
and `hidden_state hide`.
2016-01-05 23:18:59 +01:00
Jøhannes Lippmann
648db4016f
Clearer order of locations searched for config file.
...
The i3wm config locations are visited _before_ using the fallback
configs. The man page was confusing - it talked about the fallback
configs first, but also said they are looked at "at last". By changing
the order of the sentences, this should be clearer.
2016-01-05 22:06:02 +01:00
Mikkel Oscar Lyderik
2e0ef533f2
Init layout before checking config
2016-01-05 19:16:46 +01:00
Mikkel Oscar Lyderik
a8402035e9
Add modifier key to bar_config json
2016-01-05 18:36:26 +01:00
Mikkel Oscar Lyderik
95e0f44c73
Move modifier name table to common/util.c
...
Lookup of modifier names is required in several places, thus it makes
sense to move it to a general place.
2016-01-05 18:36:24 +01:00
Drew DeVault
caaff5ac54
Revert "Free wordexp_t in config.c:get_config_path"
...
This reverts commit 33b24736c7
.
2016-01-04 23:00:56 -05:00
Mikkel Oscar Lyderik
c20c63b677
Send IPC modifier event on bar_modifier up/down
...
Detects when a bar modifier key is pressed/released and sends a modifier
IPC event to any listeners (usually swaybars).
This way a swaybar can listen on the modifier event and hide/show the
bar accordingly (not implemented yet)
The modifier event looks like this:
{
"change": "pressed", // or released
"modifier": "Mod4"
}
2016-01-05 02:25:56 +01:00
Drew DeVault
33b24736c7
Free wordexp_t in config.c:get_config_path
...
Thanks @jollywho
2016-01-04 19:39:33 -05:00
Mikkel Oscar Lyderik
5af4e747d3
Merge pull request #433 from crondog/issue431
...
Return focus to fullscreen view
2016-01-05 01:14:28 +01:00
crondog
b755fd073e
Return focus to fullscreen view
...
This fixes https://github.com/SirCmpwn/sway/issues/431 by returning
focus to the fullscreen view. Also it fixes the issue with the
fullscreen view pointer not being set which did my head in
2016-01-05 10:55:29 +11:00
Mikkel Oscar Lyderik
7727c9efbc
Detect bar modifier pressed/released
2016-01-05 00:49:44 +01:00
Mikkel Oscar Lyderik
e62c49f83c
Fix overwriting current pressed keys.
...
This fixes a bug where the key at index 0 in the `key_state_array` would
be overwritten by the next pressed key. This broke any bindings
consisting of multiple non-mod keys like: `$mod+a+b`.
2016-01-04 23:26:40 +01:00
Mikkel Oscar Lyderik
aa2f754c64
swaybar: Implement binding_mode_indicator
2016-01-03 22:16:36 +01:00
Mikkel Oscar Lyderik
19833fbc8b
Add IPC event types
...
Adds custom IPC_EVENT_* types
2016-01-03 20:37:10 +01:00
crondog
397b58e88f
split toggle
...
Not sure if you will accept this, but i find it useful (I use it when
opening new terminal windows on a workspace
v2: add short hand command and docs
2015-12-31 11:14:06 +11:00
crondog
596c4d9428
Dont try and fullscreen a workspace with no views
...
Found this completely by accident
2015-12-30 13:50:50 +11:00
Drew DeVault
5292860b92
Merge pull request #418 from mikkeloscar/sway-handle-sigterm
...
Handle SIGTERM sent to sway
2015-12-29 08:22:32 -05:00
Mikkel Oscar Lyderik
16b8c2e915
Handle SIGTERM sent to sway
...
This makes sway handle and gracefully shut down everything when
receiving a SIGTERM.
Fix #416
2015-12-29 13:03:53 +01:00
Drew DeVault
d409620a55
Fix use-after-free when closing fullscreen views
2015-12-29 00:04:12 -05:00
S. Christoffer Eliesen
b18f004210
handlers: geometry_request: Better debug output.
...
Previous output was confusing.
2015-12-28 14:58:17 +01:00
S. Christoffer Eliesen
6750975b9f
arrange_windows_r: Round pixels to match reality, fixes calculations.
...
If the width or height of a container can't be evenly distributed to its
children, then the layout algorithm still thought it got it right (due
to using decimals) which caused a gap of one or more pixels for some
window arrangements.
This is fixed by this patch by first rounding off the width and height
(so that decimals are never introduced) and then adjusting the last
view in a container to fill the remaining pixels (which now is counted
correctly due to the decimals being removed).
Also, due to the way gaps are implemented, an odd sized gap can never be
aligned properly, so just adjust to closest even number.
2015-12-28 14:58:17 +01:00
S. Christoffer Eliesen
831f6680f4
arrange_windows_r: Bring parent coordinates into layout calculations.
...
This brings consistency into the algorithm (instead of resetting and
then fetching again).
2015-12-28 01:14:48 +01:00
Mikkel Oscar Lyderik
cf64000e21
Focus new sibling added to container
...
This makes sure that the window being added to a container gets focus.
2015-12-25 22:32:42 +01:00
Mikkel Oscar Lyderik
5d07c61330
Trigger workspace init event (floating)
...
Triggers workspace init event when moving a floating window to a new
workspace.
This is a follow up on #391 which didn't handle floating windows.
2015-12-25 18:02:12 +01:00
Yacine Hmito
f02cf75ff3
Use SYSCONFDIR as recommended
...
- swaylock config path not hardcoded anymore
- the unusual and weird FALLBACK_CONFIG_DIR is no more
2015-12-23 12:22:48 +01:00
Drew DeVault
8a22ac3966
Initialize id, part two
2015-12-22 08:21:13 -05:00
Drew DeVault
7c06ef35de
Initialize ID
2015-12-22 08:14:50 -05:00
Drew DeVault
91c102a897
Merge pull request #393 from robotanarchy/musl-libc-compatibility
...
musl libc compatibility
2015-12-21 20:42:08 -05:00
robotanarchy
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)
2015-12-22 00:38:18 +01:00
Mikkel Oscar Lyderik
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.
2015-12-21 23:07:52 +01:00
robotanarchy
3dd2393797
remove unused execinfo.h include from debug_log.c
2015-12-21 18:57:26 +01:00
Drew DeVault
442a54c38b
Merge pull request #390 from mikkeloscar/workspace-ipc-event
...
Don't skip all clients on ipc_workspace_event.
2015-12-21 09:49:55 -05:00
Mikkel Oscar Lyderik
42e5b4b032
Don't skip all clients on ipc_workspace_event.
...
Only clients not subcriped to the workspace event should be skipped.
2015-12-21 15:40:01 +01:00
Mikkel Oscar Lyderik
c803b79764
Trigger event on bar mode|hidden_state commands
2015-12-21 15:31:09 +01:00
Mikkel Oscar Lyderik
66c66c7304
Implement barconfig_update
IPC event
2015-12-21 15:28:34 +01:00
Mikkel Oscar Lyderik
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.
2015-12-21 14:33:27 +01:00
Drew DeVault
fc71c6303c
Fix default swaybar font
2015-12-21 05:07:19 -05:00
S. Christoffer Eliesen
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.
2015-12-20 21:23:20 +01:00
S. Christoffer Eliesen
ce54b4ff2e
container: Fix inner gaps against screen edge.
2015-12-20 21:23:20 +01:00
Drew DeVault
3082245243
Merge pull request #373 from sce/per_panel_config
...
Per panel config
2015-12-20 12:05:32 -05:00
Drew DeVault
33fb648938
Merge pull request #372 from sce/fix_swaybar_output_name_test
...
config: load_swaybars: Fix name comparison.
2015-12-20 09:23:34 -05:00
S. Christoffer Eliesen
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.
2015-12-20 12:54:34 +01:00
S. Christoffer Eliesen
6db0f6f80f
extensions: panel_config->resource => wl_surface_res.
...
Change the name to something less ambigious.
2015-12-20 12:54:34 +01:00
S. Christoffer Eliesen
6ace37d0b1
config: load_swaybars: Fix name comparison.
2015-12-20 12:53:56 +01:00
S. Christoffer Eliesen
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).
2015-12-20 10:14:36 +01:00
Drew DeVault
3282163f64
Implement compositor support for swaylock
...
This makes swaylock more or less work.
2015-12-18 19:30:19 -05:00
Drew DeVault
eefc93db43
Fix lock extension setup in compositor
2015-12-18 19:30:19 -05:00
Drew DeVault
253efad437
Merge pull request #361 from mikkeloscar/i3bar-command
...
Add support for running swaybar_command
2015-12-18 19:17:56 -05:00
Mikkel Oscar Lyderik
207678e809
Add support for running swaybar_command
2015-12-19 01:03:39 +01:00
Drew DeVault
7647762bab
Fix default workspace name generation
...
This fixes the issue where workspace 10 ends up being the default.
2015-12-18 18:52:51 -05:00
Drew DeVault
2ab4e5676e
Merge pull request #360 from sce/fix_arrange_windows
...
Fix arrange windows
2015-12-18 18:39:02 -05:00
Drew DeVault
b9f14cee41
Merge pull request #359 from mikkeloscar/i3bar-command
...
Add bar option: swaybar_command <command>
2015-12-18 18:19:59 -05:00
Mikkel Oscar Lyderik
9d7f1afdfb
Add bar option: swaybar_command <command>
2015-12-19 00:13:51 +01:00
S. Christoffer Eliesen
f0b3ee6d84
layout: arrange_windows: Partially fix swaybar irregularties.
2015-12-18 23:53:42 +01:00
S. Christoffer Eliesen
0ad5059b6f
layout: arrange_windows: Fix/better debug output.
2015-12-18 23:53:42 +01:00
Mikkel Oscar Lyderik
90ff36cab8
Terminate children when freeing output container
2015-12-18 18:27:54 +01:00
Mikkel Oscar Lyderik
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
2015-12-18 18:27:44 +01:00
Drew DeVault
7558a274fa
Add shims for swaylock on compositor
2015-12-18 08:49:04 -05:00
S. Christoffer Eliesen
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.
2015-12-18 14:03:11 +01:00
S. Christoffer Eliesen
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.
2015-12-18 13:23:49 +01:00
progandy
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 ...
2015-12-18 01:22:07 +01:00
progandy
8f1ac1ef2c
sway: enable workspace selection by number
2015-12-18 01:21:31 +01:00
Drew DeVault
03787871d0
Fix bar invocation for multihead setup
2015-12-16 19:36:31 -05:00
Drew DeVault
1a365f19c9
Use system swaybar instead of local swaybar
2015-12-16 19:30:38 -05:00
Drew DeVault
60c204a09b
Invoke swaybar when an output matches a bar config
2015-12-16 19:29:47 -05:00
Drew DeVault
f6da4dda4b
Bring unmanaged windows to front on output arrange
...
Fixes #312
2015-12-16 19:20:34 -05:00
Drew DeVault
01798a5ae2
Merge pull request #338 from mikkeloscar/bar-separator-symbol
...
Implement bar option: separator_symbol
2015-12-16 07:47:00 -05:00
Mikkel Oscar Lyderik
053fb09d1e
Use free_flat_list for simple char* list.
...
No need to reimplement free_flat_list functionality.
2015-12-16 13:06:54 +01:00
Mikkel Oscar Lyderik
2fd7dd64ec
Implement bar option: separator_symbol
2015-12-16 13:01:11 +01:00
Drew DeVault
473ac4531f
[swaybar] Get bar config via IPC
2015-12-15 22:22:22 -05:00
Drew DeVault
efff8e5ba5
Merge pull request #335 from mikkeloscar/bar-font
...
Implement bar option: font <font>
2015-12-15 18:11:21 -05:00
Mikkel Oscar Lyderik
9316851715
Implement bar option: font <font>
2015-12-15 23:59:16 +01:00
Mikkel Oscar Lyderik
ded8919c69
Implement bar option: binding_mode_indicator <yes|no>
2015-12-15 23:38:17 +01:00
Mikkel Oscar Lyderik
47f4aea9e7
Correctly free bindings list
2015-12-15 22:16:54 +01:00
Mikkel Oscar Lyderik
f59f5d27aa
Implement bar option: output <output>
2015-12-15 22:01:53 +01:00
Mikkel Oscar Lyderik
05e7334106
Fix active_workspace_border color definition
2015-12-15 15:08:41 +01:00
Drew DeVault
809c251df8
Merge pull request #328 from mikkeloscar/bar-height
...
Add bar height option (Airblader/i3)
2015-12-15 09:08:40 -05:00
Mikkel Oscar Lyderik
6834a33290
Add bar height option (Airblader/i3)
2015-12-15 15:02:13 +01:00
Drew DeVault
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]
2015-12-15 08:41:10 -05:00
Drew DeVault
b76acbaf4f
Implement IPC_GET_BAR_CONFIG
2015-12-15 08:25:53 -05:00
Mikkel Oscar Lyderik
de1f625c27
Add rgba support for bar colors
2015-12-15 13:45:04 +01:00
Mikkel Oscar Lyderik
8c1d56812b
Implement bar option: colors {}
2015-12-15 13:12:55 +01:00
Mikkel Oscar Lyderik
71a25d5da7
Remove a couple of unwanted spaces
2015-12-15 10:29:37 +01:00
Drew DeVault
242da783f4
Merge pull request #324 from mikkeloscar/free-bar-bindings
...
Free bar->bindings
2015-12-14 19:58:41 -05:00
Drew DeVault
7b0ea051c6
Merge pull request #325 from gpyh/bar_cmd_modifier
...
Added bar_cmd_modifier
2015-12-14 19:57:39 -05:00
Yacine Hmito
0ead9324dc
Added bar_cmd_modifier
2015-12-15 01:53:45 +01:00
Mikkel Oscar Lyderik
95de999922
Free bar->bindings
2015-12-15 01:53:34 +01:00
Drew DeVault
9db15e29b1
Merge pull request #323 from gpyh/bar_cmd_status_command
...
Added bar_cmd_status_command
2015-12-14 19:29:02 -05:00
Yacine Hmito
5786fa7e35
Added bar_cmd_status_command
2015-12-15 01:15:02 +01:00
Mikkel Oscar Lyderik
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.
2015-12-15 01:05:00 +01:00
Yacine Hmito
87126a9fc2
Added bar_cmd_bindsym
...
Defined a sway_mouse_binding for clicks on the swaybar
2015-12-15 00:15:32 +01:00
Drew DeVault
42a85431ee
Merge pull request #320 from mikkeloscar/configure-mouse-btn2
...
Lookup dragging key when in dragging mode
2015-12-14 17:14:49 -05:00
Mikkel Oscar Lyderik
82af08d8e9
Lookup dragging key when in dragging mode
...
Fixes bug introduced in 22916e9
where dragging of floating windows was
messed up.
2015-12-14 22:44:50 +01:00
Mikkel Oscar Lyderik
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.
2015-12-14 22:31:34 +01:00
Mikkel Oscar Lyderik
0d1eb5553c
Implement bar option: mode <dock|hide|invisible>
2015-12-14 20:15:58 +01:00
Mikkel Oscar Lyderik
d6cd37d873
Implement bar option: hidden_state <hide|show>
2015-12-14 19:52:25 +01:00
Mikkel Oscar Lyderik
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'.
2015-12-14 18:34:20 +01:00
Drew DeVault
2be742d02d
Merge pull request #314 from mikkeloscar/bar-id
...
Add initial support for custom bar-id
2015-12-14 11:25:31 -05:00
Mikkel Oscar Lyderik
2cedf88273
Add bar id to debug logs
2015-12-14 17:17:06 +01:00
Mikkel Oscar Lyderik
c6b13163c9
Add initial support for custom bar-id
2015-12-14 17:17:06 +01:00
Mikkel Oscar Lyderik
cf56c41c10
Move sway/util.c to common/util.c
2015-12-14 17:17:06 +01:00
Streetwalrus Einstein
774ffbe0d5
Detect proprietary AMD drivers too
2015-12-14 18:13:44 +02:00
Drew DeVault
b65e348233
Fix crash in bar { } blocks
2015-12-14 11:11:45 -05:00
Mikkel Oscar Lyderik
45b959f601
Move numlen(1) to sway/util.c
2015-12-14 17:07:52 +01:00
Mikkel Oscar Lyderik
211bc71599
Use tabs instead of spaces
2015-12-14 16:38:49 +01:00
Drew DeVault
0b2cf8b65c
Merge pull request #313 from mikkeloscar/bar-confing-subcommands
...
Bar confing subcommands
2015-12-14 09:59:13 -05:00
Mikkel Oscar Lyderik
b00c106460
Add more debug logging to bar option parsing
2015-12-14 15:24:27 +01:00
Mikkel Oscar Lyderik
bd0c58e85a
Implement bar option: position <top|bottom|left|right>
2015-12-14 15:15:07 +01:00
Mikkel Oscar Lyderik
cc08daded4
Implement bar option: strip_workspace_numbers <yes|no>
2015-12-14 15:14:50 +01:00
Drew DeVault
4d17aa9919
Revert "Make mouse key used for drag/resize configurable"
...
This reverts commit 22916e9ebc
.
2015-12-14 08:57:00 -05:00
Mikkel Oscar Lyderik
cb9b157e03
Add tray_output not supported warning
2015-12-14 14:52:34 +01:00
Drew DeVault
3ef6173c15
Merge pull request #311 from mikkeloscar/bar-config-parser
...
Implement bar { } config parsing
2015-12-14 08:11:51 -05:00
Mikkel Oscar Lyderik
0a8ec26383
Implement bar option: tray_padding <px> [px]
2015-12-14 12:56:59 +01:00
Mikkel Oscar Lyderik
b9e8accc51
Implement bar option: workspace_buttons <yes|no>
2015-12-14 12:56:59 +01:00
Mikkel Oscar Lyderik
74152043f4
Implement 'bar { }' block parsing
2015-12-14 12:56:45 +01:00
Kevin Hamacher
64a183b23d
Fix dangling pointer on focus swap/describe WS
2015-12-14 11:43:17 +01:00
Drew DeVault
0b6949df08
Merge pull request #305 from mikkeloscar/fix-window-start
...
Don't reset x,y position before use.
2015-12-13 17:01:16 -05:00
Drew DeVault
7868e44d3f
Notify IPC on workspace changes more frequently
2015-12-13 16:59:22 -05:00
Mikkel Oscar Lyderik
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.
2015-12-13 22:49:58 +01:00
Kevin Hamacher
d77d03ce84
Make destroy_workspace behave as expected
2015-12-13 18:19:24 +01:00
Drew DeVault
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.
2015-12-13 08:18:12 -05:00
Drew DeVault
d361ce656d
Track the fullscreen view on a workspace swayc_t
2015-12-13 07:58:00 -05:00
Drew DeVault
6655534feb
Fullscreen on top of bar
2015-12-13 07:52:57 -05:00
Drew DeVault
af80b12add
Implement invoking sway
as IPC client
...
As an alternative to invoking swaymsg.
2015-12-12 13:01:00 -05:00
Drew DeVault
19fd979af4
Merge pull request #300 from mikkeloscar/configure-mouse-btn
...
[RFC] Make mouse key used for drag/resize configurable
2015-12-12 12:28:56 -05:00
Drew DeVault
bffbe11e53
Fix config.c strlen error
2015-12-11 14:22:28 -05:00
Mikkel Oscar Lyderik
f28a1d9183
Add floating_modifier extension to manpage
2015-12-11 18:04:27 +01:00
Mikkel Oscar Lyderik
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.
2015-12-11 18:04:27 +01:00
Drew DeVault
762a78be3c
Merge pull request #292 from christophgysin/man
...
move manpages to subfolders
2015-12-05 18:16:45 -05:00
Drew DeVault
71afa38890
Add swaylock protocol, add resource destructors
...
This prevents sway crashing if swaybg or swaybar dies.
2015-12-03 08:35:22 -05:00
Christoph Gysin
bf5244b49c
Fix using last output config if none matched
2015-12-02 23:05:04 +02:00
Christoph Gysin
99af7e7c9c
move manpages to subfolders
2015-12-02 12:49:01 +02:00
Christoph Gysin
cce9c338c0
cmake: build common code only once
...
This creates (static) libraries for protocols/, common/, and wayland/.
2015-12-02 12:15:57 +02:00
Drew DeVault
9b9d968cbf
Fix for_window [...] move scratchpad correctly
2015-12-01 18:09:37 -05:00
Drew DeVault
d098c620fe
Revert "Fix bug with for_window [...] move scratchpad"
...
This reverts commit 0796b0c475
.
2015-12-01 18:05:37 -05:00
Drew DeVault
0796b0c475
Fix bug with for_window [...] move scratchpad
2015-12-01 18:00:46 -05:00
Drew DeVault
98ff23b497
Fix busted install of /etc/sway/config
2015-12-01 16:57:03 -05:00
Christoph Gysin
92a3538381
cmake: extract sway
2015-12-01 22:47:22 +02:00
Mikkel Oscar Lyderik
3658777e47
Use wlc_point instead of deprecated wlc_origin
...
Struct was renamed in wlc, use the new name.
2015-12-01 21:04:34 +01:00
Yacine Hmito
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.
2015-12-01 19:41:44 +01:00
Yacine Hmito
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).
2015-12-01 01:07:48 +01:00
Drew DeVault
44d0f731c3
Add framework for switching command sets
...
This will allow the bar {} block to have a different command set (and
also bar { colors { } }.
2015-11-29 17:20:27 -05:00
Drew DeVault
4f89735fc4
Add bar config struct and defaults
2015-11-29 17:05:04 -05:00
Drew DeVault
3f950b6e52
Merge pull request #278 from christophgysin/merge
...
cmd_output: Merge instead of replace output config
2015-11-29 16:26:11 -05:00
Christoph Gysin
b1bd3ae6f3
cmd_output: Merge instead of replace output config
2015-11-29 23:17:56 +02:00
Christoph Gysin
ae7ed79573
config: Store 'enabled' as int
2015-11-29 23:17:55 +02:00
Christoph Gysin
3c8763af22
cmd_output: check for missing subcommand arguments
2015-11-29 22:36:17 +02:00
Drew DeVault
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).
2015-11-29 14:02:58 -05:00
Drew DeVault
ef91764bc7
Fix output adjustment for panels
2015-11-29 13:59:12 -05:00
Drew DeVault
e59cffcea2
Support desktop shell panels in compositor
2015-11-29 12:03:13 -05:00
Drew DeVault
9d2bbe2640
Merge pull request #274 from sce/fix_stray_floats
...
cmd_floating: Don't add non-float as sibling to float.
2015-11-29 09:10:29 -05:00
Drew DeVault
25ad3181f5
Merge pull request #276 from sce/earlier_logging
...
main: Setup logging before wlc_init.
2015-11-29 09:08:56 -05:00
Drew DeVault
c942f1624e
Merge pull request #275 from christophgysin/cmd_output
...
refactor cmd_output
2015-11-29 09:07:22 -05:00
Drew DeVault
0af15cc19e
Merge pull request #269 from christophgysin/usage
...
Add --help to print usage
2015-11-29 09:04:39 -05:00
S. Christoffer Eliesen
c26a4b42cf
main: Setup logging before wlc_init.
...
If `wlc_init` fails the error message will never be logged or printed
anywhere.
2015-11-29 15:01:47 +01:00
Christoph Gysin
7059eccaa1
cmd_output: Log enable/disable state
2015-11-29 15:32:02 +02:00
Christoph Gysin
ffdfaaa985
apply_output_config: use list_seq_find() to find config
2015-11-29 15:31:58 +02:00
Christoph Gysin
7d82cd9c0a
cmd_output: Use list_seq_find() to find matching config
2015-11-29 15:29:06 +02:00
Christoph Gysin
88f372a22a
cmd_output: Cleanup cmd_output argument handling
2015-11-29 14:51:56 +02:00
S. Christoffer Eliesen
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.
2015-11-29 13:00:10 +01:00
Christoph Gysin
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'.
2015-11-28 23:50:44 +02:00
Christoph Gysin
2f2e1f3fc7
sway: Add --help option that prints usage
2015-11-28 23:50:44 +02:00
Christoph Gysin
e48a16ce5e
sway: Print usage and exit on unknown options
2015-11-28 23:50:44 +02:00
Christoph Gysin
3ba33321de
Use macros for exit values
2015-11-28 23:50:10 +02:00
Mikkel Oscar Lyderik
c477bbf345
Add warnings about invalid output commands
...
This handles some cases where sway will crash if an output command is
invalid/missing an argument.
2015-11-28 22:02:06 +01:00
S. Christoffer Eliesen
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?)
2015-11-28 20:35:57 +01:00
Drew DeVault
1661edee28
Allow output config for output named *
...
Which will match any output.
2015-11-28 10:18:37 -05:00
Drew DeVault
2f192cceca
Improve config file loading
...
This also makes it so that your i3 config is used before
/etc/sway/config.
2015-11-28 10:00:53 -05:00
S. Christoffer Eliesen
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.
2015-11-27 17:58:10 +01:00
S. Christoffer Eliesen
db642fc8c5
commands: code formatting: Sort list of commands by alphabet.
2015-11-27 17:58:10 +01:00
Drew DeVault
cbd7348704
Merge pull request #265 from sce/better_logging
...
debug_log: Improve container_log so that debug lines are aligned.
2015-11-27 09:56:07 -07:00
Drew DeVault
cad2694a3c
Merge pull request #264 from sce/fix_ws_next_name
...
workspace: Improve workspace_next_name.
2015-11-27 09:53:27 -07:00
S. Christoffer Eliesen
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).
2015-11-27 17:49:07 +01:00
S. Christoffer Eliesen
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.
2015-11-27 17:30:05 +01:00
S. Christoffer Eliesen
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`.
2015-11-27 17:09:19 +01:00
Drew DeVault
27f03c705d
Move IPC client into common, refactor IPC
2015-11-27 09:50:04 -05:00
Drew DeVault
53d353e6b4
Add "variant": "sway" to IPC version response
2015-11-26 16:49:36 -05:00
Drew DeVault
9a15371ba3
Parse command line args for swaymsg
2015-11-26 14:31:29 -05:00
Drew DeVault
206606b32c
Merge pull request #261 from christophgysin/exec
...
Call swaybg without invoking a shell
2015-11-25 18:59:35 -05:00
Christoph Gysin
e362f871d9
Call swaybg without invoking a shell
...
This makes escaping the arguments obsolete.
Also avoid dynamic memory allocation for the output id. It only supported ids up
to 99. Now we support up to 999, and take 4 bytes off the stack instead.
2015-11-25 23:19:11 +02:00
Christoph Gysin
be3fae148b
swaybg: implement scaling mode "fit"
2015-11-25 22:32:02 +02:00
Drew DeVault
9fb020d04c
Merge pull request #251 from sce/criteria_1
...
criteria: Add. Learn for_window command.
2015-11-25 09:28:43 -05:00
S. Christoffer Eliesen
5483fe1883
criteria: Code formatting.
2015-11-25 14:59:07 +01:00
Christoph Gysin
eeb7f5c036
config: print line number
2015-11-25 15:48:27 +02:00
S. Christoffer Eliesen
a06cb7cd01
criteria: Add. Learn for_window command.
...
A criteria is a string in the form of `[class="regex.*" title="str"]`.
It is stored in a struct with a list of *tokens* which is a
attribute/value pair (stored as a `crit_token` struct). Most tokens will
also have a precompiled regex stored that will be used during criteria
matching.
for_window command: When a new view is created its metadata is tested
against all stored criteria, and if a match is found the associated
command list is executed.
Unfortunately some metadata is not available in sway at the moment
(specifically `instance`, `window_role` and `urgent`). Any criteria
string that tries to match an unsupported attribute will fail.
(Note that while the criteria code can be used to parse any criteria
string it is currently only used by the `for_window` command.)
2015-11-25 14:34:33 +01:00
Christoph Gysin
a99aa92bc6
extensions: add missing include
...
This fixes a compiler warning:
../sway/extensions.c: In function ‘set_background’:
../sway/extensions.c:16:37: warning: implicit declaration of function ‘malloc’ [-Wimplicit-function-declaration]
struct background_config *config = malloc(sizeof(struct background_config));
^
../sway/extensions.c:16:37: warning: incompatible implicit declaration of built-in function ‘malloc’
../sway/extensions.c:16:37: note: include ‘<stdlib.h>’ or provide a declaration of ‘malloc’
2015-11-25 14:39:09 +02:00
S. Christoffer Eliesen
e31a899841
layout: get_swayc_in_direction_under: Handle floating views.
2015-11-24 21:34:41 +01:00
S. Christoffer Eliesen
b5ddad4bf6
layout: swap_container: Handle floating views.
2015-11-24 21:34:41 +01:00
S. Christoffer Eliesen
ed1b0bffbc
layout: replace_child: Handle floating views.
2015-11-24 21:34:41 +01:00
S. Christoffer Eliesen
8aef255d5f
layout: add_sibling: Handle floating views properly.
...
This should fix #241 .
2015-11-24 21:34:24 +01:00
S. Christoffer Eliesen
a6c9f40b9a
sway_binding_cmp_keys: Differentiate between modifier keys.
...
Compare modifiers as well as keys when number of modifiers+keys are the
same (so that e.g. mod1+x != mod4+x).
2015-11-24 19:26:43 +01:00
S. Christoffer Eliesen
db92920cf9
handle_command: Skip commands that has a criteria string.
...
We can't handle them currently (the criteria needs to e.g. be passed to
each command handler which then needs to do the right thing), so it's
better to just do nothing than to create unexpected results (because the
command was executed on the wrong view).
(Before this patch any command list with a criteria string would simply
fail to parse, so this is at least a step in the right direction.)
2015-11-24 16:29:28 +01:00
S. Christoffer Eliesen
b7e3d05ace
stringop: Properly handle criteria strings.
...
A criteria string (e.g. '[class="something" title="something"]') is now
correctly treated as a single argument.
2015-11-24 16:12:37 +01:00
S. Christoffer Eliesen
4367e6d3e3
container: Store app_id attribute for views.
2015-11-24 16:00:41 +01:00
S. Christoffer Eliesen
47c313fe3e
container: Store class attribute for views.
2015-11-24 16:00:41 +01:00
taiyu
9d50f88cef
fix list sorting
2015-11-24 00:30:02 -08:00
S. Christoffer Eliesen
a0c5a0bb30
cmd_bindsym: Detect/handle duplicates.
...
Also replace `bindsym_sort` with function `sway_binding_cmp` that takes
all data into account when comparing.
2015-11-22 21:17:36 +01:00
S. Christoffer Eliesen
9ce5d635f1
commands: Comment/doc for config_command.
2015-11-22 15:54:31 +01:00
S. Christoffer Eliesen
5531dbe1b2
cmd_workspace: Don't fill up config->workspace_outputs with duplicates.
...
This also fixes a bug where issuing a new "workspace a output b" command
for an already assigned workspace would not work (the old config would
be found first and used instead).
2015-11-22 11:08:08 +01:00
S. Christoffer Eliesen
d0af224e6d
stringop: lenient_strcmp: Add.
2015-11-21 22:22:09 +01:00
Drew DeVault
2100d7bfef
Fix #240
2015-11-19 20:04:03 -05:00
Drew DeVault
35fd139105
Add all documented scaling modes to config parser
...
Note that not all scaling modes are actually supported by swaybg yet.
2015-11-19 18:55:58 -05:00
Drew DeVault
5728307520
Add wallpapers to output command
2015-11-19 18:55:17 -05:00
Drew DeVault
79b277fe9b
Parse output background config
2015-11-19 18:25:15 -05:00
Drew DeVault
4a1584be53
Fix background extensions
...
Thanks @Cloudef, it works great
2015-11-19 07:23:11 -05:00
Drew DeVault
65b8a5c3ce
Add background handling
...
This does not work as expected. I think the problem is on the wlc side.
Please review, @Cloudef. To reproduce the issues:
1. Run sway
2. Open terminal in sway
3. Run swaybg
swaybg will create a surface and ask to have it set as the background,
but wlc_handle_from_wl_surface_resource will return 0. If the swaybg
surface is a shell surface, then it works - but wlc complains about the
pointer type and segfaults as soon as the pre-render hook tries to draw
the background.
2015-11-18 22:14:57 -05:00
Drew DeVault
82db2a57a9
Basic support for extensions in server and clients
2015-11-18 22:01:22 -05:00
Drew DeVault
01202568f9
Track pid of child process from exec
...
This will allow us to eventually open that process on the current view.
Requires support from @Cloudef.
2015-11-16 19:40:44 -05:00
S. Christoffer Eliesen
236f26f62e
output: Support multiple adjacent outputs.
...
When querying for an adjacent output we now need an absolute position in
order to know which adjacent output that matches. (The position is
either the current mouse position or the center of the currently focused
container, depending on context.)
If two outputs have one edge each that at least partially align with
each other they now count as adjacent.
Seamless mouse is affected by this and now properly moves and positions
itself between outputs with "uneven" placement (as long as they have at
least some part of the edge adjacent to each other).
When focusing or moving a container in a specified direction the center
of the current focused container decides where to look for an adjacent
output. So if e.g. an output has two adjacent outputs to the right and a
"focus right" command is issued then it's the placement of the currently
focused container that decides which output actually gets focused.
Also, if an output has at least one output adjacent in some direction
but the entire edge is not covered (ie. it has "holes" with no outputs),
then the algorithm will choose the output that is closest to the
currently focused container (this does not apply to seamless mouse, the
pointer will just stop at the edge in that case).
2015-11-16 21:32:18 +01:00
S. Christoffer Eliesen
a94a91a723
cmd_output: Replace existing config if called multiple times.
2015-11-16 15:57:42 +01:00
Drew DeVault
cd161aa985
We somewhat more wlc_point now
...
Apparently I missed some
cc @Cloudef
2015-11-14 17:14:23 -05:00
Drew DeVault
95442dac8d
We wlc_point now
...
cc @Cloudef
2015-11-14 11:30:29 -05:00
S. Christoffer Eliesen
f64b7e71d4
ipc: Store socketname in SWAYSOCK. Fixes --get-socketpath
.
...
After adding pid to the socket path the `--get-socketpath` command broke
because it doesn't know the pid of the running instance. Fix this by
setting and querying `SWAYSOCK`.
Also ignore `SWAYSOCK` upon normal startup if a socket exists at that
location (ie. from another sway instance), and don't overwrite `I3SOCK`
if it exists either.
2015-11-13 18:18:52 +01:00
Drew DeVault
1011957465
Merge branch 'master' of github.com:SirCmpwn/sway
2015-11-13 08:17:35 -05:00
Drew DeVault
38b18d460a
Revert "Try ~/.i3/config earlier than /etc/sway/config"
...
This reverts commit f0ceb4e909
.
2015-11-13 08:17:29 -05:00
Drew DeVault
f3fc48f692
Merge pull request #225 from sce/logind_socket_path
...
ipc: Put socket into proper user runtime dir.
2015-11-13 08:15:14 -05:00
Drew DeVault
f0ceb4e909
Try ~/.i3/config earlier than /etc/sway/config
...
And ~/.config/i3/config, of course.
2015-11-13 08:09:30 -05:00
S. Christoffer Eliesen
253204efb9
ipc: Put socket into proper user runtime dir.
2015-11-13 14:07:18 +01:00
Drew DeVault
c43ef2aedd
We don't need to implement strdup
...
After defining _GNU_SOURCE
2015-11-12 19:43:03 -05:00
Drew DeVault
bfcabe48ef
Start fleshing out wayland client implementation
...
This introduces a basic shared framework for making wayland clients
within sway itself.
2015-11-12 19:04:01 -05:00
Drew DeVault
ef8335d694
Start working on IPC for get_pixels
...
This is broken
2015-11-12 12:37:23 -05:00
Drew DeVault
250097d32b
Fix gaps for views being incorrect
2015-11-12 08:02:39 -05:00
Drew DeVault
4397cff7bc
Fix some IPC issues
...
Socket now includes pid in the filename (fixes nested sway sessions or
old sockets causing problems).
Fixed warnings on strict aliasing and cleaned up relevant code in
general.
2015-11-11 08:43:36 -05:00
Drew DeVault
d729032ba2
Add file and line number to log in Debug build
2015-11-11 08:32:32 -05:00
Mikkel Oscar Lyderik
d5b5d92b30
Include header declaring ipc_event_workpace(2)
2015-11-04 21:12:25 +01:00
S. Christoffer Eliesen
abc5fbfaec
Learn "gaps edge_gaps <on|off|toggle>".
...
When yes, the old behaviour of adding half the inner gap around each
view is used.
When no, don't add any gap when an edge of the view aligns with the
workspace. The result is inner gap only between views, not against the
workspace edge.
The algorithm is not perfect because it means the extra space is
distributed amongst edge-aligned views only, but it's simple, looks good
and it works.
2015-11-04 13:21:10 +01:00
S. Christoffer Eliesen
eeec0fda8a
commands: gaps: Re-arrange windows after changing default gaps.
2015-11-04 01:32:38 +01:00
S. Christoffer Eliesen
936f8c24e0
commands: gaps: Always apply default gaps config.
2015-11-04 01:32:37 +01:00
S. Christoffer Eliesen
5c1e20b6ff
commands: gaps: Accept zero value.
2015-11-04 01:32:37 +01:00
S. Christoffer Eliesen
820681965d
commands: gaps: Refactor, expected_syntax.
2015-11-04 01:32:37 +01:00
S. Christoffer Eliesen
af31a3f04a
commands: Learn 'move workspace to output <direction|name>'.
2015-11-03 22:38:53 +01:00
S. Christoffer Eliesen
9c8394022e
commands: Learn 'move <container|window> to output <direction|name>'.
2015-11-03 22:38:53 +01:00
taiyu
65d71d0a5e
put ipc_event_workspace in update_focus
2015-11-02 11:28:51 -08:00
S. Christoffer Eliesen
5ba47d4a44
input_state: Remove mouse_origin (x&y). Query wlc instead.
2015-10-29 18:02:02 +01:00
S. Christoffer Eliesen
78ca619769
commands: Learn mouse_warping.
...
Place mouse at center of focused view when changing to a workspace on a
different output, if option is enabled. (This replicates existing i3
option.)
This can be triggered in multiple ways:
A) via `workspace <name>` which changes output
B) via `focus <direction>` which changes output
C) via `focus output <name>` which (obviously) changes output
2015-10-29 17:41:33 +01:00
S. Christoffer Eliesen
4799d07ac1
input_state: Extract 'pointer_position_set' function from handlers.
2015-10-29 16:37:19 +01:00
S. Christoffer Eliesen
865b30f138
container: Move container_under_pointer here from handlers.
2015-10-29 16:37:19 +01:00
S. Christoffer Eliesen
3c250e78be
layout: get_swayc_in_direction: Properly find adjacent outputs.
2015-10-29 16:20:48 +01:00
S. Christoffer Eliesen
5fa8f91655
commands: Learn 'focus output <direction|name>'
2015-10-28 20:06:48 +01:00
S. Christoffer Eliesen
fede354a3d
layout: Don't reset container size if it's a floating window.
2015-10-28 20:06:48 +01:00
S. Christoffer Eliesen
fabcf7c678
handlers: Pass workspace to workspace_switch, not output.
2015-10-27 23:22:57 +01:00
Drew DeVault
6cd106d23c
Merge pull request #208 from minus7/ipc_subscribe
...
implemented IPC subscribe for workspace event
2015-10-27 17:19:18 -04:00
minus
9925554ea4
implemented IPC subscribe for workspace event
2015-10-27 21:59:17 +01:00
S. Christoffer Eliesen
9f02b0bf16
commands: Learn 'debuglog'.
...
Replicates i3 option. Verbosity level given as command line argument
becomes default log level, and using 'debuglog toggle' switches back and
forth between default and debug (or L_ERROR and debug if default is also
L_DEBUG).
2015-10-27 14:37:44 +01:00
S. Christoffer Eliesen
83ca7d3a5c
output: Fix code style.
2015-10-25 13:57:11 +01:00
S. Christoffer Eliesen
c49e5340db
commands: cmd_move: Fix "move container to workspace _number_ n"
...
This is an undocumented feature (the word "number" is just ignored
anyway), but it exists to be compatible with i3 config syntax.
Plus some code cleanup at the same time.
2015-10-25 13:19:48 +01:00
S. Christoffer Eliesen
5a70853253
log: Add swayc_log, use at a few key places.
...
swayc_log works just like sway_log, but appends type and name from given
container to the log output.
2015-10-25 13:14:28 +01:00
S. Christoffer Eliesen
c6bb23b7dd
sway/output: Create, move code from handlers.c here.
2015-10-25 13:14:23 +01:00
Drew DeVault
010368150b
Update set_origin to match wlc changes
2015-10-23 14:29:35 -04:00
S. Christoffer Eliesen
c1479701de
seamless_mouse: Move pointer only if successfully changed workspace.
...
If e.g. a window has a popup open then that will lock the current focus,
making a workspace switch denied.
So don't move the mouse pointer in such cases.
2015-10-23 16:35:48 +02:00
S. Christoffer Eliesen
1f08106b0a
handlers: Don't switch output when mouse button is pressed.
...
(E.g. if the user is using a scrollbar at the edge of the screen then
switching workspace would cancel the scroll.)
2015-10-23 16:35:48 +02:00
S. Christoffer Eliesen
362413bd50
commands: cmd_results->input is duplicated/freed.
2015-10-23 13:03:14 +02:00
S. Christoffer Eliesen
88a2ddbe83
commands: Code formatting.
2015-10-23 12:55:48 +02:00
S. Christoffer Eliesen
187f0ab1c4
commands: Allow 'floating_modifier' & 'focus_follows_mouse' at runtime.
2015-10-23 12:45:46 +02:00
S. Christoffer Eliesen
af30a1b67c
ipc,commands,config: Replace cmd_status enum with cmd_results struct.
...
In i3 the ipc reply will contain a human readable error message, and
this patch replicates that behaviour.
However, that error message is also useful for logging, which this
patch takes advantage of.
E.g. instead of logging errors directly in commands.c/checkargs, it is
fed back to the caller which eventually ends up logging everything with
maximum context available (config.c/read_config).
So instead of logging e.g. "Error on line 'exit'" it will now log:
"Error on line 'exit': Can't execute from config."
2015-10-22 23:36:24 +02:00
S. Christoffer Eliesen
544c6c412a
ipc: Return correct status in ipc reply.
2015-10-22 23:36:24 +02:00
S. Christoffer Eliesen
b093a5d16f
handlers: Fix swapped top/bottom for seamless transitions.
2015-10-22 23:07:27 +02:00
Drew DeVault
2c100105bf
Move pointer during seamless transitions
2015-10-22 16:44:29 -04:00
S. Christoffer Eliesen
edf33aad29
config: Add "seamless_mouse" to decide if pointer crosses output edges.
2015-10-22 01:39:12 +02:00
S. Christoffer Eliesen
fc1bacf034
Switch to adjacent output when hitting output edge.
...
(Currently, after switching output the relative position of the mouse
stays the same.)
2015-10-22 01:18:51 +02:00
S. Christoffer Eliesen
9b271573a9
commands: Allow changing resolution outside config load.
2015-10-22 00:16:10 +02:00
S. Christoffer Eliesen
4fea92ef0c
config: Don't try to apply bad output resolution.
2015-10-21 23:59:01 +02:00
S. Christoffer Eliesen
ca862a5bd4
config: Apply output config also during config reload.
2015-10-21 23:24:06 +02:00
S. Christoffer Eliesen
6eb8da0e14
commands,container: Tweak debug output to better reflect reality.
2015-10-21 22:22:01 +02:00
S. Christoffer Eliesen
e3837ba634
commands: Gracefully handle empty commands.
...
Before this patch sway would proceed into find_handler which would cause
a crash trying to parse a NULL string.
This could be triggered via e.g. `i3-msg -s $(sway --get-socketpath)`.
2015-10-19 19:45:35 +02:00
Drew DeVault
83c23f274c
Merge pull request #195 from sce/get_socketpath
...
main: Implement --get-socketpath switch.
2015-10-18 14:25:57 -04:00
S. Christoffer Eliesen
3be11a08e6
main: Implement --get-socketpath switch.
2015-10-18 19:53:56 +02:00
S. Christoffer Eliesen
71ebe8c36b
commands: Catch empty exec with --no-startup-id cases.
2015-10-18 19:14:49 +02:00
S. Christoffer Eliesen
71bcee4f96
commands: Ignore exec switch "--no-startup-id".
...
When using an i3 config verbatim in sway this switch to exec or
exec_always might appear.
Before this patch the switch would be passed to /bin/sh, causing
an error, and the command would not be run.
2015-10-17 14:28:38 +02:00
S. Christoffer Eliesen
783290e81a
sway/ipc: Use sway_abort instead of returning NULL.
2015-10-16 13:23:08 +02:00
S. Christoffer Eliesen
7cb0732030
sway/ipc: ipc_user_sockaddr: Use sway_assert instead of assert.
2015-10-16 13:07:50 +02:00
S. Christoffer Eliesen
382b4e425a
sway/ipc: Fix whitespace.
2015-10-16 13:06:30 +02:00
S. Christoffer Eliesen
26beb66eb5
sway/ipc: Free ipc_sockaddr upon termination.
2015-10-16 12:16:18 +02:00
S. Christoffer Eliesen
f94f8fde7e
sway/ipc: Support multiple users.
2015-10-16 12:16:16 +02:00
S. Christoffer Eliesen
ae93c6e6fe
sway/ipc: Dynamically assign ipc_sockaddr.
2015-10-16 12:15:11 +02:00
taiyu
18f4905e62
#187 , let init handle child processes
2015-10-08 08:12:31 -07:00
Drew DeVault
5bcecbb751
Revert " #187 cleanup zombies properly"
2015-10-08 06:24:35 -04:00
taiyu
5539fd89be
#187 cleanup zombies properly using default
2015-10-07 16:18:57 -07:00
taiyu
c963aa7ced
return after disconnect ipc client and minor checks
2015-09-29 07:19:10 -07:00
taiyu
4944996170
Merge branch 'master' of https://github.com/taiyu-len/sway
...
merge
2015-09-22 09:41:32 -07:00
taiyu
6c33f8122a
#184
2015-09-22 09:41:01 -07:00
taiyu
72aaffcf5b
fix config search paths
2015-09-20 10:56:22 -07:00
taiyu
9fd2d635a1
container_move check
2015-09-18 11:34:57 -07:00
taiyu
7672886cb5
dont log empty config lines
2015-09-18 08:33:28 -07:00
taiyu
0d51f62224
merge + no c_extensions
2015-09-18 07:23:04 -07:00
taiyu
d2e2b04bfd
minor fix
2015-09-18 06:52:04 -07:00
Drew DeVault
318e1be240
Fix warnings introduced by prior commit
2015-09-18 07:27:35 -04:00
Drew DeVault
8e25ce4e57
Fix build for debian stretch
...
Fixes #182
2015-09-18 07:16:20 -04:00
taiyu
a04f645d7c
style, safer fork
2015-09-15 06:56:51 -07:00
taiyu
a18caf6706
nomacro
2015-09-15 06:39:24 -07:00
taiyu
0bea2e2122
multi command keybinds
2015-09-14 19:59:25 -07:00
Drew DeVault
e505abfe75
Revert "new_workspace null behavior + testmap functions + regex"
...
This reverts commit e1d18e42a8
.
Fixes #180
cc @taiyu-len
2015-09-13 19:46:16 -04:00
taiyu
2093d4ddee
cmd_for_window dummy function
2015-09-12 02:45:03 -07:00
taiyu
e1d18e42a8
new_workspace null behavior + testmap functions + regex
2015-09-12 02:38:03 -07:00
taiyu
aaa0923bc4
cmd status + workspace ws output op
2015-09-10 11:07:40 -07:00
taiyu
6388241abb
mode supports multi token names
2015-09-08 10:53:15 -07:00
taiyu
799ff640f8
remove old things
2015-09-08 10:28:53 -07:00
taiyu
aa22dc3113
var replacement changes
2015-09-08 10:27:09 -07:00
taiyu
fd6d06ff61
fix missing symbol bug
2015-09-08 09:52:33 -07:00
taiyu
da76ecb5f8
escape check fix
2015-09-08 09:10:36 -07:00
taiyu
d673a72705
set variable changes
2015-09-08 08:54:57 -07:00
Thomas Wouters
c3f76f8785
fix outut typo
2015-09-08 14:37:20 +02:00
taiyu
0de29d8247
prevent views from disappearing
2015-09-07 15:22:15 -07:00
taiyu
3eb29ea736
strdup + style
2015-09-07 15:03:04 -07:00
taiyu
47ff000697
put strip_whitespace back
2015-09-07 14:40:23 -07:00
taiyu
71af5b7dde
config modes
2015-09-07 14:29:40 -07:00
taiyu
3fb8397724
free config stuff
2015-09-07 06:52:27 -07:00
taiyu
b7de289332
free config when reloading
2015-09-06 23:22:02 -07:00
taiyu
5408d34c9c
config_path cleanup
2015-09-06 22:48:43 -07:00
taiyu
3e9cdfd6a3
man page
2015-09-06 06:52:20 -07:00
taiyu
f25c6b312b
gap resize
2015-09-05 20:48:52 -07:00
taiyu
afa6747145
enum for command type
2015-09-04 17:09:07 -07:00
taiyu
c5d0b5d437
style
2015-09-04 17:02:02 -07:00
taiyu
4cd18449d2
better handling of commands during config
2015-09-04 16:57:03 -07:00
taiyu
dbeca88dee
default gap value
2015-09-04 16:14:59 -07:00
taiyu
782729be13
properly free cmd_queue, should partially fix #165 from what i tell from its log.
2015-09-02 08:51:26 -07:00
Drew DeVault
1756a4f2da
fclose /proc/modules when we're done with it
2015-09-02 11:47:15 -04:00
Drew DeVault
4ef60e7c09
Add check for nvidia module and warn user
2015-09-02 11:46:21 -04:00
Drew DeVault
47c7ed9f3a
Do not set FD_CLOEXEC
2015-09-02 10:47:02 -04:00
Drew DeVault
eb003689a3
Log sway version on startup
2015-09-02 09:42:27 -04:00
Drew DeVault
930f42ae81
Remove stropts.h from ipc.c
...
Apparently it's not required, and for some reason Fedora doesn't have
it. Fixes #162
2015-09-02 07:37:41 -04:00
taiyu
972748e674
cleaned up leaky prev_workspace_name
2015-09-01 09:02:26 -07:00
taiyu
09c9ee76c3
properly remove children in loops
2015-08-31 08:49:24 -07:00
Luminarys
12e96f0f9e
Added in workspace_auto_back_and_forth
2015-08-30 21:34:24 -05:00
Luminarys
23f040133d
Removed unnecessary debug line
2015-08-30 20:02:31 -05:00
Luminarys
fe2ec8a676
Added in workspace back_and_forth
2015-08-30 19:59:14 -05:00
taiyu
7fbb8b785e
#154 destroy view handler properly destroys views
2015-08-30 16:28:21 -07:00
taiyu
f787fac8fc
#153 add "ctrl" and "alt" to modifiers struct
2015-08-30 13:20:56 -07:00
Luminarys
28e937020a
Made scratchpad handling identical to i3
2015-08-29 21:14:13 -05:00
taiyu
79da7f112a
#151 fix
2015-08-29 06:51:37 -07:00
Drew DeVault
6b962ebd22
Merge pull request #150 from Luminarys/master
...
Added in Scratchpad
2015-08-29 06:51:16 -04:00
taiyu
836f24b047
#149 change focus before pointer_mode
2015-08-28 23:43:52 -07:00
taiyu
9acd3d2068
#149 fix, reorder floating windows on click.
2015-08-28 23:01:48 -07:00
taiyu
1924399166
#148 fix, choose non-floating view for inserting container
2015-08-28 22:51:36 -07:00
Luminarys
167409702f
Fixed move scratchpad and added in scratchpad show
2015-08-29 00:33:33 -05:00
Luminarys
7eefecf479
Added in scratchpad adding
2015-08-28 23:39:12 -05:00
taiyu
63e735270c
move v3
2015-08-28 19:35:29 -07:00
taiyu
e0d5486957
default floating_mod
2015-08-28 14:45:40 -07:00
taiyu
da2d992563
style
2015-08-28 12:31:41 -07:00
taiyu
b359429e90
fix issue #140 , dont set pointer mode if no floating_mod
2015-08-28 12:30:59 -07:00
taiyu
28c22c8f80
style
2015-08-28 11:14:59 -07:00
taiyu
c9de300888
layout fix for a certain case
2015-08-28 11:11:26 -07:00
taiyu
076cf78d7c
dont move floating contaienrs
2015-08-28 11:04:58 -07:00
taiyu
1820b3f0bb
move function redone
2015-08-28 11:03:10 -07:00
taiyu
4757ea6a12
forgot visibility of floating containers
2015-08-27 23:42:26 -07:00
taiyu
5678d824e4
update visibility + container info functions
2015-08-27 23:18:28 -07:00
taiyu
dfe0dda8d0
proper visibility update
2015-08-27 20:55:48 -07:00
taiyu
da79bd65de
use previous outputs
2015-08-27 20:32:56 -07:00
Luminarys
acb3fbdfb5
Added in default_orientation handling
2015-08-27 21:52:59 -05:00
taiyu
0a74364656
update visibility for moved workspaces
2015-08-27 08:32:06 -07:00
taiyu
08faffdd76
dont swap floating containers
2015-08-27 07:10:17 -07:00
taiyu
d115335951
move workspace from dead output to other output
2015-08-26 21:25:57 -07:00
Luminarys
42de135c3a
Added in better versioning info
2015-08-26 21:13:53 -05:00
taiyu
4df64127e9
slight fix
2015-08-26 16:50:47 -07:00
taiyu
274e56a602
fixed move_container bug, log prints before aborting
2015-08-26 16:27:01 -07:00
minus
6bbfd65735
fixed container_map
...
applies to the passed in container now as well.
fixes workspaces staying always marked visible.
also set workspaces to not visible by default; happens when you move a
container to a new workspace that thus is not visible
2015-08-27 00:44:47 +02:00
minus
873a51f7e2
converted IPC to use json-c
...
get_workspaces and get_outputs
2015-08-27 00:41:07 +02:00
minus
2289029fab
added json-c lib and implemented IPC get_version
2015-08-26 23:49:38 +02:00
taiyu
357af228d6
some function documentation, fixed gaps on config reload
2015-08-26 13:35:22 -07:00
taiyu
1fa7a91bfb
move_container_to fixup
2015-08-26 11:01:26 -07:00
Drew DeVault
c4257055eb
Merge pull request #135 from Luminarys/master
...
Added in build version based on git hash
2015-08-26 10:18:06 -04:00
Drew DeVault
adcf89cfe4
Do not pass modifiers when getting keysyms from wlc
...
Fixes #124
Keyboard handling can likely be simplified after this change.
2015-08-26 08:24:23 -04:00
Luminarys
38cfdf99f4
Added in build version based on git hash
2015-08-25 22:04:57 -05:00
taiyu
e121258426
longopt minor fix
2015-08-25 16:39:05 -07:00
Drew DeVault
10eb58667b
Merge pull request #133 from minus7/wlc-keyboard-fix
...
fixed keyboard handling
2015-08-25 16:39:25 -04:00
minus
bfdff821c3
fixed keyboard handling
...
handle_key does not get the keysym from wlc anymore
2015-08-25 22:38:16 +02:00
taiyu
225c2fbe5b
fixed segfault on exit + a little fixup of that floatfocus pr
2015-08-25 13:29:33 -07:00
Drew DeVault
0bf380a0b1
Merge pull request #131 from nicklaswj/master
...
Focus floating window, if any, when the last tiling window has been closed
2015-08-25 16:13:06 -04:00
Nicklas Warming Jacobsen
227d5dbe08
code style clean up
2015-08-25 22:00:39 +02:00
minus
9535305137
fixed moving to other output and visibility
2015-08-25 20:43:37 +02:00
Nicklas Warming Jacobsen
a70b9a9a7a
removed stupid test code
2015-08-25 20:25:38 +02:00
Nicklas Warming Jacobsen
7a1c36716a
Focus floating window, if any, when the last tiling has been closed
2015-08-25 20:15:23 +02:00
minus
ca89ba83a8
changed view visibility to be bool
...
view_visibility enum remains with one constant that is the mask to wlc's view masking
2015-08-25 20:13:35 +02:00
minus
e533014201
added missing util.h/c stuff
2015-08-25 19:53:59 +02:00
minus
e854a54e96
changed workspace_{outout_,}{next,prev} to return workspace
...
so it can be reused for "move container to workspace next"
2015-08-25 19:00:20 +02:00
minus
03e4a97dbe
added "move container to workspace"
...
makes the previous commit actually testable
2015-08-25 18:25:36 +02:00
minus
f22c937953
refactored view visibility
...
- replace visibilty mask integers with an enum
- set output's visibilty mask on creation
- added update_visibility to manually update a containers visibility (e.g. when it moved to an invisible workspace)
2015-08-25 18:24:15 +02:00
minus
1efda79bf2
refactored workspace_next/prev
2015-08-25 15:17:18 +02:00
Luminarys
7c5b6f8c52
Added in backtrace printing
2015-08-24 15:44:58 -05:00
taiyu
dbad30a409
add limit to swayc_in_direction
2015-08-24 01:11:21 -07:00
taiyu
b054ac9d49
Merge branch 'master' of https://github.com/SirCmpwn/sway
...
merge
2015-08-23 19:11:06 -07:00
taiyu
c8415d7fef
split_string memory leaks cleanedup
2015-08-23 19:09:18 -07:00
Drew DeVault
f30fb2452c
Minor fixes to keyboard handling
2015-08-23 15:52:36 -04:00
taiyu
51ab3c9180
merge
2015-08-23 12:34:18 -07:00
Drew DeVault
1ac0c8cd47
Refactor keyboard to consider modified keysyms
...
Press Shift
Press 0 # Reads as ')'
Release Shift
Release 0 # Reads as '0' but we now recognize it as the same
2015-08-23 15:28:49 -04:00
Drew DeVault
663f53b22a
Merge pull request #123 from Luminarys/master
...
Added in output disabling
2015-08-23 14:34:20 -04:00
Luminarys
7a21388997
Minor fix
2015-08-23 13:32:47 -05:00
Luminarys
5bfed9b213
Cleanup and minor adjustments to disabling
2015-08-23 13:18:07 -05:00
Drew DeVault
e78221e6a0
Prefix log events from wlc with [wlc]
2015-08-23 13:31:16 -04:00
Luminarys
e01cf0b566
Added in glitchy disabling
2015-08-23 12:23:01 -05:00
Luminarys
98fad060e2
Added in glitchy disabling
2015-08-23 12:23:01 -05:00
Drew DeVault
e232241466
Do not log with colors unless stdout is a tty
2015-08-23 13:17:53 -04:00
Drew DeVault
ac2034df99
Handle wlc log events
2015-08-23 13:08:04 -04:00
taiyu
d72cc92541
style
2015-08-23 07:59:18 -07:00
taiyu
299406a048
slight fix
2015-08-22 22:32:41 -07:00
taiyu
f53ce887e8
fixed container resize oddity
2015-08-22 22:14:59 -07:00
taiyu
f24b78898a
dont swap view with workspace...
2015-08-22 21:54:39 -07:00
taiyu
a4ded14991
small change
2015-08-22 21:23:22 -07:00
taiyu
f1e38be09f
no mode for fullscreen
2015-08-22 21:16:46 -07:00
taiyu
42d5d9a177
mouse tile resize mode done
2015-08-22 21:03:45 -07:00
taiyu
36cd180f02
fixed vanishing floating view
2015-08-22 18:25:05 -07:00
taiyu
e139de0857
floating/tiling move + floating resize cleaned and fixed
2015-08-22 18:01:38 -07:00
Drew DeVault
1fd5962aeb
Fix minor bug with output positioning
2015-08-22 15:21:56 -04:00
Drew DeVault
07229edfe6
Implement output positioning
...
🎉
2015-08-22 15:19:02 -04:00
Drew DeVault
eac0920f49
Set x/y positions for output containers
2015-08-22 14:44:47 -04:00
Drew DeVault
232940f813
Whoops
...
Regards to @Cloudef
2015-08-22 14:03:51 -04:00
Drew DeVault
b7f4607544
Implement output configuration through config
...
Do not use `output res WIDTHxHEIGHT` yet, wlc has issues with it (cc
@Cloudef)
2015-08-22 11:18:55 -04:00
Luminarys
c0b68aa6fc
Added in bspwm like view swapping
2015-08-22 01:03:18 -05:00
Luminarys
f6b16ca089
Refactored resizing functions into resize.c
2015-08-21 22:26:11 -05:00
Luminarys
ad1ca31dd5
Altered resize command to prevent resizing past min h/w
2015-08-21 21:22:29 -05:00
Luminarys
e067913fb8
More resize fixes
2015-08-21 20:50:17 -05:00
Luminarys
63a3236064
Fixed resizing
2015-08-21 19:37:19 -05:00
Drew DeVault
2a799a731f
Remove wlc logging stuff
2015-08-21 18:24:54 -04:00
Drew DeVault
39041d07b5
Merge remote-tracking branch 'taiyu-len/master'
2015-08-21 17:00:00 -04:00
Luminarys
f7a6dd7ce9
Minor fix to resizing with mouse
2015-08-21 15:36:37 -05:00
taiyu
b05317c3a6
style
2015-08-21 12:41:54 -07:00
taiyu
de5196dc1e
comments + fixed leak
2015-08-21 12:19:29 -07:00
taiyu
d2e1c660b1
swayc_is_fullscreen
2015-08-21 10:45:18 -07:00
taiyu
dde8bfe728
check floating mod for resizing windows, and dont send click
2015-08-21 10:34:37 -07:00
taiyu
5a67628ad9
Merge branch 'master' of https://github.com/SirCmpwn/sway
...
merge
2015-08-21 10:28:49 -07:00
taiyu
1a1ac64662
bugfixes, renames
2015-08-21 10:28:37 -07:00
Luminarys
ad72abb58f
Removed ugly intializer for pointer_state
2015-08-21 11:31:05 -05:00
Drew DeVault
1c38b7a8d2
Merge pull request #111 from Luminarys/master
...
Added in proper resize locking
2015-08-21 12:23:53 -04:00
Luminarys
a8eab5492a
Added in proper resize locking
2015-08-21 11:19:06 -05:00
minus
8dfaf6265b
fixed #108 signed/unsigned comparison
2015-08-21 16:53:11 +02:00
Luminarys
97bd548456
More minor fixes
2015-08-21 09:26:22 -05:00
Luminarys
de86c5f4ea
Cleanup and minor fixes
2015-08-21 09:24:26 -05:00
Drew DeVault
6278922f7a
Fix clang warnings
...
These particular warnings have always struck me as stupid
2015-08-21 08:24:48 -04:00
Drew DeVault
a436fc17ff
Merge pull request #105 from Half-Shot/master
...
Basic 'move' functionality.
2015-08-21 07:24:17 -04:00
Drew DeVault
0266b0666a
Fix compiler warnings (which were really errors)
2015-08-21 07:15:00 -04:00
Drew DeVault
464b49eda2
Merge pull request #101 from Luminarys/master
...
Added in basic resizing command.
2015-08-21 07:12:05 -04:00
Luminarys
96ab21b276
Fixes to resizing and added in resize lock once boundaries are exceeded
2015-08-21 00:49:47 -05:00
Luminarys
461da7f87f
Added in bspwm like mouse resizing
2015-08-21 00:17:26 -05:00
Luminarys
f589731f29
Rewrite of resize command to make it more sane
2015-08-20 21:37:59 -05:00
Half-Shot
68213d57c5
Fixed style errors
2015-08-20 22:29:36 +01:00
Drew DeVault
3a5fce339f
Reset key buffer on reload
...
To preserve my sanity
2015-08-20 17:14:46 -04:00
Half-Shot
713bf29ec9
Few stray bits
2015-08-20 21:45:00 +01:00
Half-Shot
5a9ba261bc
Merge branch 'master' of https://github.com/SirCmpwn/sway
2015-08-20 21:32:08 +01:00
Half-Shot
2a62c5c7fb
Basic left right move command implemented.
2015-08-20 21:29:40 +01:00
minus
754793aad4
added IPC messages get_workspaces and get_outputs
...
No escaping on container names is done yet, as well as some values are
hardcoded because they don't exist yet.
2015-08-20 21:13:01 +02:00
taiyu
36e07e9ebc
find_parent_by_type
2015-08-20 09:52:54 -07:00
Luminarys
c9935507f2
Style fixes
2015-08-20 11:42:01 -05:00
Luminarys
d06732e1a8
Altered incorrect comment
2015-08-20 11:35:01 -05:00
Luminarys
bc3babf566
Added in basic resize command
2015-08-20 11:30:32 -05:00
minus
4c56cd0ed6
set I3SOCK for i3-msg compatibility
2015-08-20 15:27:59 +02:00
minus
6ab968e63e
fixed formatting
2015-08-20 15:27:59 +02:00
minus
f26ed32e46
added sway_terminate to exit cleanly
2015-08-20 15:27:56 +02:00
minus
70f046c87a
set IPC client sockets to close on exec
2015-08-20 15:24:33 +02:00
minus
91c0877264
properly exit sway
...
- wlc_terminate() instead of exit(0)
- unlink IPC socket
2015-08-20 15:24:33 +02:00
minus
bfbadadf70
use env var SWAYSOCK if available
...
or fall back to /tmp/sway-ipc.sock
2015-08-20 15:24:33 +02:00
minus
773e85c681
properly handle IPC clients
2015-08-20 15:24:33 +02:00
minus
5d99215469
added i3-ipc support/parsing
2015-08-20 15:24:33 +02:00
minus
8981b48cd2
very basic IPC implementation
...
simply executes the received data as command
2015-08-20 15:24:33 +02:00
Drew DeVault
579fe70ed9
Add command line parsing
...
Closes #6
2015-08-20 08:37:24 -04:00
taiyu
927ef0a5ec
Merge branch 'master' of https://github.com/SirCmpwn/sway
...
merging
2015-08-20 05:08:04 -07:00
Drew DeVault
95f5660897
Merge pull request #97 from taiyu-len/master
...
setup for resizable windows, drop weight
2015-08-20 08:07:16 -04:00
taiyu
f5fde7c45c
style
2015-08-20 05:06:22 -07:00
taiyu
f6e002fb8b
small fix, default width/height 0
2015-08-20 04:57:01 -07:00
taiyu
b76dcf6e0f
unnessesary log
2015-08-20 04:50:15 -07:00
taiyu
fbaa9111a8
setup for resizable windows, drop weight
2015-08-20 04:47:36 -07:00
Drew DeVault
85ae987515
Fix compiler warning
2015-08-20 07:38:40 -04:00
Drew DeVault
14947c92aa
Merge pull request #94 from taiyu-len/master
...
input_state.ch, and command conflicts resolved
2015-08-20 07:38:04 -04:00
taiyu
ba6034e8c8
changes
2015-08-20 04:24:39 -07:00
KoffeinFlummi
3c124d9e7d
Change gap behaviour to more closely match i3-gaps
...
Previously, when only using inner gaps, the gap between a window at the
edge of the output was only half the size of the gaps between views.
Additionally, the gaps between the actual windows was twice as wide as
it was on i3-gaps.
2015-08-20 08:47:51 +02:00
taiyu
1d9b73ed67
remove debug message
2015-08-19 20:31:28 -07:00
taiyu
686780f12d
another small fix to move_focus
2015-08-19 20:29:24 -07:00
taiyu
66e82a68fc
small fix
2015-08-19 20:28:05 -07:00
taiyu
5ff0619ca1
input state, find_container_in_direction
2015-08-19 20:22:15 -07:00
taiyu
470b4dfbae
key_state.ch, and command conflicts resolved
2015-08-19 18:59:27 -07:00
Drew DeVault
4db89b5fe4
Deal with more xkb bullshit
2015-08-19 21:14:34 -04:00
Drew DeVault
e5d3074d70
Whitelist a handful of characters for keys
...
Ones that don't change when you hold shift
2015-08-19 21:04:34 -04:00
Luminarys
29b6b2f37b
Fixed mode_toggle
2015-08-19 19:57:39 -05:00
Drew DeVault
1d8591d902
Improve key handling somewhat
...
XKB is fucking bullshit
2015-08-19 20:52:52 -04:00
Drew DeVault
84a778b688
Improve key buffer handling
2015-08-19 20:12:05 -04:00
Drew DeVault
2dabca03f4
Remove logging of all key presess
...
This makes the logs a bit too hard to read
2015-08-19 19:55:40 -04:00
Drew DeVault
057d2e529d
Merge pull request #92 from z33ky/master
...
A couple of cppcheck issues
2015-08-19 19:30:26 -04:00
Alexander 'z33ky' Hirsch
f85d0740a8
Fix potential memory leak
2015-08-20 02:30:22 +02:00
Alexander 'z33ky' Hirsch
22675b0111
Minor style fix
2015-08-20 02:30:22 +02:00
Alexander 'z33ky' Hirsch
c068f47ce3
Fix potential crash when toggling fullscreen mode
2015-08-20 02:30:22 +02:00
Drew DeVault
74c9df0c07
Fix error with workspace/output name matching
2015-08-19 19:29:55 -04:00
taiyu
6f424ff6b8
fixed default active_workspace, and more use of set_focused_container_for(...)
2015-08-19 16:15:17 -07:00
taiyu
b79a49a394
use enums for pointer click names
2015-08-19 15:44:13 -07:00
taiyu
a31f23f90c
fixed active_workspace update on focus change
2015-08-19 15:22:55 -07:00
taiyu
269d6ba4ea
fixed
2015-08-19 13:27:06 -07:00
taiyu
48a983316c
floating mode_toggle
2015-08-19 13:02:29 -07:00
Luminarys
c29214f348
Minor style fix
2015-08-19 14:14:54 -05:00
Drew DeVault
4ac920827d
Merge pull request #89 from taiyu-len/master
...
reset floating view on floating_mod repress
2015-08-19 15:09:14 -04:00
taiyu
e53a95c60d
style
2015-08-19 11:15:13 -07:00
taiyu
7bbb102e2d
reset floating view on floating_mod repress
2015-08-19 10:45:40 -07:00
aouelete
acbcf17905
Fixed config path
2015-08-19 13:41:58 -04:00
taiyu
8f529536e3
pointer uses its own modifiers
2015-08-19 10:27:53 -07:00
Luminarys
daea22bc89
Resize lock fixes
2015-08-19 12:06:00 -05:00
Luminarys
9542f8746a
Added in resize locking
2015-08-19 11:28:04 -05:00
taiyu
289aab9f0a
removed debug which shouldnt be there
2015-08-19 09:21:44 -07:00