[svn-upgrade] Integrating new upstream version, ion3 (20070506)

[ion3.git] / ioncore / clientwin.h

diff --git a/ioncore/clientwin.h b/ioncore/clientwin.h
index 2080d3db33ee5191d035d6870979034d6cc35ef3..d81b11a987173f3bd91108cff5bbf1987082dd9e 100644 (file)
--- a/ioncore/clientwin.h
+++ b/ioncore/clientwin.h
@@ -1,12 +1,9 @@
 /*
  * ion/ioncore/clientwin.h
  *
- * Copyright (c) Tuomo Valkonen 1999-2006. 
+ * Copyright (c) Tuomo Valkonen 1999-2007. 
  *
- * Ion is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2.1 of the License, or
- * (at your option) any later version.
+ * See the included file LICENSE for details.
  */
 
 #ifndef ION_IONCORE_CLIENTWIN_H
@@ -28,15 +25,20 @@
 #define CLIENTWIN_P_WM_DELETE        0x00001
 #define CLIENTWIN_P_WM_TAKE_FOCUS    0x00002
 #define CLIENTWIN_PROP_ACROBATIC     0x00010
-#define CLIENTWIN_PROP_MAXSIZE       0x00020
-#define CLIENTWIN_PROP_ASPECT        0x00040
-#define CLIENTWIN_PROP_TRANSPARENT   0x00080
-#define CLIENTWIN_PROP_IGNORE_RSZINC 0x00100
-#define CLIENTWIN_PROP_MINSIZE       0x00200
-#define CLIENTWIN_PROP_IGNORE_CFGRQ  0x00400
-#define CLIENTWIN_NEED_CFGNTFY       0x01000
+#define CLIENTWIN_PROP_TRANSPARENT   0x00020
+#define CLIENTWIN_PROP_IGNORE_CFGRQ  0x00040
+#define CLIENTWIN_PROP_MINSIZE       0x00100
+#define CLIENTWIN_PROP_MAXSIZE       0x00200
+#define CLIENTWIN_PROP_ASPECT        0x00400
+#define CLIENTWIN_PROP_RSZINC        0x00800
+#define CLIENTWIN_PROP_I_MINSIZE     0x01000
+#define CLIENTWIN_PROP_I_MAXSIZE     0x02000
+#define CLIENTWIN_PROP_I_ASPECT      0x04000
+#define CLIENTWIN_PROP_I_RSZINC      0x08000
 #define CLIENTWIN_USE_NET_WM_NAME    0x10000
 #define CLIENTWIN_FS_RQ              0x20000
+#define CLIENTWIN_UNMAP_RQ           0x40000
+#define CLIENTWIN_NEED_CFGNTFY       0x80000
 
 
 DECLCLASS(WClientWin){
@@ -49,8 +51,6 @@ DECLCLASS(WClientWin){
     
     int orig_bw;
 
-    Window transient_for;
-    
     Colormap cmap;
     Colormap *cmaps;
     Window *cmapwins;
@@ -58,8 +58,6 @@ DECLCLASS(WClientWin){
 
     XSizeHints size_hints;
     
-    WPHolder *fs_pholder;
-    
     ExtlTab proptab;
 };
 
@@ -69,7 +67,7 @@ extern void clientwin_get_size_hints(WClientWin *cwin);
 extern void clientwin_unmapped(WClientWin *cwin);
 extern void clientwin_destroyed(WClientWin *cwin);
 extern void clientwin_kill(WClientWin *cwin);
-extern bool clientwin_rqclose(WClientWin *cwin, bool relocate_ignored);
+extern void clientwin_rqclose(WClientWin *cwin, bool relocate_ignored);
 
 extern void clientwin_tfor_changed(WClientWin *cwin);