Added .gitignore.

[dana/xcompmgr.git] / xcompmgr.c

diff --git a/xcompmgr.c b/xcompmgr.c
index 5996d1a..a142cff 100644 (file)
--- a/xcompmgr.c
+++ b/xcompmgr.c
@@ -625,9 +625,7 @@ shadow_picture (Display *dpy, double opacity, Picture alpha_pict, int width, int
 {
     XImage  *shadowImage;
     Pixmap  shadowPixmap;
-    Pixmap  finalPixmap;
     Picture shadowPicture;
-    Picture finalPicture;
     GC     gc;
     
     shadowImage = make_shadow (dpy, opacity, width, height);
@@ -1165,11 +1163,13 @@ repair_win (Display *dpy, win *w)
     w->damaged = 1;
 }
 
+static unsigned int
+get_opacity_prop (Display *dpy, win *w, unsigned int def);
+
 static void
 map_win (Display *dpy, Window id, unsigned long sequence, Bool fade)
 {
     win                *w = find_win (dpy, id);
-    Drawable   back;
 
     if (!w)
        return;
@@ -1179,6 +1179,10 @@ map_win (Display *dpy, Window id, unsigned long sequence, Bool fade)
     /* This needs to be here or else we lose transparency messages */
     XSelectInput (dpy, id, PropertyChangeMask);
 
+    /* This needs to be here since we don't get PropertyNotify when unmapped */
+    w->opacity = get_opacity_prop (dpy, w, OPAQUE);
+    determine_mode (dpy, w);
+
 #if CAN_DO_USABLE
     w->damage_bounds.x = w->damage_bounds.y = 0;
     w->damage_bounds.width = w->damage_bounds.height = 0;
@@ -1332,7 +1336,6 @@ determine_mode(Display *dpy, win *w)
 {
     int mode;
     XRenderPictFormat *format;
-    unsigned int default_opacity;
 
     /* if trans prop == -1 fall back on  previous tests*/
 
@@ -1467,10 +1470,7 @@ add_win (Display *dpy, Window id, Window prev)
     new->borderClip = None;
     new->prev_trans = 0;
 
-    /* moved mode setting to one place */
-    new->opacity = get_opacity_prop (dpy, new, OPAQUE);
     new->windowType = determine_wintype (dpy, new->id);
-    determine_mode (dpy, new);
     
     new->next = *p;
     *p = new;
@@ -1512,7 +1512,6 @@ static void
 configure_win (Display *dpy, XConfigureEvent *ce)
 {
     win                    *w = find_win (dpy, ce->window);
-    Window         above;
     XserverRegion   damage = None;
     
     if (!w)
@@ -1599,7 +1598,7 @@ finish_destroy_win (Display *dpy, Window id, Bool gone)
     for (prev = &list; (w = *prev); prev = &w->next)
        if (w->id == id)
        {
-           if (!gone)
+           if (gone)
                finish_unmap_win (dpy, w);
            *prev = w->next;
            if (w->picture)
@@ -1766,7 +1765,7 @@ error (Display *dpy, XErrorEvent *ev)
     default: break;
     }
        
-    printf ("error %d request %d minor %d serial %d\n",
+    printf ("error %d request %d minor %d serial %lu\n",
            ev->error_code, ev->request_code, ev->minor_code, ev->serial);
 
 /*    abort ();            this is just annoying to most people */
@@ -1781,7 +1780,7 @@ expose_root (Display *dpy, Window root, XRectangle *rects, int nrects)
     add_damage (dpy, region);
 }
 
-
+#if DEBUG_EVENTS
 static int
 ev_serial (XEvent *ev)
 {
@@ -1790,7 +1789,6 @@ ev_serial (XEvent *ev)
     return NextRequest (ev->xany.display);
 }
 
-
 static char *
 ev_name (XEvent *ev)
 {
@@ -1834,11 +1832,12 @@ ev_window (XEvent *ev)
        return 0;
     }
 }
+#endif
 
 void
 usage (char *program)
 {
-    fprintf (stderr, "%s v1.1.2\n", program);
+    fprintf (stderr, "%s v1.1.3\n", program);
     fprintf (stderr, "usage: %s [options]\n", program);
     fprintf (stderr, "Options\n");
     fprintf (stderr, "   -d display\n      Specifies which display should be managed.\n");
@@ -1884,19 +1883,13 @@ main (int argc, char **argv)
     XEvent         ev;
     Window         root_return, parent_return;
     Window         *children;
-    Pixmap         transPixmap;
-    Pixmap         blackPixmap;
     unsigned int    nchildren;
     int                    i;
     XRenderPictureAttributes   pa;
-    XRenderColor               c;
     XRectangle     *expose_rects = 0;
     int                    size_expose = 0;
     int                    n_expose = 0;
     struct pollfd   ufd;
-    int                    n;
-    int                    last_update;
-    int                    now;
     int                    p;
     int                    composite_major, composite_minor;
     char           *display = 0;
@@ -2077,7 +2070,7 @@ main (int argc, char **argv)
            }
 
            XNextEvent (dpy, &ev);
-           if (ev.type & 0x7f != KeymapNotify)
+           if ((ev.type & 0x7f) != KeymapNotify)
                discard_ignore (dpy, ev.xany.serial);
 #if DEBUG_EVENTS
            printf ("event %10.10s serial 0x%08x window 0x%08x\n",