Reorganize wlr-common

This commit is contained in:
Drew DeVault 2017-06-21 12:10:07 -04:00
parent fd91244e83
commit f4453d104d
46 changed files with 71 additions and 91 deletions

View file

@ -11,8 +11,8 @@
#include <gbm.h>
#include <wlr/session.h>
#include <wlr/common/list.h>
#include <wlr/backend/drm.h>
#include <wlr/util/list.h>
#include "backend/egl.h"
#include "backend/udev.h"

View file

@ -1,10 +1,10 @@
#ifndef _WLR_BACKEND_LIBINPUT_INTERNAL_H
#define _WLR_BACKEND_LIBINPUT_INTERNAL_H
#include <libinput.h>
#include <wlr/backend/interface.h>
#include <wlr/common/list.h>
#include <wayland-server-core.h>
#include <wlr/backend/interface.h>
#include <wlr/interfaces/wlr_input_device.h>
#include <wlr/util/list.h>
#include "backend/udev.h"
struct wlr_backend_state {

View file

@ -3,7 +3,7 @@
#include <wlr/backend/interface.h>
#include <wlr/backend/multi.h>
#include <wlr/common/list.h>
#include <wlr/util/list.h>
struct wlr_backend_state {
struct wlr_backend *backend;

View file

@ -4,9 +4,9 @@
#include <wayland-client.h>
#include <wayland-server.h>
#include <wayland-egl.h>
#include <wlr/common/list.h>
#include <wlr/backend/wayland.h>
#include <wlr/types/wlr_input_device.h>
#include <wlr/util/list.h>
#include "backend/egl.h"
struct wlr_backend_state {

View file

@ -1,19 +0,0 @@
#ifndef _WLR_COMMON_LOG_H
#define _WLR_COMMON_LOG_H
#include <stdbool.h>
#include <stdarg.h>
typedef enum {
L_SILENT = 0,
L_ERROR = 1,
L_INFO = 2,
L_DEBUG = 3,
L_LAST,
} log_importance_t;
typedef void (*log_callback_t)(log_importance_t importance, const char *fmt, va_list args);
void wlr_init_log(log_callback_t callback);
void wlr_log_stderr(log_importance_t verbosity, const char *fmt, va_list args);
#endif

View file

@ -1,7 +1,7 @@
#ifndef _WLR_TYPES_OUTPUT_H
#define _WLR_TYPES_OUTPUT_H
#include <wayland-server.h>
#include <wlr/common/list.h>
#include <wlr/util/list.h>
#include <stdbool.h>
struct wlr_output_mode_state;

View file

@ -1,5 +1,5 @@
#ifndef _WLR_LIST_H
#define _WLR_LIST_H
#ifndef _WLR_UTIL_LIST_H
#define _WLR_UTIL_LIST_H
#include <stddef.h>

View file

@ -1,9 +1,21 @@
#ifndef _WLR_INTERNAL_COMMON_LOG_H
#define _WLR_INTERNAL_COMMON_LOG_H
#ifndef _WLR_UTIL_LOG_H
#define _WLR_UTIL_LOG_H
#include <stdbool.h>
#include <stdarg.h>
#include <string.h>
#include <errno.h>
#include <wlr/common/log.h>
typedef enum {
L_SILENT = 0,
L_ERROR = 1,
L_INFO = 2,
L_DEBUG = 3,
L_LAST,
} log_importance_t;
typedef void (*log_callback_t)(log_importance_t importance, const char *fmt, va_list args);
void wlr_init_log(log_callback_t callback);
#ifdef __GNUC__
#define ATTRIB_PRINTF(start, end) __attribute__((format(printf, start, end)))