ryan/cwm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cvsimport

Browse Source
This commit is contained in:
okan
2014-01-29 22:30:00 +00:00
parent 2b233f0548 2be890489b
commit 1fd3fc4997
7 changed files with 99 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

98
conf.c
View File

@@ -32,26 +32,52 @@
#include "calmwm.h"
static const char *conf_bind_getmask(const char *, unsigned int *);
static void conf_unbind_kbd(struct conf *, struct keybinding *);
static void conf_unbind_mouse(struct conf *, struct mousebinding *);
static void conf_cmd_remove(struct conf *, const char *);
static void conf_unbind_kbd(struct conf *, struct binding *);
static void conf_unbind_mouse(struct conf *, struct binding *);
/* Add an command menu entry to the end of the menu */
void
int
conf_cmd_add(struct conf *c, const char *name, const char *path)
{
struct cmd *cmd;
/* "term" and "lock" have special meanings. */
if (strcmp(name, "term") == 0)
(void)strlcpy(c->termpath, path, sizeof(c->termpath));
else if (strcmp(name, "lock") == 0)
(void)strlcpy(c->lockpath, path, sizeof(c->lockpath));
else {
struct cmd *cmd = xmalloc(sizeof(*cmd));
(void)strlcpy(cmd->name, name, sizeof(cmd->name));
(void)strlcpy(cmd->path, path, sizeof(cmd->path));
if (strcmp(name, "term") == 0) {
if (strlcpy(c->termpath, path, sizeof(c->termpath)) >=
sizeof(c->termpath))
return (0);
} else if (strcmp(name, "lock") == 0) {
if (strlcpy(c->lockpath, path, sizeof(c->lockpath)) >=
sizeof(c->lockpath))
return (0);
} else {
cmd = xmalloc(sizeof(*cmd));
conf_cmd_remove(c, name);
if (strlcpy(cmd->name, name, sizeof(cmd->name)) >=
sizeof(cmd->name))
return (0);
if (strlcpy(cmd->path, path, sizeof(cmd->path)) >=
sizeof(cmd->path))
return (0);
TAILQ_INSERT_TAIL(&c->cmdq, cmd, entry);
}
return (1);
}
static void
conf_cmd_remove(struct conf *c, const char *name)
{
struct cmd *cmd = NULL, *cmdnxt;
TAILQ_FOREACH_SAFE(cmd, &c->cmdq, entry, cmdnxt) {
if (strcmp(cmd->name, name) == 0) {
TAILQ_REMOVE(&c->cmdq, cmd, entry);
free(cmd);
}
}
}
void
conf_autogroup(struct conf *c, int no, const char *val)
{
@@ -249,9 +275,8 @@ conf_init(struct conf *c)
for (i = 0; i < nitems(color_binds); i++)
c->color[i] = xstrdup(color_binds[i]);
/* Default term/lock */
(void)strlcpy(c->termpath, "xterm", sizeof(c->termpath));
(void)strlcpy(c->lockpath, "xlock", sizeof(c->lockpath));
conf_cmd_add(c, "lock", "xlock");
conf_cmd_add(c, "term", "xterm");
(void)snprintf(c->known_hosts, sizeof(c->known_hosts), "%s/%s",
homedir, ".ssh/known_hosts");
@@ -263,10 +288,9 @@ void
conf_clear(struct conf *c)
{
struct autogroupwin *ag;
struct keybinding *kb;
struct binding *kb, *mb;
struct winmatch *wm;
struct cmd *cmd;
struct mousebinding *mb;
int i;
while ((cmd = TAILQ_FIRST(&c->cmdq)) != NULL) {
@@ -329,7 +353,7 @@ static const struct {
{ "lower", kbfunc_client_lower, CWM_WIN, {0} },
{ "raise", kbfunc_client_raise, CWM_WIN, {0} },
{ "search", kbfunc_client_search, 0, {0} },
{ "menusearch", kbfunc_menu_search, 0, {0} },
{ "menusearch", kbfunc_menu_cmd, 0, {0} },
{ "hide", kbfunc_client_hide, CWM_WIN, {0} },
{ "cycle", kbfunc_client_cycle, 0, {.i = CWM_CYCLE} },
{ "rcycle", kbfunc_client_cycle, 0, {.i = CWM_RCYCLE} },
@@ -466,16 +490,16 @@ conf_bind_getmask(const char *name, unsigned int *mask)
int
conf_bind_kbd(struct conf *c, const char *bind, const char *cmd)
{
struct keybinding *kb;
const char *key;
unsigned int i, mask;
struct binding *kb;
const char *key;
unsigned int i, mask;
kb = xcalloc(1, sizeof(*kb));
key = conf_bind_getmask(bind, &mask);
kb->modmask |= mask;
kb->keysym = XStringToKeysym(key);
if (kb->keysym == NoSymbol) {
kb->press.keysym = XStringToKeysym(key);
if (kb->press.keysym == NoSymbol) {
warnx("unknown symbol: %s", key);
free(kb);
return (0);
@@ -510,15 +534,15 @@ conf_bind_kbd(struct conf *c, const char *bind, const char *cmd)
}
static void
conf_unbind_kbd(struct conf *c, struct keybinding *unbind)
conf_unbind_kbd(struct conf *c, struct binding *unbind)
{
struct keybinding *key = NULL, *keynxt;
struct binding *key = NULL, *keynxt;
TAILQ_FOREACH_SAFE(key, &c->keybindingq, entry, keynxt) {
if (key->modmask != unbind->modmask)
continue;
if (key->keysym == unbind->keysym) {
if (key->press.keysym == unbind->press.keysym) {
TAILQ_REMOVE(&c->keybindingq, key, entry);
if (key->argtype & ARG_CHAR)
free(key->argument.c);
@@ -549,15 +573,15 @@ static const struct {
int
conf_bind_mouse(struct conf *c, const char *bind, const char *cmd)
{
struct mousebinding *mb;
const char *button, *errstr;
unsigned int i, mask;
struct binding *mb;
const char *button, *errstr;
unsigned int i, mask;
mb = xcalloc(1, sizeof(*mb));
button = conf_bind_getmask(bind, &mask);
mb->modmask |= mask;
mb->button = strtonum(button, Button1, Button5, &errstr);
mb->press.button = strtonum(button, Button1, Button5, &errstr);
if (errstr) {
warnx("button number is %s: %s", errstr, button);
free(mb);
@@ -587,15 +611,15 @@ conf_bind_mouse(struct conf *c, const char *bind, const char *cmd)
}
static void
conf_unbind_mouse(struct conf *c, struct mousebinding *unbind)
conf_unbind_mouse(struct conf *c, struct binding *unbind)
{
struct mousebinding *mb = NULL, *mbnxt;
struct binding *mb = NULL, *mbnxt;
TAILQ_FOREACH_SAFE(mb, &c->mousebindingq, entry, mbnxt) {
if (mb->modmask != unbind->modmask)
continue;
if (mb->button == unbind->button) {
if (mb->press.button == unbind->press.button) {
TAILQ_REMOVE(&c->mousebindingq, mb, entry);
free(mb);
}
@@ -622,25 +646,25 @@ conf_cursor(struct conf *c)
void
conf_grab_mouse(Window win)
{
struct mousebinding *mb;
struct binding *mb;
xu_btn_ungrab(win);
TAILQ_FOREACH(mb, &Conf.mousebindingq, entry) {
if (mb->flags & CWM_WIN)
xu_btn_grab(win, mb->modmask, mb->button);
xu_btn_grab(win, mb->modmask, mb->press.button);
}
}
void
conf_grab_kbd(Window win)
{
struct keybinding *kb;
struct binding *kb;
xu_key_ungrab(win);
TAILQ_FOREACH(kb, &Conf.keybindingq, entry)
xu_key_grab(win, kb->modmask, kb->keysym);
xu_key_grab(win, kb->modmask, kb->press.keysym);
}
static char *cwmhints[] = {