From d7ff776552bef524e905d85c2a5e7651c8408658 Mon Sep 17 00:00:00 2001
From: M Stoeckl <code@mstoeckl.com>
Date: Mon, 21 Jan 2019 12:39:16 -0500
Subject: Move sway-specific functions in common/util.c into sway/

Modifier handling functions were moved into sway/input/keyboard.c;
opposite_direction for enum wlr_direction into sway/tree/output.c;
and get_parent_pid into sway/tree/root.c .
---
 common/util.c | 105 ----------------------------------------------------------
 1 file changed, 105 deletions(-)

(limited to 'common')

diff --git a/common/util.c b/common/util.c
index 27039dcb..60f2f160 100644
--- a/common/util.c
+++ b/common/util.c
@@ -1,17 +1,9 @@
 #define _POSIX_C_SOURCE 200809L
-#include <assert.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
 #include <float.h>
 #include <math.h>
-#include <stdint.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <strings.h>
-#include <xkbcommon/xkbcommon-names.h>
-#include <wlr/types/wlr_keyboard.h>
 #include "log.h"
 #include "util.h"
 
@@ -27,88 +19,6 @@ int numlen(int n) {
 	return log10(abs(n)) + (n > 0 ? 1 : 2);
 }
 
-static struct modifier_key {
-	char *name;
-	uint32_t mod;
-} modifiers[] = {
-	{ XKB_MOD_NAME_SHIFT, WLR_MODIFIER_SHIFT },
-	{ XKB_MOD_NAME_CAPS, WLR_MODIFIER_CAPS },
-	{ XKB_MOD_NAME_CTRL, WLR_MODIFIER_CTRL },
-	{ "Ctrl", WLR_MODIFIER_CTRL },
-	{ XKB_MOD_NAME_ALT, WLR_MODIFIER_ALT },
-	{ "Alt", WLR_MODIFIER_ALT },
-	{ XKB_MOD_NAME_NUM, WLR_MODIFIER_MOD2 },
-	{ "Mod3", WLR_MODIFIER_MOD3 },
-	{ XKB_MOD_NAME_LOGO, WLR_MODIFIER_LOGO },
-	{ "Mod5", WLR_MODIFIER_MOD5 },
-};
-
-uint32_t get_modifier_mask_by_name(const char *name) {
-	int i;
-	for (i = 0; i < (int)(sizeof(modifiers) / sizeof(struct modifier_key)); ++i) {
-		if (strcasecmp(modifiers[i].name, name) == 0) {
-			return modifiers[i].mod;
-		}
-	}
-
-	return 0;
-}
-
-const char *get_modifier_name_by_mask(uint32_t modifier) {
-	int i;
-	for (i = 0; i < (int)(sizeof(modifiers) / sizeof(struct modifier_key)); ++i) {
-		if (modifiers[i].mod == modifier) {
-			return modifiers[i].name;
-		}
-	}
-
-	return NULL;
-}
-
-int get_modifier_names(const char **names, uint32_t modifier_masks) {
-	int length = 0;
-	int i;
-	for (i = 0; i < (int)(sizeof(modifiers) / sizeof(struct modifier_key)); ++i) {
-		if ((modifier_masks & modifiers[i].mod) != 0) {
-			names[length] = modifiers[i].name;
-			++length;
-			modifier_masks ^= modifiers[i].mod;
-		}
-	}
-
-	return length;
-}
-
-pid_t get_parent_pid(pid_t child) {
-	pid_t parent = -1;
-	char file_name[100];
-	char *buffer = NULL;
-	char *token = NULL;
-	const char *sep = " ";
-	FILE *stat = NULL;
-	size_t buf_size = 0;
-
-	sprintf(file_name, "/proc/%d/stat", child);
-
-	if ((stat = fopen(file_name, "r"))) {
-		if (getline(&buffer, &buf_size, stat) != -1) {
-			token = strtok(buffer, sep); // pid
-			token = strtok(NULL, sep);   // executable name
-			token = strtok(NULL, sep);   // state
-			token = strtok(NULL, sep);   // parent pid
-			parent = strtol(token, NULL, 10);
-		}
-		free(buffer);
-		fclose(stat);
-	}
-
-	if (parent) {
-		return (parent == child) ? -1 : parent;
-	}
-
-	return -1;
-}
-
 uint32_t parse_color(const char *color) {
 	if (color[0] == '#') {
 		++color;
@@ -152,18 +62,3 @@ float parse_float(const char *value) {
 	}
 	return flt;
 }
-
-enum wlr_direction opposite_direction(enum wlr_direction d) {
-	switch (d) {
-	case WLR_DIRECTION_UP:
-		return WLR_DIRECTION_DOWN;
-	case WLR_DIRECTION_DOWN:
-		return WLR_DIRECTION_UP;
-	case WLR_DIRECTION_RIGHT:
-		return WLR_DIRECTION_LEFT;
-	case WLR_DIRECTION_LEFT:
-		return WLR_DIRECTION_RIGHT;
-	}
-	assert(false);
-	return 0;
-}
-- 
cgit v1.2.3