#include <sys/time.h>
#include <time.h>
#include <unistd.h>
+#include <getopt.h>
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include <X11/Xatom.h>
run_fades (Display *dpy)
{
int now = get_time_in_milliseconds();
- fade *f, *next;
+ fade *next = fades;
int steps;
Bool need_dequeue;
if (fade_time - now > 0)
return;
steps = 1 + (now - fade_time) / fade_delta;
- for (next = fades; f = next; )
+
+ while (next)
{
+ fade *f = next;
win *w = f->w;
next = f->next;
f->cur += f->step * steps;
{
XImage *shadowImage;
Pixmap shadowPixmap;
- Pixmap finalPixmap;
Picture shadowPicture;
- Picture finalPicture;
GC gc;
shadowImage = make_shadow (dpy, opacity, width, height);
return 0;
}
-static char *backgroundProps[] = {
+static const char *backgroundProps[] = {
"_XROOTPMAP_ID",
"_XSETROOT_ID",
0,
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;
/* 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;
{
int mode;
XRenderPictFormat *format;
- unsigned int default_opacity;
/* if trans prop == -1 fall back on previous tests*/
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;
configure_win (Display *dpy, XConfigureEvent *ce)
{
win *w = find_win (dpy, ce->window);
- Window above;
XserverRegion damage = None;
if (!w)
error (Display *dpy, XErrorEvent *ev)
{
int o;
- char *name = 0;
+ const char *name = 0;
if (should_ignore (dpy, ev->serial))
return 0;
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 */
add_damage (dpy, region);
}
-
+#if DEBUG_EVENTS
static int
ev_serial (XEvent *ev)
{
return NextRequest (ev->xany.display);
}
-
static char *
ev_name (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");
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;
}
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",