mirror of
				https://github.com/swaywm/sway.git
				synced 2025-11-03 09:01:43 -05:00 
			
		
		
		
	The original purpose of this commit is to replace some for loops with list_find. But while doing this I found the workspace_prev_next_impl functions to be difficult to read and also contained a bug, so I refactored them and fixed the bug. To reproduce the bug: * Have two outputs, where the left output has workspaces 1, 2, 3 and the right output has workspaces 4, 5, 6. Make workspace 2 focused_inactive and workspace 4 focused. * Run `workspace prev`. * Previously it would visit the left output, then apply `workspace prev` to workspace 2, which focuses workspace 1. * Now it will focus the rightmost workspace on the left output (workspace 3). The refactoring I made to the workspace functions are: * Added the static keyword. * They now accept an int dir rather than bool, to avoid an unnecessary conversion. * Rather than preparing start and end variables for the purpose of iterating, just iterate everything. * Replace for loops with list_find. * Don't call workspace_output_prev_next_impl (this fixes the bug).
		
			
				
	
	
		
			158 lines
		
	
	
	
		
			3.5 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			158 lines
		
	
	
	
		
			3.5 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
#include "list.h"
 | 
						|
#include <stdio.h>
 | 
						|
#include <stdlib.h>
 | 
						|
#include <string.h>
 | 
						|
#include "log.h"
 | 
						|
 | 
						|
list_t *create_list(void) {
 | 
						|
	list_t *list = malloc(sizeof(list_t));
 | 
						|
	if (!list) {
 | 
						|
		return NULL;
 | 
						|
	}
 | 
						|
	list->capacity = 10;
 | 
						|
	list->length = 0;
 | 
						|
	list->items = malloc(sizeof(void*) * list->capacity);
 | 
						|
	return list;
 | 
						|
}
 | 
						|
 | 
						|
static void list_resize(list_t *list) {
 | 
						|
	if (list->length == list->capacity) {
 | 
						|
		list->capacity += 10;
 | 
						|
		list->items = realloc(list->items, sizeof(void*) * list->capacity);
 | 
						|
	}
 | 
						|
}
 | 
						|
 | 
						|
void list_free(list_t *list) {
 | 
						|
	if (list == NULL) {
 | 
						|
		return;
 | 
						|
	}
 | 
						|
	free(list->items);
 | 
						|
	free(list);
 | 
						|
}
 | 
						|
 | 
						|
void list_foreach(list_t *list, void (*callback)(void *item)) {
 | 
						|
	if (list == NULL || callback == NULL) {
 | 
						|
		return;
 | 
						|
	}
 | 
						|
	for (int i = 0; i < list->length; i++) {
 | 
						|
		callback(list->items[i]);
 | 
						|
	}
 | 
						|
}
 | 
						|
 | 
						|
void list_add(list_t *list, void *item) {
 | 
						|
	list_resize(list);
 | 
						|
	list->items[list->length++] = item;
 | 
						|
}
 | 
						|
 | 
						|
void list_insert(list_t *list, int index, void *item) {
 | 
						|
	list_resize(list);
 | 
						|
	memmove(&list->items[index + 1], &list->items[index], sizeof(void*) * (list->length - index));
 | 
						|
	list->length++;
 | 
						|
	list->items[index] = item;
 | 
						|
}
 | 
						|
 | 
						|
void list_del(list_t *list, int index) {
 | 
						|
	list->length--;
 | 
						|
	memmove(&list->items[index], &list->items[index + 1], sizeof(void*) * (list->length - index));
 | 
						|
}
 | 
						|
 | 
						|
void list_cat(list_t *list, list_t *source) {
 | 
						|
	int i;
 | 
						|
	for (i = 0; i < source->length; ++i) {
 | 
						|
		list_add(list, source->items[i]);
 | 
						|
	}
 | 
						|
}
 | 
						|
 | 
						|
void list_qsort(list_t *list, int compare(const void *left, const void *right)) {
 | 
						|
	qsort(list->items, list->length, sizeof(void *), compare);
 | 
						|
}
 | 
						|
 | 
						|
int list_seq_find(list_t *list, int compare(const void *item, const void *data), const void *data) {
 | 
						|
	for (int i = 0; i < list->length; i++) {
 | 
						|
		void *item = list->items[i];
 | 
						|
		if (compare(item, data) == 0) {
 | 
						|
			return i;
 | 
						|
		}
 | 
						|
	}
 | 
						|
	return -1;
 | 
						|
}
 | 
						|
 | 
						|
int list_find(list_t *list, const void *item) {
 | 
						|
	for (int i = 0; i < list->length; i++) {
 | 
						|
		if (list->items[i] == item) {
 | 
						|
			return i;
 | 
						|
		}
 | 
						|
	}
 | 
						|
	return -1;
 | 
						|
}
 | 
						|
 | 
						|
void list_swap(list_t *list, int src, int dest) {
 | 
						|
	void *tmp = list->items[src];
 | 
						|
	list->items[src] = list->items[dest];
 | 
						|
	list->items[dest] = tmp;
 | 
						|
}
 | 
						|
 | 
						|
void list_move_to_end(list_t *list, void *item) {
 | 
						|
	int i;
 | 
						|
	for (i = 0; i < list->length; ++i) {
 | 
						|
		if (list->items[i] == item) {
 | 
						|
			break;
 | 
						|
		}
 | 
						|
	}
 | 
						|
	if (!sway_assert(i < list->length, "Item not found in list")) {
 | 
						|
		return;
 | 
						|
	}
 | 
						|
	list_del(list, i);
 | 
						|
	list_add(list, item);
 | 
						|
}
 | 
						|
 | 
						|
static void list_rotate(list_t *list, int from, int to) {
 | 
						|
	void *tmp = list->items[to];
 | 
						|
 | 
						|
	while (to > from) {
 | 
						|
		list->items[to] = list->items[to - 1];
 | 
						|
		to--;
 | 
						|
	}
 | 
						|
 | 
						|
	list->items[from] = tmp;
 | 
						|
}
 | 
						|
 | 
						|
static void list_inplace_merge(list_t *list, int left, int last, int mid, int compare(const void *a, const void *b)) {
 | 
						|
	int right = mid + 1;
 | 
						|
 | 
						|
	if (compare(&list->items[mid], &list->items[right]) <= 0) {
 | 
						|
		return;
 | 
						|
	}
 | 
						|
 | 
						|
	while (left <= mid && right <= last) {
 | 
						|
		if (compare(&list->items[left], &list->items[right]) <= 0) {
 | 
						|
			left++;
 | 
						|
		} else {
 | 
						|
			list_rotate(list, left, right);
 | 
						|
			left++;
 | 
						|
			mid++;
 | 
						|
			right++;
 | 
						|
		}
 | 
						|
	}
 | 
						|
}
 | 
						|
 | 
						|
static void list_inplace_sort(list_t *list, int first, int last, int compare(const void *a, const void *b)) {
 | 
						|
	if (first >= last) {
 | 
						|
		return;
 | 
						|
	} else if ((last - first) == 1) {
 | 
						|
		if (compare(&list->items[first], &list->items[last]) > 0) {
 | 
						|
			list_swap(list, first, last);
 | 
						|
		}
 | 
						|
	} else {
 | 
						|
		int mid = (int)((last + first) / 2);
 | 
						|
		list_inplace_sort(list, first, mid, compare);
 | 
						|
		list_inplace_sort(list, mid + 1, last, compare);
 | 
						|
		list_inplace_merge(list, first, last, mid, compare);
 | 
						|
	}
 | 
						|
}
 | 
						|
 | 
						|
void list_stable_sort(list_t *list, int compare(const void *a, const void *b)) {
 | 
						|
	if (list->length > 1) {
 | 
						|
		list_inplace_sort(list, 0, list->length - 1, compare);
 | 
						|
	}
 | 
						|
}
 |