From 8a2841a8ab5bb9295ae07cb8fd442f00114a4e8d Mon Sep 17 00:00:00 2001
From: rhp <rhp>
Date: Sat, 7 Jul 2001 18:43:19 +0000
Subject: [PATCH] ...

---
 Makefile.am     |  2 +-
 configure.in    |  2 +-
 src/Makefile.am |  1 +
 src/window.c    | 17 ++++++++++-------
 src/window.h    |  8 ++++++++
 5 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index cd6fc53d6..e3f5d376e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,3 @@
 
-SUBDIRS=src intl po
+SUBDIRS=src 
 
diff --git a/configure.in b/configure.in
index 87bcea717..5f24c4453 100644
--- a/configure.in
+++ b/configure.in
@@ -38,7 +38,7 @@ fi
 changequote([,])dnl
 
 ALL_LINGUAS=""
-AM_GNU_GETTEXT
+dnl AM_GNU_GETTEXT
 
 ## here we get the flags we'll actually use
 PKG_CHECK_MODULES(METACITY, gtk+-2.0 >= 1.3.6)
diff --git a/src/Makefile.am b/src/Makefile.am
index 6b1771042..5043c9818 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,6 +2,7 @@
 INCLUDES=@METACITY_CFLAGS@ -DMETACITY_LIBEXECDIR=\"$(libexecdir)\" -DHOST_ALIAS=\"@HOST_ALIAS@\" 
 
 metacity_SOURCES= 				\
+	common.h				\
 	core.c					\
 	core.h					\
 	display.c				\
diff --git a/src/window.c b/src/window.c
index 7708723ba..6302ed157 100644
--- a/src/window.c
+++ b/src/window.c
@@ -418,7 +418,7 @@ meta_window_new (MetaDisplay *display, Window xwindow,
       window->type == META_WINDOW_TOOLBAR ||
       window->type == META_WINDOW_MENU)
     {
-      if ((window->size_hints.flags & PPosition) == 0)
+      if (window->size_hints.flags & PPosition)
         {
           window->placed = TRUE;
           meta_verbose ("Not placing non-normal non-dialog window with PPosition set\n");
@@ -1721,14 +1721,17 @@ meta_window_configure_request (MetaWindow *window,
 
   meta_window_get_gravity_position (window, &x, &y);
 
-  if (FALSE && /* For now, always ignore program-specified positions. */
+  if ((window->type == META_WINDOW_DESKTOP ||
+       window->type == META_WINDOW_DOCK ||
+       window->type == META_WINDOW_TOOLBAR ||
+       window->type == META_WINDOW_MENU) &&
       (window->size_hints.flags & PPosition))
     {
-     if (event->xconfigurerequest.value_mask & CWX)
-       x = event->xconfigurerequest.x;
-     
-     if (event->xconfigurerequest.value_mask & CWY)
-       y = event->xconfigurerequest.y;
+      if (event->xconfigurerequest.value_mask & CWX)
+        x = event->xconfigurerequest.x;
+      
+      if (event->xconfigurerequest.value_mask & CWY)
+        y = event->xconfigurerequest.y;
     }
 
   width = window->rect.width;
diff --git a/src/window.h b/src/window.h
index 3fd1d0ff9..26269530f 100644
--- a/src/window.h
+++ b/src/window.h
@@ -248,6 +248,14 @@ void        meta_window_queue_move_resize  (MetaWindow  *window);
 void        meta_window_get_position       (MetaWindow  *window,
                                             int         *x,
                                             int         *y);
+/* gets position we need to set to stay in current position,
+ * assuming position will be gravity-compensated. i.e.
+ * this is the position a client would send in a configure
+ * request.
+ */
+void        meta_window_get_gravity_position (MetaWindow  *window,
+                                              int         *x,
+                                              int         *y);
 void        meta_window_delete             (MetaWindow  *window,
                                             Time         timestamp);
 void        meta_window_focus              (MetaWindow  *window,