summaryrefslogtreecommitdiff
path: root/include/compiz.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/compiz.h')
-rw-r--r--include/compiz.h92
1 files changed, 21 insertions, 71 deletions
diff --git a/include/compiz.h b/include/compiz.h
index ca50395..ec212da 100644
--- a/include/compiz.h
+++ b/include/compiz.h
@@ -30,16 +30,18 @@
#include <compiz-common.h>
-COMPIZ_BEGIN_DECLS
+#include <string>
+#include <vector>
+#include <list>
+
+typedef std::string CompString;
+
typedef int CompBool;
typedef int CompTimeoutHandle;
typedef int CompWatchFdHandle;
-typedef union _CompOptionValue CompOptionValue;
-
typedef struct _CompMetadata CompMetadata;
-typedef struct _CompOption CompOption;
typedef struct _CompPlugin CompPlugin;
@@ -48,78 +50,27 @@ class CompDisplay;
class CompScreen;
class CompWindow;
class CompObject;
+class CompOption;
-typedef bool (*CallBackProc) (void *closure);
-
-typedef enum {
- CompOptionTypeBool,
- CompOptionTypeInt,
- CompOptionTypeFloat,
- CompOptionTypeString,
- CompOptionTypeColor,
- CompOptionTypeAction,
- CompOptionTypeKey,
- CompOptionTypeButton,
- CompOptionTypeEdge,
- CompOptionTypeBell,
- CompOptionTypeMatch,
- CompOptionTypeList
-} CompOptionType;
-
-void
-compInitOptionValue (CompOptionValue *v);
-
-void
-compFiniOptionValue (CompOptionValue *v,
- CompOptionType type);
-
-void
-compInitOption (CompOption *option);
-
-void
-compFiniOption (CompOption *option);
-
-CompOption *
-compFindOption (CompOption *option,
- int nOption,
- const char *name,
- int *index);
+typedef union _CompPrivate {
+ void *ptr;
+ long val;
+ unsigned long uval;
+ void *(*fptr) (void);
+} CompPrivate;
-CompBool
-compSetBoolOption (CompOption *option,
- CompOptionValue *value);
-
-CompBool
-compSetIntOption (CompOption *option,
- CompOptionValue *value);
-
-CompBool
-compSetFloatOption (CompOption *option,
- CompOptionValue *value);
-
-CompBool
-compSetStringOption (CompOption *option,
- CompOptionValue *value);
-CompBool
-compSetColorOption (CompOption *option,
- CompOptionValue *value);
-
-CompBool
-compSetActionOption (CompOption *option,
- CompOptionValue *value);
+typedef bool (*CallBackProc) (void *closure);
-CompBool
-compSetMatchOption (CompOption *option,
- CompOptionValue *value);
+typedef enum {
+ CompLogLevelFatal = 0,
+ CompLogLevelError,
+ CompLogLevelWarn,
+ CompLogLevelInfo,
+ CompLogLevelDebug
+} CompLogLevel;
-CompBool
-compSetOptionList (CompOption *option,
- CompOptionValue *value);
-CompBool
-compSetOption (CompOption *option,
- CompOptionValue *value);
CompBool
compInitMetadata (CompMetadata *metadata);
@@ -156,6 +107,5 @@ compReadXmlChunk (const char *src,
int length);
-COMPIZ_END_DECLS
#endif