summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlp Toker <alp@atoker.com>2006-08-26 18:29:58 +0100
committerAlp Toker <alp@atoker.com>2006-08-26 18:29:58 +0100
commitbf05aba7b960e7995ed0881459c967fbcaa39dac (patch)
tree99002eaa01879d3f81c8f4ff6b11e0e5a636c15e
parent9f794518837f3147c3a9c808eede4e3652255daa (diff)
downloadcompiz-cil-bf05aba7b960e7995ed0881459c967fbcaa39dac.tar.gz
compiz-cil-bf05aba7b960e7995ed0881459c967fbcaa39dac.tar.bz2
Clean up PluginLoader comments and whitespace
-rw-r--r--src/PluginLoader.cs63
1 files changed, 6 insertions, 57 deletions
diff --git a/src/PluginLoader.cs b/src/PluginLoader.cs
index c4682d7..0302370 100644
--- a/src/PluginLoader.cs
+++ b/src/PluginLoader.cs
@@ -158,7 +158,7 @@ namespace Compiz
public delegate bool InitPluginProc<T> (IntPtr plugin, T obj);
public delegate void FiniPluginProc<T> (IntPtr plugin, T obj);
-
+
public delegate IntPtr GetOptionsProc<T> (T obj, out int count);
public delegate bool SetOptionProc<T> (T obj, string name, IntPtr value);
@@ -179,12 +179,6 @@ namespace Compiz
[StructLayout (LayoutKind.Sequential, Pack=1, CharSet=CharSet.Ansi)]
public unsafe struct CompPluginVTable
{
- /*
- public string name;
- public string shortDesc;
- public string longDesc;
- */
-
public string Name
{
get {
@@ -217,30 +211,6 @@ namespace Compiz
public IntPtr shortDesc;
public IntPtr longDesc;
- //public bool Init (CompPlugin* plugin)
- /*
- public bool Init (IntPtr plugin)
- {
- if (init == null)
- return false;
-
- return init (plugin);
- }
- */
-
- /*
- public event InitPluginProc initt
- {
- add {
- IntPtr f = Marshal.GetFunctionPointerForDelegate (value);
- initWindow = f;
- } remove {
- initWindow = IntPtr.Zero;
- }
- }
- */
-
- //public event InitPluginProc init;
public IntPtr init;
public IntPtr fini;
@@ -258,58 +228,37 @@ namespace Compiz
public IntPtr getScreenOptions;
public IntPtr setScreenOption;
- /*
- public InitPluginProc init;
- public FiniPluginProc fini;
-
- public InitPluginProc<Screen> initScreen;
- public FiniPluginProc<Screen> finiScreen;
-
- public InitPluginProc<Window> initWindow;
- public FiniPluginProc<Window> finiWindow;
-
- public GetOptionsProc<Display> getDisplayOptions;
- public SetOptionProc<Display> setDisplayOption;
-
- public GetOptionsProc<Screen> getScreenOptions;
- public SetOptionProc<Screen> setScreenOption;
- */
-
public CompPluginDep *deps;
public int nDeps;
}
+ /*
[StructLayout (LayoutKind.Sequential, Pack=1, CharSet=CharSet.Ansi)]
- public unsafe struct CompPluginVTableOld
+ public unsafe struct CompPluginVTable
{
- /*
public string name;
public string shortDesc;
public string longDesc;
- */
-
- public IntPtr name;
- public IntPtr shortDesc;
- public IntPtr longDesc;
public InitPluginProc init;
public FiniPluginProc fini;
public InitPluginProc<Screen> initScreen;
public FiniPluginProc<Screen> finiScreen;
-
+
public InitPluginProc<Window> initWindow;
public FiniPluginProc<Window> finiWindow;
public GetOptionsProc<Display> getDisplayOptions;
public SetOptionProc<Display> setDisplayOption;
-
+
public GetOptionsProc<Screen> getScreenOptions;
public SetOptionProc<Screen> setScreenOption;
public CompPluginDep *deps;
public int nDeps;
}
+ */
public delegate CompPluginVTable PluginGetInfoProc ();
}