aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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
2018-01-15drm: do not pageflip when enabling outputemersion
2018-01-15Merge pull request #562 from emersion/xwayland-fullscreen-render-childrenTony Crisci
xwayland: render children window in fullscreen
2018-01-15Merge pull request #564 from agx/masteremersion
Don't crash if crtc->cursor is NULL
2018-01-15Don't crash if crtc->cursor is NULLGuido Günther
Same as what atomic_crtc_set_cursor does Core was generated by `_build/rootston/rootston'. Program terminated with signal SIGSEGV, Segmentation fault. 0 0xb6f28a1c in atomic_crtc_move_cursor (drm=0x1ebc8e8, crtc=0x1ead498, x=0, y=0) at ../backend/drm/atomic.c:170 170 if (!crtc || !crtc->cursor) { (gdb) bt 0 0xb6f28a1c in atomic_crtc_move_cursor (drm=0x1ebc8e8, crtc=0x1ead498, x=0, y=0) at ../backend/drm/atomic.c:170 1 0xb6f2a856 in wlr_drm_connector_move_cursor (output=0x2242b28, x=0, y=0) at ../backend/drm/drm.c:634 2 0xb6f3cea0 in wlr_output_cursor_set_image (cursor=0x21a0338, pixels=0x22e1290 "", stride=24, width=24, height=24, hotspot_x=4, hotspot_y=4) at ../types/wlr_output.c:516 3 0xb6f39da2 in wlr_cursor_set_image (cur=0x22cfc90, pixels=0x22e1290 "", stride=24, width=24, height=24, hotspot_x=4, hotspot_y=4, scale=1) at ../types/wlr_cursor.c:310 4 0xb6f44d2a in wlr_xcursor_manager_set_cursor_image (manager=0x22cfd10, name=0x434420 "left_ptr", cursor=0x22cfc90) at ../types/wlr_xcursor_manager.c:80 5 0x00431c0a in roots_seat_configure_xcursor (seat=0x22cef08) at ../rootston/seat.c:515 6 0x0043137c in roots_seat_init_cursor (seat=0x22cef08) at ../rootston/seat.c:210 7 0x004315ec in roots_seat_create (input=0x218d220, name=0x434594 "seat0") at ../rootston/seat.c:289 8 0x0042ecba in input_get_seat (input=0x218d220, name=0x434594 "seat0") at ../rootston/input.c:39 9 0x0042ed04 in input_add_notify (listener=0x218d228, data=0x218d3b0) at ../rootston/input.c:54 10 0xb6f2f2e6 in wl_signal_emit (signal=0x1ea548c, data=0x218d3b0) at /usr/include/wayland-server-core.h:387 11 0xb6f2f572 in input_add_reemit (listener=0x1ea9990, data=0x218d3b0) at ../backend/multi/backend.c:101 12 0xb6f2db7e in wl_signal_emit (signal=0x1ea992c, data=0x218d3b0) at /usr/include/wayland-server-core.h:387 13 0xb6f2ddaa in handle_device_added (backend=0x1ea9920, libinput_dev=0x2292598) at ../backend/libinput/events.c:87 14 0xb6f2e164 in wlr_libinput_event (backend=0x1ea9920, event=0x2292b78) at ../backend/libinput/events.c:198 15 0xb6f2d678 in wlr_libinput_readable (fd=23, mask=1, _backend=0x1ea9920) at ../backend/libinput/backend.c:28 16 0xb6f2d7c0 in wlr_libinput_backend_start (_backend=0x1ea9920) at ../backend/libinput/backend.c:74 17 0xb6f27170 in wlr_backend_start (backend=0x1ea9920) at ../backend/backend.c:30 18 0xb6f2f320 in multi_backend_start (wlr_backend=0x1ea5480) at ../backend/multi/backend.c:22 19 0xb6f27170 in wlr_backend_start (backend=0x1ea5480) at ../backend/backend.c:30 20 0x0042fbc6 in main (argc=1, argv=0xbe89dd04) at ../rootston/main.c:60