e43c20134a
remove unnecessary parens
7 years ago
14511da75d
send scroll events to swaybar blocks
7 years ago
79a998849b
make hotspot callback take an x11 button id
7 years ago
255dc8bbb0
swaybar: Read urgent colors from IPC
7 years ago
c73a40555f
swaybar/bg: Fix crash on DPMS off
...
When turning off displays via DPMS, swaybar and swaybg still tried to
render, but did not get a valid buffer, causing them to crash.
7 years ago
63b4bf5000
Update for swaywm/wlroots#1126
7 years ago
1b4c289482
Fix swaybar teardown when workspace buttons hidden
7 years ago
78c08fb0a2
Implement mode --pango_markup
7 years ago
e012b05b00
Swaybar: Respect pango_markup config
...
Makes swaybar respect the user's pango_markup configuration in the
workspace buttons and binding mode indicator.
7 years ago
3b6629af3c
Revert "Install swaybar and swaybg under /usr/lib/sway"
...
This reverts commit f2c209c299
7 years ago
2c0c3dc7cc
Revert "Make the LIBDIR path configurable"
...
This reverts commit 1670b46bf6
7 years ago
0cdc47ab1e
Revert "Meson: Replace option `instlibdir` with `libexecdir`"
...
This reverts commit 830c4ef74c
7 years ago
830c4ef74c
Meson: Replace option `instlibdir` with `libexecdir`
...
Derive a value from it, called `rundir` rather than writing join_paths(libexecdir,
'sway') all over the place.
7 years ago
1670b46bf6
Make the LIBDIR path configurable
7 years ago
f2c209c299
Install swaybar and swaybg under /usr/lib/sway
7 years ago
aa36899d8a
Fix a bunch of swaybar memory leaks
7 years ago
63267240bf
Work around maybe-uninitialized in bar.c
...
Fixes #1855 .
7 years ago
4dfbc3160c
Fix swaybar axis event logic
...
Uses 'visible' instead of 'focused', since we may scroll on a bar which
isn't the focused output.
We can't use "next_on_output" or "prev_on_output" to implement this,
because it only modify the focused output. So scrolling on an unfocused
output will affect the incorrect one.
We just use the "workspace name" command instead.
7 years ago
c63554885e
Remove void * casts
...
They're pointless.
7 years ago
2ebb6073b7
Remove status command event on error
...
This prevents very high CPU load when the status command dies,
and poll continuously awoken with POLLHUP.
7 years ago
9a3fb33e33
Change remove_event logic
...
We defer the removal of entries until after the poll loop has finished.
Otherwise we may end up adjusting the poll array while we're still
reading from it, causing us to skip events.
7 years ago
e0107c4dd7
Always send POLLHUP and POLLERR with event loop
7 years ago
9bc4565a59
Fix memory leak on swaybar
...
Code from @NilsBrause
Ref #1820
7 years ago
0d67d56c2a
Set _POSIX_C_SOURCE properly
7 years ago
5785170421
Fix separator height calculation
...
Fixes #1796
Also rearranged this code to more closely mirror the similar code above
so future discrepancies are easier to spot.
7 years ago
84243a708e
Merge pull request #1792 from RyanDwyer/fix-swaybar-status-blocks
...
Fix swaybar not showing all status blocks
7 years ago
7dfc0409eb
Check height in surface local coordinates and rename some variables.
7 years ago
39e3319394
fix swaybar ipc handling
...
Swap return with break in IPC_EVENT_WORKSPACE case to free resp.
Change default return value to true. This causes IPC_EVENT_MODE changes to be
rendered instantly.
7 years ago
1a0d367f22
Fix swaybar not showing all status blocks.
7 years ago
c38de16722
Fix swaybar output config.
7 years ago
ac3be29517
Fix some more bugs
7 years ago
bac65078a2
Fix buffer issues in swaybar status line.
7 years ago
16e363e3e2
Fix swaybar HiDPI rounding issue
7 years ago
4ba6545c65
Fixup for #1773
7 years ago
257a831c72
Use full ws->name in swaybar hotspot callback
...
If strip_workspace_numbers option is enabled, we must preserve the right
workspace name for hotspot.
7 years ago
efac07db5f
Fix workspaces not updated on swaybar
7 years ago
f242362e7e
Handle output removal on swaybar
7 years ago
38bdd4bdeb
Address review feedback
7 years ago
c4e92c81f5
Adjust height calculation, naming
7 years ago
d48e7036aa
Don't use asserts with side-effects
7 years ago
2605950769
Add hidpi support to swaybar
7 years ago
f366ef373e
Fix #1709
7 years ago
ef50d84be1
Render blocks the correct order
7 years ago
c507727ad2
Fix use-after-free with block hotspots
7 years ago
0cbd2a4f49
Send click events for i3bar blocks
7 years ago
333dbcbe72
Render i3bar blocks
7 years ago
ee85c91831
Demarcate i3bar JSON into individual updates
7 years ago
2a5108a278
Implement workspace switch on click
7 years ago
ae14dfc7ae
Implement scroll wheel workspace switching
7 years ago
8d1425bde9
Initialize seat pointer in swaybar
7 years ago
2a90d26ebe
Fix issues with swaybar on DRM
7 years ago
d8104db8f1
Early return from render functions if necessary
7 years ago
095ac31921
Use render_all_frames from bar_setup
7 years ago
6fe66d0e6c
Fix layer_surface_closed
7 years ago
f3fbf19312
Do some small cleanup
...
- Fix workspace events (security config isn't in use so it wasn't being
sent)
- Kill status bar process when swaybar exits
- Don't rearrange windows on every layer surface commit
7 years ago
b72825441b
Fixed laggy focused output boolean
7 years ago
da6e48520b
Tear down bar when display exits
7 years ago
0464a9910d
Clean up status line on exit
7 years ago
0d0ab7c5ce
Implement status line
...
Does not yet support i3bar json protocol
7 years ago
718502c815
Iterate over workspaces backwards
7 years ago
531c175d3e
Respect user bar height preference
...
This is an i3-gaps feature we support
7 years ago
1e8faeec02
Pixel-perfect rendering
7 years ago
37b61eff2d
Add binding mode indicator
7 years ago
86ba0fc15d
Re-render bar on IPC updates
7 years ago
3a458cd7b5
Implement workspace button rendering
7 years ago
3399ad9840
Round up workspaces on each output
7 years ago
e5e8094dc3
Only utilize the configured outputs
7 years ago
5c9ad035db
Wire up basic IPC support
7 years ago
cab1352801
Start port of swaybar to layer shell
...
This starts up the event loop and wayland display and shims out the
basic top level rendering concepts. Also includes some changes to
incorporate pango into the 1.x codebase properly.
7 years ago
d071ff08ae
remove the rest of cmake
7 years ago
675e4b7de7
Removed trailing comma from swaybar click event json
7 years ago
44e72573cb
Fix include path to input-event-codes.h for FreeBSD.
7 years ago
5a63f0f57b
Fix build on FreeBSD adjusting/removing _XOPEN_SOURCE declaration.
7 years ago
feb8bb96ee
swaybar protocol: handle button 4 and 5
...
i3 bar handles scroll events as button 4 and 5. An example use
case would be volume up/down.
7 years ago
2b927685ca
styling fixes
7 years ago
39df3aed82
styling fixes
7 years ago
d873d09f23
style fixes
7 years ago
65022e1cbf
click_events as documented at https://i3wm.org/docs/i3bar-protocol.html
7 years ago
ba6224f4e5
Prevent crash if DBus connection is NULL
...
Fixes #1307
7 years ago
8976a47f62
[swaybar] fix non-dbus build
...
Swaybar's CMakeLists.txt uses the enable-tray option directly to decide whether to build the tray. This leads to a compilation error if dbus is not installed.
This patch uses the ENABLE_TRAY variable instead, which is only true if the user enabled the tray *and* dbus is available.
8 years ago
e8f589c3dc
Fix memory leaks in swaybar tray
8 years ago
5ceb52962e
Fix name validation in sni_watcher.c
...
This commit also fixes a memory leak that occurs on failure.
8 years ago
62223e8fbb
Don't trust SNI names, fixes #1274
...
If an item doesn't have a well-formed name, it will not be added to the
tray.
8 years ago
6a525b23dd
Adjust _XOPEN_SOURCE value for build on FreeBSD and fix pointer comparison error.
8 years ago
387eca1b29
Revert "swaybar: Group child processes for signalling"
...
This reverts commit 8f4bc0a374
8 years ago
5f915a9d03
Fix #1252
8 years ago
ed8f56ba38
Handle getline failure in icon theme parsing
8 years ago
0fc9628f03
Merge branch 'master' into tray
8 years ago
33fdae2001
Remove Xembed Support
...
Xembed support is premature in sway and should be postponed. This commit
only removes swaybar starting xembedsniproxy, if users would like, they
can still start xembedsniproxy manually, however there will be no
official support.
8 years ago
8f4bc0a374
swaybar: Group child processes for signalling
...
Fixes child proccess killing, when status_command is a complex command
like "i3status | wrapper.sh".
Set the process group id of the child process by calling `setpgid` after
forking and before calling `exec`.
The process group ID will be set to the process ID of the forked
process. Processes spawned by this child process will also have this
group ID.
Send signals to the process group with `killpg`. This will send the
signal to all of the process group.
8 years ago
0a71aa6e97
Fix Catching NewIcon Signal
...
The unique name was not copied out of the wire marshalled DBus message
data so `sni_uniq_cmp` would always match against junk data.
8 years ago
1451ee8fd1
Reorganize Tray Code
...
Remove tray code from bar.c and render.c
8 years ago
790887ce76
Fix cairo blending on tray icons
8 years ago
843ad38b3c
Implement Tray Icons
...
This commit implements the StatusNotifierItem protocol, and enables
swaybar to show tray icons. It also uses `xembedsniproxy` in order to
communicate with xembed applications.
The tray is completely optional, and can be disabled on compile time
with the `enable-tray` option. Or on runtime with the bar config option
`tray_output none`.
Overview of changes:
In swaybar very little is changed outside the tray subfolder except
that all events are now polled in `event_loop.c`, this creates no
functional difference.
Six bar configuration options were added, these are detailed in
sway-bar(5)
The tray subfolder is where all protocol implementation takes place and
is organised as follows:
tray/sni_watcher.c:
This file contains the StatusNotifierWatcher. It keeps track of
items and hosts and reports when they come or go.
tray/tray.c
This file contains the StatusNotifierHost. It keeps track of
sway's version of the items and represents the tray itself.
tray/sni.c
This file contains the StatusNotifierItem struct and all
communication with individual items.
tray/icon.c
This file implements the icon theme protocol. It allows for
finding icons by name, rather than by pixmap.
tray/dbus.c
This file allows for asynchronous DBus communication.
See #986 #343
8 years ago
173b338567
Add -DVERSION flag for release version numbers
8 years ago
9aed9d9359
UnGNUify the codebase
8 years ago
9ad1e6b40f
Handle malloc failure in ipc_recv_response
8 years ago
ad4d21d60b
add bar colours for focused_(workspace|statusline|separator)
...
If these aren't defined in config, color settings without 'focused_'
prefix are used as a fallback.
8 years ago
2a24772c4b
config: set pango_markup default to false
8 years ago
c0916f6138
Use CAIRO_OPERATOR_SOURCE for swaybar
8 years ago
6f2c39610e
parse pango markup in workspace names (and bugfix)
...
This change allows using numeric character references in workspace names
- for example æ which stands for sharp s. A fix was necessary in
get_pango_layout, since markup and parsed markup had different width.
8 years ago
fe89d7fba3
Correctly scale swaybar
...
Fixes #910 . There were some missing multiplications with window->scale.
8 years ago
e4cb4d1b5c
Fix swaybar when running on named outputs.
...
When using a bar on a named output, load_swaybars() requires the
output to be active (ie. in the root container), but this is not the case if
the bar is added to the last output. To fix this, load_swaybars() is now
called after the output has been added to the root container.
After fixing that, swaybar would segfault due to using the wrong index
variable when loading outputs and config.
8 years ago
c239f228c2
swaybar sends workspace name in quotes
...
fixes #894
8 years ago
af44154119
Fix constant scale factor in font code
8 years ago
b2226ac655
Add client support for HiDPI
...
This adds HiDPI support to swaybar, swaybg, and swaylock.
8 years ago
61184e3208
Initial testing on hidpi clients
8 years ago
416417a54c
Reorganize includes
8 years ago
98aa59fdda
implement solid color rendering for swaybg
9 years ago
06f46955c0
Fix a warning
9 years ago
3bb880bf20
Implement configurable wrapping on bar ws scroll
9 years ago
147a88260a
Fix #753
9 years ago
e38d6b94b8
Change workspace when mouse wheel is scrolled while hovering over the bar
9 years ago
250ddc66c6
Rename pointer_input::notify to indicate that is called on button clicks
9 years ago
8a232c8cfd
Send command to sway to change workspace when workspace button is clicked
9 years ago
a0c8799c80
Compute what workspace button is clicked
...
This commit does not do anything with this information other than logging it.
9 years ago
c805e42635
Extract workspace size computation from render_workspace_button()
...
Also remove some unnecessary strtup()s and rename a few variables and functions.
9 years ago
103954dd2b
Setup to receive mouse click events and log them
9 years ago
d3752b4140
swaybar: Make swaybar a shell surface
9 years ago
c55ae9956b
Fix another -Wunused-result
9 years ago
468ddfb34d
Fix missing include paths
...
When headers were installed in more sofisticated places (but package
config knows it right), it revealed missing paths in CMake
configuration. Lets fix it.
9 years ago
0f1cfdec61
Renamed to pango_markup
9 years ago
ee4e245f16
Fix line length calculation
9 years ago
2e6c43e62b
Added plaintext_markup to swaybar IPC
9 years ago
53b53dd8c2
Added plaintext markup configuration
9 years ago
a796ce4f66
Merge pull request #598 from Hummer12007/pango_fix
...
Passing missing argument to get_text_size
9 years ago
11f0b4539d
Use i3bar format for markup field.
...
In the i3bar protocol the value of the markup field is a string: "pango"
or "none" rather than a bool. This patch makes swaybar compatible with
that.
http://i3wm.org/docs/i3bar-protocol.html
9 years ago
a25c35f859
Passing missing argument to get_text_size
9 years ago
84fae94ab9
Flesh out pango markup implementation
9 years ago
9c42557b66
Stop swaybar crashing without args
9 years ago
d80466068a
Handle swaybar using sway font
9 years ago
cefcce48aa
Make client/pango.h not depend on client/window.h
9 years ago
af7a251806
Poll before wl_display_dispatch
9 years ago
e4c1176b72
Differentiate between all or no outputs
9 years ago
6d57f03028
Make single bar handle multiple outputs
9 years ago
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.
9 years ago
a5345e807e
extract cairo_set_source_u32()
9 years ago
123de86001
swaybar: Fix plaintext handling.
...
Fix #473
9 years ago
96935f2682
Fix colors off by one
9 years ago
ed227f5664
swaybar: move headers to include/bar
9 years ago
a61a27c485
swaybar: cleanup CmakeLists.txt
9 years ago
aa6ad09183
swaybar: rename state to bar
9 years ago
c6fc0033e1
swaybar: move core functionality to state.c
9 years ago
6140f9c42c
swaybar: Move swaybar_teardown to free_state
9 years ago
fcc47cb3bd
swaybar: move ipc stuff to ipc.{h,c}
9 years ago
a6349a2444
swaybar: feactor render, statusline
9 years ago
bb986cb336
swaybar: Separate config
9 years ago
ac3f36c091
swaybar: add --help option
9 years ago
bba72fb21a
swaybar: debug option takes no argument
9 years ago
364e37a1eb
Fix whitespace issues.
9 years ago
7f7e06d4c9
swaybar: fix logging
...
Optionally turn on debugging in swaybar. I acidentally introduced
persistent logging in a previous commit
9 years ago
576181ec09
swaybar: Implement workspace_buttons yes|no
9 years ago
aa2f754c64
swaybar: Implement binding_mode_indicator
9 years ago
f2d519d0ba
Merge pull request #427 from mikkeloscar/ipc-update
...
Refactor IPC server/client
9 years ago
7298a9c67a
Add type to returned response.
...
Makes `ipc_recv_response` return a struct with size, type and payload
rather than just the payload string.
This is useful if the type has to be checked on the client.
9 years ago
a20226772e
swaybar: rename ipc_listen_sock.. to ipc_event_sock..
9 years ago
c2f3530fab
Only strip when starting with a num
...
This makes sure the `:` isn't striped if you have a workspace named:
`:something`.
9 years ago
ccdcdc3396
swaybar: Implement strip_workspace_numbers
9 years ago
14dd358a55
saybar: remove stray logline
9 years ago
d72be6c0d5
swaybar: Add support for custom separator symbol
9 years ago
97a4f7ceac
Merge pull request #409 from mikkeloscar/bar-airblade-features
...
swaybar: Add support for Airblade i3bar extensions
9 years ago
8955e5f1ad
swaybar: Free unused IPC response
9 years ago
e7aef1e23c
swaybar: if-else style fixes
9 years ago
d21b15a4be
swaybar: Add support for Airblade i3bar extensions
...
This extends the i3bar protocol implementation with the following
features from @Airblade/i3:
* background
* border
* border_top, border_bottom, border_left, border_right
A block will now be rendered like this:
```
(border_left + margin) + width + (margin + border_right) + sep
```
Where `border_left/border_right` and their related margin is only drawn
if the `border` is specified and the border has a width > 0 (default is
1).
`border_top` and `border_bottom` does not affect the height of the bar
(no margin is added), thus it will be drawn behind the text if it is too
big. The user should specify a bar height if more space between
top/bottom borders are required.
9 years ago
26d2381040
swaybar: remove random whitespaces
9 years ago
e370187394
swaybar: Fix json related crash.
...
This should fix the random json related crashes in swaybar.
The crashes occured because the same socket was used for listening on
workspace events and requesting workspace info, resulting in a
unreliable message queue on the socket.
The solution is to use one socket for the events and one socket for
reliably requesting workspace/output info.
9 years ago
8e8ec6d92b
Merge branch 'master' of https://github.com/SirCmpwn/sway
9 years ago
21541e9e64
swaybar: Replace fgets with read and own buffer
9 years ago
edd93b5b55
swaybar: min_width and align
9 years ago
b66c51ea2c
swaybar: fix array indices in i3json_handle
9 years ago
bd74320da9
Stop swaybar from not rendering after the first go around
...
I am not sure if this is a correct issue/fix but on my system at least
after an i3bar protocol is detected this while loop never goes back
around meaning it doesnt process the status line anymore.
9 years ago
8fefdb3c64
swaybar: fix memory leaks
9 years ago
d060d0a39f
swaybar: add a visible separator between elements
9 years ago
aa5930c966
swaybar: Improve i3bar proto implementation
...
Also reintroduce plaintext fallback for simple status lines.
9 years ago
d37169a927
swaybar: fix whitespace
9 years ago
70b24fbb1f
Clean up a bit
9 years ago
d1f6f45cb3
Make start on i3bar json parsing
9 years ago
5c8a3afff9
swaybar: Correct handling of SIGTERM.
...
Swaybar did not correctly handle the SIGTERM sent from sway when
exiting, ultimately leaving the child status_command behind.
This should correctly handle the SIGTERM signal and terminate the
status_command.
Fix #386
9 years ago
83eb8d16aa
swaybar: Add font support
9 years ago
d373a193ac
swaybar: pixel perfect layout
...
This should make the bar workspace button layout identical to the layout
used in i3.
9 years ago
da6cd3cef7
swaybar: use height from config
9 years ago
bc9b93f597
swaybar: use select instead of busyloop
...
Use of busyloop caused high cpu usage for sway because swaybar had to be
redrawn all the time. By using select instead the bar only has to be
redrawn when the status_command changes (i.e. every second) or when the
workspaces are updated.
Fix #345
9 years ago
c8555f5813
swaybar: use position from config
9 years ago
859f2fea0c
Just bail if ws_json is fucked up
9 years ago
de2f3b393a
Wow that was stupid
9 years ago
d1e031025d
I'm still getting crashes without this line
9 years ago
de219f6bec
swaybar: ipc_update_ws: Fix memory corruption.
...
json_object_object_get_ex does not require json_object_put according to
docs, this should fix the random crashes.
9 years ago
a116eafaa4
Fix possible segfault in swaybar
9 years ago
8a6e05d7a1
swaybar: Remove stropts.h, fixes build for fedora.
...
Turns out that fedora killed off stropts.h some time ago [1] and
removing it seems to work just fine. (Tested on Fedora 23)
[1] https://bugzilla.redhat.com/show_bug.cgi?id=439403
9 years ago
529ee83ef6
swaybar: terminate status_command process
...
Fix #346
Send SIGTERM to the `status_command` process before swaybar exits.
9 years ago
d91185d67b
Fix null dereference in swaybar
9 years ago
0f7614306d
swaybar: Check that registry is set before teardown
9 years ago
adadb109a7
Only re-render swaybar when it has changed
...
Fixes #345
9 years ago
5a9cc96446
Make swaybar a little quieter
9 years ago
3bd388a307
Remove trailing whitespace
9 years ago
1db4b4a8f5
Correct typo seperator -> separator
9 years ago
a9f6cd0e17
Make swaybar run without status_command
9 years ago
ce8b71415f
Make swaybar check command arguments
9 years ago
1825cf32bf
Apply color config from swaybar
9 years ago
473ac4531f
[swaybar] Get bar config via IPC
9 years ago
f80e7364b1
Parse command line in swaybar
9 years ago
93ac7d43a8
Fix rendering of borders on workspaces (swaybar)
9 years ago
e277d4e094
Subscribe to workspace change events and redraw
9 years ago
7918feb9cd
Display workspaces on swaybar
9 years ago
36bf4d24cf
Free last line in swaybar
9 years ago
6596582bc3
Display output from a command on swaybar
9 years ago
cce9c338c0
cmake: build common code only once
...
This creates (static) libraries for protocols/, common/, and wayland/.
9 years ago
c9ce15aa18
cmake: remove subprojects
9 years ago
55b3532fe0
cmake: remove unnecessary quotes
9 years ago
2dedf206d7
cmake: use out-of-source build
9 years ago
f7ec3d00a0
cmake: use tabs instead of spaces
9 years ago
905966bcae
cmake: style consistency
9 years ago
2429266e3e
cmake: convert all cmake commands to lowercase
9 years ago
82d464bb90
Add text rendering support to wayland clients
9 years ago
e59cffcea2
Support desktop shell panels in compositor
9 years ago
60e76cf932
Add swaybar basics
...
This should make the bar open and appear as the panel, once sway
supports panels. Right now it crashes sway!
9 years ago
63cf8e48c4
Add swaybar subproject
9 years ago
Peter Rice
Ryan Dwyer
minus
emersion
Brian Ashworth
Rostislav Pehlivanov
Nicolas Braud-Santoni
Alex Xu (Hello71)
Scott Anderson
Bruno Pinto
Scott Anderson
Drew DeVault
db
Tony Crisci
Joona Romppanen
Johannes Lundberg
John Axel Eriksson
akokshar@redhat.com
Calvin Lee
Tobias Blass
Mykyta Holubakha
Yury Krivopalov
Sebastian Noack
D.B
Drew DeVault
Zandr Martin
David Eklov
Tomáš Čech
Mikkel Oscar Lyderik
crondog
Christoph Gysin
progandy
S. Christoffer Eliesen
Kevin Hamacher