itycodes
/
wlseeds
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build: unify naming for HAVE_* defines

Browse Source 
We sometimes used HAS_, sometimes polluted the LIBINPUT_ namespace,
etc.
Simon Ser 2 years ago committed by Alexander Orzechowski
parent a4a40618ad
commit 86fc2199f8
11 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File

6
backend/libinput/events.c
Unescape View File

@ -174,12 +174,12 @@ void handle_libinput_event(struct wlr_libinput_backend *backend,
handle_pointer_button(event, &dev->pointer); handle_pointer_button(event, &dev->pointer);
break; break;
case LIBINPUT_EVENT_POINTER_AXIS: case LIBINPUT_EVENT_POINTER_AXIS:
#if !LIBINPUT_HAS_SCROLL_VALUE120 #if !HAVE_LIBINPUT_SCROLL_VALUE120
/* This event must be ignored in favour of the SCROLL_* events */ /* This event must be ignored in favour of the SCROLL_* events */
handle_pointer_axis(event, &dev->pointer); handle_pointer_axis(event, &dev->pointer);
#endif #endif
break; break;
#if LIBINPUT_HAS_SCROLL_VALUE120 #if HAVE_LIBINPUT_SCROLL_VALUE120
case LIBINPUT_EVENT_POINTER_SCROLL_WHEEL: case LIBINPUT_EVENT_POINTER_SCROLL_WHEEL:
handle_pointer_axis_value120(event, &dev->pointer, handle_pointer_axis_value120(event, &dev->pointer,
WLR_AXIS_SOURCE_WHEEL); WLR_AXIS_SOURCE_WHEEL);
@ -250,7 +250,7 @@ void handle_libinput_event(struct wlr_libinput_backend *backend,
case LIBINPUT_EVENT_GESTURE_PINCH_END: case LIBINPUT_EVENT_GESTURE_PINCH_END:
handle_pointer_pinch_end(event, &dev->pointer); handle_pointer_pinch_end(event, &dev->pointer);
break; break;
#if LIBINPUT_HAS_HOLD_GESTURES #if HAVE_LIBINPUT_HOLD_GESTURES
case LIBINPUT_EVENT_GESTURE_HOLD_BEGIN: case LIBINPUT_EVENT_GESTURE_HOLD_BEGIN:
handle_pointer_hold_begin(event, &dev->pointer); handle_pointer_hold_begin(event, &dev->pointer);
break; break;

4
backend/libinput/meson.build
Unescape View File

@ -29,5 +29,5 @@ features += { 'libinput-backend': true }
wlr_deps += libinput wlr_deps += libinput
# libinput hold gestures and high resolution scroll are available since 1.19.0 # libinput hold gestures and high resolution scroll are available since 1.19.0
internal_config.set10('LIBINPUT_HAS_HOLD_GESTURES', libinput.version().version_compare('>=1.19.0')) internal_config.set10('HAVE_LIBINPUT_HOLD_GESTURES', libinput.version().version_compare('>=1.19.0'))
internal_config.set10('LIBINPUT_HAS_SCROLL_VALUE120', libinput.version().version_compare('>=1.19.0')) internal_config.set10('HAVE_LIBINPUT_SCROLL_VALUE120', libinput.version().version_compare('>=1.19.0'))

2
backend/libinput/pointer.c
Unescape View File

@ -124,7 +124,7 @@ void handle_pointer_axis(struct libinput_event *event,
wl_signal_emit_mutable(&pointer->events.frame, pointer); wl_signal_emit_mutable(&pointer->events.frame, pointer);
} }
#if LIBINPUT_HAS_SCROLL_VALUE120 #if HAVE_LIBINPUT_SCROLL_VALUE120
void handle_pointer_axis_value120(struct libinput_event *event, void handle_pointer_axis_value120(struct libinput_event *event,
struct wlr_pointer *pointer, enum wlr_axis_source source) { struct wlr_pointer *pointer, enum wlr_axis_source source) {
struct libinput_event_pointer *pevent = struct libinput_event_pointer *pevent =

8
backend/x11/backend.c
Unescape View File

@ -198,7 +198,7 @@ static void backend_destroy(struct wlr_backend *backend) {
wlr_drm_format_set_finish(&x11->dri3_formats); wlr_drm_format_set_finish(&x11->dri3_formats);
wlr_drm_format_set_finish(&x11->shm_formats); wlr_drm_format_set_finish(&x11->shm_formats);
#if HAS_XCB_ERRORS #if HAVE_XCB_ERRORS
xcb_errors_context_free(x11->errors_context); xcb_errors_context_free(x11->errors_context);
#endif #endif
@ -629,7 +629,7 @@ struct wlr_backend *wlr_x11_backend_create(struct wl_display *display,
shm_format->format, DRM_FORMAT_MOD_INVALID); shm_format->format, DRM_FORMAT_MOD_INVALID);
} }
#if HAS_XCB_ERRORS #if HAVE_XCB_ERRORS
if (xcb_errors_context_new(x11->xcb, &x11->errors_context) != 0) { if (xcb_errors_context_new(x11->xcb, &x11->errors_context) != 0) {
wlr_log(WLR_ERROR, "Failed to create error context"); wlr_log(WLR_ERROR, "Failed to create error context");
return false; return false;
@ -673,7 +673,7 @@ error_x11:
} }
static void handle_x11_error(struct wlr_x11_backend *x11, xcb_value_error_t *ev) { static void handle_x11_error(struct wlr_x11_backend *x11, xcb_value_error_t *ev) {
#if HAS_XCB_ERRORS #if HAVE_XCB_ERRORS
const char *major_name = xcb_errors_get_name_for_major_code( const char *major_name = xcb_errors_get_name_for_major_code(
x11->errors_context, ev->major_opcode); x11->errors_context, ev->major_opcode);
if (!major_name) { if (!major_name) {
@ -711,7 +711,7 @@ log_raw:
static void handle_x11_unknown_event(struct wlr_x11_backend *x11, static void handle_x11_unknown_event(struct wlr_x11_backend *x11,
xcb_generic_event_t *ev) { xcb_generic_event_t *ev) {
#if HAS_XCB_ERRORS #if HAVE_XCB_ERRORS
const char *extension; const char *extension;
const char *event_name = xcb_errors_get_name_for_xcb_event( const char *event_name = xcb_errors_get_name_for_xcb_event(
x11->errors_context, ev, &extension); x11->errors_context, ev, &extension);

2
include/backend/libinput.h
Unescape View File

@ -72,7 +72,7 @@ void handle_pointer_button(struct libinput_event *event,
struct wlr_pointer *pointer); struct wlr_pointer *pointer);
void handle_pointer_axis(struct libinput_event *event, void handle_pointer_axis(struct libinput_event *event,
struct wlr_pointer *pointer); struct wlr_pointer *pointer);
#if LIBINPUT_HAS_SCROLL_VALUE120 #if HAVE_LIBINPUT_SCROLL_VALUE120
void handle_pointer_axis_value120(struct libinput_event *event, void handle_pointer_axis_value120(struct libinput_event *event,
struct wlr_pointer *pointer, enum wlr_axis_source source); struct wlr_pointer *pointer, enum wlr_axis_source source);
#endif #endif

4
include/backend/x11.h
Unescape View File

@ -19,7 +19,7 @@
#include "config.h" #include "config.h"
#if HAS_XCB_ERRORS #if HAVE_XCB_ERRORS
#include <xcb/xcb_errors.h> #include <xcb/xcb_errors.h>
#endif #endif
@ -99,7 +99,7 @@ struct wlr_x11_backend {
// The time we last received an event // The time we last received an event
xcb_timestamp_t time; xcb_timestamp_t time;
#if HAS_XCB_ERRORS #if HAVE_XCB_ERRORS
xcb_errors_context_t *errors_context; xcb_errors_context_t *errors_context;
#endif #endif

2
include/meson.build
Unescape View File

@ -30,7 +30,7 @@ install_subdir('wlr',
) )
foreach name, have : internal_features foreach name, have : internal_features
internal_config.set10('HAS_' + name.underscorify().to_upper(), have) internal_config.set10('HAVE_' + name.underscorify().to_upper(), have)
endforeach endforeach
wlr_files += configure_file( wlr_files += configure_file(
output: 'config.h', output: 'config.h',

4
include/xwayland/xwm.h
Unescape View File

@ -8,7 +8,7 @@
#include "config.h" #include "config.h"
#include "xwayland/selection.h" #include "xwayland/selection.h"
#if HAS_XCB_ERRORS #if HAVE_XCB_ERRORS
#include <xcb/xcb_errors.h> #include <xcb/xcb_errors.h>
#endif #endif
@ -126,7 +126,7 @@ struct wlr_xwm {
const xcb_query_extension_reply_t *xfixes; const xcb_query_extension_reply_t *xfixes;
const xcb_query_extension_reply_t *xres; const xcb_query_extension_reply_t *xres;
uint32_t xfixes_major_version; uint32_t xfixes_major_version;
#if HAS_XCB_ERRORS #if HAVE_XCB_ERRORS
xcb_errors_context_t *errors_context; xcb_errors_context_t *errors_context;
#endif #endif
unsigned int last_focus_seq; unsigned int last_focus_seq;

2
render/allocator/gbm.c
Unescape View File

@ -41,7 +41,7 @@ static bool export_gbm_bo(struct gbm_bo *bo,
int i; int i;
int32_t handle = -1; int32_t handle = -1;
for (i = 0; i < attribs.n_planes; ++i) { for (i = 0; i < attribs.n_planes; ++i) {
#if HAS_GBM_BO_GET_FD_FOR_PLANE #if HAVE_GBM_BO_GET_FD_FOR_PLANE
(void)handle; (void)handle;
attribs.fd[i] = gbm_bo_get_fd_for_plane(bo, i); attribs.fd[i] = gbm_bo_get_fd_for_plane(bo, i);

2
render/allocator/meson.build
Unescape View File

@ -21,5 +21,5 @@ if gbm.found()
features += { 'gbm-allocator': true } features += { 'gbm-allocator': true }
has = cc.has_function('gbm_bo_get_fd_for_plane', dependencies: [gbm]) has = cc.has_function('gbm_bo_get_fd_for_plane', dependencies: [gbm])
internal_config.set10('HAS_GBM_BO_GET_FD_FOR_PLANE', has) internal_config.set10('HAVE_GBM_BO_GET_FD_FOR_PLANE', has)
endif endif

8
xwayland/xwm.c
Unescape View File

@ -1534,7 +1534,7 @@ static void xwm_handle_focus_in(struct wlr_xwm *xwm,
} }
static void xwm_handle_xcb_error(struct wlr_xwm *xwm, xcb_value_error_t *ev) { static void xwm_handle_xcb_error(struct wlr_xwm *xwm, xcb_value_error_t *ev) {
#if HAS_XCB_ERRORS #if HAVE_XCB_ERRORS
const char *major_name = const char *major_name =
xcb_errors_get_name_for_major_code(xwm->errors_context, xcb_errors_get_name_for_major_code(xwm->errors_context,
ev->major_opcode); ev->major_opcode);
@ -1572,7 +1572,7 @@ log_raw:
} }
static void xwm_handle_unhandled_event(struct wlr_xwm *xwm, xcb_generic_event_t *ev) { static void xwm_handle_unhandled_event(struct wlr_xwm *xwm, xcb_generic_event_t *ev) {
#if HAS_XCB_ERRORS #if HAVE_XCB_ERRORS
const char *extension; const char *extension;
const char *event_name = const char *event_name =
xcb_errors_get_name_for_xcb_event(xwm->errors_context, xcb_errors_get_name_for_xcb_event(xwm->errors_context,
@ -1797,7 +1797,7 @@ void xwm_destroy(struct wlr_xwm *xwm) {
if (xwm->event_source) { if (xwm->event_source) {
wl_event_source_remove(xwm->event_source); wl_event_source_remove(xwm->event_source);
} }
#if HAS_XCB_ERRORS #if HAVE_XCB_ERRORS
if (xwm->errors_context) { if (xwm->errors_context) {
xcb_errors_context_free(xwm->errors_context); xcb_errors_context_free(xwm->errors_context);
} }
@ -2072,7 +2072,7 @@ struct wlr_xwm *xwm_create(struct wlr_xwayland *xwayland, int wm_fd) {
return NULL; return NULL;
} }
#if HAS_XCB_ERRORS #if HAVE_XCB_ERRORS
if (xcb_errors_context_new(xwm->xcb_conn, &xwm->errors_context)) { if (xcb_errors_context_new(xwm->xcb_conn, &xwm->errors_context)) {
wlr_log(WLR_ERROR, "Could not allocate error context"); wlr_log(WLR_ERROR, "Could not allocate error context");
xwm_destroy(xwm); xwm_destroy(xwm);

Write Preview
Loading…
Cancel
Save