mirror of
https://github.com/hyprwm/wlroots-hyprland.git
synced 2024-11-26 06:35:58 +01:00
config fixes
This commit is contained in:
parent
30611894f2
commit
1193dd564b
1 changed files with 24 additions and 23 deletions
|
@ -6,6 +6,7 @@
|
||||||
#include <getopt.h>
|
#include <getopt.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
#include <sys/param.h>
|
||||||
#include <wlr/util/log.h>
|
#include <wlr/util/log.h>
|
||||||
#include <wlr/types/wlr_geometry.h>
|
#include <wlr/types/wlr_geometry.h>
|
||||||
#include "shared.h"
|
#include "shared.h"
|
||||||
|
@ -16,15 +17,17 @@ static void usage(const char *name, int ret) {
|
||||||
fprintf(stderr,
|
fprintf(stderr,
|
||||||
"usage: %s [-C <FILE>]\n"
|
"usage: %s [-C <FILE>]\n"
|
||||||
"\n"
|
"\n"
|
||||||
" -C <FILE> Path to the configuration file (default: wlr-example.ini).\n"
|
" -C <FILE> Path to the configuration file\n"
|
||||||
" See `examples/wlr-example.ini.example` for config file documentation.\n", name);
|
" (default: wlr-example.ini).\n"
|
||||||
|
" See `examples/wlr-example.ini.example` for config\n"
|
||||||
|
" file documentation.\n", name);
|
||||||
|
|
||||||
exit(ret);
|
exit(ret);
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct wlr_geometry *parse_geometry(const char *str) {
|
static struct wlr_geometry *parse_geometry(const char *str) {
|
||||||
// format: {width}x{height}+{x}+{y}
|
// format: {width}x{height}+{x}+{y}
|
||||||
if (strlen(str) > 255l) {
|
if (strlen(str) > 255) {
|
||||||
wlr_log(L_ERROR, "cannot parse geometry string, too long");
|
wlr_log(L_ERROR, "cannot parse geometry string, too long");
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
@ -43,8 +46,8 @@ static struct wlr_geometry *parse_geometry(const char *str) {
|
||||||
char *endptr;
|
char *endptr;
|
||||||
long val = strtol(pch, &endptr, 0);
|
long val = strtol(pch, &endptr, 0);
|
||||||
|
|
||||||
if ((errno == ERANGE && (val == LONG_MAX || val == LONG_MIN))
|
if ((errno == ERANGE && (val == LONG_MAX || val == LONG_MIN)) ||
|
||||||
|| (errno != 0 && val == 0)) {
|
(errno != 0 && val == 0)) {
|
||||||
goto invalid_input;
|
goto invalid_input;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -70,7 +73,7 @@ static struct wlr_geometry *parse_geometry(const char *str) {
|
||||||
pch = strtok(NULL, "x+");
|
pch = strtok(NULL, "x+");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!has_width || !has_height || !has_x || !has_y) {
|
if (!has_width || !has_height) {
|
||||||
goto invalid_input;
|
goto invalid_input;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -87,7 +90,8 @@ invalid_input:
|
||||||
static const char *output_prefix = "output:";
|
static const char *output_prefix = "output:";
|
||||||
static const char *device_prefix = "device:";
|
static const char *device_prefix = "device:";
|
||||||
|
|
||||||
static int config_ini_handler(void *user, const char *section, const char *name, const char *value) {
|
static int config_ini_handler(void *user, const char *section, const char *name,
|
||||||
|
const char *value) {
|
||||||
struct example_config *config = user;
|
struct example_config *config = user;
|
||||||
if (strncmp(output_prefix, section, strlen(output_prefix)) == 0) {
|
if (strncmp(output_prefix, section, strlen(output_prefix)) == 0) {
|
||||||
const char *output_name = section + strlen(output_prefix);
|
const char *output_name = section + strlen(output_prefix);
|
||||||
|
@ -133,11 +137,10 @@ static int config_ini_handler(void *user, const char *section, const char *name,
|
||||||
}
|
}
|
||||||
} else if (strcmp(section, "cursor") == 0) {
|
} else if (strcmp(section, "cursor") == 0) {
|
||||||
if (strcmp(name, "map-to-output") == 0) {
|
if (strcmp(name, "map-to-output") == 0) {
|
||||||
|
free(config->cursor.mapped_output);
|
||||||
config->cursor.mapped_output = strdup(value);
|
config->cursor.mapped_output = strdup(value);
|
||||||
} else if (strcmp(name, "geometry") == 0) {
|
} else if (strcmp(name, "geometry") == 0) {
|
||||||
if (config->cursor.mapped_geo) {
|
free(config->cursor.mapped_geo);
|
||||||
free(config->cursor.mapped_geo);
|
|
||||||
}
|
|
||||||
config->cursor.mapped_geo = parse_geometry(value);
|
config->cursor.mapped_geo = parse_geometry(value);
|
||||||
} else {
|
} else {
|
||||||
wlr_log(L_ERROR, "got unknown cursor config: %s", name);
|
wlr_log(L_ERROR, "got unknown cursor config: %s", name);
|
||||||
|
@ -161,14 +164,10 @@ static int config_ini_handler(void *user, const char *section, const char *name,
|
||||||
}
|
}
|
||||||
|
|
||||||
if (strcmp(name, "map-to-output") == 0) {
|
if (strcmp(name, "map-to-output") == 0) {
|
||||||
if (dc->mapped_output) {
|
free(dc->mapped_output);
|
||||||
free(dc->mapped_output);
|
|
||||||
}
|
|
||||||
dc->mapped_output = strdup(value);
|
dc->mapped_output = strdup(value);
|
||||||
} else if (strcmp(name, "geometry") == 0) {
|
} else if (strcmp(name, "geometry") == 0) {
|
||||||
if (dc->mapped_geo) {
|
free(dc->mapped_geo);
|
||||||
free(dc->mapped_geo);
|
|
||||||
}
|
|
||||||
dc->mapped_geo = parse_geometry(value);
|
dc->mapped_geo = parse_geometry(value);
|
||||||
} else {
|
} else {
|
||||||
wlr_log(L_ERROR, "got unknown device config: %s", name);
|
wlr_log(L_ERROR, "got unknown device config: %s", name);
|
||||||
|
@ -199,10 +198,10 @@ struct example_config *parse_args(int argc, char *argv[]) {
|
||||||
|
|
||||||
if (!config->config_path) {
|
if (!config->config_path) {
|
||||||
// get the config path from the current directory
|
// get the config path from the current directory
|
||||||
char cwd[1024];
|
char cwd[MAXPATHLEN];
|
||||||
if (getcwd(cwd, sizeof(cwd)) != NULL) {
|
if (getcwd(cwd, sizeof(cwd)) != NULL) {
|
||||||
char buf[1024];
|
char buf[MAXPATHLEN];
|
||||||
sprintf(buf, "%s/%s", cwd, "wlr-example.ini");
|
snprintf(buf, MAXPATHLEN, "%s/%s", cwd, "wlr-example.ini");
|
||||||
config->config_path = strdup(buf);
|
config->config_path = strdup(buf);
|
||||||
} else {
|
} else {
|
||||||
wlr_log(L_ERROR, "could not get cwd");
|
wlr_log(L_ERROR, "could not get cwd");
|
||||||
|
@ -213,7 +212,8 @@ struct example_config *parse_args(int argc, char *argv[]) {
|
||||||
int result = ini_parse(config->config_path, config_ini_handler, config);
|
int result = ini_parse(config->config_path, config_ini_handler, config);
|
||||||
|
|
||||||
if (result == -1) {
|
if (result == -1) {
|
||||||
wlr_log(L_ERROR, "Could not find config file at %s", config->config_path);
|
wlr_log(L_ERROR, "Could not find config file at %s",
|
||||||
|
config->config_path);
|
||||||
exit(1);
|
exit(1);
|
||||||
} else if (result == -2) {
|
} else if (result == -2) {
|
||||||
wlr_log(L_ERROR, "Could not allocate memory to parse config file");
|
wlr_log(L_ERROR, "Could not allocate memory to parse config file");
|
||||||
|
@ -257,7 +257,8 @@ void example_config_destroy(struct example_config *config) {
|
||||||
free(config);
|
free(config);
|
||||||
}
|
}
|
||||||
|
|
||||||
struct wlr_output_layout *configure_layout(struct example_config *config, struct wl_list *outputs) {
|
struct wlr_output_layout *configure_layout(struct example_config *config,
|
||||||
|
struct wl_list *outputs) {
|
||||||
struct wlr_output_layout *layout = wlr_output_layout_init();
|
struct wlr_output_layout *layout = wlr_output_layout_init();
|
||||||
int max_x = INT_MIN;
|
int max_x = INT_MIN;
|
||||||
int max_x_y = INT_MIN; // y value for the max_x output
|
int max_x_y = INT_MIN; // y value for the max_x output
|
||||||
|
@ -272,7 +273,8 @@ struct wlr_output_layout *configure_layout(struct example_config *config, struct
|
||||||
conf->x, conf->y);
|
conf->x, conf->y);
|
||||||
wlr_output_transform(output->output, conf->transform);
|
wlr_output_transform(output->output, conf->transform);
|
||||||
int width, height;
|
int width, height;
|
||||||
wlr_output_effective_resolution(output->output, &width, &height);
|
wlr_output_effective_resolution(output->output, &width,
|
||||||
|
&height);
|
||||||
if (conf->x + width > max_x) {
|
if (conf->x + width > max_x) {
|
||||||
max_x = conf->x + width;
|
max_x = conf->x + width;
|
||||||
max_x_y = conf->y;
|
max_x_y = conf->y;
|
||||||
|
@ -301,4 +303,3 @@ struct wlr_output_layout *configure_layout(struct example_config *config, struct
|
||||||
|
|
||||||
return layout;
|
return layout;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue