applied cleanup from M. Hurton and S. Nagy

[dwm.git] / dwm.c

diff --git a/dwm.c b/dwm.c
index 5cbb59b..d0239f4 100644 (file)
--- a/dwm.c
+++ b/dwm.c
@@ -347,7 +347,7 @@ checkotherwm(void) {
 
 void
 cleanup(void) {
 
 void
 cleanup(void) {

-       Arg a = {.i = ~0};
+       Arg a = {.ui = ~0};

        Layout foo = { "", NULL };
 
        close(STDIN_FILENO);
        Layout foo = { "", NULL };
 
        close(STDIN_FILENO);


@@ -903,8 +903,8 @@ manage(Window w, XWindowAttributes *wa) {
        XSelectInput(dpy, w, EnterWindowMask|FocusChangeMask|PropertyChangeMask|StructureNotifyMask);
        grabbuttons(c, False);
        updatetitle(c);
        XSelectInput(dpy, w, EnterWindowMask|FocusChangeMask|PropertyChangeMask|StructureNotifyMask);
        grabbuttons(c, False);
        updatetitle(c);

-       if((rettrans = XGetTransientForHint(dpy, w, &trans) == Success))
-               for(t = clients; t && t->win != trans; t = t->next);
+       if((rettrans = XGetTransientForHint(dpy, w, &trans)) == Success)
+               t = getclient(trans);

        if(t)
                c->tags = t->tags;
        else
        if(t)
                c->tags = t->tags;
        else


@@ -1640,11 +1640,11 @@ updatewmhints(Client *c) {
 
 void
 view(const Arg *arg) {
 
 void
 view(const Arg *arg) {

-       if(arg && (arg->i & TAGMASK) == tagset[seltags])
+       if(arg && (arg->ui & TAGMASK) == tagset[seltags])

                return;
        seltags ^= 1; /* toggle sel tagset */
        if(arg && (arg->ui & TAGMASK))
                return;
        seltags ^= 1; /* toggle sel tagset */
        if(arg && (arg->ui & TAGMASK))

-               tagset[seltags] = arg->i & TAGMASK;
+               tagset[seltags] = arg->ui & TAGMASK;

        clearurgent();
        arrange();
 }
        clearurgent();
        arrange();
 }