reorganize demo, make it looks like running in sequential instead of trigger by async events

demo/CMakeLists.txt

@@ -2,13 +2,15 @@ find_program(VALAC valac)
 if(NOT VALAC)
 	message(FATAL_ERROR "valac not found")
 endif()
+
 find_program(VALA_DBUS_BINDING_TOOL vala-dbus-binding-tool)
 if(NOT VALA_DBUS_BINDING_TOOL)
 	message(FATAL_ERROR "vala-dbus-binding-tool not found")
 endif()
-find_library(READLINE REQUIRED)
 
+find_library(READLINE REQUIRED)
 pkg_check_modules(GIO2 REQUIRED gio-2.0)
+pkg_check_modules(GDK3 REQUIRED gdk-3.0)
 
 set(RES_DIR ${CMAKE_CURRENT_SOURCE_DIR}/res)
 set(DBUS_DIR ${CMAKE_CURRENT_SOURCE_DIR}/dbus)
@@ -34,6 +36,7 @@ add_custom_command(OUTPUT wfdctl.c
 						  org-freedesktop-miracle-wfd.c
 				COMMAND ${VALAC} --target-glib=2.50 -H wfdctl.h --use-header -C
 								--pkg=gio-2.0
+								--pkg=gdk-3.0
 								${CMAKE_CURRENT_SOURCE_DIR}/wfdctl.vala
 								org-freedesktop-networkmanager.vala
 								org-freedesktop-miracle-wifi.vala
@@ -52,7 +55,7 @@ add_custom_command(OUTPUT wfdctl-res.c
 						${RES_DIR}/wfdctl-res.xml
 				WORKING_DIRECTORY ${RES_DIR})
 
-include_directories(${GIO2_INCLUDE_DIRS})
+include_directories(${GIO2_INCLUDE_DIRS} ${GDK3_INCLUDE_DIRS})
 
 # silent C compiler warning about valac generated code, bad practice
 set(CMAKE_C_FLAGS "-Wno-unused-label ${CMAKE_C_FLAGS}")
@@ -66,5 +69,6 @@ add_executable(miracle-wfdctl wfdctl
 							  org-freedesktop-miracle-wifi.c
 							  org-freedesktop-miracle-wfd.c)
 
-target_link_libraries(miracle-wfdctl ${GIO2_LIBRARIES})
+target_link_libraries(miracle-wfdctl ${GIO2_LIBRARIES}
+									 ${GDK3_LIBRARIES})
 

demo/wfdctl.vala

@@ -10,37 +10,20 @@ const string OBJ_PATH_LINK = "/org/freedesktop/miracle/wifi/link";
 const string OBJ_PATH_PEER = "/org/freedesktop/miracle/wifi/peer";
 const string OBJ_PATH_SINK = "/org/freedesktop/miracle/wfd/sink";
 const string OBJ_PATH_SESSION = "/org/freedesktop/miracle/wfd/session";
+const string IFACE_DEVICE = "org.freedesktop.NetworkManager.Device";
+const string IFACE_LINK = "org.freedesktop.miracle.wifi.Link";
+const string IFACE_PEER = "org.freedesktop.miracle.wifi.Peer";
+const string IFACE_SINK = "org.freedesktop.miracle.wfd.Sink";
+const string IFACE_SESSION = "org.freedesktop.miracle.wfd.Session";
 
 errordomain WfdCtlError
 {
 	NO_SUCH_NIC,
+	TIMEOUT,
+	MONITOR_GONE,
 }
 
-DBusObjectManagerClient nm;
+private void print(string format, ...)
-DBusObjectManagerClient wifi;
-DBusObjectManagerClient wfd;
-
-HashTable<string, Device> devices;
-HashTable<string, Link> links;
-HashTable<string, Peer> peers;
-HashTable<string, Sink> sinks;
-HashTable<string, Session> sessions;
-
-string curr_sink_id;
-int retry_count = 0;
-
-string opt_iface;
-string opt_wfd_subelems;
-string opt_peer_mac;
-
-const GLib.OptionEntry[] option_entries = {
-	{ "interface", 'i', 0, OptionArg.STRING, ref opt_iface, "name of wireless network interface", "WNIC name" },
-	{ "wfd-subelems", 'w', 0, OptionArg.STRING, ref opt_wfd_subelems, "device infomation.  default: 000600111c4400c8", "device info subelems" },
-	{ "peer-mac", 'p', 0, OptionArg.STRING, ref opt_peer_mac, "MAC address of target peer", "peer MAC" },
-	{ null },
-};
-
-void print(string format, ...)
 {
 	var argv = va_list();
 	stderr.printf("%s: ", Environment.get_prgname());
@@ -48,40 +31,8 @@ void print(string format, ...)
 	stderr.printf("\n");
 }
 
-unowned Device? find_device_by_name(string nic_name)
-{
-	foreach(var d in devices.get_values()) {
-		if(nic_name == d.interface) {
-			return d;
-		}
-	}
-
-	return null;
-}
-
-unowned Link? find_link_by_name(string nic_name)
-{
-	foreach(var l in links.get_values()) {
-		if(nic_name == l.interface_name) {
-			return l;
-		}
-	}
-
-	return null;
-}
-
-unowned Sink? find_sink_by_label(string id)
-{
-	return sinks.lookup(id);
-}
-
-bool is_wnic(string nic_name)
-{
-	return find_link_by_name(nic_name) != null;
-}
-
 // to deal with sd_bus_path_encode/decode()ed path
-string decode_path(string s)
+private string decode_path(string s)
 {
 	char c;
 	StringBuilder d = new StringBuilder();
@@ -99,327 +50,485 @@ string decode_path(string s)
 	return d.str;
 }
 
-private async void wait_prop_changed(DBusProxy o, string name)
+private class WfdCtl : GLib.Application
 {
-	ulong id = o.g_properties_changed.connect((props) => {
+	static string opt_iface;
-		string k;
+	static string opt_wfd_subelems;
-		Variant v;
+	static string opt_peer_mac;
-		foreach(var prop in props) {
+	static string opt_display;
-			prop.get("{sv}", out k, out v);
+	static string opt_authority;
-			if(k == name) {
+	static int opt_monitor_num;
-				wait_prop_changed.callback();
+	static string opt_audio_device;
+
+	protected signal void link_added(string index, Link link);
+	protected signal void link_removed(string index, Link link);
+	protected signal void peer_added(string label, Peer peer);
+	protected signal void peer_removed(string label, Peer peer);
+	protected signal void sink_added(string label, Sink sink);
+	protected signal void sink_removed(string label, Sink sink);
+	protected signal void session_added(string id, Session session);
+	protected signal void session_removed(string id, Session session);
+
+	DBusObjectManagerClient nm;
+	DBusObjectManagerClient wifi;
+	DBusObjectManagerClient wfd;
+
+	HashTable<string, Device> devices;
+	HashTable<string, Link> links;
+	HashTable<string, Peer> peers;
+	HashTable<string, Sink> sinks;
+	HashTable<string, Session> sessions;
+
+	string curr_sink_mac;
+	Gdk.Display display;
+
+	const GLib.OptionEntry[] option_entries = {
+		{ "interface", 'i', 0, OptionArg.STRING, ref opt_iface, "name of wireless network interface", "WNIC name" },
+		{ "wfd-subelems", 'w', 0, OptionArg.STRING, ref opt_wfd_subelems, "device infomation.  default: 000600111c4400c8", "device info subelems" },
+		{ "peer-mac", 'p', 0, OptionArg.STRING, ref opt_peer_mac, "MAC address of target peer", "peer MAC" },
+		{ "authority", 'x', 0, OptionArg.STRING, ref opt_authority, "authority to capture from display. default: XAUTHORITY environment variable", "display authority" },
+		{ "display", 'd', 0, OptionArg.STRING, ref opt_display, "display name.  default: DISPLAY environment variable", "display name" },
+		{ "monitor-num", 'm', 0, OptionArg.INT, ref opt_monitor_num, "monitor number.  default: -1, primary monitor", "monitor number" },
+		{ "audio-device", 'a', 0, OptionArg.STRING, ref opt_audio_device, "pulseaudio device name", "audio device name" },
+		{ null },
+	};
+
+	public WfdCtl()
+	{
+		Object(application_id: "org.freedesktop.miracle.WfdCtl",
+						flags: ApplicationFlags.FLAGS_NONE);
+
+		devices = new HashTable<string, Device>(str_hash, str_equal);
+		links = new HashTable<string, Link>(str_hash, str_equal);
+		peers = new HashTable<string, Peer>(str_hash, str_equal);
+		sinks = new HashTable<string, Sink>(str_hash, str_equal);
+		sessions = new HashTable<string, Session>(str_hash, str_equal);
+
+		add_main_option_entries(option_entries);
+	}
+
+	private void add_object(string path) throws Error
+	{
+		int sep = path.last_index_of_char('/');
+		string prefix = path.substring(0, sep);
+		string key = path.substring(sep + 1);
+		switch(prefix) {
+			case OBJ_PATH_DEVICE:
+				Device d = Bus.get_proxy_sync(BusType.SYSTEM,
+								BUS_NAME_NETWORK_MANAGER,
+								path);
+				if(is_wnic(d.interface)) {
+					devices.insert(d.interface, d);
+				}
 				break;
-			}
+			case OBJ_PATH_LINK:
-		}
+				Link l = Bus.get_proxy_sync(BusType.SYSTEM,
-	});
-
-	yield;
-
-	o.disconnect(id);
-}
-
-async void add_object(DBusObject o) throws Error
-{
-	unowned string path = o.get_object_path();
-	int sep = path.last_index_of_char('/');
-	string prefix = path.substring(0, sep);
-	string key = path.substring(sep + 1);
-	switch(prefix) {
-		case OBJ_PATH_DEVICE:
-			Device dev = yield Bus.get_proxy(BusType.SYSTEM,
-							BUS_NAME_NETWORK_MANAGER,
-							path);
-			if(!is_wnic(dev.interface)) {
-				break;
-			}
-			devices.insert(dev.interface, dev);
-			break;
-		case OBJ_PATH_LINK:
-			Link link = yield Bus.get_proxy(BusType.SYSTEM,
-							BUS_NAME_WIFID,
-							path);
-			links.insert(key, link);
-			info("found wnic: %s\n", link.interface_name);
-			break;
-		case OBJ_PATH_PEER:
-			key = decode_path(key);
-			if(!peers.contains(key)) {
-				Peer peer = yield Bus.get_proxy(BusType.SYSTEM,
 								BUS_NAME_WIFID,
 								path);
-				peers.insert(key, peer);
+				key = decode_path(key);
-				info("found peer: %s\n", key);
+				links.insert(key, l);
-			}
+				info("found wireless interface: %s\n", l.interface_name);
-			break;
+				link_added(key, l);
-		case OBJ_PATH_SINK:
+				break;
-			key = decode_path(key);
+			case OBJ_PATH_PEER:
-			Sink sink = yield Bus.get_proxy(BusType.SYSTEM,
+				key = decode_path(key);
-							BUS_NAME_DISPD,
+				if(peers.contains(key)) {
-							path);
+					break;
-			sinks.insert(key, sink);
+				}
-			info("found sink: %s", key);
+				Peer p = Bus.get_proxy_sync(BusType.SYSTEM,
-			form_p2p_group.begin(key, sink);
+								BUS_NAME_WIFID,
-			break;
+								path);
-		case OBJ_PATH_SESSION:
+				peers.insert(key, p);
-			break;
+				info("peer added: %s\n", key);
-	}
+				peer_added(key, p);
-}
+				break;
-
+			case OBJ_PATH_SINK:
-void on_object_added(DBusObjectManager m, DBusObject o)
+				Sink s = Bus.get_proxy_sync(BusType.SYSTEM,
-{
+								BUS_NAME_DISPD,
-	try {
+								path);
-		add_object.begin(o);
+				key = decode_path(key);
-	}
+				sinks.insert(key, s);
-	catch(Error e) {
+				info("sink added: %s", key);
-		warning("error occured while adding newly created DBus object: %s",
+				sink_added(key, s);
-						e.message);
+				break;
-	}
+			case OBJ_PATH_SESSION:
-}
+				Session s = Bus.get_proxy_sync(BusType.SYSTEM,
-
+								BUS_NAME_DISPD,
-void on_object_removed(DBusObjectManager m, DBusObject o)
+								path);
-{
+				key = decode_path(key);
-	//try {
+				sessions.insert(key, s);
-		//remove_object.begin(o);
+				info("session added: %s", key);
-	//}
+				session_added(key, s);
-	//catch(Error e) {
-		//warning("error occured while removing newly created DBus object: %s",
-						//e.message);
-	//}
-}
-
-async void fetch_info_from_dbus() throws Error
-{
-	wifi = yield DBusObjectManagerClient.new_for_bus(
-					BusType.SYSTEM,
-					DBusObjectManagerClientFlags.NONE,
-					BUS_NAME_WIFID,
-					"/org/freedesktop/miracle/wifi",
-					null,
-					null);
-	foreach(var o in wifi.get_objects()) {
-		yield add_object(o);
-	}
-	wifi.object_added.connect(on_object_added);
-	wifi.object_removed.connect(on_object_removed);
-
-	nm = yield DBusObjectManagerClient.new_for_bus(
-					BusType.SYSTEM,
-					DBusObjectManagerClientFlags.NONE,
-					BUS_NAME_NETWORK_MANAGER,
-					"/org/freedesktop",
-					null,
-					null);
-	foreach(var o in nm.get_objects()) {
-		yield add_object(o);
-	}
-	nm.object_added.connect(on_object_added);
-	nm.object_removed.connect(on_object_removed);
-
-	wfd = yield DBusObjectManagerClient.new_for_bus(
-					BusType.SYSTEM,
-					DBusObjectManagerClientFlags.NONE,
-					BUS_NAME_DISPD,
-					"/org/freedesktop/miracle/wfd",
-					null,
-					null);
-	foreach(var o in wfd.get_objects()) {
-		yield add_object(o);
-	}
-	wfd.object_added.connect(on_object_added);
-	wfd.object_removed.connect(on_object_removed);
-}
-
-async void initiate_session() throws Error
-{
-	unowned Sink sink = find_sink_by_label(curr_sink_id);
-
-	unowned string xauth = Environment.get_variable("XAUTHORITY");
-	if(null == xauth) {
-		error("no environment variable XAUTHORITY specified");
-	}
-	unowned string display = Environment.get_variable("DISPLAY");
-	if(null == display) {
-		error("no environment variable DISPLAY specified");
-	}
-	info(@"establishing display session...");
-	sink.start_session(xauth,
-					@"x://$(display).0",
-					0, 0, 1920, 1080,
-					"alsa_output.pci-0000_00_1b.0.analog-stereo.monitor");
-}
-
-async void form_p2p_group(string id, Sink sink) throws Error
-{
-	if(null != curr_sink_id) {
-		print("already hang out with sink: %s", curr_sink_id);
-		return;
-	}
-
-	if(!id.has_prefix(opt_peer_mac)) {
-		print("not the sink we are waiting for: %s", id);
-		return;
-	}
-
-	curr_sink_id = id;
-
-	Peer p = peers.lookup(id);
-	if(null == p) {
-		p = yield Bus.get_proxy(BusType.SYSTEM,
-						BUS_NAME_WIFID,
-						sink.peer);
-		peers.insert(id, p);
-	}
-
-	info("forming P2P group with %s (%s)...", p.p2_p_mac, p.friendly_name);
-
-	uint timeout_id = Timeout.add_seconds(20, () => {
-		p.disconnect();
-		form_p2p_group.callback();
-		return false;
-	});
-	ulong prop_changed_id = (p as DBusProxy).g_properties_changed.connect((props) => {
-		foreach(var prop in props) {
-			string k;
-			Variant v;
-			prop.get("{sv}", out k, out v);
-			if("Connected" == k) {
-				form_p2p_group.callback();
 				break;
-			}
 		}
-	});
+	}
 
-	p.connect("auto", "");
+	private void remove_object(string path)
-	yield;
+	{
+		debug("object removed: %s", path);
 
-	Source.remove(timeout_id);
+		int sep = path.last_index_of_char('/');
-	(p as DBusProxy).disconnect(prop_changed_id);
+		string prefix = path.substring(0, sep);
-
+		string key = path.substring(sep + 1);
-	if(!p.connected) {
+		switch(prefix) {
-		++ retry_count;
+			case OBJ_PATH_DEVICE:
-		if(3 == retry_count) {
+				break;
-			print("tried our best to form P2P group but with failure, bye");
+			case OBJ_PATH_LINK:
+				break;
+			case OBJ_PATH_PEER:
+				break;
+			case OBJ_PATH_SINK:
+				key = decode_path(key);
+				break;
+			case OBJ_PATH_SESSION:
+				key = decode_path(key);
+				break;
 		}
-
-		print("failed to form P2P group with %s, try again", p.p2_p_mac);
-
-		curr_sink_id = null;
-
-		form_p2p_group.begin(id, sink);
-		return;
 	}
 
-	yield initiate_session();
+	private void on_object_added(DBusObjectManager m, DBusObject o)
-}
+	{
-
-async void start_p2p_scan() throws Error
-{
-	Device d = find_device_by_name(opt_iface);
-	if(null == d) {
-		throw new WfdCtlError.NO_SUCH_NIC("no such wireless adapter: %s",
-						opt_iface);
-	}
-
-	if(d.managed) {
-		info("tell NetworkManager do not touch %s anymore", opt_iface);
-
-		d.managed = false;
-		yield wait_prop_changed(d as DBusProxy, "Managed");
-	}
-
-	Link l = find_link_by_name(opt_iface);
-	if(null == l) {
-		throw new WfdCtlError.NO_SUCH_NIC("no such wireless adapter: %s",
-						opt_iface);
-	}
-
-	if(!l.managed) {
-		info("let wifid manage %s", opt_iface);
-
-		l.manage();
-		yield wait_prop_changed(l as DBusProxy, "Managed");
-	}
-
-	if(l.wfd_subelements != opt_wfd_subelems) {
-		info("update wfd_subelems to broadcast what kind of device we are");
-
-		l.wfd_subelements = opt_wfd_subelems;
-		yield wait_prop_changed(l as DBusProxy, "WfdSubelements");
-	}
-
-	if(!l.p2_p_scanning) {
-		info("start P2P scanning...");
-		l.p2_p_scanning = true;
-	}
-
-	info("wait for peer '%s'...", opt_peer_mac);
-}
-
-async void start_wireless_display() throws Error
-{
-	yield fetch_info_from_dbus();
-	yield start_p2p_scan();
-}
-
-void app_activate(Application app)
-{
-	if(null == opt_iface) {
-		opt_iface = "wlan0";
-		print("no wireless adapter specified by -i, use '%s' instead",
-						opt_iface);
-	}
-
-	if(null == opt_wfd_subelems) {
-		opt_wfd_subelems = "000600111c4400c8";
-		print("no wfd_subelems specified by -w, use '%s' instead",
-						opt_wfd_subelems);
-	}
-
-	if(null == opt_peer_mac) {
-		print("no peer MAC specified by -p, bye");
-		app.release();
-		return;
-	}
-
-	start_wireless_display.begin((o, r) => {
 		try {
-			start_wireless_display.end(r);
+			add_object(o.get_object_path());
 		}
 		catch(Error e) {
-			print("failed to fetch device information from DBus");
+			print("failed to fetch information from DBus for object: %s",
-			app.release();
+							o.get_object_path());
 		}
-	});
+	}
-}
 
-void app_startup(Application app)
+	private void on_object_removed(DBusObjectManager m, DBusObject o)
-{
+	{
-	app.hold();
+		remove_object(o.get_object_path());
+	}
+
+	private void fetch_info_from_dbus() throws Error
+	{
+		wifi = new DBusObjectManagerClient.for_bus_sync(
+						BusType.SYSTEM,
+						DBusObjectManagerClientFlags.NONE,
+						BUS_NAME_WIFID,
+						"/org/freedesktop/miracle/wifi",
+						null,
+						null);
+		wifi.object_added.connect(on_object_added);
+		wifi.object_removed.connect(on_object_removed);
+
+		nm = new DBusObjectManagerClient.for_bus_sync(
+						BusType.SYSTEM,
+						DBusObjectManagerClientFlags.NONE,
+						BUS_NAME_NETWORK_MANAGER,
+						"/org/freedesktop",
+						null,
+						null);
+		nm.object_added.connect(on_object_added);
+		nm.object_removed.connect(on_object_removed);
+
+		wfd = new DBusObjectManagerClient.for_bus_sync(
+						BusType.SYSTEM,
+						DBusObjectManagerClientFlags.NONE,
+						BUS_NAME_DISPD,
+						"/org/freedesktop/miracle/wfd",
+						null,
+						null);
+		wfd.object_added.connect(on_object_added);
+		wfd.object_removed.connect(on_object_removed);
+
+		foreach(var o in wifi.get_objects()) {
+			add_object(o.get_object_path());
+		}
+
+		foreach(var o in nm.get_objects()) {
+			add_object(o.get_object_path());
+		}
+
+		foreach(var o in wfd.get_objects()) {
+			add_object(o.get_object_path());
+		}
+	}
+
+	private async void start_p2p_scan() throws Error
+	{
+		Device d = find_device_by_name(opt_iface);
+		if(null == d) {
+			throw new WfdCtlError.NO_SUCH_NIC("no such wireless adapter: %s",
+							opt_iface);
+		}
+
+		if(d.managed) {
+			info("tell NetworkManager do not touch %s anymore", opt_iface);
+
+			d.managed = false;
+			yield wait_prop_changed(d as DBusProxy, "Managed");
+		}
+
+		Link l = find_link_by_name(opt_iface);
+		if(null == l) {
+			throw new WfdCtlError.NO_SUCH_NIC("no such wireless adapter: %s",
+							opt_iface);
+		}
+
+		if(!l.managed) {
+			info("let wifid manage %s", opt_iface);
+
+			l.manage();
+			yield wait_prop_changed(l as DBusProxy, "Managed");
+		}
+
+		if(l.wfd_subelements != opt_wfd_subelems) {
+			info("update wfd_subelems to broadcast what kind of device we are");
+
+			l.wfd_subelements = opt_wfd_subelems;
+			yield wait_prop_changed(l as DBusProxy, "WfdSubelements");
+		}
+
+		if(!l.p2_p_scanning) {
+			info("start P2P scanning...");
+			l.p2_p_scanning = true;
+			yield wait_prop_changed(l as DBusProxy, "P2PScanning");
+		}
+
+		print("wait for peer '%s'...", opt_peer_mac);
+	}
+
+	private async void wait_for_target_sink()
+	{
+		if(null != find_sink_by_mac(opt_peer_mac)) {
+			return;
+		}
+
+		ulong id = sink_added.connect((l, s) => {
+			if(null != find_sink_by_mac(opt_peer_mac)) {
+				wait_for_target_sink.callback();
+			}
+		});
+
+		yield;
+
+		disconnect(id);
+	}
+
+	private async void form_p2p_group() throws Error
+	{
+		if(null != curr_sink_mac) {
+			print("already hang out with sink: %s", curr_sink_mac);
+			return;
+		}
+
+		Sink s = find_sink_by_mac(opt_peer_mac);
+		curr_sink_mac = opt_peer_mac;
+
+		string l = s.peer;
+		l = decode_path(l.substring(l.last_index_of_char('/') + 1));
+		Peer p = peers.lookup(l);
+
+		info("forming P2P group with %s (%s)...", p.p2_p_mac, p.friendly_name);
+
+		p.connect("auto", "");
+		yield wait_prop_changed(p as DBusProxy, "Connected", 20);
+
+		info("P2P group formed");
+	}
+
+	private async void establish_session() throws Error
+	{
+		weak Gdk.Monitor m = (-1 == opt_monitor_num)
+						? display.get_primary_monitor()
+						: display.get_monitor(opt_monitor_num);
+		if(null == m) {
+			throw new WfdCtlError.MONITOR_GONE("monitor %d gone",
+							opt_monitor_num);
+		}
+
+		info("establishing display session...");
+
+		Sink sink = find_sink_by_mac(opt_peer_mac);
+		sink.start_session(opt_authority,
+						@"x://$(opt_display)",
+						m.geometry.x,
+						m.geometry.y,
+						m.geometry.width,
+						m.geometry.height,
+						null == opt_audio_device ? "" : opt_audio_device);
+	}
+
+	private async void start_wireless_display() throws Error
+	{
+		fetch_info_from_dbus();
+		yield start_p2p_scan();
+		yield wait_for_target_sink();
+		yield form_p2p_group();
+		yield establish_session();
+	}
+
+	private bool check_options()
+	{
+		if(null == opt_peer_mac) {
+			print("please specify a peer MAC with -p option");
+			return false;
+		}
+
+		if(null == opt_display) {
+			opt_display = Environment.get_variable("DISPLAY");
+			if(null == opt_display) {
+				print("no video source found. play specify one by DISPLAY " +
+								"environment or -d option");
+				return false;
+			}
+			else {
+				print("no display name specified by -d, " +
+								"use DISPLAY environment variable instead");
+			}
+		}
+
+		if(null == opt_authority) {
+			opt_authority = Environment.get_variable("XAUTHORITY");
+			if(null == opt_authority) {
+				print("no display authority found. play specify one by XAUTHORITY " +
+								"environment or -x option");
+				return false;
+			}
+			else {
+				print("no display authority specified by -x, " +
+								"use XAUTHORITY environment variable instead");
+			}
+		}
+
+		if(null == opt_iface) {
+			opt_iface = "wlan0";
+			print("no wireless adapter specified by -i, use '%s' instead",
+							opt_iface);
+		}
+
+		if(null == opt_wfd_subelems) {
+			opt_wfd_subelems = "000600111c4400c8";
+			print("no wfd_subelems specified by -w, use '%s' instead",
+							opt_wfd_subelems);
+		}
+
+		display = Gdk.Display.open(opt_display);
+		if(null == display) {
+			print("invalid display option: %s", opt_display);
+			return false;
+		}
+
+		if(-1 != opt_monitor_num &&
+						null == display.get_monitor(opt_monitor_num)) {
+			print("invalid screen number option: %d", opt_monitor_num);
+			return false;
+		}
+
+		return true;
+	}
+
+	protected override void activate()
+	{
+		if(!check_options()) {
+			return;
+		}
+
+		hold();
+
+		start_wireless_display.begin((o, r) => {
+			try {
+				start_wireless_display.end(r);
+			}
+			catch(Error e) {
+				print("failed to cast to wireless display: %s", e.message);
+				release();
+			}
+		});
+	}
+
+	private unowned Device? find_device_by_name(string nic_name)
+	{
+		foreach(var d in devices.get_values()) {
+			if(nic_name == d.interface) {
+				return d;
+			}
+		}
+
+		return null;
+	}
+
+	private unowned Link? find_link_by_name(string nic_name)
+	{
+		foreach(var l in links.get_values()) {
+			if(nic_name == l.interface_name) {
+				return l;
+			}
+		}
+
+		return null;
+	}
+
+	private unowned Sink? find_sink_by_mac(string m)
+	{
+		foreach(var l in sinks.get_keys()) {
+			if(l.has_prefix(m)) {
+				return sinks.lookup(l);
+			}
+		}
+
+		return null;
+	}
+
+	private bool is_wnic(string nic_name)
+	{
+		return find_link_by_name(nic_name) != null;
+	}
+
+	private async void wait_prop_changed(DBusProxy o,
+					string name,
+					uint timeout = 0) throws WfdCtlError
+	{
+		ulong prop_changed_id = o.g_properties_changed.connect((props) => {
+			string k;
+			Variant v;
+			foreach(var prop in props) {
+				prop.get("{sv}", out k, out v);
+				if(k == name) {
+					wait_prop_changed.callback();
+					break;
+				}
+			}
+		});
+
+		bool timed_out = false;
+		uint timeout_id = 0;
+		if(0 < timeout) {
+			timeout_id = Timeout.add_seconds(timeout,
+							() => {
+								timed_out = true;
+								wait_prop_changed.callback();
+								return false;
+							});
+		}
+
+		yield;
+
+		if(0 < timeout) {
+			Source.remove(timeout_id);
+		}
+		o.disconnect(prop_changed_id);
+
+		if(timed_out) {
+			throw new WfdCtlError.TIMEOUT("timeout to wait for property %s change",
+							name);
+		}
+	}
 }
 
 int main(string[]? argv)
 {
+	Gdk.init(ref argv);
 	Intl.setlocale();
 	Environment.set_prgname(Path.get_basename(argv[0]));
 
-	devices = new HashTable<string, Device>(str_hash, str_equal);
+	Application app = new WfdCtl();
-	links = new HashTable<string, Link>(str_hash, str_equal);
-	peers = new HashTable<string, Peer>(str_hash, str_equal);
-	sinks = new HashTable<string, Sink>(str_hash, str_equal);
-	sessions = new HashTable<string, Session>(str_hash, str_equal);
-
-	var options = new OptionContext("- WfdCtl");
-	options.set_help_enabled(true);
-	options.add_main_entries(option_entries, null);
-
-	Application app = new Application("org.freedesktop.miracle.WfdCtl",
-					ApplicationFlags.FLAGS_NONE);
 	app.set_default();
-	app.startup.connect(app_startup);
-	app.activate.connect(app_activate);
 
 	try {
-		options.parse(ref argv);
 		app.register();
 	}
 	catch(Error e) {