mirror of
https://github.com/leahneukirchen/cwm.git
synced 2023-08-10 21:13:12 +03:00
63ebc0cd8b
* refs/heads/master: (28 commits) Use screen's saved view instead of re-querying the server. Slightly expand and expose verbose debugging. add debugging for x events Add a simple debug logging mechanism. Simplification; use asprintf where appropriate now. Use func attributes where appropriate. Fix wins comparison declaration since it's unsigned from XQueryTree(). Generate name_to_func[] in a clean and readable fashion. Shrink tier[] by one after removing matchname in r1.55. If the requested group number is invalid, bail but don't kill cwm. Quick fix: exit after a failed execvp in u_spawn instead; previously we did in u_exec, but the introduction of re-exec'ing the previous invocation of cwm if 'exec_wm' failed missed the 'exec' failing path. Will likely split out as a proper fix. Only exec the fallback when in CWM_EXEC_WM state. Typo, from Julien Steinhauser. Convert menu-exec-wm from an abritrary exec menu, into a config-based menu from which one may configure (wm <name> <path_and_args>) (and choose) specific window managers to replace the running one. 'wm cwm cwm' is included by default. As done for buttonrelease, work specific un-cycling and un-highlighting actions into the keyrelease event, only performing what's actually needed for each; should result in much fewer events against keyreleases. No intended behaviour change. Merge group_toggle_membership_leave into the buttonrelease event and only do border work for a group/ungroup action. add helper function client_show to bring together like actions for unhide/raise Add support for re-exec'ing with SIGHUP; equivalent to the already built-in 'restart' function. Use poll and XNextEvent to replace XNextEvent blocking inside the x11 event handler. zap stray that snuck in ...
139 lines
2.6 KiB
C
139 lines
2.6 KiB
C
/*
|
|
* calmwm - the calm window manager
|
|
*
|
|
* Copyright (c) 2004 Marius Aamodt Eriksen <marius@monkey.org>
|
|
*
|
|
* Permission to use, copy, modify, and distribute this software for any
|
|
* purpose with or without fee is hereby granted, provided that the above
|
|
* copyright notice and this permission notice appear in all copies.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
|
|
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
|
|
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
|
|
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
|
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
|
|
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
|
|
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
|
*
|
|
* $OpenBSD$
|
|
*/
|
|
|
|
#include <sys/types.h>
|
|
#include "queue.h"
|
|
|
|
#include <err.h>
|
|
#include <errno.h>
|
|
#include <limits.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <unistd.h>
|
|
|
|
#include "calmwm.h"
|
|
|
|
static void log_msg(const char *, va_list);
|
|
|
|
void
|
|
u_spawn(char *argstr)
|
|
{
|
|
switch (fork()) {
|
|
case 0:
|
|
u_exec(argstr);
|
|
exit(1);
|
|
case -1:
|
|
warn("fork");
|
|
default:
|
|
break;
|
|
}
|
|
}
|
|
|
|
void
|
|
u_exec(char *argstr)
|
|
{
|
|
#define MAXARGLEN 20
|
|
char *args[MAXARGLEN], **ap = args;
|
|
char **end = &args[MAXARGLEN - 1], *tmp;
|
|
char *s = argstr;
|
|
|
|
while (ap < end && (*ap = strsep(&argstr, " \t")) != NULL) {
|
|
if (**ap == '\0')
|
|
continue;
|
|
ap++;
|
|
if (argstr != NULL) {
|
|
/* deal with quoted strings */
|
|
switch(argstr[0]) {
|
|
case '"':
|
|
case '\'':
|
|
if ((tmp = strchr(argstr + 1, argstr[0]))
|
|
!= NULL) {
|
|
*(tmp++) = '\0';
|
|
*(ap++) = ++argstr;
|
|
argstr = tmp;
|
|
}
|
|
break;
|
|
default:
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
*ap = NULL;
|
|
|
|
(void)setsid();
|
|
(void)execvp(args[0], args);
|
|
warn("%s", s);
|
|
}
|
|
|
|
char *
|
|
u_argv(char * const *argv)
|
|
{
|
|
size_t siz = 0;
|
|
int i;
|
|
char *p;
|
|
|
|
if (argv == 0)
|
|
return(NULL);
|
|
|
|
for (i = 0; argv[i]; i++)
|
|
siz += strlen(argv[i]) + 1;
|
|
if (siz == 0)
|
|
return(NULL);
|
|
|
|
p = xmalloc(siz);
|
|
strlcpy(p, argv[0], siz);
|
|
for (i = 1; argv[i]; i++) {
|
|
strlcat(p, " ", siz);
|
|
strlcat(p, argv[i], siz);
|
|
}
|
|
return(p);
|
|
}
|
|
|
|
static void
|
|
log_msg(const char *msg, va_list ap)
|
|
{
|
|
char *fmt;
|
|
|
|
if (asprintf(&fmt, "%s\n", msg) == -1) {
|
|
vfprintf(stderr, msg, ap);
|
|
fprintf(stderr, "\n");
|
|
} else {
|
|
vfprintf(stderr, fmt, ap);
|
|
free(fmt);
|
|
}
|
|
fflush(stderr);
|
|
}
|
|
|
|
void
|
|
log_debug(int level, const char *func, const char *msg, ...)
|
|
{
|
|
char *fmt;
|
|
va_list ap;
|
|
|
|
if (Conf.debug < level)
|
|
return;
|
|
|
|
va_start(ap, msg);
|
|
xasprintf(&fmt, "debug%d: %s: %s", level, func, msg);
|
|
log_msg(fmt, ap);
|
|
va_end(ap);
|
|
}
|