Skip to main content

Browse the archive

Revision e4cb4d1b5cd32e9455243ee7138bf007343269c2 authored by Ryan Dwyer on 17 September 2016, 07:25:45 UTC, committed by Ryan Dwyer on 17 September 2016, 07:25:45 UTC 
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.
1 parent 461e250
Raw File
CMakeLists.txt 
include(Wayland)

WAYLAND_ADD_PROTOCOL_CLIENT(proto-client-xdg-shell
	xdg-shell.xml
	xdg-shell
)
WAYLAND_ADD_PROTOCOL_CLIENT(proto-client-desktop-shell
	desktop-shell.xml
	desktop-shell
)
WAYLAND_ADD_PROTOCOL_SERVER(proto-server-desktop-shell
	desktop-shell.xml
	desktop-shell
)

WAYLAND_ADD_PROTOCOL_CLIENT(proto-client-swaylock
	swaylock.xml
	swaylock
)
WAYLAND_ADD_PROTOCOL_SERVER(proto-server-swaylock
	swaylock.xml
	swaylock
)

add_library(sway-protocols STATIC
	${proto-client-xdg-shell}
	${proto-client-desktop-shell}
	${proto-server-desktop-shell}
	${proto-client-swaylock}
	${proto-server-swaylock}
	)

set(PROTOCOLS_INCLUDE_DIRS ${CMAKE_BINARY_DIR}/protocols PARENT_SCOPE)
INCLUDE_DIRECTORIES(${WAYLAND_INCLUDE_DIR} ${XKBCOMMON_INCLUDE_DIRS})
back to top