aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-01-28meson: add systemd/elogind backends only if enabledPatrick Steinhardt
Right now, we are adding systemd and elogind backends to the build system as soon as their libraries are found on the build system. Instead, we should only add them if the libraries have been found _and_ the user has actually requested them to be included.
2018-01-28travis: add job building wlroots without various optionsPatrick Steinhardt
Recently, the support for building rootston without XWayland was broken. While the breakage was easily fixable, the more important problem is that actually nobody seems to ever compile wlroots without XWayland, causing silent breakage. This problem can easily be handled by the CI system: in addition to the existing job which enables XWayland, add a second job which compiles wlroots without XWayland. This will catch breakage at a much earlier stage. Catching broken builds without XWayland support obviously only covers one part of a greater issue, as all the other options may cause our builds to break, too. While we cannot test each combination, we can at least make sure to have one build with all options enabled and one with all options disabled.
2018-01-28rootston: move together XWayland setup codePatrick Steinhardt
The XWayland code for creating the cursor as well as creating the surface itself are currently split up into two ifdef'ed sections in `desktop_create()`. Move together these two sections in order to avoid having multiple ifdefs as well as making it clearer that they do in fact serve the same purpose of setting up the XWayland environment.
2018-01-28rootston: fix compilation without XWayland supportPatrick Steinhardt
In case wlroots is not being compiled with XWayland support, we will not have an xwayland surface in our roots view. While we make sure to pay attention to that in some places, we are not being consistent and try to access the xwayland surface in other places. Obviously, this leads to a compiler error due to the field not being present. Fix the issue by sprinkling in a few additional ifdefs where required.
2018-01-27Merge pull request #588 from agx/armDrew DeVault
Fix warnings on arm-linux
2018-01-27drm: Use ptrdiff_t instead of intmax_t in format stringGuido Günther
since we're looking at pointer differences. Otherwise the build fails on arm like In file included from ../backend/drm/drm.c:19:0: ../include/wlr/util/log.h:34:17: error: format '%jd' expects argument of type 'intmax_t', but argument 7 has type 'int' [-Werror=format=] _wlr_log(verb, "[%s:%d] " fmt, _strip_path(__FILE__), __LINE__, ##__VA_ARGS__) ^ ../backend/drm/drm.c:462:2: note: in expansion of macro 'wlr_log' wlr_log(L_DEBUG, "%s: crtc=%ju ovr=%jd pri=%jd cur=%jd", conn->output.name, ^~~~~~~ ../backend/drm/drm.c:462:39: note: format string is defined here wlr_log(L_DEBUG, "%s: crtc=%ju ovr=%jd pri=%jd cur=%jd", conn->output.name, ~~^ %d
2018-01-27wlr_keyboard: use correct printf format string for keymap_sizeGuido Günther
keymap_size is a size_t. Otherwise the build fails on arm like ../types/wlr_keyboard.c: In function 'wlr_keyboard_set_keymap': ../include/wlr/util/log.h:34:17: error: format '%lu' expects argument of type 'long unsigned int', but argument 5 has type 'size_t {aka unsigned int}' [-Werror=format=] _wlr_log(verb, "[%s:%d] " fmt, _strip_path(__FILE__), __LINE__, ##__VA_ARGS__) ^ ../types/wlr_keyboard.c:218:3: note: in expansion of macro 'wlr_log' wlr_log(L_ERROR, "creating a keymap file for %lu bytes failed", kb->keymap_size); ^~~~~~~ ../types/wlr_keyboard.c:218:50: note: format string is defined here wlr_log(L_ERROR, "creating a keymap file for %lu bytes failed", kb->keymap_size); ~~^ %u
2018-01-26Merge pull request #585 from agx/mesonemersion
meson: add tags and ctags targets
2018-01-26meson: add ctags and etags targetsGuido Günther
to create tag files. Idea taken from systemd. Signed-off-by: Guido Günther <agx@sigxcpu.org>
2018-01-26Remove vim stuff from .gitignoreDrew DeVault
If this affects you put this in your vimrc: set backupdir=~/.cache set directory=~/.cache
2018-01-24Merge pull request #584 from VincentVanlaer/drm-segfaultDrew DeVault
Clean up session signal handler on drm init fail
2018-01-24Merge pull request #583 from agx/mesonemersion
meson: print enabled options
2018-01-24Clean up session signal handler on drm init failVincent Vanlaer
2018-01-24meson: print enabled optionsGuido Günther
This makes it simpler to figure out what was enabled.
2018-01-24Merge pull request #579 from Ongy/dpms_decoupleemersion
decouples outputenable state and wl_output global
2018-01-24re-adds wlr_output_update_enabledMarkus Ongyerth
Re-add the wlr_output_update_enabled to make sure wlr_output::events.enable is called when the output enabled state changes.
2018-01-23Merge pull request #570 from acrisci/decorationsTony Crisci
Decorations
2018-01-23decouples outputenable state and wl_output globalMarkus Ongyerth
This decouples wlr_output_enable and the wl_global. The previously internal functions wlr_output_(destroy/create)_global are exposed and used automatically in the wlr_output_layout to create/tear down the global. The compositor can handle them itself if it wants to, but I think this is the right moment to create/destroy the wl_output when the wlr_output_layout is used.
2018-01-23decorations: respect motif hintsTony Crisci
2018-01-23fix decorations on wayland backendTony Crisci
2018-01-22Merge pull request #578 from emersion/fix-cursor-output-layout-destroyDrew DeVault
cursor: fix segfault when destroying a wlr_output_layout with a wlr_cursor attached
2018-01-22cursor: fix segfault when destroying a wlr_output_layout with a wlr_cursor ↵emersion
attached
2018-01-21take roots_view out of input.hTony Crisci
2018-01-21take seat.h out of view.hTony Crisci
2018-01-21rename matrix model box to project boxTony Crisci
2018-01-21rename wlr_deco_part to roots_deco_partTony Crisci
2018-01-21fix cursor issueTony Crisci
2018-01-21make it work with rotationTony Crisci
2018-01-21Merge pull request #576 from Timidger/bugfix/crtc-null-check-in-set-cursoremersion
Check if crtc is null in in cursor cleanup when output removed
2018-01-21move matrix model code to matrix.hTony Crisci
2018-01-21Add con/crtc null check to move_cursor in drmTimidger
2018-01-21Added crtc null check for other drm funcsTimidger
2018-01-21Merge branch 'master' into decorationsTony Crisci
2018-01-21Fixes #575Timidger
2018-01-21Merge pull request #574 from jsshandle/masteremersion
Improve code style in accordance with CONTRIBUTING.md
2018-01-21style: add else keywords in xwm.cJohannes Schramm
2018-01-21style: add comment to empty while loop in logind.cJohannes Schramm
2018-01-21style: include brackets for if/while/for, even if it's a single statementJohannes Schramm
2018-01-17Merge pull request #553 from acrisci/modifier-fixesDrew DeVault
compositor modifier hooks
2018-01-17dont use pointer for modifiersTony Crisci
2018-01-17Merge branch 'master' into modifier-fixesTony Crisci
2018-01-17Merge pull request #569 from emersion/hide-seat-cursorTony Crisci
rootston: hide cursor if seat has only keyboards
2018-01-17rootston: hide cursor if seat has no pointeremersion
2018-01-16basic decorationsTony Crisci
2018-01-16rootston: set real seat capabilitiesemersion
2018-01-16decorate xwayland viewsTony Crisci
2018-01-16abstract box matrixTony Crisci
2018-01-15Merge pull request #567 from Timidger/example-loggingDrew DeVault
Fixed logging for examples
2018-01-15Fixed logging for examplesTimidger
2018-01-15Merge pull request #549 from emersion/output-enabledDrew DeVault
Add wlr_output::enabled