Merge remote-tracking branch 'org/master'
# Conflicts: # dwm.c
This commit is contained in:
commit
62deba6b98
1 changed files with 5 additions and 4 deletions
9
dwm.c
9
dwm.c
|
@ -214,7 +214,7 @@ static void monocle(Monitor *m);
|
|||
static void motionnotify(XEvent *e);
|
||||
static void movemouse(const Arg *arg);
|
||||
static Client *nexttiled(Client *c);
|
||||
static void pop(Client *);
|
||||
static void pop(Client *c);
|
||||
static void propertynotify(XEvent *e);
|
||||
static void quit(const Arg *arg);
|
||||
static Monitor *recttomon(int x, int y, int w, int h);
|
||||
|
@ -243,7 +243,7 @@ static void spawn(const Arg *arg);
|
|||
static Monitor *systraytomon(Monitor *m);
|
||||
static void tag(const Arg *arg);
|
||||
static void tagmon(const Arg *arg);
|
||||
static void tile(Monitor *);
|
||||
static void tile(Monitor *m);
|
||||
static void togglebar(const Arg *arg);
|
||||
static void togglefloating(const Arg *arg);
|
||||
static void togglesticky(const Arg *arg);
|
||||
|
@ -276,7 +276,6 @@ static void zoom(const Arg *arg);
|
|||
static void autostart_exec(void);
|
||||
|
||||
/* variables */
|
||||
static Systray *systray = NULL;
|
||||
static const char broken[] = "broken";
|
||||
static char stext[256];
|
||||
static int screen;
|
||||
|
@ -1823,7 +1822,7 @@ setmfact(const Arg *arg)
|
|||
f = arg->f < 1.0 ? arg->f + selmon->mfact : arg->f - 1.0;
|
||||
if (f < 0.05 || f > 0.95)
|
||||
return;
|
||||
selmon->mfact = selmon->pertag->mfacts[selmon->pertag->curtag] = f;
|
||||
selmon->mfact = f;
|
||||
arrange(selmon);
|
||||
}
|
||||
|
||||
|
@ -1835,6 +1834,8 @@ setup(void)
|
|||
Atom utf8string;
|
||||
|
||||
/* clean up any zombies immediately */
|
||||
if (signal(SIGCHLD, sigchld) == SIG_ERR)
|
||||
die("can't install SIGCHLD handler:");
|
||||
sigchld(0);
|
||||
|
||||
/* init screen */
|
||||
|
|
Loading…
Reference in a new issue