hyprwm
/
wlroots-hyprland
mirror of https://github.com/hyprwm/wlroots-hyprland.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into xwayland-dnd

This commit is contained in:
emersion 2018-04-03 13:35:40 -04:00
parent 591ea27cf9 31c6ce13cd
commit 41fccb8507
No known key found for this signature in database
GPG Key ID: 0FDE7BE0E88F5E48
4 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend/x11/input_device.c
View File

@ -1,3 +1,4 @@
#include <wlr/config.h>
#include <wlr/interfaces/wlr_input_device.h>
#include <wlr/interfaces/wlr_keyboard.h>
#include <wlr/interfaces/wlr_pointer.h>
@ -8,6 +9,9 @@
#elif __FreeBSD__
#include <dev/evdev/input-event-codes.h>
#endif
#ifdef WLR_HAS_XCB_XKB
#include <xcb/xkb.h>
#endif
#include "backend/x11.h"
#include "util/signal.h"

5
include/wlr/meson.build
View File

@ -9,5 +9,6 @@ version_data.set('WLR_VERSION_API_CURRENT', so_version[0])
version_data.set('WLR_VERSION_API_REVISION', so_version[1])
version_data.set('WLR_VERSION_API_AGE', so_version[2])
configure_file(output: 'config.h', install_dir: 'include/wlr', configuration: conf_data)
configure_file(output: 'version.h', install_dir: 'include/wlr', configuration: version_data)
wlr_inc_dest = join_paths(get_option('includedir'), 'wlr')
configure_file(output: 'config.h', install_dir: wlr_inc_dest, configuration: conf_data)
configure_file(output: 'version.h', install_dir: wlr_inc_dest, configuration: version_data)

4
meson.build
View File

@ -125,8 +125,10 @@ if get_option('enable-xwayland')
else
exclude_headers += 'xwayland.h'
endif
includedir = get_option('includedir')
exclude_headers += 'meson.build'
install_subdir('include/wlr', install_dir: 'include', exclude_files: exclude_headers)
install_subdir('include/wlr', install_dir: includedir, exclude_files: exclude_headers)
subdir('include')

2
rootston/cursor.c
View File

@ -271,7 +271,7 @@ static void roots_cursor_press_button(struct roots_cursor *cursor,
break;
case WLR_BUTTON_PRESSED:
roots_seat_set_focus(seat, view);
if (wlr_surface_is_layer_surface(surface)) {
if (surface && wlr_surface_is_layer_surface(surface)) {
struct wlr_layer_surface *layer =
wlr_layer_surface_from_wlr_surface(surface);
if (layer->current.keyboard_interactive) {