Browse Source
Remove libunique dependency
Remove libunique dependency
libunique-3.0 should not be used in Gtk3 application anymore. Its functionality was replaced by Gtk.Application. Moreover, the argument 1-5 now looks the displayed layer again changes by key events.master
Olaf Schulz
2 years ago
10 changed files with 272 additions and 350 deletions
-
20Makefile
-
70src/app.vala
-
44src/config-manager.vala
-
56src/indicator.vala
-
133src/main.vala
-
162src/neo-window.vala
-
6src/tray.vala
-
29src/unique.vala
-
8vapi/unique-3.0.deps
-
94vapi/unique-3.0.vapi
@ -0,0 +1,70 @@ |
|||
using Gtk; |
|||
|
|||
namespace NeoLayoutViewer{ |
|||
|
|||
public class NeoLayoutViewerApp: Gtk.Application { |
|||
|
|||
public NeoWindow neo_win = null; |
|||
|
|||
#if tray |
|||
public AppStatusIcon neo_tray; //for gnome2.x, kde(?) |
|||
#endif |
|||
#if indicator |
|||
public NeoIndicator neo_indicator; //for gnome3.x |
|||
#endif |
|||
#if _NO_WIN |
|||
public KeybindingManager manager; |
|||
#endif |
|||
|
|||
public int start_layer = 0; // > 0: keybord events do not change displayed layer |
|||
public ConfigManager configm; |
|||
|
|||
|
|||
public NeoLayoutViewerApp(ConfigManager configm) { |
|||
Object(application_id: "org.gnome.neo_layout_viewer", |
|||
flags: ApplicationFlags.HANDLES_OPEN ); |
|||
|
|||
this.configm = configm; |
|||
} |
|||
|
|||
protected override void activate () { |
|||
if (this.neo_win == null ) { |
|||
// Create the window of this application and show it |
|||
this.neo_win = new NeoWindow (this); |
|||
|
|||
#if tray |
|||
this.neo_tray = new AppStatusIcon(neo_win); |
|||
#endif |
|||
|
|||
#if indicator |
|||
this.neo_indicator = new NeoIndicator(neo_win); |
|||
#endif |
|||
|
|||
#if _NO_WIN |
|||
manager = new KeybindingManager(this.neo_win); |
|||
manager.bind(configm.getConfig().get("show_shortcut"), ()=>{this.neo_win.toggle();}); |
|||
manager.bind(configm.getConfig().get("move_shortcut"), ()=>{this.neo_win.numkeypad_move(0);}); |
|||
#endif |
|||
|
|||
this.add_window(this.neo_win); |
|||
}else{ |
|||
// reached if app.activate() called by remote instance |
|||
this.neo_win.toggle(); |
|||
} |
|||
} |
|||
|
|||
public override void open (File[] files, string hint) { |
|||
// Threat non-option argument(s) as layer to show at startup. |
|||
// Note: This signal is not called in remote-case. |
|||
|
|||
foreach (File file in files) { |
|||
var slayer = file.get_basename(); |
|||
this.start_layer = int.parse(slayer); |
|||
break; |
|||
} |
|||
this.activate(); // init neo_win |
|||
this.neo_win.show(); |
|||
} |
|||
|
|||
} |
|||
} |
|||
@ -1,29 +0,0 @@ |
|||
using Gtk; |
|||
using Unique; |
|||
|
|||
namespace NeoLayoutViewer { |
|||
|
|||
public const int SHOW=1000; |
|||
|
|||
public static Unique.App? showPreviousInstance(string name, Gtk.Window win){ |
|||
var app = new Unique.App(name, null); |
|||
app.add_command ("Show application", SHOW); |
|||
if( app.is_running ){ |
|||
//where is already a running instance |
|||
debug("Application already running. Show window of other instance."); |
|||
app.send_message(SHOW,null); |
|||
return null; |
|||
} |
|||
|
|||
app.message_received.connect( (t, command, data, time) =>{ |
|||
if(command == SHOW){ |
|||
((NeoWindow)win).toggle(); |
|||
} |
|||
return Unique.Response.OK; |
|||
}); |
|||
|
|||
return app; |
|||
} |
|||
|
|||
} |
|||
|
|||
@ -1,8 +0,0 @@ |
|||
gio-2.0 |
|||
cairo |
|||
atk |
|||
pango |
|||
gdk-3.0 |
|||
gdk-pixbuf-2.0 |
|||
gtk+-3.0 |
|||
|
|||
@ -1,94 +0,0 @@ |
|||
/* unique-1.0.vapi generated by vapigen, do not modify. */ |
|||
|
|||
namespace Unique { |
|||
[CCode (cheader_filename = "unique/unique.h")] |
|||
public class App : GLib.Object { |
|||
[CCode (has_construct_function = false)] |
|||
public App (string name, string? startup_id); |
|||
public void add_command (string command_name, int command_id); |
|||
public Unique.Response send_message (int command_id, Unique.MessageData? message_data); |
|||
public void watch_window (Gtk.Window window); |
|||
[CCode (has_construct_function = false)] |
|||
public App.with_commands (string name, string? startup_id, ...); |
|||
[NoAccessorMethod] |
|||
public bool is_running { get; } |
|||
[NoAccessorMethod] |
|||
public string name { owned get; construct; } |
|||
[NoAccessorMethod] |
|||
public Gdk.Screen screen { owned get; set construct; } |
|||
[NoAccessorMethod] |
|||
public string startup_id { owned get; construct; } |
|||
public virtual signal Unique.Response message_received (int command, Unique.MessageData message_data, uint time_); |
|||
} |
|||
[CCode (cheader_filename = "unique/unique.h")] |
|||
public class Backend : GLib.Object { |
|||
public weak string name; |
|||
public weak Unique.App parent; |
|||
public weak Gdk.Screen screen; |
|||
public weak string startup_id; |
|||
public uint workspace; |
|||
[CCode (has_construct_function = false)] |
|||
protected Backend (); |
|||
public static unowned Unique.Backend create (); |
|||
public unowned string get_name (); |
|||
public unowned Gdk.Screen get_screen (); |
|||
public unowned string get_startup_id (); |
|||
public uint get_workspace (); |
|||
public virtual bool request_name (); |
|||
public virtual Unique.Response send_message (int command_id, Unique.MessageData message_data, uint time_); |
|||
public void set_name (string name); |
|||
public void set_screen (Gdk.Screen screen); |
|||
public void set_startup_id (string startup_id); |
|||
} |
|||
[CCode (cheader_filename = "unique/unique.h", copy_function = "unique_message_data_copy", type_id = "unique_message_data_get_type ()")] |
|||
[Compact] |
|||
public class MessageData { |
|||
[CCode (has_construct_function = false)] |
|||
public MessageData (); |
|||
public Unique.MessageData copy (); |
|||
public unowned uchar[] @get (size_t length); |
|||
public unowned string get_filename (); |
|||
public unowned Gdk.Screen get_screen (); |
|||
public unowned string get_startup_id (); |
|||
public string get_text (); |
|||
[CCode (array_length = false)] |
|||
public string[] get_uris (); |
|||
public uint get_workspace (); |
|||
public void @set ([CCode (array_length_type = "gsize")] uchar[]? data); |
|||
public void set_filename (string filename); |
|||
public bool set_text (string str, ssize_t length); |
|||
public bool set_uris ([CCode (array_length = false)] string[] uris); |
|||
} |
|||
[CCode (cheader_filename = "unique/unique.h", cprefix = "UNIQUE_")] |
|||
public enum Command { |
|||
INVALID, |
|||
ACTIVATE, |
|||
NEW, |
|||
OPEN, |
|||
CLOSE |
|||
} |
|||
[CCode (cheader_filename = "unique/unique.h", cprefix = "UNIQUE_RESPONSE_")] |
|||
public enum Response { |
|||
INVALID, |
|||
OK, |
|||
CANCEL, |
|||
FAIL, |
|||
PASSTHROUGH |
|||
} |
|||
[CCode (cheader_filename = "unique/unique.h")] |
|||
public const string API_VERSION_S; |
|||
[CCode (cheader_filename = "unique/unique.h")] |
|||
public const string DEFAULT_BACKEND_S; |
|||
[CCode (cheader_filename = "unique/unique.h")] |
|||
public const int MAJOR_VERSION; |
|||
[CCode (cheader_filename = "unique/unique.h")] |
|||
public const int MICRO_VERSION; |
|||
[CCode (cheader_filename = "unique/unique.h")] |
|||
public const int MINOR_VERSION; |
|||
[CCode (cheader_filename = "unique/unique.h")] |
|||
public const string PROTOCOL_VERSION_S; |
|||
[CCode (cheader_filename = "unique/unique.h")] |
|||
public const int VERSION_HEX; |
|||
[CCode (cheader_filename = "unique/unique.h")] |
|||
public const string VERSION_S; |
|||
} |
|||
Write
Preview
Loading…
Cancel
Save
Reference in new issue