RomanNum3ral
/
ly
mirror of https://github.com/fairyglade/ly.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #393 from UtkarshVerma/xinitrc 

Make `xinitrc` path configurable
This commit is contained in:
ShiningLea 2022-06-03 10:04:35 +02:00 committed by GitHub
parent 4b5374c13f 802ad7b204
commit 2e1a57648b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
res/config.ini
View File

@ -100,6 +100,9 @@
# xorg server command # xorg server command
#x_cmd = /usr/bin/X #x_cmd = /usr/bin/X
# xinitrc
#xinitrc = ~/.xinitrc
# xorg setup command # xorg setup command
#x_cmd_setup = /etc/ly/xsetup.sh #x_cmd_setup = /etc/ly/xsetup.sh

3
src/config.c
View File

@ -190,6 +190,7 @@ void config_load(const char *cfg_path)
{"wayland_specifier", &config.wayland_specifier, config_handle_bool}, {"wayland_specifier", &config.wayland_specifier, config_handle_bool},
{"waylandsessions", &config.waylandsessions, config_handle_str}, {"waylandsessions", &config.waylandsessions, config_handle_str},
{"x_cmd", &config.x_cmd, config_handle_str}, {"x_cmd", &config.x_cmd, config_handle_str},
{"xinitrc", &config.xinitrc, config_handle_str},
{"x_cmd_setup", &config.x_cmd_setup, config_handle_str}, {"x_cmd_setup", &config.x_cmd_setup, config_handle_str},
{"xauth_cmd", &config.xauth_cmd, config_handle_str}, {"xauth_cmd", &config.xauth_cmd, config_handle_str},
{"xsessions", &config.xsessions, config_handle_str}, {"xsessions", &config.xsessions, config_handle_str},
@ -296,6 +297,7 @@ void config_defaults()
config.wayland_specifier = false; config.wayland_specifier = false;
config.waylandsessions = strdup("/usr/share/wayland-sessions"); config.waylandsessions = strdup("/usr/share/wayland-sessions");
config.x_cmd = strdup("/usr/bin/X"); config.x_cmd = strdup("/usr/bin/X");
config.xinitrc = strdup("~/.xinitrc");
config.x_cmd_setup = strdup(DATADIR "/xsetup.sh"); config.x_cmd_setup = strdup(DATADIR "/xsetup.sh");
config.xauth_cmd = strdup("/usr/bin/xauth"); config.xauth_cmd = strdup("/usr/bin/xauth");
config.xsessions = strdup("/usr/share/xsessions"); config.xsessions = strdup("/usr/share/xsessions");
@ -364,6 +366,7 @@ void config_free()
free(config.wayland_cmd); free(config.wayland_cmd);
free(config.waylandsessions); free(config.waylandsessions);
free(config.x_cmd); free(config.x_cmd);
free(config.xinitrc);
free(config.x_cmd_setup); free(config.x_cmd_setup);
free(config.xauth_cmd); free(config.xauth_cmd);
free(config.xsessions); free(config.xsessions);

1
src/config.h
View File

@ -94,6 +94,7 @@ struct config
bool wayland_specifier; bool wayland_specifier;
char* waylandsessions; char* waylandsessions;
char* x_cmd; char* x_cmd;
char* xinitrc;
char* x_cmd_setup; char* x_cmd_setup;
char* xauth_cmd; char* xauth_cmd;
char* xsessions; char* xsessions;

2
src/inputs.c
View File

@ -82,7 +82,7 @@ void input_desktop(struct desktop* target)
target->len = 0; target->len = 0;
input_desktop_add(target, strdup(lang.shell), strdup(""), DS_SHELL); input_desktop_add(target, strdup(lang.shell), strdup(""), DS_SHELL);
input_desktop_add(target, strdup(lang.xinitrc), strdup("~/.xinitrc"), DS_XINITRC); input_desktop_add(target, strdup(lang.xinitrc), strdup(config.xinitrc), DS_XINITRC);
#if 0 #if 0
input_desktop_add(target, strdup(lang.wayland), strdup(""), DS_WAYLAND); input_desktop_add(target, strdup(lang.wayland), strdup(""), DS_WAYLAND);
#endif #endif