mainnika
/
weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libweston: Migrate functions that operate on 'weston_compositor'

Browse Source 
Signed-off-by: Marius Vlad <marius.vlad@collabora.com>
dev
Marius Vlad 6 years ago committed by Daniel Stone
parent a72e3716e8
commit 56f3a68a01
7 changed files with 103 additions and 97 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 97
      include/libweston/libweston.h
  2. 1
      libweston/input.c
  3. 98
      libweston/libweston-internal.h
  4. 1
      libweston/linux-dmabuf.c
  5. 1
      libweston/touch-calibration.c
  6. 1
      remoting/remoting-plugin.c
  7. 1
      tests/surface-screenshot-test.c

97
include/libweston/libweston.h
Unescape View File

@ -1761,15 +1761,6 @@ notify_touch_frame(struct weston_touch_device *device);
void void
notify_touch_cancel(struct weston_touch_device *device); notify_touch_cancel(struct weston_touch_device *device);
void
weston_compositor_set_touch_mode_normal(struct weston_compositor *compositor);
void
weston_compositor_set_touch_mode_calib(struct weston_compositor *compositor);
void
touch_calibrator_mode_changed(struct weston_compositor *compositor);
void void
notify_touch_calibrator(struct weston_touch_device *device, notify_touch_calibrator(struct weston_touch_device *device,
const struct timespec *time, int32_t slot, const struct timespec *time, int32_t slot,
@ -1812,11 +1803,6 @@ weston_plane_init(struct weston_plane *plane,
void void
weston_plane_release(struct weston_plane *plane); weston_plane_release(struct weston_plane *plane);
void
weston_compositor_stack_plane(struct weston_compositor *ec,
struct weston_plane *plane,
struct weston_plane *above);
/* 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)
@ -1835,8 +1821,6 @@ weston_compositor_damage_all(struct weston_compositor *compositor);
void void
weston_compositor_wake(struct weston_compositor *compositor); weston_compositor_wake(struct weston_compositor *compositor);
void void
weston_compositor_offscreen(struct weston_compositor *compositor);
void
weston_compositor_sleep(struct weston_compositor *compositor); weston_compositor_sleep(struct weston_compositor *compositor);
struct weston_view * struct weston_view *
weston_compositor_pick_view(struct weston_compositor *compositor, weston_compositor_pick_view(struct weston_compositor *compositor,
@ -1895,56 +1879,11 @@ weston_compositor_add_axis_binding(struct weston_compositor *compositor,
enum weston_keyboard_modifier modifier, enum weston_keyboard_modifier modifier,
weston_axis_binding_handler_t binding, weston_axis_binding_handler_t binding,
void *data); void *data);
struct weston_binding *
weston_compositor_add_debug_binding(struct weston_compositor *compositor,
uint32_t key,
weston_key_binding_handler_t binding,
void *data);
void
weston_binding_destroy(struct weston_binding *binding);
void void
weston_install_debug_key_binding(struct weston_compositor *compositor, weston_install_debug_key_binding(struct weston_compositor *compositor,
uint32_t mod); uint32_t mod);
void
weston_binding_list_destroy_all(struct wl_list *list);
void
weston_compositor_run_key_binding(struct weston_compositor *compositor,
struct weston_keyboard *keyboard,
const struct timespec *time,
uint32_t key,
enum wl_keyboard_key_state state);
void
weston_compositor_run_modifier_binding(struct weston_compositor *compositor,
struct weston_keyboard *keyboard,
enum weston_keyboard_modifier modifier,
enum wl_keyboard_key_state state);
void
weston_compositor_run_button_binding(struct weston_compositor *compositor,
struct weston_pointer *pointer,
const struct timespec *time,
uint32_t button,
enum wl_pointer_button_state value);
void
weston_compositor_run_touch_binding(struct weston_compositor *compositor,
struct weston_touch *touch,
const struct timespec *time,
int touch_type);
int
weston_compositor_run_axis_binding(struct weston_compositor *compositor,
struct weston_pointer *pointer,
const struct timespec *time,
struct weston_pointer_axis_event *event);
int
weston_compositor_run_debug_binding(struct weston_compositor *compositor,
struct weston_keyboard *keyboard,
const struct timespec *time,
uint32_t key,
enum wl_keyboard_key_state state);
void void
weston_compositor_set_default_pointer_grab(struct weston_compositor *compositor, weston_compositor_set_default_pointer_grab(struct weston_compositor *compositor,
const struct weston_pointer_grab_interface *interface); const struct weston_pointer_grab_interface *interface);
@ -2042,9 +1981,6 @@ weston_buffer_from_resource(struct wl_resource *resource);
void void
weston_compositor_get_time(struct timespec *time); weston_compositor_get_time(struct timespec *time);
char *
weston_compositor_print_scene_graph(struct weston_compositor *ec);
void void
weston_compositor_destroy(struct weston_compositor *ec); weston_compositor_destroy(struct weston_compositor *ec);
struct weston_compositor * struct weston_compositor *
@ -2068,23 +2004,6 @@ void
weston_compositor_exit(struct weston_compositor *ec); weston_compositor_exit(struct weston_compositor *ec);
void * void *
weston_compositor_get_user_data(struct weston_compositor *compositor); weston_compositor_get_user_data(struct weston_compositor *compositor);
int
weston_compositor_set_presentation_clock(struct weston_compositor *compositor,
clockid_t clk_id);
int
weston_compositor_set_presentation_clock_software(
struct weston_compositor *compositor);
void
weston_compositor_read_presentation_clock(
const struct weston_compositor *compositor,
struct timespec *ts);
bool
weston_compositor_import_dmabuf(struct weston_compositor *compositor,
struct linux_dmabuf_buffer *buffer);
void
weston_compositor_shutdown(struct weston_compositor *ec);
void 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);
@ -2136,8 +2055,6 @@ weston_seat_release(struct weston_seat *seat);
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);
void
weston_compositor_xkb_destroy(struct weston_compositor *ec);
/* String literal of spaces, the same width as the timestamp. */ /* String literal of spaces, the same width as the timestamp. */
#define STAMP_SPACE " " #define STAMP_SPACE " "
@ -2230,12 +2147,6 @@ weston_output_mode_switch_to_temporary(struct weston_output *output,
int int
weston_output_mode_switch_to_native(struct weston_output *output); weston_output_mode_switch_to_native(struct weston_output *output);
int
noop_renderer_init(struct weston_compositor *ec);
int
weston_input_init(struct weston_compositor *compositor);
int int
weston_backend_init(struct weston_compositor *c, weston_backend_init(struct weston_compositor *c,
struct weston_backend_config *config_base); struct weston_backend_config *config_base);
@ -2300,10 +2211,6 @@ weston_head_init(struct weston_head *head, const char *name);
void void
weston_head_release(struct weston_head *head); weston_head_release(struct weston_head *head);
void
weston_compositor_add_head(struct weston_compositor *compositor,
struct weston_head *head);
void void
weston_head_set_monitor_strings(struct weston_head *head, weston_head_set_monitor_strings(struct weston_head *head,
const char *make, const char *make,
@ -2407,10 +2314,6 @@ weston_output_init(struct weston_output *output,
struct weston_compositor *compositor, struct weston_compositor *compositor,
const char *name); const char *name);
void
weston_compositor_add_pending_output(struct weston_output *output,
struct weston_compositor *compositor);
int int
weston_output_enable(struct weston_output *output); weston_output_enable(struct weston_output *output);

1
libweston/input.c
Unescape View File

@ -43,6 +43,7 @@
#include "shared/os-compatibility.h" #include "shared/os-compatibility.h"
#include "shared/timespec-util.h" #include "shared/timespec-util.h"
#include <libweston/libweston.h> #include <libweston/libweston.h>
#include "libweston-internal.h"
#include "relative-pointer-unstable-v1-server-protocol.h" #include "relative-pointer-unstable-v1-server-protocol.h"
#include "pointer-constraints-unstable-v1-server-protocol.h" #include "pointer-constraints-unstable-v1-server-protocol.h"
#include "input-timestamps-unstable-v1-server-protocol.h" #include "input-timestamps-unstable-v1-server-protocol.h"

98
libweston/libweston-internal.h
Unescape View File

@ -58,4 +58,102 @@ void
weston_buffer_release_reference(struct weston_buffer_release_reference *ref, weston_buffer_release_reference(struct weston_buffer_release_reference *ref,
struct weston_buffer_release *buf_release); struct weston_buffer_release *buf_release);
/* weston_bindings */
void
weston_binding_destroy(struct weston_binding *binding);
void
weston_binding_list_destroy_all(struct wl_list *list);
/* weston_compositor */
void
touch_calibrator_mode_changed(struct weston_compositor *compositor);
int
noop_renderer_init(struct weston_compositor *ec);
void
weston_compositor_add_head(struct weston_compositor *compositor,
struct weston_head *head);
void
weston_compositor_add_pending_output(struct weston_output *output,
struct weston_compositor *compositor);
struct weston_binding *
weston_compositor_add_debug_binding(struct weston_compositor *compositor,
uint32_t key,
weston_key_binding_handler_t binding,
void *data);
bool
weston_compositor_import_dmabuf(struct weston_compositor *compositor,
struct linux_dmabuf_buffer *buffer);
void
weston_compositor_offscreen(struct weston_compositor *compositor);
char *
weston_compositor_print_scene_graph(struct weston_compositor *ec);
void
weston_compositor_read_presentation_clock(
const struct weston_compositor *compositor,
struct timespec *ts);
int
weston_compositor_run_axis_binding(struct weston_compositor *compositor,
struct weston_pointer *pointer,
const struct timespec *time,
struct weston_pointer_axis_event *event);
void
weston_compositor_run_button_binding(struct weston_compositor *compositor,
struct weston_pointer *pointer,
const struct timespec *time,
uint32_t button,
enum wl_pointer_button_state value);
int
weston_compositor_run_debug_binding(struct weston_compositor *compositor,
struct weston_keyboard *keyboard,
const struct timespec *time,
uint32_t key,
enum wl_keyboard_key_state state);
void
weston_compositor_run_key_binding(struct weston_compositor *compositor,
struct weston_keyboard *keyboard,
const struct timespec *time,
uint32_t key,
enum wl_keyboard_key_state state);
void
weston_compositor_run_modifier_binding(struct weston_compositor *compositor,
struct weston_keyboard *keyboard,
enum weston_keyboard_modifier modifier,
enum wl_keyboard_key_state state);
void
weston_compositor_run_touch_binding(struct weston_compositor *compositor,
struct weston_touch *touch,
const struct timespec *time,
int touch_type);
void
weston_compositor_stack_plane(struct weston_compositor *ec,
struct weston_plane *plane,
struct weston_plane *above);
void
weston_compositor_set_touch_mode_normal(struct weston_compositor *compositor);
void
weston_compositor_set_touch_mode_calib(struct weston_compositor *compositor);
int
weston_compositor_set_presentation_clock(struct weston_compositor *compositor,
clockid_t clk_id);
int
weston_compositor_set_presentation_clock_software(
struct weston_compositor *compositor);
void
weston_compositor_shutdown(struct weston_compositor *ec);
void
weston_compositor_xkb_destroy(struct weston_compositor *ec);
int
weston_input_init(struct weston_compositor *compositor);
#endif #endif

1
libweston/linux-dmabuf.c
Unescape View File

@ -33,6 +33,7 @@
#include <libweston/libweston.h> #include <libweston/libweston.h>
#include "linux-dmabuf.h" #include "linux-dmabuf.h"
#include "linux-dmabuf-unstable-v1-server-protocol.h" #include "linux-dmabuf-unstable-v1-server-protocol.h"
#include "libweston-internal.h"
static void static void
linux_dmabuf_buffer_destroy(struct linux_dmabuf_buffer *buffer) linux_dmabuf_buffer_destroy(struct linux_dmabuf_buffer *buffer)

1
libweston/touch-calibration.c
Unescape View File

@ -34,6 +34,7 @@
#include <libweston/zalloc.h> #include <libweston/zalloc.h>
#include "shared/timespec-util.h" #include "shared/timespec-util.h"
#include <libweston/libweston.h> #include <libweston/libweston.h>
#include "libweston-internal.h"
#include "weston-touch-calibration-server-protocol.h" #include "weston-touch-calibration-server-protocol.h"

1
remoting/remoting-plugin.c
Unescape View File

@ -47,6 +47,7 @@
#include <libweston/backend-drm.h> #include <libweston/backend-drm.h>
#include "shared/helpers.h" #include "shared/helpers.h"
#include "shared/timespec-util.h" #include "shared/timespec-util.h"
#include "libweston-internal.h"
#define MAX_RETRY_COUNT 3 #define MAX_RETRY_COUNT 3

1
tests/surface-screenshot-test.c
Unescape View File

@ -36,6 +36,7 @@
#include <libweston/libweston.h> #include <libweston/libweston.h>
#include "compositor/weston.h" #include "compositor/weston.h"
#include "file-util.h" #include "file-util.h"
#include "libweston-internal.h"
static char * static char *
encode_PAM_comment_line(const char *comment) encode_PAM_comment_line(const char *comment)

Write Preview
Loading…
Cancel
Save