Merge branch 'master' into rename-surface-subsurfaces

swaybar/bar.c

@@ -156,31 +156,56 @@ static void wl_pointer_axis(void *data, struct wl_pointer *wl_pointer,
 	if (!sway_assert(output, "axis with no active output")) {
 		return;
 	}
+
 	double amt = wl_fixed_to_double(value);
-	if (!bar->config->wrap_scroll) {
+	if (amt == 0.0) {
-		int i = 0;
+		return;
-		struct swaybar_workspace *ws = NULL;
+	}
-		wl_list_for_each(ws, &output->workspaces, link) {
+
-			if (ws->focused) {
+	struct swaybar_workspace *first = NULL;
-				break;
+	struct swaybar_workspace *active = NULL;
-			}
+	struct swaybar_workspace *last;
-			++i;
+
+	struct swaybar_workspace *iter;
+	wl_list_for_each(iter, &output->workspaces, link) {
+		if (!first) {
+			first = iter;
 		}
-		int len = wl_list_length(&output->workspaces);
+
-		if (!sway_assert(i != len, "axis with null workspace")) {
+		if (iter->visible) {
-			return;
+			active = iter;
 		}
-		if (i == 0 && amt > 0) {
+
-			return; // Do not wrap
+		last = iter;
+	}
+
+	if (!sway_assert(active, "axis with null workspace")) {
+		return;
+	}
+
+	struct swaybar_workspace *new;
+
+	if (amt > 0.0) {
+		if (active == first) {
+			if (!bar->config->wrap_scroll) {
+				return;
+			}
+			new = last;
 		}
-		if (i == len - 1 && amt < 0) {
+
-			return; // Do not wrap
+		new = wl_container_of(active->link.prev, new, link);
+	} else {
+		if (active == last) {
+			if (!bar->config->wrap_scroll) {
+				return;
+			}
+			new = first;
 		}
+
+		new = wl_container_of(active->link.next, new, link);
 	}
 
-	const char *workspace_name =
+	ipc_send_workspace_command(bar, new->name);
-		amt < 0 ?  "prev_on_output" : "next_on_output";
-	ipc_send_workspace_command(bar, workspace_name);
 }
 
 static void wl_pointer_frame(void *data, struct wl_pointer *wl_pointer) {