Commit graph

1227 commits

Author SHA1 Message Date
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
Drew DeVault
eb268e8d50 Merge pull request #327 from mikkeloscar/bar-colors
Implement bar option: colors {}
2015-12-15 07:51:40 -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
Drew DeVault
cfba09a4ac Merge pull request #326 from mikkeloscar/remove-spaces
Remove a couple of unwanted spaces
2015-12-15 07:03:00 -05: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
Drew DeVault
18b4959578 Merge pull request #322 from mikkeloscar/default-bar-config
Move default bar config to bar creation.
2015-12-14 19:10:29 -05: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
Drew DeVault
0b5c695d8e Merge pull request #321 from gpyh/bar_cmds
Added bar_cmd_bindsym
2015-12-14 18:21:04 -05: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
Drew DeVault
fa0f57cd04 Merge pull request #319 from mikkeloscar/bar-mode
Implement bar option: mode <dock|hide|invisible>
2015-12-14 16:47:28 -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
Drew DeVault
fc9908a40a Merge pull request #318 from mikkeloscar/bar-hidden-state
Implement bar option: hidden_state <hide|show>
2015-12-14 13:59:11 -05:00
Mikkel Oscar Lyderik
d6cd37d873 Implement bar option: hidden_state <hide|show> 2015-12-14 19:52:25 +01:00
Drew DeVault
966971f07d Merge pull request #317 from mikkeloscar/bar-id-option
Implement bar option: id <custom-id>
2015-12-14 13:09:59 -05: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
Drew DeVault
89025facbf Merge pull request #316 from Streetwalrus/fglrx
Detect proprietary AMD drivers too
2015-12-14 11:24:52 -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
Drew DeVault
5fbac4a17c Merge pull request #315 from mikkeloscar/fix-whitespace
Use tabs instead of spaces
2015-12-14 10:41:35 -05: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
Drew DeVault
ff8fa91708 Merge pull request #310 from fluxchief/set-focused-container-fix
Fix dangling pointer on focus swap/describe WS
2015-12-14 08:09:14 -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
93ac7d43a8 Fix rendering of borders on workspaces (swaybar) 2015-12-13 17:07:36 -05: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