elementary/gala
1
1
Fork 0
mirror of https://github.com/elementary/gala.git synced 2024-10-05 19:27:25 +03:00
Code Issues Packages Projects Releases Wiki Activity

Updated VAPI & Gala namespace

Browse Source
This commit is contained in:
Garden Gnome 2012-05-28 12:17:55 +01:00
parent 7ff1c56857
commit ac7ff6f594
5 changed files with 30 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -42,6 +42,7 @@ ensure_vala_version("0.16.0" MINIMUM)
include(ValaPrecompile)
vala_precompile(VALA_C
src/main.vala
src/gala.vala
src/gala-plugin.vala
src/Widgets/WorkspaceSwitcher.vala
src/Widgets/WindowSwitcher.vala

8
src/gala-plugin.vala
View File

@ -5,7 +5,11 @@ namespace Gala {
public WorkspaceSwitcher wswitcher;
public WindowSwitcher winswitcher;
public Clutter.Actor elements;
public Plugin () {
}
public override void start () {
this.elements = Meta.get_stage_for_screen (this.get_screen ());
@ -228,7 +232,7 @@ namespace Gala {
}
public override Meta.PluginInfo plugin_info () {
return {"Gala", "0.1", "Tom Beckmann", "GPLv3", "A nice window manager"};
return {"Gala", Gala.VERSION, "Tom Beckmann", "GPLv3", "A nice window manager"};
}
}

16
src/gala.vala Normal file
View File

@ -0,0 +1,16 @@
namespace Gala {
const string VERSION = "0.1";
const OptionEntry[] OPTIONS = {
{ "version", 0, OptionFlags.NO_ARG, OptionArg.CALLBACK, (void*) print_version, "Print version", null },
{ null }
};
void print_version () {
stdout.printf ("Gala %s\n", Gala.VERSION);
Meta.exit (Meta.ExitCode.SUCCESS);
}
}

18
src/main.vala
View File

@ -3,25 +3,15 @@ public extern int x_handle_event (X.Event xevent);
[CCode (cname="clutter_x11_get_stage_window")]
public extern X.Window x_get_stage_window (Clutter.Actor stage);
void print_version () {
stdout.printf("test\n");
Meta.exit (Meta.ExitCode.SUCCESS);
}
int main (string [] args) {
const OptionEntry[] options = {
{ "version", 0, OptionFlags.NO_ARG, OptionArg.CALLBACK, (void*) print_version, "Print version", null },
{ null }
};
OptionContext ctx = Meta.get_option_context ();
ctx.add_main_entries(options, null);
ctx.add_main_entries (Gala.OPTIONS, null);
try {
ctx.parse(ref args);
ctx.parse (ref args);
} catch (Error e) {
stderr.printf("Error initializing: %s\n", e.message);
Meta.exit(Meta.ExitCode.ERROR);
stderr.printf ("Error initializing: %s\n", e.message);
Meta.exit (Meta.ExitCode.ERROR);
}
Meta.Plugin.type_register (new Gala.Plugin ().get_type ());

4
vapi/libmutter.vapi
View File

@ -1103,5 +1103,7 @@ namespace Meta {
KeyHandlerFunc handler);
[CCode (cheader_filename = "meta/prefs.h")]
public delegate void KeyHandlerFunc (Display display, Screen screen, Window window,
X.Event event, KeyBinding binding);
X.Event event, KeyBinding binding);
[CCode (cheader_filename = "meta/prefs.h")]
public static void prefs_override_preference_schema (char *key, char *schema);
}