nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bugfix: Correctly restart i3 when not using its absolute path

This commit is contained in:
Michael Stapelberg 2009-05-01 16:10:02 +02:00
parent e9c5643a8b
commit e91f399609
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
debian/changelog vendored
View File

@ -24,6 +24,7 @@ i3-wm (3.a-bf1-1) unstable; urgency=low
etc. etc.
* Bugfix: Correctly update state when moving fullscreen windows across * Bugfix: Correctly update state when moving fullscreen windows across
workspaces. workspaces.
* Bugfix: Correctly restart i3 when not using its absolute path
* Implement scrolling on stack windows and on the bottom bar. * Implement scrolling on stack windows and on the bottom bar.
* Create i3-wm-dbg with debug symbols * Create i3-wm-dbg with debug symbols
* Don't rely on libxcb-wm any longer, as it got removed in libxcb 0.3.4. * Don't rely on libxcb-wm any longer, as it got removed in libxcb 0.3.4.

2
include/i3.h
View File

@ -22,7 +22,7 @@
#define NUM_ATOMS 12 #define NUM_ATOMS 12
extern char *application_path; extern char **start_argv;
extern Display *xkbdpy; extern Display *xkbdpy;
extern TAILQ_HEAD(bindings_head, Binding) bindings; extern TAILQ_HEAD(bindings_head, Binding) bindings;
extern SLIST_HEAD(stack_wins_head, Stack_Window) stack_wins; extern SLIST_HEAD(stack_wins_head, Stack_Window) stack_wins;

4
src/commands.c
View File

@ -607,8 +607,8 @@ void parse_command(xcb_connection_t *conn, const char *command) {
/* Is it <restart>? Then restart in place. */ /* Is it <restart>? Then restart in place. */
if (STARTS_WITH(command, "restart")) { if (STARTS_WITH(command, "restart")) {
LOG("restarting \"%s\"...\n", application_path); LOG("restarting \"%s\"...\n", start_argv[0]);
execl(application_path, application_path, NULL); execvp(start_argv[0], start_argv);
/* not reached */ /* not reached */
} }

4
src/mainx.c
View File

@ -44,7 +44,7 @@
#include "xinerama.h" #include "xinerama.h"
/* This is the path to i3, copied from argv[0] when starting up */ /* This is the path to i3, copied from argv[0] when starting up */
char *application_path; char **start_argv;
/* This is our connection to X11 for use with XKB */ /* This is our connection to X11 for use with XKB */
Display *xkbdpy; Display *xkbdpy;
@ -338,7 +338,7 @@ int main(int argc, char *argv[], char *env[]) {
if (!isatty(fileno(stdout))) if (!isatty(fileno(stdout)))
setbuf(stdout, NULL); setbuf(stdout, NULL);
application_path = sstrdup(argv[0]); start_argv = argv;
while ((opt = getopt(argc, argv, "c:v")) != -1) { while ((opt = getopt(argc, argv, "c:v")) != -1) {
switch (opt) { switch (opt) {