koma/i3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add support for I3_SOCKET_PATH-atom

Browse Source
This commit is contained in:
Axel Wagner
2011-03-19 22:06:08 +01:00
parent d993f8a3a1
commit 2fd7449e29
4 changed files with 36 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
i3bar/src/main.c
View File

@ -218,11 +218,6 @@ int main(int argc, char **argv) {
fontname = "-misc-fixed-medium-r-semicondensed--12-110-75-75-c-60-iso10646-1";
}
if (socket_path == NULL) {
ELOG("No Socket Path Specified, default to %s\n", i3_default_sock_path);
socket_path = expand_path(i3_default_sock_path);
}
if (config.dockpos != DOCKPOS_NONE) {
if (config.hide_on_modifier) {
ELOG("--dock and --hide are mutually exclusive!\n");
@ -235,7 +230,16 @@ int main(int argc, char **argv) {
main_loop = ev_default_loop(0);
init_colors(&colors);
init_xcb(fontname);
char *atom_sock_path = init_xcb(fontname);
if (socket_path == NULL) {
socket_path = atom_sock_path;
}
if (socket_path == NULL) {
ELOG("No Socket Path Specified, default to %s\n", i3_default_sock_path);
socket_path = expand_path(i3_default_sock_path);
}
free_colors(&colors);