Merge branch 'master' of ssh://git.freedesktop.org/git/xorg/lib/libAppleWMlibAppleWM-1.2.0

7 files changed, 77 insertions, 86 deletions

diff --git a/.gitignore b/.gitignore
index e309ac2..09c84ad 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
+.deps
+.libs
 Makefile
 Makefile.in
 aclocal.m4
@@ -18,3 +20,9 @@ ltmain.sh
 missing
 stamp-h1
 *~
+*.o
+*.la
+*.lo
+libAppleWM-*.tar.*
+ChangeLog
+tags
diff --git a/Makefile.am b/Makefile.am
index d5cf273..b672c43 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,7 +24,7 @@ SUBDIRS = src man
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = applewm.pc
 
-EXTRA_DIST = applewm.pc.in autogen.sh
+EXTRA_DIST = applewm.pc.in
 
 
 EXTRA_DIST += ChangeLog
@@ -33,6 +33,6 @@ MAINTAINERCLEANFILES = ChangeLog
 .PHONY: ChangeLog
 
 ChangeLog:
-	(GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
+	$(CHANGELOG_CMD)
 
 dist-hook: ChangeLog
diff --git a/README b/README
index e69de29..afa3b4c 100644
--- a/README
+++ b/README
@@ -0,0 +1,27 @@
+AppleWM is a simple library designed to interface with the Apple-WM extension.
+This extension allows X window managers to better interact with
+the Mac OS X Aqua user interface when running X11 in a rootless mode.
+
+All questions regarding this software should be directed at the
+Xorg mailing list:
+
+        http://lists.freedesktop.org/mailman/listinfo/xorg
+
+Please submit bug reports to the Xorg bugzilla:
+
+        https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+
+The master development code repository can be found at:
+
+        git://anongit.freedesktop.org/git/xorg/lib/libAppleWM
+
+        http://cgit.freedesktop.org/xorg/lib/libAppleWM
+
+For patch submission instructions, see:
+
+	http://www.x.org/wiki/Development/Documentation/SubmittingPatches
+
+For more information on the git code manager, see:
+
+        http://wiki.x.org/wiki/GitPage
+
diff --git a/configure.ac b/configure.ac
index 619d4be..b061807 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,20 +27,25 @@ AC_INIT(libAppleWM, 1.2.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=x
 AM_INIT_AUTOMAKE([dist-bzip2])
 AM_MAINTAINER_MODE
 
+# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG
+m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.2)
 AM_CONFIG_HEADER(config.h)
 
 # Check for progs
 AC_PROG_CC
 AC_PROG_LIBTOOL
+XORG_CWARNFLAGS
 
 # Check for dependencies
 PKG_CHECK_MODULES(APPLEWM, x11 xext xextproto [applewmproto >= 1.2])
-
+APPLEWM_CFLAGS="$CWARNFLAGS $APPLEWM_CFLAGS"
 AC_SUBST(APPLEWM_CFLAGS)
 AC_SUBST(APPLEWM_LIBS)
 		  
 XORG_CHECK_MALLOC_ZERO
 XORG_RELEASE_VERSION
+XORG_CHANGELOG
 
 AC_OUTPUT([Makefile
 	   src/Makefile
diff --git a/man/.gitignore b/man/.gitignore
deleted file mode 100644
index 282522d..0000000
--- a/man/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/src/.gitignore b/src/.gitignore
deleted file mode 100644
index 9730646..0000000
--- a/src/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.la
-*.lo
diff --git a/src/applewm.c b/src/applewm.c
index 2a79998..5c6e59f 100644
--- a/src/applewm.c
+++ b/src/applewm.c
@@ -55,8 +55,8 @@ static char *applewm_extension_name = APPLEWMNAME;
  *****************************************************************************/
 
 static int close_display(Display *dpy, XExtCodes *extCodes);
-static Bool wire_to_event();
-static Status event_to_wire();
+static Bool wire_to_event(Display *dpy, XEvent *re, xEvent *event);
+static Status event_to_wire(Display *dpy, XEvent *re, xEvent *event);
 
 static /* const */ XExtensionHooks applewm_extension_hooks = {
     NULL,				/* create_gc */
@@ -79,10 +79,7 @@ static XEXT_GENERATE_FIND_DISPLAY (find_display, applewm_info,
 
 static XEXT_GENERATE_CLOSE_DISPLAY (close_display, applewm_info)
 
-static Bool wire_to_event (dpy, re, event)
-    Display *dpy;
-    XEvent  *re;
-    xEvent  *event;
+static Bool wire_to_event (Display *dpy, XEvent *re, xEvent *event)
 {
     XExtDisplayInfo *info = find_display (dpy);
     XAppleWMNotifyEvent *se;
@@ -109,10 +106,7 @@ static Bool wire_to_event (dpy, re, event)
     return False;
 }
 
-static Status event_to_wire (dpy, re, event)
-    Display *dpy;
-    XEvent  *re;
-    xEvent  *event;
+static Status event_to_wire (Display *dpy, XEvent *re, xEvent *event)
 {
     XExtDisplayInfo *info = find_display (dpy);
     XAppleWMNotifyEvent *se;
@@ -150,9 +144,7 @@ static Status event_to_wire (dpy, re, event)
 #endif
 
 
-Bool XAppleWMQueryExtension (dpy, event_basep, error_basep)
-    Display *dpy;
-    int *event_basep, *error_basep;
+Bool XAppleWMQueryExtension (Display *dpy, int *event_basep, int *error_basep)
 {
     XExtDisplayInfo *info = find_display (dpy);
 
@@ -168,11 +160,8 @@ Bool XAppleWMQueryExtension (dpy, event_basep, error_basep)
     }
 }
 
-Bool XAppleWMQueryVersion(dpy, majorVersion, minorVersion, patchVersion)
-    Display* dpy;
-    int* majorVersion;
-    int* minorVersion;
-    int* patchVersion;
+Bool XAppleWMQueryVersion(Display* dpy, int* majorVersion, int* minorVersion,
+			  int* patchVersion)
 {
     XExtDisplayInfo *info = find_display (dpy);
     xAppleWMQueryVersionReply rep;
@@ -200,9 +189,7 @@ Bool XAppleWMQueryVersion(dpy, majorVersion, minorVersion, patchVersion)
     return True;
 }
 
-Bool XAppleWMDisableUpdate(dpy, screen)
-    Display* dpy;
-    int screen;
+Bool XAppleWMDisableUpdate(Display* dpy, int screen)
 {
     XExtDisplayInfo *info = find_display (dpy);
     xAppleWMDisableUpdateReq *req;
@@ -221,9 +208,7 @@ Bool XAppleWMDisableUpdate(dpy, screen)
     return True;
 }
 
-Bool XAppleWMReenableUpdate(dpy, screen)
-    Display* dpy;
-    int screen;
+Bool XAppleWMReenableUpdate(Display* dpy, int screen)
 {
     XExtDisplayInfo *info = find_display (dpy);
     xAppleWMReenableUpdateReq *req;
@@ -242,9 +227,7 @@ Bool XAppleWMReenableUpdate(dpy, screen)
     return True;
 }
 
-Bool XAppleWMSelectInput(dpy, mask)
-    Display* dpy;
-    unsigned long mask;
+Bool XAppleWMSelectInput(Display* dpy, unsigned long mask)
 {
     XExtDisplayInfo *info = find_display (dpy);
     xAppleWMSelectInputReq *req;
@@ -263,11 +246,9 @@ Bool XAppleWMSelectInput(dpy, mask)
     return True;
 }
 
-Bool XAppleWMSetWindowMenuWithShortcuts(dpy, nitems, items, shortcuts)
-    Display* dpy;
-    int nitems;
-    const char **items;
-    const char *shortcuts;
+Bool XAppleWMSetWindowMenuWithShortcuts(Display* dpy, int nitems,
+					const char **items,
+					const char *shortcuts)
 {
     XExtDisplayInfo *info = find_display (dpy);
     xAppleWMSetWindowMenuReq *req;
@@ -306,17 +287,12 @@ Bool XAppleWMSetWindowMenuWithShortcuts(dpy, nitems, items, shortcuts)
     return True;
 }
 
-Bool XAppleWMSetWindowMenu(dpy, nitems, items)
-    Display* dpy;
-    int nitems;
-    const char **items;
+Bool XAppleWMSetWindowMenu(Display* dpy, int nitems, const char **items)
 {
     return XAppleWMSetWindowMenuWithShortcuts (dpy, nitems, items, NULL);
 }
 
-Bool XAppleWMSetWindowMenuCheck(dpy, idx)
-    Display* dpy;
-    int idx;
+Bool XAppleWMSetWindowMenuCheck(Display* dpy, int idx)
 {
     XExtDisplayInfo *info = find_display (dpy);
     xAppleWMSetWindowMenuCheckReq *req;
@@ -335,8 +311,7 @@ Bool XAppleWMSetWindowMenuCheck(dpy, idx)
     return True;
 }
 
-Bool XAppleWMSetFrontProcess(dpy)
-    Display* dpy;
+Bool XAppleWMSetFrontProcess(Display* dpy)
 {
     XExtDisplayInfo *info = find_display (dpy);
     xAppleWMSetFrontProcessReq *req;
@@ -354,10 +329,7 @@ Bool XAppleWMSetFrontProcess(dpy)
     return True;
 }
 
-Bool XAppleWMSetWindowLevel(dpy, id, level)
-    Display* dpy;
-    Window id;
-    int level;
+Bool XAppleWMSetWindowLevel(Display* dpy, Window id, int level)
 {
     XExtDisplayInfo *info = find_display (dpy);
     xAppleWMSetWindowLevelReq *req;
@@ -406,10 +378,7 @@ Bool XAppleWMSendPSN(Display* dpy) {
     return True;
 }
 
-
-Bool XAppleWMSetCanQuit(dpy, state)
-    Display* dpy;
-    Bool state;
+Bool XAppleWMSetCanQuit(Display* dpy, Bool state)
 {
     XExtDisplayInfo *info = find_display (dpy);
     xAppleWMSetCanQuitReq *req;
@@ -428,13 +397,11 @@ Bool XAppleWMSetCanQuit(dpy, state)
     return True;
 }
 
-Bool XAppleWMFrameGetRect(dpy, frame_class, frame_rect,
-                          ix, iy, iw, ih, ox, oy, ow, oh, rx, ry, rw, rh)
-    Display* dpy;
-    unsigned int frame_class, frame_rect;
-    short ix, iy, iw, ih;
-    short ox, oy, ow, oh;
-    short *rx, *ry, *rw, *rh;
+Bool XAppleWMFrameGetRect(Display *dpy,
+			  unsigned int frame_class, unsigned int frame_rect,
+			  short  ix, short  iy, short  iw, short  ih,
+			  short  ox, short  oy, short  ow, short  oh,
+			  short *rx, short *ry, short *rw, short *rh)
 {
     XExtDisplayInfo *info = find_display (dpy);
     xAppleWMFrameGetRectReply rep;
@@ -472,13 +439,11 @@ Bool XAppleWMFrameGetRect(dpy, frame_class, frame_rect,
     return True;
 }
 
-unsigned int XAppleWMFrameHitTest(dpy, frame_class, px, py,
-                                  ix, iy, iw, ih, ox, oy, ow, oh)
-    Display* dpy;
-    unsigned int frame_class;
-    short px, py;
-    short ix, iy, iw, ih;
-    short ox, oy, ow, oh;
+unsigned int XAppleWMFrameHitTest(Display *dpy,
+				  unsigned int frame_class,
+				  short px, short py,
+				  short ix, short iy, short iw, short ih,
+				  short ox, short oy, short ow, short oh)
 {
     XExtDisplayInfo *info = find_display (dpy);
     xAppleWMFrameHitTestReply rep;
@@ -515,18 +480,12 @@ unsigned int XAppleWMFrameHitTest(dpy, frame_class, px, py,
     return rep.ret;
 }
 
-Bool XAppleWMFrameDraw(dpy, screen, window,
-                       frame_class, frame_attr,
-                       ix, iy, iw, ih, ox, oy, ow, oh,
-                       title_length, title_bytes)
-    Display* dpy;
-    int screen;
-    Window window;
-    unsigned int frame_class, frame_attr;
-    short ix, iy, iw, ih;
-    short ox, oy, ow, oh;
-    unsigned int title_length;
-    const unsigned char *title_bytes;
+Bool XAppleWMFrameDraw(Display *dpy, int screen, Window window,
+		       unsigned int frame_class, unsigned int frame_attr,
+		       short ix, short iy, short iw, short ih,
+		       short ox, short oy, short ow, short oh,
+		       unsigned int title_length,
+		       const unsigned char * title_bytes)
 {
     XExtDisplayInfo *info = find_display (dpy);
     xAppleWMFrameDrawReq *req;