Commit 63ef078a authored by Marius Vlad's avatar Marius Vlad Committed by Daniel Stone
Browse files

libweston: Migrate functions that operate on 'weston_output' into backend header


Signed-off-by: Marius Vlad's avatarMarius Vlad <marius.vlad@collabora.com>
parent e41c1bff
...@@ -41,6 +41,7 @@ ...@@ -41,6 +41,7 @@
#include <wayland-client.h> #include <wayland-client.h>
#include <libweston/libweston.h> #include <libweston/libweston.h>
#include "backend.h"
#include "libweston-internal.h" #include "libweston-internal.h"
#include "weston.h" #include "weston.h"
#include "shared/helpers.h" #include "shared/helpers.h"
......
...@@ -1732,15 +1732,9 @@ weston_layer_mask_is_infinite(struct weston_layer *layer); ...@@ -1732,15 +1732,9 @@ weston_layer_mask_is_infinite(struct weston_layer *layer);
/* An invalid flag in presented_flags to catch logic errors. */ /* An invalid flag in presented_flags to catch logic errors. */
#define WP_PRESENTATION_FEEDBACK_INVALID (1U << 31) #define WP_PRESENTATION_FEEDBACK_INVALID (1U << 31)
void
weston_output_finish_frame(struct weston_output *output,
const struct timespec *stamp,
uint32_t presented_flags);
void void
weston_output_schedule_repaint(struct weston_output *output); weston_output_schedule_repaint(struct weston_output *output);
void void
weston_output_damage(struct weston_output *output);
void
weston_compositor_schedule_repaint(struct weston_compositor *compositor); weston_compositor_schedule_repaint(struct weston_compositor *compositor);
void void
weston_compositor_damage_all(struct weston_compositor *compositor); weston_compositor_damage_all(struct weston_compositor *compositor);
...@@ -1925,28 +1919,16 @@ void ...@@ -1925,28 +1919,16 @@ void
weston_compositor_exit_with_code(struct weston_compositor *compositor, weston_compositor_exit_with_code(struct weston_compositor *compositor,
int exit_code); int exit_code);
void void
weston_output_init_zoom(struct weston_output *output);
void
weston_output_update_zoom(struct weston_output *output); weston_output_update_zoom(struct weston_output *output);
void void
weston_output_activate_zoom(struct weston_output *output, weston_output_activate_zoom(struct weston_output *output,
struct weston_seat *seat); struct weston_seat *seat);
void
weston_output_move(struct weston_output *output, int x, int y);
void void
weston_output_add_destroy_listener(struct weston_output *output, weston_output_add_destroy_listener(struct weston_output *output,
struct wl_listener *listener); struct wl_listener *listener);
struct wl_listener * struct wl_listener *
weston_output_get_destroy_listener(struct weston_output *output, weston_output_get_destroy_listener(struct weston_output *output,
wl_notify_func_t notify); wl_notify_func_t notify);
void
weston_output_release(struct weston_output *output);
void
weston_output_transform_coordinate(struct weston_output *output,
double device_x, double device_y,
double *x, double *y);
int int
weston_compositor_set_xkb_rule_names(struct weston_compositor *ec, weston_compositor_set_xkb_rule_names(struct weston_compositor *ec,
struct xkb_rule_names *names); struct xkb_rule_names *names);
...@@ -2028,10 +2010,6 @@ weston_surface_set_color(struct weston_surface *surface, ...@@ -2028,10 +2010,6 @@ weston_surface_set_color(struct weston_surface *surface,
void void
weston_surface_destroy(struct weston_surface *surface); weston_surface_destroy(struct weston_surface *surface);
int
weston_output_mode_set_native(struct weston_output *output,
struct weston_mode *mode,
int32_t scale);
int int
weston_output_mode_switch_to_temporary(struct weston_output *output, weston_output_mode_switch_to_temporary(struct weston_output *output,
struct weston_mode *mode, struct weston_mode *mode,
......
...@@ -57,5 +57,36 @@ weston_head_set_physical_size(struct weston_head *head, ...@@ -57,5 +57,36 @@ weston_head_set_physical_size(struct weston_head *head,
void void
weston_head_set_subpixel(struct weston_head *head, weston_head_set_subpixel(struct weston_head *head,
enum wl_output_subpixel sp); enum wl_output_subpixel sp);
/* weston_output */
void
weston_output_init(struct weston_output *output,
struct weston_compositor *compositor,
const char *name);
void
weston_output_damage(struct weston_output *output);
void
weston_output_move(struct weston_output *output, int x, int y);
void
weston_output_release(struct weston_output *output);
void
weston_output_init_zoom(struct weston_output *output);
void
weston_output_finish_frame(struct weston_output *output,
const struct timespec *stamp,
uint32_t presented_flags);
int
weston_output_mode_set_native(struct weston_output *output,
struct weston_mode *mode,
int32_t scale);
void
weston_output_transform_coordinate(struct weston_output *output,
double device_x, double device_y,
double *x, double *y);
#endif #endif
...@@ -72,6 +72,7 @@ ...@@ -72,6 +72,7 @@
#include <libweston/version.h> #include <libweston/version.h>
#include <libweston/plugin-registry.h> #include <libweston/plugin-registry.h>
#include "pixel-formats.h" #include "pixel-formats.h"
#include "backend.h"
#include "libweston-internal.h" #include "libweston-internal.h"
/** /**
......
...@@ -39,6 +39,7 @@ ...@@ -39,6 +39,7 @@
#include <libinput.h> #include <libinput.h>
#include <libweston/libweston.h> #include <libweston/libweston.h>
#include "backend.h"
#include "libweston-internal.h" #include "libweston-internal.h"
#include "libinput-device.h" #include "libinput-device.h"
#include "shared/helpers.h" #include "shared/helpers.h"
......
...@@ -38,6 +38,7 @@ ...@@ -38,6 +38,7 @@
#include <libweston/libweston.h> #include <libweston/libweston.h>
#include "shared/helpers.h" #include "shared/helpers.h"
#include "shared/timespec-util.h" #include "shared/timespec-util.h"
#include "backend.h"
#include "libweston-internal.h" #include "libweston-internal.h"
#include "wcap/wcap-decode.h" #include "wcap/wcap-decode.h"
......
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
#include <stdbool.h> #include <stdbool.h>
#include <libweston/libweston.h> #include <libweston/libweston.h>
#include "backend.h"
#include "libweston-internal.h" #include "libweston-internal.h"
#include "text-cursor-position-server-protocol.h" #include "text-cursor-position-server-protocol.h"
#include "shared/helpers.h" #include "shared/helpers.h"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment