aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorSimon Ser <contact@emersion.fr>2019-06-02 13:37:34 +0300
committerDrew DeVault <sir@cmpwn.com>2019-06-02 09:30:47 -0400
commit3dec88e4555ee5fd95ffd69133623816cb0c25c4 (patch)
tree065cdcd3a9b21ac955aa8e8e76648f14d8b7038d /include
parentabddd7b4db54a0066850e6a0deb8c3f24581639e (diff)
Remove orbital screenshooter and gamma-control
These are undocumented, outdated protocols that have a better wlr-protocols equivalent.
Diffstat (limited to 'include')
-rw-r--r--include/rootston/desktop.h4
-rw-r--r--include/wlr/types/meson.build2
-rw-r--r--include/wlr/types/wlr_gamma_control.h46
-rw-r--r--include/wlr/types/wlr_screenshooter.h49
4 files changed, 0 insertions, 101 deletions
diff --git a/include/rootston/desktop.h b/include/rootston/desktop.h
index bc582334..791f5a8b 100644
--- a/include/rootston/desktop.h
+++ b/include/rootston/desktop.h
@@ -6,7 +6,6 @@
#include <wlr/types/wlr_compositor.h>
#include <wlr/types/wlr_foreign_toplevel_management_v1.h>
#include <wlr/types/wlr_gamma_control_v1.h>
-#include <wlr/types/wlr_gamma_control.h>
#include <wlr/types/wlr_gtk_primary_selection.h>
#include <wlr/types/wlr_idle_inhibit_v1.h>
#include <wlr/types/wlr_idle.h>
@@ -21,7 +20,6 @@
#include <wlr/types/wlr_presentation_time.h>
#include <wlr/types/wlr_relative_pointer_v1.h>
#include <wlr/types/wlr_screencopy_v1.h>
-#include <wlr/types/wlr_screenshooter.h>
#include <wlr/types/wlr_text_input_v3.h>
#include <wlr/types/wlr_virtual_keyboard_v1.h>
#include <wlr/types/wlr_xcursor_manager.h>
@@ -47,9 +45,7 @@ struct roots_desktop {
struct wlr_compositor *compositor;
struct wlr_xdg_shell_v6 *xdg_shell_v6;
struct wlr_xdg_shell *xdg_shell;
- struct wlr_gamma_control_manager *gamma_control_manager;
struct wlr_gamma_control_manager_v1 *gamma_control_manager_v1;
- struct wlr_screenshooter *screenshooter;
struct wlr_export_dmabuf_manager_v1 *export_dmabuf_manager_v1;
struct wlr_server_decoration_manager *server_decoration_manager;
struct wlr_xdg_decoration_manager_v1 *xdg_decoration_manager;
diff --git a/include/wlr/types/meson.build b/include/wlr/types/meson.build
index c7e7bdbf..288fd1c5 100644
--- a/include/wlr/types/meson.build
+++ b/include/wlr/types/meson.build
@@ -9,7 +9,6 @@ install_headers(
'wlr_foreign_toplevel_management_v1.h',
'wlr_fullscreen_shell_v1.h',
'wlr_gamma_control_v1.h',
- 'wlr_gamma_control.h',
'wlr_gtk_primary_selection.h',
'wlr_idle_inhibit_v1.h',
'wlr_idle.h',
@@ -34,7 +33,6 @@ install_headers(
'wlr_region.h',
'wlr_relative_pointer_v1.h',
'wlr_screencopy_v1.h',
- 'wlr_screenshooter.h',
'wlr_seat.h',
'wlr_server_decoration.h',
'wlr_surface.h',
diff --git a/include/wlr/types/wlr_gamma_control.h b/include/wlr/types/wlr_gamma_control.h
deleted file mode 100644
index 912a413c..00000000
--- a/include/wlr/types/wlr_gamma_control.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * This an unstable interface of wlroots. No guarantees are made regarding the
- * future consistency of this API.
- */
-#ifndef WLR_USE_UNSTABLE
-#error "Add -DWLR_USE_UNSTABLE to enable unstable wlroots features"
-#endif
-
-#ifndef WLR_TYPES_WLR_GAMMA_CONTROL_H
-#define WLR_TYPES_WLR_GAMMA_CONTROL_H
-
-#include <wayland-server.h>
-
-struct wlr_gamma_control_manager {
- struct wl_global *global;
- struct wl_list controls; // wlr_gamma_control::link
-
- struct wl_listener display_destroy;
-
- struct {
- struct wl_signal destroy;
- } events;
-
- void *data;
-};
-
-struct wlr_gamma_control {
- struct wl_resource *resource;
- struct wlr_output *output;
- struct wl_list link;
-
- struct wl_listener output_destroy_listener;
-
- struct {
- struct wl_signal destroy;
- } events;
-
- void* data;
-};
-
-struct wlr_gamma_control_manager *wlr_gamma_control_manager_create(
- struct wl_display *display);
-void wlr_gamma_control_manager_destroy(
- struct wlr_gamma_control_manager *gamma_control_manager);
-
-#endif
diff --git a/include/wlr/types/wlr_screenshooter.h b/include/wlr/types/wlr_screenshooter.h
deleted file mode 100644
index d90ed5e1..00000000
--- a/include/wlr/types/wlr_screenshooter.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * This protocol is obsolete and will be removed in a future version. The
- * recommended replacement is wlr-screencopy.
- */
-
-/*
- * This an unstable interface of wlroots. No guarantees are made regarding the
- * future consistency of this API.
- */
-#ifndef WLR_USE_UNSTABLE
-#error "Add -DWLR_USE_UNSTABLE to enable unstable wlroots features"
-#endif
-
-#ifndef WLR_TYPES_WLR_SCREENSHOOTER_H
-#define WLR_TYPES_WLR_SCREENSHOOTER_H
-
-#include <wayland-server.h>
-
-/**
- * A very basic screenshooter interrface which implements the Orbital protocol.
- */
-struct wlr_screenshooter {
- struct wl_global *global;
- struct wl_list screenshots; // wlr_screenshot::link
-
- struct wl_listener display_destroy;
-
- struct {
- struct wl_signal destroy;
- } events;
-
- void *data;
-};
-
-struct wlr_screenshot {
- struct wl_resource *resource;
- struct wl_resource *output_resource;
- struct wl_list link;
-
- struct wlr_output *output;
- struct wlr_screenshooter *screenshooter;
-
- void* data;
-};
-
-struct wlr_screenshooter *wlr_screenshooter_create(struct wl_display *display);
-void wlr_screenshooter_destroy(struct wlr_screenshooter *screenshooter);
-
-#endif