godzil/wmfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[ALL] Fix killclient segfault, add some thing ...

Browse Source
This commit is contained in:
Martin Duquesnoy
2008-09-13 17:27:43 +02:00
parent 69ecf11071
commit b1de167d77
4 changed files with 44 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
event.c
View File

@@ -12,11 +12,11 @@ buttonpress(XEvent ev) {
if((c = gettbar(ev.xbutton.window))) {
raiseclient(c);
if(ev.xbutton.button == Button1)
mouseaction(c, ev.xbutton.x_root, ev.xbutton.y_root, Move); /* type 0 for move */
mouseaction(c, ev.xbutton.x_root, ev.xbutton.y_root, Move);
else if(ev.xbutton.button == Button2)
tile_switch(NULL);
else if(ev.xbutton.button == Button3)
mouseaction(c, ev.xbutton.x_root, ev.xbutton.y_root, Resize); /* type 1 for resize */
mouseaction(c, ev.xbutton.x_root, ev.xbutton.y_root, Resize);
} else if((c = getbutton(ev.xbutton.window))) {
if(ev.xbutton.button == Button1)
killclient(NULL);
@@ -28,11 +28,11 @@ buttonpress(XEvent ev) {
if((c = getclient(ev.xbutton.window))) {
raiseclient(c);
if(ev.xbutton.button == Button1)
mouseaction(c, ev.xbutton.x_root, ev.xbutton.y_root, Move); /* type 0 for move */
mouseaction(c, ev.xbutton.x_root, ev.xbutton.y_root, Move);
else if(ev.xbutton.button == Button2)
togglemax(NULL);
else if(ev.xbutton.button == Button3)
mouseaction(c, ev.xbutton.x_root, ev.xbutton.y_root, Resize); /* type 1 for resize */
mouseaction(c, ev.xbutton.x_root, ev.xbutton.y_root, Resize);
}
/* Bar */
/* for tag click */
@@ -101,15 +101,9 @@ configurerequest(XEvent ev) {
wc.stack_mode = ev.xconfigurerequest.detail;
XConfigureWindow(dpy, ev.xconfigurerequest.window,
ev.xconfigurerequest.value_mask, &wc);
if((c = getclient(ev.xconfigurerequest.window))) {
if(wc.y < mw && wc.x < mh) {
c->free = True;
c->max = False;
c->tile = False;
if((c = getclient(ev.xconfigurerequest.window)))
if(wc.y < mw && wc.x < mh)
moveresize(c, wc.x, wc.y, wc.width, wc.height, 1);
arrange();
}
}
return;
}
@@ -131,8 +125,9 @@ enternotify(XEvent ev) {
return;
if((c = getclient(ev.xcrossing.window))
|| (c = gettbar(ev.xcrossing.window)))
if(c->win != bar)
focus(c);
focus(c);
else
focus(NULL);
return;
}
@@ -206,7 +201,7 @@ propertynotify(XEvent ev) {
}
if(ev.xproperty.atom == XA_WM_NAME
|| ev.xproperty.atom == net_atom[NetWMName])
updateall();
updatetitle(c);
}
return;
}

4
wmfs.1.txt
View File

@@ -4,7 +4,7 @@ wmfs(1)
NAME
----
wmfs - Windows Manager From Scratch
WMFS - Windows Manager From Scratch
SYNOPSIS
--------
@@ -81,7 +81,7 @@ CONFIGURATION
BUGS
----
Know bug list here.
WMFS isn't stable for now.
AUTHORS
-------

88
wmfs.c
View File

@@ -234,11 +234,10 @@ grabkeys(void) {
void
hide(Client *c) {
if(!c || c->hide) return;
if(!c)
return;
long data[] = { IconicState, None };
/* unmapclient(c); */
/* Just hide for now... */
XMoveWindow(dpy, c->win, c->x, c->y+mh*2);
if(conf.ttbarheight) {
XMoveWindow(dpy, c->tbar, c->x, c->y+mh*2);
@@ -332,6 +331,7 @@ init(void) {
CWOverrideRedirect | CWBackPixmap | CWEventMask, &at);
XSetWindowBackground(dpy, bar, conf.colors.bar);
XMapRaised(dpy, bar);
taglen[0] = 3;
updatebar();
updatebutton(0);
@@ -400,7 +400,7 @@ killclient(char *cmd) {
Atom *a;
XEvent ev;
if(!sel && ishide(sel))
if(!sel || ishide(sel))
return;
/* check is the client can be close
@@ -475,7 +475,6 @@ manage(Window w, XWindowAttributes *wa) {
Window trans;
Status rettrans;
XWindowChanges winc;
XSetWindowAttributes at;
c = emallocz(sizeof(Client));
c->win = w;
@@ -483,55 +482,35 @@ manage(Window w, XWindowAttributes *wa) {
c->y = wa->y + conf.ttbarheight + barheight;
c->w = wa->width;
c->h = wa->height;
c->border = wa->border_width;
c->tag = seltag;
if(conf.ttbarheight) {
at.override_redirect = 1;
at.background_pixmap = ParentRelative;
at.event_mask = ButtonPressMask | ExposureMask;
c->tbar = XCreateWindow(dpy, root, c->x, c->y - conf.ttbarheight,
c->w, conf.ttbarheight, 0, DefaultDepth(dpy, screen),
CopyFromParent, DefaultVisual(dpy, screen),
CWOverrideRedirect | CWBackPixmap | CWEventMask, &at);
XSetWindowBackground(dpy, c->tbar, conf.colors.bar);
setborder(c->tbar, conf.colors.bordernormal);
c->button = XCreateWindow(dpy, root, c->x + c->w - 10, BUTY(c->y),
5, BUTH, 0, DefaultDepth(dpy, screen),
CopyFromParent, DefaultVisual(dpy, screen),
CWOverrideRedirect | CWBackPixmap | CWEventMask, &at);
XSetWindowBackground(dpy, c->button, conf.colors.borderfocus);
XSetWindowBorder(dpy, c->button, conf.colors.bordernormal);
XSetWindowBorderWidth(dpy, c->button, 1);
c->tbar = XCreateSimpleWindow(dpy, root, c->x, c->y - conf.ttbarheight,
c->w, conf.ttbarheight, conf.borderheight,
conf.colors.bordernormal, conf.colors.bar);
XSelectInput(dpy, c->tbar, ExposureMask | EnterWindowMask);
c->button = XCreateSimpleWindow(dpy, root, c->x + c->w - 10, BUTY(c->y),
5, BUTH, 1, conf.colors.bordernormal,
conf.colors.borderfocus);
}
XConfigureWindow(dpy, w, CWBorderWidth, &winc);
setborder(w, conf.colors.bordernormal);
grabbuttons(c, False);
XSelectInput(dpy, w, EnterWindowMask | FocusChangeMask
| PropertyChangeMask | StructureNotifyMask);
XSelectInput(dpy, w, EnterWindowMask | FocusChangeMask | PropertyChangeMask | StructureNotifyMask);
setsizehints(c);
updatetitle(c);
if((rettrans = XGetTransientForHint(dpy, w, &trans) == Success))
for(t = clients; t && t->win != trans; t = t->next);
if(t)
c->tag = t->tag;
if(!c->free)
c->free = (rettrans == Success) || c->hint;
if(c->free)
raiseclient(c);
attach(c);
if(c->free)
raiseclient(c);
XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h);
mapclient(c);
layoutfunc[seltag]();
arrange();
return;
}
@@ -551,7 +530,7 @@ maxlayout(void) {
moveresize(c, 0,
conf.ttbarheight + barheight,
(mw-(conf.borderheight * 2)),
(mh-(conf.borderheight * 2)- conf.ttbarheight - barheight), 0);
(mh-(conf.borderheight * 2) - conf.ttbarheight - barheight), 0);
c->max = True;
}
return;
@@ -565,12 +544,11 @@ mouseaction(Client *c, int x, int y, int type) {
int ocx, ocy;
XEvent ev;
if((c->max && !c->hint)
|| c->tile)
if(c->max || c->tile)
return;
ocx = c->x;
ocy = c->y;
if(XGrabPointer(dpy, root, 0, MouseMask, GrabModeAsync, GrabModeAsync,
None, cursor[((type) ?CurResize:CurMove)], CurrentTime) != GrabSuccess) return;
if(type)
@@ -584,18 +562,19 @@ mouseaction(Client *c, int x, int y, int type) {
XUngrabPointer(dpy, CurrentTime);
return;
} else if(ev.type == MotionNotify) {
XSync(dpy, 0);
if(type) /* Resize */
XSync(dpy, False);
/* Resize */
if(type)
moveresize(c, c->x, c->y,
((ev.xmotion.x - ocx <= 0) ? 1 : ev.xmotion.x - ocx),
((ev.xmotion.y - ocy <= 0) ? 1 : ev.xmotion.y - ocy), 1);
else /* Move */
/* Move */
else
moveresize(c,
(ocx + (ev.xmotion.x - x)),
(ocy + (ev.xmotion.y - y)),
c->w, c->h, 0);
if(c->y < barheight + conf.ttbarheight - 5) {
c->w, c->h, 1);
if(c->y < barheight + conf.ttbarheight - 5) {
moveresize(c, c->x, barheight+conf.ttbarheight, c->w, c->h, 1);
XUngrabPointer(dpy, CurrentTime);
return;
@@ -621,7 +600,8 @@ moveresize(Client *c, int x, int y, int w, int h, bool r) {
h -= c->baseh;
/* aspect */
if (c->minay > 0 && c->maxay > 0
&& c->minax > 0 && c->maxax > 0) {
&& c->minax > 0 && c->maxax > 0)
{
if (w * c->maxay > h * c->maxax)
w = h * c->maxax / c->maxay;
else if (w * c->minay < h * c->minax)
@@ -672,7 +652,7 @@ moveresize(Client *c, int x, int y, int w, int h, bool r) {
Client*
nexttiled(Client *c) {
for(; c && (c->free || c->hint || ishide(c)); c = c->next);
for(; c && (c->free || ishide(c)); c = c->next);
return c;
}
@@ -880,7 +860,8 @@ tile(void) {
x = 0;
y = barto;
for(i = 0, c = nexttiled(clients); c; c = nexttiled(c->next), i++) {
for(i = 0, c = nexttiled(clients); c; c = nexttiled(c->next), i++)
{
c->max = False;
c->tile = True;
c->ox = c->x; c->oy = c->y;
@@ -934,10 +915,8 @@ togglemax(char *cmd) {
if(!sel || ishide(sel) || sel->hint)
return;
if(!sel->max) {
sel->ox = sel->x;
sel->oy = sel->y;
sel->ow = sel->w;
sel->oh = sel->h;
sel->ox = sel->x; sel->oy = sel->y;
sel->ow = sel->w; sel->oh = sel->h;
moveresize(sel, 0,
conf.ttbarheight + barheight,
(mw-(conf.borderheight * 2)),
@@ -953,11 +932,10 @@ togglemax(char *cmd) {
void
unhide(Client *c) {
if(!c || !c->hide) return;
if(!c)
return;
long data[] = { NormalState, None };
/* mapclient(c); */
XMoveWindow(dpy,c->win,c->x,c->y);
if(conf.ttbarheight) {
XMoveWindow(dpy,c->tbar,c->x, (c->y - conf.ttbarheight));
@@ -1006,7 +984,6 @@ updatebar(void) {
lt = time(NULL);
XClearWindow(dpy, bar);
XSetForeground(dpy, gc, conf.colors.text);
for(i=0; i<conf.ntag; ++i) {
ITOA(p, clientpertag(i+1));
@@ -1039,7 +1016,6 @@ updatebar(void) {
XSetForeground(dpy, gc, conf.colors.text);
XDrawString(dpy, bar, gc, mw - j * fonty, fonth-1 , bartext ,j);
XDrawLine(dpy, bar, gc, mw- j * fonty-5 , 0 , mw - j * fonty-5, barheight);
XSync(dpy, False);
/* Update Bar Buttons */
updatebutton(1);

1
wmfs.h
View File

@@ -47,7 +47,6 @@ struct Client {
int maxw, maxh, minw, minh;
int minax, maxax, minay, maxay;
/* } */
int border; /* border height */
Window win; /* Window */
Window tbar; /* Titlebar */
Window button; /* Close Button */