Ian Fan
47a66da5de
swaybar: only free tokener when using i3bar protocol
2018-09-18 18:06:19 +01:00
Ian Fan
5912325d5c
swaybar: add debugging statements for handling i3bar json
2018-09-18 16:10:34 +01:00
Ian Fan
7882ac66ef
swaybar: rewrite i3bar protocol handling
...
This now correctly handles an incoming json infinite array by shifting
most of the heavy listing to the json-c parser, as well as sending
multiple statuses at once. It also removes the struct
i3bar_protocol_state and moves its members into the status_line struct,
allowing the same buffer to be used for both protocols.
2018-09-18 11:36:33 +01:00
Ian Fan
8cbce77e1d
swaybar: rewrite protocol determination
...
This now uses the getline function to receive the header, replacing
read_line_buffer, which has been deleted since it is otherwise unused.
Furthermore, once the protocol has been determined, the current status
is handled immediately to be shown (though this has not been added for
the i3bar protocol since it has not yet been rewritten to handle this).
2018-09-18 11:36:33 +01:00
Ian Fan
70245c2cd5
swaybar: rewrite text protocol handling
...
This now uses getline to correctly handle multiple or long statuses. It
also removes the struct text_protocol_state and moves its members into
the status_line struct.
2018-09-18 11:36:33 +01:00
Ian Fan
babd9618b9
swaybar: only create i3bar block hotspot if click events are enabled
2018-09-18 11:36:33 +01:00
Ian Fan
87c93d6ad9
swaybar: send trailing comma with click event json
2018-09-18 11:36:33 +01:00
Ian Fan
9932c6a1f1
swaybar: fix empty function prototypes
2018-09-18 11:36:33 +01:00
Ian Fan
952453480f
swaybar: invalidate file descriptors upon closing
2018-09-18 11:36:33 +01:00
Ian Fan
4cb28de89f
swaybar: remove block links upon exit
2018-09-18 11:36:33 +01:00
emersion
012df55be5
swaybar: use output names instead of output indexes
2018-09-17 16:04:09 +02:00
Ian Fan
e32e86b65d
bar: remove i3bar_block_free in favour of i3bar_block_unref
2018-09-14 21:06:54 +01:00
Ian Fan
2eaef80206
i3bar: count references to blocks
...
This prevents blocks from being destroyed before their hotspots are destroyed,
in case it is used for a pending click event that fires between the bar
receiving a new status, which destroys the block, and the bar rendering the new
status, which destroys the hotspot; this problem can be easily produced by
scrolling on a block that immediately causes a new status to be sent, with
multiple outputs
2018-09-12 08:28:28 +01:00
Ryan Dwyer
9215ca0f01
Align titles to baseline
...
This does the following:
* Adds a baseline argument to get_text_size (the baseline is the
distance from the top of the texture to the baseline).
* Stores the baseline in the container when calculating the title
height.
* Takes the baseline into account when calculating the config's max font
height.
* When rendering, pads the textures according to the baseline so they
line up.
2018-09-08 16:25:07 +10:00
Jason
13fbe5176b
Fix swaybar block background fill logic
...
Same as #2571 but for 1.0.
2018-09-05 18:48:31 +09:00
sghctoma
073dcb3a86
Change _XOPEN_SOURCE defines to _POSIX_C_SOURCE
2018-09-03 09:08:49 +02:00
sghctoma
cc16948c85
Fix feature macros for FreeBSD
...
On FreeBSD, snprintf and vsnprintf are visible only if
_XOPEN_SOURCE >= 600.
2018-08-30 09:34:26 +02:00
minus
bfcfabee2b
swaybar: Fix scroll handling on workspace buttons
...
As well as ignoring scroll events on status elements when click_events
is enabled.
Previously, using the scroll wheel on a workspace button would switch to
that workspace instead of scrolling through them. Clicks and scrolling
on status elements would always be processed by swaybar, too. So in case
you were using scrolling as volume control on a status item, swaybar
would additionally scroll through your workspaces.
2018-07-19 21:15:01 +02:00
emersion
48b911a459
Merge pull request #2281 from pvsr/X11_click
...
Send clicks to swaybar blocks as X11 button ids
2018-07-18 00:16:15 +01:00
Peter Rice
e43c20134a
remove unnecessary parens
2018-07-17 19:04:04 -04:00
Peter Rice
14511da75d
send scroll events to swaybar blocks
2018-07-16 18:55:11 -04:00
Peter Rice
79a998849b
make hotspot callback take an x11 button id
2018-07-16 18:55:04 -04:00
Ryan Dwyer
255dc8bbb0
swaybar: Read urgent colors from IPC
2018-07-17 08:29:43 +10:00
minus
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.
2018-07-14 00:04:02 +02:00
emersion
63b4bf5000
Update for swaywm/wlroots#1126
2018-07-09 22:54:30 +01:00
Brian Ashworth
1b4c289482
Fix swaybar teardown when workspace buttons hidden
2018-07-06 11:38:02 -04:00
Brian Ashworth
78c08fb0a2
Implement mode --pango_markup
2018-07-05 18:12:14 -04:00
Ryan Dwyer
e012b05b00
Swaybar: Respect pango_markup config
...
Makes swaybar respect the user's pango_markup configuration in the
workspace buttons and binding mode indicator.
2018-05-09 14:54:22 +10:00
Rostislav Pehlivanov
3b6629af3c
Revert "Install swaybar and swaybg under /usr/lib/sway"
...
This reverts commit f2c209c299
2018-05-06 00:20:57 +01:00
Rostislav Pehlivanov
2c0c3dc7cc
Revert "Make the LIBDIR path configurable"
...
This reverts commit 1670b46bf6
2018-05-06 00:19:52 +01:00
Rostislav Pehlivanov
0cdc47ab1e
Revert "Meson: Replace option instlibdir with libexecdir"
...
This reverts commit 830c4ef74c
2018-05-06 00:19:43 +01:00
Nicolas Braud-Santoni
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.
2018-05-05 17:22:46 +02:00
Nicolas Braud-Santoni
1670b46bf6
Make the LIBDIR path configurable
2018-05-05 17:22:46 +02:00
Nicolas Braud-Santoni
f2c209c299
Install swaybar and swaybg under /usr/lib/sway
2018-05-05 17:22:46 +02:00
emersion
aa36899d8a
Fix a bunch of swaybar memory leaks
2018-04-24 22:28:55 +01:00
Alex Xu (Hello71)
63267240bf
Work around maybe-uninitialized in bar.c
...
Fixes #1855 .
2018-04-24 12:29:11 -04:00
Scott Anderson
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.
2018-04-22 17:25:15 +12:00
Scott Anderson
c63554885e
Remove void * casts
...
They're pointless.
2018-04-21 14:45:34 +12:00
Scott Anderson
2ebb6073b7
Remove status command event on error
...
This prevents very high CPU load when the status command dies,
and poll continuously awoken with POLLHUP.
2018-04-21 14:39:46 +12:00
Scott Anderson
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.
2018-04-21 14:38:34 +12:00
Scott Anderson
e0107c4dd7
Always send POLLHUP and POLLERR with event loop
2018-04-21 13:44:32 +12:00
Bruno Pinto
9bc4565a59
Fix memory leak on swaybar
...
Code from @NilsBrause
Ref #1820
2018-04-20 01:58:30 +01:00
Scott Anderson
0d67d56c2a
Set _POSIX_C_SOURCE properly
2018-04-15 15:50:39 +12:00
Drew DeVault
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.
2018-04-10 22:18:54 -04:00
emersion
84243a708e
Merge pull request #1792 from RyanDwyer/fix-swaybar-status-blocks
...
Fix swaybar not showing all status blocks
2018-04-10 18:38:43 -04:00
Ryan Dwyer
7dfc0409eb
Check height in surface local coordinates and rename some variables.
2018-04-11 08:34:21 +10:00
db
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.
2018-04-10 22:01:22 +02:00
Ryan Dwyer
1a0d367f22
Fix swaybar not showing all status blocks.
2018-04-10 16:08:08 +10:00
Ryan Dwyer
c38de16722
Fix swaybar output config.
2018-04-10 13:38:15 +10:00
Drew DeVault
ac3be29517
Fix some more bugs
2018-04-09 08:07:54 -04:00
Ryan Dwyer
bac65078a2
Fix buffer issues in swaybar status line.
2018-04-09 17:25:39 +10:00
emersion
16e363e3e2
Fix swaybar HiDPI rounding issue
2018-04-08 13:49:11 -04:00
Drew DeVault
4ba6545c65
Fixup for #1773
2018-04-08 10:04:23 -04:00
db
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.
2018-04-08 15:48:59 +02:00
Drew DeVault
efac07db5f
Fix workspaces not updated on swaybar
2018-04-06 09:43:52 -04:00
Drew DeVault
f242362e7e
Handle output removal on swaybar
2018-04-05 16:04:30 -04:00
Drew DeVault
38bdd4bdeb
Address review feedback
2018-04-03 22:52:40 -04:00
Drew DeVault
c4e92c81f5
Adjust height calculation, naming
2018-04-03 21:57:47 -04:00
Drew DeVault
d48e7036aa
Don't use asserts with side-effects
2018-04-03 21:29:43 -04:00
Drew DeVault
2605950769
Add hidpi support to swaybar
2018-04-03 21:06:28 -04:00
Drew DeVault
f366ef373e
Fix #1709
2018-04-03 11:17:34 -04:00
Drew DeVault
ef50d84be1
Render blocks the correct order
2018-04-02 13:53:40 -04:00
Drew DeVault
c507727ad2
Fix use-after-free with block hotspots
2018-04-02 11:53:56 -04:00
Drew DeVault
0cbd2a4f49
Send click events for i3bar blocks
2018-04-02 11:09:23 -04:00
Drew DeVault
333dbcbe72
Render i3bar blocks
2018-04-02 11:09:23 -04:00
Drew DeVault
ee85c91831
Demarcate i3bar JSON into individual updates
2018-04-02 11:09:23 -04:00
Drew DeVault
2a5108a278
Implement workspace switch on click
2018-03-30 22:44:08 -04:00
Drew DeVault
ae14dfc7ae
Implement scroll wheel workspace switching
2018-03-30 22:44:08 -04:00
Drew DeVault
8d1425bde9
Initialize seat pointer in swaybar
2018-03-30 22:44:08 -04:00
Drew DeVault
2a90d26ebe
Fix issues with swaybar on DRM
2018-03-30 00:30:38 -04:00
Drew DeVault
d8104db8f1
Early return from render functions if necessary
2018-03-29 23:35:49 -04:00
Drew DeVault
095ac31921
Use render_all_frames from bar_setup
2018-03-29 22:32:17 -04:00
Drew DeVault
6fe66d0e6c
Fix layer_surface_closed
2018-03-29 22:25:25 -04:00
Drew DeVault
f3fbf19312
Do some small cleanup
...
- Fix workspace events (security config isn't in use so it wasn't being
sent)
- Kill status bar process when swaybar exits
- Don't rearrange windows on every layer surface commit
2018-03-29 22:11:08 -04:00
Drew DeVault
b72825441b
Fixed laggy focused output boolean
2018-03-29 22:11:08 -04:00
Drew DeVault
da6e48520b
Tear down bar when display exits
2018-03-29 22:11:08 -04:00
Drew DeVault
0464a9910d
Clean up status line on exit
2018-03-29 22:11:08 -04:00
Drew DeVault
0d0ab7c5ce
Implement status line
...
Does not yet support i3bar json protocol
2018-03-29 22:11:08 -04:00
Drew DeVault
718502c815
Iterate over workspaces backwards
2018-03-29 22:11:08 -04:00
Drew DeVault
531c175d3e
Respect user bar height preference
...
This is an i3-gaps feature we support
2018-03-29 22:11:08 -04:00
Drew DeVault
1e8faeec02
Pixel-perfect rendering
2018-03-29 22:11:08 -04:00
Drew DeVault
37b61eff2d
Add binding mode indicator
2018-03-29 22:11:08 -04:00
Drew DeVault
86ba0fc15d
Re-render bar on IPC updates
2018-03-29 22:11:08 -04:00
Drew DeVault
3a458cd7b5
Implement workspace button rendering
2018-03-29 22:11:08 -04:00
Drew DeVault
3399ad9840
Round up workspaces on each output
2018-03-29 22:11:08 -04:00
Drew DeVault
e5e8094dc3
Only utilize the configured outputs
2018-03-29 22:11:08 -04:00
Drew DeVault
5c9ad035db
Wire up basic IPC support
2018-03-29 22:11:08 -04:00
Drew DeVault
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.
2018-03-29 22:11:08 -04:00
Tony Crisci
d071ff08ae
remove the rest of cmake
2017-12-01 05:21:03 -05:00
Joona Romppanen
675e4b7de7
Removed trailing comma from swaybar click event json
2017-10-28 17:35:48 +03:00
Johannes Lundberg
44e72573cb
Fix include path to input-event-codes.h for FreeBSD.
2017-10-15 10:54:47 +02:00
Johannes Lundberg
5a63f0f57b
Fix build on FreeBSD adjusting/removing _XOPEN_SOURCE declaration.
2017-10-14 20:38:33 +02:00
John Axel Eriksson
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.
2017-09-23 15:22:40 +02:00
akokshar@redhat.com
2b927685ca
styling fixes
2017-08-30 08:16:17 +02:00
akokshar@redhat.com
39df3aed82
styling fixes
2017-08-29 17:33:06 +02:00
akokshar@redhat.com
d873d09f23
style fixes
2017-08-29 15:55:30 +02:00
akokshar@redhat.com
65022e1cbf
click_events as documented at https://i3wm.org/docs/i3bar-protocol.html
2017-08-29 11:19:43 +02:00
Calvin Lee
ba6224f4e5
Prevent crash if DBus connection is NULL
...
Fixes #1307
2017-08-12 12:52:31 +02:00
Tobias Blass
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.
2017-07-20 23:03:16 +02:00
Calvin Lee
e8f589c3dc
Fix memory leaks in swaybar tray
2017-07-16 19:06:24 -07:00
