Renamed 'wlr_drm_display' to 'wlr_drm_output'

3 files changed, 19 insertions, 19 deletions

diff --git a/include/backend/drm/backend.h b/include/backend/drm/backend.h
index 32182d0c..d6093bc2 100644
--- a/include/backend/drm/backend.h
+++ b/include/backend/drm/backend.h
@@ -28,12 +28,12 @@ struct wlr_drm_backend {
 	} event_src;
 
 	struct {
-		struct wl_signal display_add;
-		struct wl_signal display_rem;
-		struct wl_signal display_render;
+		struct wl_signal output_add;
+		struct wl_signal output_rem;
+		struct wl_signal output_render;
 	} signals;
 
-	list_t *displays;
+	list_t *outputs;
 
 	uint32_t taken_crtcs;
 
diff --git a/include/backend/drm/drm.h b/include/backend/drm/drm.h
index 346974ca..6c3bb49f 100644
--- a/include/backend/drm/drm.h
+++ b/include/backend/drm/drm.h
@@ -25,15 +25,15 @@ bool wlr_drm_renderer_init(struct wlr_drm_renderer *renderer,
 		struct wlr_drm_backend *backend, int fd);
 void wlr_drm_renderer_free(struct wlr_drm_renderer *renderer);
 
-enum wlr_drm_display_state {
-	DRM_DISP_INVALID,
-	DRM_DISP_DISCONNECTED,
-	DRM_DISP_NEEDS_MODESET,
-	DRM_DISP_CONNECTED,
+enum wlr_drm_output_state {
+	DRM_OUTPUT_INVALID,
+	DRM_OUTPUT_DISCONNECTED,
+	DRM_OUTPUT_NEEDS_MODESET,
+	DRM_OUTPUT_CONNECTED,
 };
 
-struct wlr_drm_display {
-	enum wlr_drm_display_state state;
+struct wlr_drm_output {
+	enum wlr_drm_output_state state;
 	uint32_t connector;
 	char name[16];
 
@@ -55,11 +55,11 @@ struct wlr_drm_display {
 	bool cleanup;
 };
 
-bool wlr_drm_display_modeset(struct wlr_drm_display *disp, const char *str);
-void wlr_drm_display_free(struct wlr_drm_display *disp, bool restore);
+bool wlr_drm_output_modeset(struct wlr_drm_output *out, const char *str);
+void wlr_drm_output_free(struct wlr_drm_output *out, bool restore);
 
-void wlr_drm_display_begin(struct wlr_drm_display *disp);
-void wlr_drm_display_end(struct wlr_drm_display *disp);
+void wlr_drm_output_begin(struct wlr_drm_output *out);
+void wlr_drm_output_end(struct wlr_drm_output *out);
 
 void wlr_drm_scan_connectors(struct wlr_drm_backend *backend);
 void wlr_drm_event(int fd);
diff --git a/include/wlr/backend/drm.h b/include/wlr/backend/drm.h
index ede43fda..13679782 100644
--- a/include/wlr/backend/drm.h
+++ b/include/wlr/backend/drm.h
@@ -5,7 +5,7 @@
 #include <wlr/session.h>
 
 struct wlr_drm_backend;
-struct wlr_drm_display;
+struct wlr_drm_output;
 
 struct wlr_drm_backend *wlr_drm_backend_init(struct wlr_session *session,
 	struct wl_listener *add, struct wl_listener *rem, struct wl_listener *render);
@@ -13,8 +13,8 @@ void wlr_drm_backend_free(struct wlr_drm_backend *backend);
 
 struct wl_event_loop *wlr_drm_backend_get_event_loop(struct wlr_drm_backend *backend);
 
-bool wlr_drm_display_modeset(struct wlr_drm_display *disp, const char *str);
-void wlr_drm_display_begin(struct wlr_drm_display *disp);
-void wlr_drm_display_end(struct wlr_drm_display *disp);
+bool wlr_drm_output_modeset(struct wlr_drm_output *out, const char *str);
+void wlr_drm_output_begin(struct wlr_drm_output *out);
+void wlr_drm_output_end(struct wlr_drm_output *out);
 
 #endif