Remove unused SWAY_VIEW_TYPES

include/sway/tree/view.h

@@ -59,11 +59,9 @@ struct sway_wl_shell_surface {
 };
 
 enum sway_view_type {
-	SWAY_WL_SHELL_VIEW,
+	SWAY_VIEW_WL_SHELL,
-	SWAY_XDG_SHELL_V6_VIEW,
+	SWAY_VIEW_XDG_SHELL_V6,
-	SWAY_XWAYLAND_VIEW,
+	SWAY_VIEW_XWAYLAND,
-	// Keep last
-	SWAY_VIEW_TYPES,
 };
 
 enum sway_view_prop {

sway/desktop/output.c

@@ -188,7 +188,7 @@ static void render_view(struct sway_container *view, void *data) {
 	}
 
 	switch (sway_view->type) {
-	case SWAY_XDG_SHELL_V6_VIEW: {
+	case SWAY_VIEW_XDG_SHELL_V6: {
 		int window_offset_x = view->sway_view->wlr_xdg_surface_v6->geometry.x;
 		int window_offset_y = view->sway_view->wlr_xdg_surface_v6->geometry.y;
 		render_surface(surface, wlr_output, when,
@@ -197,13 +197,12 @@ static void render_view(struct sway_container *view, void *data) {
 			when, view->x - window_offset_x, view->y - window_offset_y, 0, alpha);
 		break;
 	}
-	case SWAY_WL_SHELL_VIEW:
+	case SWAY_VIEW_WL_SHELL:
 		render_wl_shell_surface(sway_view->wlr_wl_shell_surface, wlr_output,
 			when, view->x, view->y, 0, alpha, false);
 		break;
-	case SWAY_XWAYLAND_VIEW:
+	case SWAY_VIEW_XWAYLAND:
-		render_surface(surface, wlr_output, when, view->x, view->y,
+		render_surface(surface, wlr_output, when, view->x, view->y, 0, alpha);
-			0, alpha);
 		break;
 	default:
 		break;

sway/desktop/wl_shell.c

@@ -12,7 +12,7 @@
 #include "log.h"
 
 static bool assert_wl_shell(struct sway_view *view) {
-	return sway_assert(view->type == SWAY_WL_SHELL_VIEW,
+	return sway_assert(view->type == SWAY_VIEW_WL_SHELL,
 		"Expecting wl_shell view!");
 }
 
@@ -97,7 +97,7 @@ void handle_wl_shell_surface(struct wl_listener *listener, void *data) {
 		return;
 	}
 
-	struct sway_view *view = view_create(SWAY_WL_SHELL_VIEW, &view_impl);
+	struct sway_view *view = view_create(SWAY_VIEW_WL_SHELL, &view_impl);
 	if (!sway_assert(view, "Failed to allocate view")) {
 		return;
 	}

sway/desktop/xdg_shell_v6.c

@@ -12,7 +12,7 @@
 #include "log.h"
 
 static bool assert_xdg(struct sway_view *view) {
-	return sway_assert(view->type == SWAY_XDG_SHELL_V6_VIEW,
+	return sway_assert(view->type == SWAY_VIEW_XDG_SHELL_V6,
 			"Expected xdg shell v6 view!");
 }
 
@@ -126,7 +126,7 @@ void handle_xdg_shell_v6_surface(struct wl_listener *listener, void *data) {
 		return;
 	}
 
-	struct sway_view *view = view_create(SWAY_XDG_SHELL_V6_VIEW, &view_impl);
+	struct sway_view *view = view_create(SWAY_VIEW_XDG_SHELL_V6, &view_impl);
 	if (!sway_assert(view, "Failed to allocate view")) {
 		return;
 	}

sway/desktop/xwayland.c

@@ -42,7 +42,7 @@ static void create_unmanaged(struct wlr_xwayland_surface *xsurface) {
 
 
 static bool assert_xwayland(struct sway_view *view) {
-	return sway_assert(view->type == SWAY_XWAYLAND_VIEW,
+	return sway_assert(view->type == SWAY_VIEW_XWAYLAND,
 		"Expected xwayland view!");
 }
 
@@ -185,7 +185,7 @@ void handle_xwayland_surface(struct wl_listener *listener, void *data) {
 		return;
 	}
 
-	struct sway_view *view = view_create(SWAY_XWAYLAND_VIEW, &view_impl);
+	struct sway_view *view = view_create(SWAY_VIEW_XWAYLAND, &view_impl);
 	if (!sway_assert(view, "Failed to allocate view")) {
 		return;
 	}

sway/input/seat.c

@@ -66,7 +66,7 @@ static void seat_send_focus(struct sway_seat *seat,
 		return;
 	}
 	struct sway_view *view = con->sway_view;
-	if (view->type == SWAY_XWAYLAND_VIEW) {
+	if (view->type == SWAY_VIEW_XWAYLAND) {
 		struct wlr_xwayland *xwayland =
 			seat->input->server->xwayland;
 		wlr_xwayland_set_seat(xwayland, seat->wlr_seat);

sway/tree/container.c

@@ -413,31 +413,28 @@ struct sway_container *container_at(struct sway_container *parent,
 			double view_sy = oy - swayc->y;
 
 			switch (sview->type) {
-				case SWAY_WL_SHELL_VIEW:
+			case SWAY_VIEW_XWAYLAND:
-					break;
+			case SWAY_VIEW_WL_SHELL:
-				case SWAY_XDG_SHELL_V6_VIEW:
+				break;
-					// the top left corner of the sway container is the
+			case SWAY_VIEW_XDG_SHELL_V6:
-					// coordinate of the top left corner of the window geometry
+				// the top left corner of the sway container is the
-					view_sx += sview->wlr_xdg_surface_v6->geometry.x;
+				// coordinate of the top left corner of the window geometry
-					view_sy += sview->wlr_xdg_surface_v6->geometry.y;
+				view_sx += sview->wlr_xdg_surface_v6->geometry.x;
-
+				view_sy += sview->wlr_xdg_surface_v6->geometry.y;
-					// check for popups
+
-					double popup_sx, popup_sy;
+				// check for popups
-					struct wlr_xdg_surface_v6 *popup =
+				double popup_sx, popup_sy;
-						wlr_xdg_surface_v6_popup_at(sview->wlr_xdg_surface_v6,
+				struct wlr_xdg_surface_v6 *popup =
-								view_sx, view_sy, &popup_sx, &popup_sy);
+					wlr_xdg_surface_v6_popup_at(sview->wlr_xdg_surface_v6,
-
+							view_sx, view_sy, &popup_sx, &popup_sy);
-					if (popup) {
+
-						*sx = view_sx - popup_sx;
+				if (popup) {
-						*sy = view_sy - popup_sy;
+					*sx = view_sx - popup_sx;
-						*surface = popup->surface;
+					*sy = view_sy - popup_sy;
-						return swayc;
+					*surface = popup->surface;
-					}
+					return swayc;
-					break;
+				}
-				case SWAY_XWAYLAND_VIEW:
+				break;
-					break;
-				default:
-					break;
 			}
 
 			// check for subsurfaces