mirror of
https://github.com/awesomeWM/awesome
synced 2024-11-17 07:47:41 +01:00
ac188235ed
Hi there.
awesome-client is now linked against the whole hog of x-related libs
that awesome depends on. These get pulled in by awesome-client using the
same LDFLAGS as awesome. Removing x-related libs from the LDFLAGS for
awesome-client is only half of the story, as it also depends on util.c
which now has a couple of x-related functions. The attached patch also
splits these functions into a separate xutil.{c,h} file pair and teaches
the rest of the files to use them. Apart from the small difference in
file size (I see a 3-3.5% decrease in file size, both for a stripped and
a non-stripped awesome-client binary), this should also somewhat reduce
the startup time (since awesome-client won't have to map all of these
libraries).
Cheers...
\n\n
92 lines
2.1 KiB
C
92 lines
2.1 KiB
C
#include <X11/Xutil.h>
|
|
#include <X11/Xatom.h>
|
|
#include <X11/extensions/Xinerama.h>
|
|
#include <sys/wait.h>
|
|
|
|
#include "xutil.h"
|
|
|
|
void
|
|
uicb_exec(awesome_config * awesomeconf,
|
|
const char *arg)
|
|
{
|
|
char path[PATH_MAX];
|
|
if(awesomeconf->display)
|
|
close(ConnectionNumber(awesomeconf->display));
|
|
|
|
sscanf(arg, "%s", path);
|
|
execlp(path, arg, NULL);
|
|
}
|
|
|
|
void
|
|
uicb_spawn(awesome_config * awesomeconf,
|
|
const char *arg)
|
|
{
|
|
static char *shell = NULL;
|
|
char *display = NULL;
|
|
char *tmp, newdisplay[128];
|
|
|
|
if(!shell && !(shell = getenv("SHELL")))
|
|
shell = a_strdup("/bin/sh");
|
|
if(!arg)
|
|
return;
|
|
|
|
if(!XineramaIsActive(awesomeconf->display) && (tmp = getenv("DISPLAY")))
|
|
{
|
|
display = a_strdup(tmp);
|
|
if((tmp = strrchr(display, '.')))
|
|
*tmp = '\0';
|
|
snprintf(newdisplay, sizeof(newdisplay), "%s.%d", display, awesomeconf->screen);
|
|
setenv("DISPLAY", newdisplay, 1);
|
|
}
|
|
|
|
|
|
/* The double-fork construct avoids zombie processes and keeps the code
|
|
* clean from stupid signal handlers. */
|
|
if(fork() == 0)
|
|
{
|
|
if(fork() == 0)
|
|
{
|
|
if(awesomeconf->display)
|
|
close(ConnectionNumber(awesomeconf->display));
|
|
setsid();
|
|
execl(shell, shell, "-c", arg, (char *) NULL);
|
|
fprintf(stderr, "awesome: execl '%s -c %s'", shell, arg);
|
|
perror(" failed");
|
|
}
|
|
exit(EXIT_SUCCESS);
|
|
}
|
|
wait(0);
|
|
}
|
|
|
|
Bool
|
|
xgettextprop(Display *disp, Window w, Atom atom, char *text, ssize_t textlen)
|
|
{
|
|
char **list = NULL;
|
|
int n;
|
|
|
|
XTextProperty name;
|
|
|
|
if(!text || !textlen)
|
|
return False;
|
|
|
|
text[0] = '\0';
|
|
XGetTextProperty(disp, w, &name, atom);
|
|
|
|
if(!name.nitems)
|
|
return False;
|
|
|
|
if(name.encoding == XA_STRING)
|
|
a_strncpy(text, textlen, (char *) name.value, textlen - 1);
|
|
|
|
else if(XmbTextPropertyToTextList(disp, &name, &list, &n) >= Success && n > 0 && *list)
|
|
{
|
|
a_strncpy(text, textlen, *list, textlen - 1);
|
|
XFreeStringList(list);
|
|
}
|
|
|
|
text[textlen - 1] = '\0';
|
|
XFree(name.value);
|
|
|
|
return True;
|
|
}
|
|
|