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

[ion3.git] / ioncore / global.h

diff --git a/ioncore/global.h b/ioncore/global.h
index 37569104b812575552ccab5799951413a944f044..7ac78419c0c699063946ff9ca13b66f2206cad49 100644 (file)
--- a/ioncore/global.h
+++ b/ioncore/global.h
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/global.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
@@ -17,6 +17,8 @@
 #include <X11/Xutil.h>
 #include <X11/Xresource.h>
 
+#include <libtu/stringstore.h>
+
 #include "rootwin.h"
 #include "screen.h"
 #include "window.h"
@@ -35,8 +37,17 @@ enum{
     IONCORE_OPMODE_DEINIT
 };
 
+enum{
+    IONCORE_FOCUSNEXT_OTHER,
+    IONCORE_FOCUSNEXT_POINTERHACK,
+    IONCORE_FOCUSNEXT_ENTERWINDOW,
+    IONCORE_FOCUSNEXT_FALLBACK
+};
+
+
 INTRSTRUCT(WGlobal);
 
+
 DECLSTRUCT(WGlobal){
     int argc;
     char **argv;
@@ -61,6 +72,7 @@ DECLSTRUCT(WGlobal){
     WScreen *screens;
     WRegion *focus_next;
     bool warp_next;
+    int focus_next_source;
     
     /* We could have a display WRegion but the screen-link could impose
      * some problems so these are handled as a special case.
@@ -77,14 +89,33 @@ DECLSTRUCT(WGlobal){
     bool screen_notify;
     int frame_default_index;
     bool framed_transients;
-    
-    /*bool save_enabled;*/
+    bool no_mousefocus;
+    bool unsqueeze_enabled;
+    bool autoraise;
     
     bool use_mb; /* use mb routines? */
     bool enc_sb; /* 8-bit charset? If unset, use_mb must be set. */
     bool enc_utf8; /* mb encoding is utf8? */
     
     const char *sm_client_id;
+    
+    struct{
+        StringId activated,
+                 inactivated,
+                 activity,
+                 sub_activity,
+                 name,
+                 unset_manager,
+                 set_manager,
+                 tag,
+                 set_return,
+                 unset_return,
+                 pseudoactivated,
+                 pseudoinactivated,
+                 deinit,
+                 map,
+                 unmap;
+    } notifies;
 };