Merge lp:~kay20/wingpanel-indicator-power/improved-on-trunk-branch into lp:~wingpanel-devs/wingpanel-indicator-power/trunk

[kay van der Zander]

Add a display brightness slider

[kay van der Zander (kay20)]

this branch fixes bug #1503202

[Adam Bieńkowski (donadigo)]

Some diff comments, mostly I would to see all multiple get_default () calls be removed (see comments for more details). Other comments include some tips about the code style and small things, apart from that the code looks okay. Note that I didn't actually test it, it's only a code review for now.

review: Needs Fixing (code)

[lp:~kay20/wingpanel-indicator-power/improved-on-trunk-branch]

209. By kay van der Zander on 2017-04-06

incorporate review of Adam

[Danielle Foré (danrabbit)]

Added a couple small inline comments that will make the brightness icon center against the battery icon :)

Otherwise, I can confirm that it works as expected on a notebook.

[lp:~kay20/wingpanel-indicator-power/improved-on-trunk-branch]

210. By kay van der Zander on 2017-04-09

adjust margin on he brightness icon

[Danielle Foré (danrabbit)]

is get_symbolic_icon_name_for_backlight really necessary? Seems like you should just do display_widget.set_icon_name ("display-brightness-symbolic") and do all that in one place in one line :p

[Danielle Foré (danrabbit)]

review: Approve (ux)

[Adam Bieńkowski (donadigo)]

Still couple of small things, but it is indeed better now. Look diff comments.

review: Needs Fixing (code)

[lp:~kay20/wingpanel-indicator-power/improved-on-trunk-branch]

211. By kay van der Zander on 2017-04-09

incorporated review of adam

[Adam Bieńkowski (donadigo)]

LGTM.

review: Approve (code)

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2015-08-03 20:11:42 +0000
+++ src/CMakeLists.txt	2017-04-09 18:23:30 +0000
@@ -1,7 +1,7 @@
 find_package (PkgConfig)
 
 # Add all your dependencies to the list below
-pkg_check_modules (DEPS REQUIRED gthread-2.0 gtk+-3.0 wingpanel-2.0 granite libgtop-2.0 libbamf3)
+pkg_check_modules (DEPS REQUIRED gthread-2.0 gtk+-3.0 wingpanel-2.0 granite libgtop-2.0 libbamf3 libudev)
 
 add_definitions (${DEPS_CFLAGS})
 link_directories (${DEPS_LIBRARY_DIRS})
@@ -19,6 +19,7 @@
   Widgets/PopoverWidget.vala
   Widgets/AppList.vala
   Widgets/DeviceList.vala
+  Widgets/ScreenBrightness.vala
   Services/SettingsManager.vala
   Services/DeviceManager.vala
   Services/Device.vala
@@ -26,8 +27,10 @@
   Services/DBusInterfaces/Properties.vala
   Services/DBusInterfaces/UPower.vala
   Services/DBusInterfaces/Device.vala
+  Services/DBusInterfaces/Screen.vala
   Services/ProcessMonitor/Monitor.vala
   Services/ProcessMonitor/Process.vala
+  Services/Backlight/Backlight.vala
   ${CMAKE_CURRENT_BINARY_DIR}/config.vala
 PACKAGES
   wingpanel-2.0
@@ -36,6 +39,7 @@
   posix
 CUSTOM_VAPIS
   ../vapi/libgtop-2.0.vapi
+  ../vapi/libudev.vapi
 OPTIONS
   --thread
 )

=== modified file 'src/Indicator.vala'
--- src/Indicator.vala	2016-12-09 21:42:13 +0000
+++ src/Indicator.vala	2017-04-09 18:23:30 +0000
@@ -47,12 +47,20 @@
             popover_widget = new Widgets.PopoverWidget (is_in_session);
             popover_widget.settings_shown.connect (() => this.close ());
 
+            var dm = Services.DeviceManager.get_default ();
+
             /* No need to display the indicator when the device is completely in AC mode */
-            Services.DeviceManager.get_default ().notify["has-battery"].connect (update_visibility);
-            Services.DeviceManager.get_default ().notify["primary-battery"].connect (update_primary_battery);
-
-            /* Start the device-search after connecting the signals */
-            Services.DeviceManager.get_default ().init ();
+            if (dm.has_battery || dm.backlight.present) {
+                update_visibility ();
+                if (dm.primary_battery != null) {
+                    update_primary_battery ();
+                    /* No need to display the indicator when the device is completely in AC mode */
+                    dm.notify["has-battery"].connect (update_visibility);
+                    dm.notify["primary-battery"].connect (update_primary_battery);
+                } else if (dm.backlight.present) {
+                    show_backlight_data ();
+                }
+            }
         }
 
         return popover_widget;
@@ -60,6 +68,7 @@
 
     public override void opened () {
         Services.ProcessMonitor.Monitor.get_default ().update ();
+        popover_widget.update_brightness_slider ();
     }
 
     public override void closed () {
@@ -67,8 +76,11 @@
     }
 
     private void update_visibility () {
-        if (this.visible != Services.DeviceManager.get_default ().has_battery) {
-            this.visible = Services.DeviceManager.get_default ().has_battery;
+        var dm = Services.DeviceManager.get_default ();
+        if (dm.has_battery || dm.backlight.present) {
+            visible = true;
+        } else {
+            visible = false;
         }
     }
 
@@ -86,13 +98,24 @@
         if (display_widget != null) {
             var icon_name = Utils.get_symbolic_icon_name_for_battery (battery);
 
-            display_widget.icon_name = icon_name;
+            display_widget.set_icon_name (icon_name);
 
             /* Debug output for designers */
             debug ("Icon changed to \"%s\"", icon_name);
 
-            display_widget.percent = (int)Math.round (battery.percentage);
-        }
+            display_widget.set_percent ((int)Math.round (battery.percentage));
+    	}
+    }
+
+    private void show_backlight_data () {
+        if (display_widget != null) {
+	    var icon_name = Utils.get_symbolic_icon_name_for_backlight ();
+
+	    display_widget.set_icon_name (icon_name);
+
+	    /* Debug output for designers */
+	    debug ("Icon changed to \"%s\"", icon_name);
+	}
     }
 }
 

=== added directory 'src/Services/Backlight'
=== added file 'src/Services/Backlight/Backlight.vala'
--- src/Services/Backlight/Backlight.vala	1970-01-01 00:00:00 +0000
+++ src/Services/Backlight/Backlight.vala	2017-04-09 18:23:30 +0000
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2011-2015 Wingpanel Developers (http://launchpad.net/wingpanel)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+public class Power.Services.Backlight : GLib.Object {
+
+    private const string BACKLIGHT_NAME = "backlight";
+
+    public bool present { get; construct set; }
+
+    construct {
+        present = get_backlight_present ();
+        debug ("backlight present: %s", present.to_string ());
+    }
+
+    private static bool get_backlight_present () {
+        var context = new UDev.Context ();
+        var e = context.create_enumerate ();
+        e.add_match_subsystem (BACKLIGHT_NAME);
+        e.scan_devices ();
+
+        for (unowned UDev.List d = e.entries; d != null; d = d.next) {
+            var path = d.name;
+            var dev = context.open_syspath (path);
+
+            if (dev != null) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+}

=== added file 'src/Services/DBusInterfaces/Screen.vala'
--- src/Services/DBusInterfaces/Screen.vala	1970-01-01 00:00:00 +0000
+++ src/Services/DBusInterfaces/Screen.vala	2017-04-09 18:23:30 +0000
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2011-2016 Wingpanel Developers (http://launchpad.net/wingpanel)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+namespace Power.Services.DBusInterfaces {
+  [DBus (name = "org.gnome.SettingsDaemon.Power.Screen")]
+  interface PowerSettings : GLib.Object {
+    #if OLD_GSD
+    public abstract uint get_percentage () throws IOError;
+    public abstract uint set_percentage (uint percentage) throws IOError;
+    #else
+    // use the Brightness property after updateing g-s-d to 3.10 or above
+    public abstract int brightness { get; set; }
+    #endif
+  }
+}

=== modified file 'src/Services/Device.vala'
--- src/Services/Device.vala	2016-03-02 21:02:12 +0000
+++ src/Services/Device.vala	2017-04-09 18:23:30 +0000
@@ -105,7 +105,11 @@
     }
 
     private void update_properties () {
-        device.Refresh ();
+        try {
+            device.Refresh ();
+        } catch (Error e) {
+            critical ("Updating the upower device parameters failed: %s", e.message);
+        }
 
         has_history = device.has_history;
         has_statistics = device.has_statistics;

=== modified file 'src/Services/DeviceManager.vala'
--- src/Services/DeviceManager.vala	2016-02-23 19:21:02 +0000
+++ src/Services/DeviceManager.vala	2017-04-09 18:23:30 +0000
@@ -26,26 +26,35 @@
     private DBusInterfaces.UPower? upower = null;
     private DBusInterfaces.Properties? upower_properties = null;
 
+    public Services.Backlight backlight { get; construct; }
     public Gee.HashMap<string, Device> devices { get; private set; }
     public Gee.Iterator batteries { get; private set; }
-
     public Device primary_battery { get; private set; }
-
     public bool has_battery { get; private set; }
-
     public bool on_battery { get; private set; }
     public bool on_low_battery { get; private set; }
 
     public signal void battery_registered (string device_path, Device battery);
     public signal void battery_deregistered (string device_path);
 
-    public void init () {
+    construct {
+        backlight = new Services.Backlight ();
+            
         if (connect_to_bus ()) {
             update_properties ();
             read_devices ();
             update_batteries ();
             connect_signals ();
+        }    
+    }
+
+    // singleton one class object in memory. use instance to get data.
+    public static unowned DeviceManager get_default () {
+        if (instance == null) {
+            instance = new DeviceManager ();
         }
+
+        return instance;
     }
 
     private bool connect_to_bus () {
@@ -65,7 +74,7 @@
         }
     }
 
-    private void read_devices () {
+    public void read_devices () {
         try {
             var devices = upower.EnumerateDevices ();
 
@@ -175,12 +184,4 @@
             battery_deregistered (device_path);
         }
     }
-
-    public static DeviceManager get_default () {
-        if (instance == null) {
-            instance = new DeviceManager ();
-        }
-
-        return instance;
-    }
 }

=== modified file 'src/Utils.vala'
--- src/Utils.vala	2016-11-30 22:39:56 +0000
+++ src/Utils.vala	2017-04-09 18:23:30 +0000
@@ -30,6 +30,10 @@
         return get_icon_name_for_battery (battery) + "-symbolic";
     }
 
+    public string get_symbolic_icon_name_for_backlight () {
+        return "display-brightness-symbolic";
+    }
+
     public string get_icon_name_for_battery (Services.Device battery) {
         if (battery.percentage == 100 && is_charging (battery.state) == true) {
             return "battery-full-charged";

=== modified file 'src/Widgets/AppList.vala'
--- src/Widgets/AppList.vala	2016-12-09 21:42:13 +0000
+++ src/Widgets/AppList.vala	2017-04-09 18:23:30 +0000
@@ -27,6 +27,10 @@
     construct {
         app_manager = Services.AppManager.get_default ();
 
+        connect_signals ();
+    }
+
+    private void connect_signals () {
         Services.ProcessMonitor.Monitor.get_default ().updated.connect (() => {
             /* Don't block the ui while updating the data */
             Idle.add (() => {

=== modified file 'src/Widgets/DeviceList.vala'
--- src/Widgets/DeviceList.vala	2016-12-09 21:42:13 +0000
+++ src/Widgets/DeviceList.vala	2017-04-09 18:23:30 +0000
@@ -26,9 +26,13 @@
 
     construct {
         entries = new Gee.HashMap<string, Gtk.Grid> ();
-
-        Services.DeviceManager.get_default ().battery_registered.connect (add_battery);
-        Services.DeviceManager.get_default ().battery_deregistered.connect (remove_battery);
+        var dm = Services.DeviceManager.get_default ();
+
+        dm.battery_registered.connect (add_battery);
+        dm.battery_deregistered.connect (remove_battery);
+
+        // load all battery information.
+        dm.read_devices ();
     }
 
     private void update_icons (Services.Device battery, Gtk.Image device_image, Gtk.Image battery_image) {

=== modified file 'src/Widgets/DisplayWidget.vala'
--- src/Widgets/DisplayWidget.vala	2016-12-09 21:42:13 +0000
+++ src/Widgets/DisplayWidget.vala	2017-04-09 18:23:30 +0000
@@ -22,17 +22,6 @@
     private Gtk.Revealer percent_revealer;
     private Gtk.Label percent_label;
 
-    public string icon_name {
-        set {
-            image.icon_name = value;
-        }
-    }
-
-    public int percent {
-        set {
-            percent_label.label = "%i%%".printf (value);
-        }
-    }
 
     construct {
         valign = Gtk.Align.CENTER;
@@ -56,4 +45,12 @@
             percent_revealer.set_reveal_child (Services.SettingsManager.get_default ().show_percentage);
         });
     }
+
+    public void set_icon_name (string icon_name) {
+        image.icon_name = icon_name;
+    }
+
+    public void set_percent (int percentage) {
+        percent_label.set_label ("%i%%".printf (percentage));
+    }
 }

=== modified file 'src/Widgets/PopoverWidget.vala'
--- src/Widgets/PopoverWidget.vala	2016-12-09 20:49:16 +0000
+++ src/Widgets/PopoverWidget.vala	2017-04-09 18:23:30 +0000
@@ -21,6 +21,7 @@
     public bool is_in_session { get; construct; default = false; }
     private DeviceList device_list;
     private AppList app_list;
+    private ScreenBrightness screen_brightness;
 
     private Wingpanel.Widgets.Switch show_percent_switch;
     private Wingpanel.Widgets.Button show_settings_button;
@@ -33,6 +34,19 @@
 
     construct {
         device_list = new DeviceList ();
+        var dm = Services.DeviceManager.get_default ();
+
+        if (dm.has_battery) {
+            debug ("show list of batteries");
+            pack_start (device_list);
+            pack_start (new Wingpanel.Widgets.Separator ());
+        }
+
+        if (dm.backlight.present) {
+            debug ("show brightness slider");
+            screen_brightness = new ScreenBrightness ();
+            pack_start (screen_brightness);
+        }
 
         show_percent_switch = new Wingpanel.Widgets.Switch (_("Show Percentage"), Services.SettingsManager.get_default ().show_percentage);
         show_settings_button = new Wingpanel.Widgets.Button (_("Power Settings…"));
@@ -43,9 +57,13 @@
             app_list = new AppList ();
             this.pack_start (app_list); /* The app-list contains an own separator that is displayed if necessary. */
             this.pack_start (new Wingpanel.Widgets.Separator ());
-            this.pack_start (show_percent_switch);
+
+            if (dm.has_battery) {
+                this.pack_start (show_percent_switch);
+            }
+
             this.pack_start (show_settings_button);
-        } else {
+        } else if (dm.has_battery) {
             this.pack_start (new Wingpanel.Widgets.Separator ());
             this.pack_start (show_percent_switch);
         }
@@ -61,6 +79,10 @@
         }
     }
 
+    public void update_brightness_slider () {
+        screen_brightness.update_slider ();
+    }
+
     private void show_settings () {
         var list = new List<string> ();
         list.append ("power");

=== added file 'src/Widgets/ScreenBrightness.vala'
--- src/Widgets/ScreenBrightness.vala	1970-01-01 00:00:00 +0000
+++ src/Widgets/ScreenBrightness.vala	2017-04-09 18:23:30 +0000
@@ -0,0 +1,90 @@
+/*
+ * Copyright (c) 2011-2016 Wingpanel Developers (http://launchpad.net/wingpanel)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+public class Power.Widgets.ScreenBrightness : Gtk.Grid {
+    private const string DBUS_PATH = "/org/gnome/SettingsDaemon/Power";
+    private const string DBUS_NAME = "org.gnome.SettingsDaemon";
+
+    private Gtk.Image image;
+    private Gtk.Scale brightness_slider;
+    private Services.DBusInterfaces.PowerSettings iscreen;
+
+    construct {
+        orientation = Gtk.Orientation.HORIZONTAL;
+        set_column_spacing (12);
+        init_bus.begin ();
+        
+        image = new Gtk.Image.from_icon_name ("brightness-display-symbolic", Gtk.IconSize.DIALOG);
+        image.margin_start = 6;
+        attach (image, 0, 0, 1, 1);
+
+        brightness_slider = new Gtk.Scale.with_range (Gtk.Orientation.HORIZONTAL, 0, 100, 10);
+        brightness_slider.margin_end = 12;
+        brightness_slider.hexpand = true;
+        brightness_slider.draw_value = false;
+
+        brightness_slider.value_changed.connect (() => {
+            on_scale_value_changed.begin ();
+        });
+
+      #if OLD_GSD
+        brightness_slider.set_value (iscreen.get_percentage ());
+      #else
+        brightness_slider.set_value (iscreen.brightness);
+      #endif
+
+        attach (brightness_slider, 1, 0, 1, 1);
+    }
+
+    public void update_slider () {
+      #if OLD_GSD
+        brightness_slider.set_value (iscreen.get_percentage ());
+      #else
+        brightness_slider.set_value (iscreen.brightness);
+      #endif
+
+      // this fixes the first slow response
+      #if OLD_GSD
+        iscreen.set_percentage (iscreen.get_percentage ());
+      #else
+        iscreen.brightness = iscreen.brightness;
+      #endif
+    }
+
+    private async void init_bus () {
+        try {
+            iscreen = Bus.get_proxy_sync (BusType.SESSION, DBUS_NAME, DBUS_PATH, DBusProxyFlags.GET_INVALIDATED_PROPERTIES);
+        } catch (IOError e) {
+            warning ("screen brightness error %s", e.message);
+        }
+    }
+
+    private async void on_scale_value_changed () {
+        int val = (int) brightness_slider.get_value ();
+        try {
+          #if OLD_GSD
+            iscreen.set_percentage (val);
+          #else
+            iscreen.brightness = val;
+          #endif
+        } catch (IOError e) {
+            warning ("screen brightness error %s", e.message);
+        }
+    }
+}

=== added file 'vapi/libudev.vapi'
--- vapi/libudev.vapi	1970-01-01 00:00:00 +0000
+++ vapi/libudev.vapi	2017-04-09 18:23:30 +0000
@@ -0,0 +1,642 @@
+[CCode (cheader_filename = "libudev.h")]
+namespace UDev {
+	/**
+	 * Reads the udev config and system environment allows custom logging
+	 */
+	[CCode (cname = "struct udev", ref_function = "udev_ref", unref_function = "udev_unref", has_type_id = false)]
+	public class Context {
+		/**
+		 * Create udev library context.
+		 *
+		 * This reads the udev configuration file, and fills in the default values.
+		 */
+		[CCode (cname = "udev_new")]
+		public Context ();
+		/**
+		 * The device directory path.
+		 *
+		 * The default value is "/dev", the actual value may be overridden in the
+		 * udev configuration file.
+		 */
+		[CCode (cname = "udev_get_dev_path")]
+		public string dev_path {
+			get;
+		}
+		public int log_priority {
+			[CCode (cname = "udev_get_log_priority")]
+			get;
+			[CCode (cname = "udev_set_log_priority")]
+			set;
+		}
+		/**
+		 * The udev runtime directory path.
+		 *
+		 * The default is "/run/udev".
+		 */
+		[CCode (cname = "udev_get_run_path")]
+		public string run_path {
+			get;
+		}
+		/**
+		 * The sysfs mount point.
+		 *
+		 * The default is "/sys". For testing purposes, it can be overridden with
+		 * udev_sys= in the udev configuration file.
+		 */
+		[CCode (cname = "udev_get_sys_path")]
+		public string sys_path {
+			get;
+		}
+		public void* user_data {
+			[CCode (cname = "udev_get_userdata")]
+			get;
+			[CCode (cname = "udev_set_userdata")]
+			set;
+		}
+		[CCode (cname = "udev_enumerate_new")]
+		public Enumerate create_enumerate ();
+		[CCode (cname = "udev_queue_new")]
+		public Queue? create_queue ();
+		/**
+		 * Create new udev monitor and connect to a specified event source. Valid
+		 * sources identifiers are "udev" and "kernel".
+		 *
+		 * Applications should usually not connect directly to the "kernel" events,
+		 * because the devices might not be useable at that time, before udev has
+		 * configured them, and created device nodes. Accessing devices at the same
+		 * time as udev, might result in unpredictable behavior. The "udev" events
+		 * are sent out after udev has finished its event processing, all rules
+		 * have been processed, and needed device nodes are created.
+		 */
+		[CCode (cname = "udev_monitor_new_from_netlink")]
+		public Monitor? monitor_from_netlink (string name = "udev");
+		/**
+		 * Create new udev device, and fill in information from the current process
+		 * environment.
+		 *
+		 * This only works reliable if the process is called from a udev rule. It
+		 * is usually used for tools executed from IMPORT= rules.
+		 */
+		[CCode (cname = "udev_device_new_from_environment")]
+		public Device? new_from_environment ();
+		/**
+		 * Create new udev device, and fill in information from the sys device and
+		 * the udev database entry by its major/minor number and type.
+		 *
+		 * Character and block device numbers are not unique across the two types.
+		 * @param type 'c' for character devices or 'b' for block devices.sudo
+		 */
+		[CCode (cname = "udev_device_new_from_devnum")]
+		public Device? open_devnum (char type, Posix.dev_t devnum);
+		/**
+		 * Create new udev device, and fill in information from the sys device
+		 * and the udev database entry. The device is looked up by the subsystem
+		 * and name string of the device, like "mem" / "zero", or "block" / "sda".
+		 */
+		[CCode (cname = "udev_device_new_from_subsystem_sysname")]
+		public Device? open_subsystem_sysname (string subsystem, string sysname);
+		/**
+		 * Create new udev device, and fill in information from the sys device and
+		 * the udev database entry.
+		 *
+		 * The syspath is the absolute path to the device, including the sys mount
+		 * point.
+		 */
+		[CCode (cname = "udev_device_new_from_syspath")]
+		public Device? open_syspath (string syspath);
+		/**
+		 * Take a reference of the udev library context.
+		 */
+		[CCode (cname = "udev_ref")]
+		public void ref ();
+		/**
+		 * The error logging function.
+		 *
+		 * The built-in logging writes to stderr. It can be overridden by a custom
+		 * function, to plug log messages into the users' logging functionality.
+		 */
+		[CCode (cname = "udev_set_log_fn")]
+		public void set_logger (Logger logger);
+
+		/**
+		 * Drop a reference of the udev library context.
+		 */
+		[CCode (cname = "udev_unref")]
+		public void unref ();
+	}
+
+	/**
+	 * Kernel sys devices
+	 *
+	 * Representation of kernel sys devices. Devices are uniquely identified by
+	 * their syspath, every device has exactly one path in the kernel sys
+	 * filesystem. Devices usually belong to a kernel subsystem, and and have a
+	 * unique name inside that subsystem.
+	 */
+	[CCode (cname = "struct udev_device", ref_function = "udev_device_ref", unref_function = "udev_device_unref", has_type_id = false)]
+	public class Device {
+		/**
+		 * The action if the device was received through a monitor.
+		 *
+		 * Devices read from sys do not have an action string. Usual actions are: add, remove, change, online, offline.
+		 */
+		public string? action {
+			[CCode (cname = "udev_device_get_action")]
+			get;
+		}
+
+		/**
+		 * An indexable collection of sys attrs
+		 */
+		public SysAttr attr {
+			[CCode (cname = "")]
+			get;
+		}
+		/**
+		 * The udev library context with which the device was created.
+		 */
+		public Context context {
+			[CCode (cname = "udev_device_get_udev")]
+			get;
+		}
+		/**
+		 * The list of device links pointing to the device file of the udev device.
+		 */
+		public List? devlinks {
+			[CCode (cname = "udev_device_get_devlinks_list_entry")]
+			get;
+		}
+		/**
+		 * Retrieve the device node file name belonging to the udev device.
+		 *
+		 * The path is an absolute path, and starts with the device directory.
+		 */
+		public string? devnode {
+			[CCode (cname = "udev_device_get_devnode")]
+			get;
+		}
+		/**
+		 * The the device major/minor number
+		 */
+		public Posix.dev_t devnum {
+			[CCode (cname = "udev_device_get_devnum")]
+			get;
+		}
+		/**
+		 * Retrieve the kernel devpath value of the udev device.
+		 *
+		 * The path does not contain the sys mount point, and starts with a '/'.
+		 */
+		public string devpath {
+			[CCode (cname = "udev_device_get_devpath")]
+			get;
+		}
+		/**
+		 * The devtype name of the device, if it can be determined.
+		 */
+		public string? devtype {
+			[CCode (cname = "udev_device_get_devtype")]
+			get;
+		}
+		/**
+		 * Get the name of the driver, if one is attached.
+		 */
+		public string? driver {
+			[CCode (cname = "udev_device_get_driver")]
+			get;
+		}
+		/**
+		 * Has already handled the device and has set up device node permissions
+		 * and context, or has renamed a network device?
+		 *
+		 * This is only implemented for devices with a device node or network
+		 * interfaces. All other devices return true.
+		 */
+		public bool is_initialized {
+			[CCode (cname = "udev_device_get_is_initialized")]
+			get;
+		}
+		/**
+		 * Find the next parent device, and fill in information from the sys device
+		 * and the udev database entry.
+		 *
+		 * It is not necessarily just the upper level directory, empty or not
+		 * recognized sys directories are ignored.
+		 */
+		public Device? parent {
+			[CCode (cname = "udev_device_get_parent")]
+			get;
+		}
+		/**
+		 * The list of key/value device properties of the udev device.
+		 */
+		public List? properties {
+			[CCode (cname = "udev_device_get_properties_list_entry")]
+			get;
+		}
+		/**
+		 * The sequence number
+		 *
+		 * This is only valid if the device was received through a monitor. Devices read from sys do not have a sequence number.
+		 */
+		public uint64 seqnum {
+			[CCode (cname = "udev_device_get_seqnum")]
+			get;
+		}
+		/**
+		 * The subsystem string of the device, if it can be determined.
+		 *
+		 * This string will not contain /.
+		 */
+		public string? subsystem {
+			[CCode (cname = "udev_device_get_subsystem")]
+			get;
+		}
+		/**
+		 * The list of available sysattrs, with value being empty.
+		 *
+		 * This just return all available sysfs attributes for a particular device
+		 * without reading their values.
+		 */
+		public List sysattr {
+			[CCode (cname = "udev_device_get_sysattr_list_entry")]
+			get;
+		}
+		/**
+		 * The sys name of the device device
+		 */
+		public string sysname {
+			[CCode (cname = "udev_device_get_sysname")]
+			get;
+		}
+		/**
+		 * The trailing number of of the device name
+		 */
+		public string sysnum {
+			[CCode (cname = "udev_device_get_sysnum")]
+			get;
+		}
+		/**
+		 * Retrieve the absolute sys path of the udev device starting with the sys mount point.
+		 */
+		public string syspath {
+			[CCode (cname = "udev_device_get_syspath")]
+			get;
+		}
+		/**
+		 * The list of tags attached to the udev device
+		 */
+		public List? tags {
+			[CCode (cname = "udev_device_get_tags_list_entry")]
+			get;
+		}
+		/**
+		 * The number of microseconds passed since udev set up the device for the
+		 * first time.
+		 *
+		 * This is only implemented for devices with need to store properties
+		 * in the udev database. All other devices are 0.
+		 */
+		public uint64 usec_since_initialized {
+			[CCode (cname = "udev_device_get_usec_since_initialized")]
+			get;
+		}
+		/**
+		 * Get the value of a device property, if one exists.
+		 */
+		[CCode (cname = "udev_device_get_property_value")]
+		public unowned string? get (string key);
+		/**
+		 * Find the next parent device, with a matching subsystem and devtype
+		 * value, and fill in information from the sys device and the udev database
+		 * entry.
+		 *
+		 * @param devtype the type of the device, or null to match any.
+		 */
+		[CCode (cname = "udev_device_get_parent_with_subsystem_devtype")]
+		public unowned Device? get_parent (string subsystem, string? devtype = null);
+		[CCode (cname = "udev_device_has_tag")]
+		public bool has_tag (string tag);
+		/**
+		 * Take a reference of a udev device.
+		 */
+		[CCode (cname = "udev_device_ref")]
+		public void ref ();
+		/**
+		 * Drop a reference of a udev device.
+		 */
+		[CCode (cname = "udev_device_unref")]
+		public void unref ();
+	}
+
+	/**
+	 * Search sysfs for specific devices and provide a sorted list
+	 */
+	[CCode (cname = "struct udev_enumerate", ref_function = "udev_enumerate_ref", unref_function = "udev_enumerate_unref", has_type_id = false)]
+	public class Enumerate {
+		/**
+		 * The udev library context.
+		 */
+		public Context context {
+			[CCode (cname = "udev_enumerate_get_udev")]
+			get;
+		}
+		/**
+		 * The sorted list of device paths.
+		 */
+		public List? entries {
+			[CCode (cname = "udev_enumerate_get_list_entry")]
+			get;
+		}
+		/**
+		 * Match only devices which udev has set up already.
+		 *
+		 * This makes sure, that the device node permissions and context are
+		 * properly set and that network devices are fully renamed.
+		 *
+		 * Usually, devices which are found in the kernel but not already handled
+		 * by udev, have still pending events. Services should subscribe to monitor
+		 * events and wait for these devices to become ready, instead of using
+		 * uninitialized devices.
+		 * @return false on success
+		 */
+		[CCode (cname = "udev_enumerate_add_match_is_initialized")]
+		public bool add_match_is_initialized ();
+		/**
+		 * Return the devices on the subtree of one given device.
+		 *
+		 * The parent itself is included in the list.
+		 * @return false on success
+		 */
+		[CCode (cname = "udev_enumerate_add_match_parent")]
+		public bool add_match_parent (Device parent);
+		/**
+		 * Filter for a property of the device to include in the list
+		 * @return false on success
+		 */
+		[CCode (cname = "udev_enumerate_add_match_property")]
+		public bool add_match_property (string property, string @value);
+		/**
+		 * Filter for a subsystem of the device to include in the list
+		 * @return false on success
+		 */
+		[CCode (cname = "udev_enumerate_add_match_subsystem")]
+		public bool add_match_subsystem (string subsystem);
+		/**
+		 * Filter for a sys attribute at the device to include in the list
+		 * @return false on success
+		 */
+		[CCode (cname = "udev_enumerate_add_match_sysattr")]
+		public bool add_match_sysattr (string sysattr, string @value);
+		/**
+		 * Filter for the name of the device to include in the list
+		 * @return false on success
+		 */
+		[CCode (cname = "udev_enumerate_add_match_sysname")]
+		public bool add_match_sysname (string sysname);
+		/**
+		 * Filter for a tag of the device to include in the list
+		 * @return false on success
+		 */
+		[CCode (cname = "udev_enumerate_add_match_tag")]
+		public bool add_match_tag (string tag);
+		/**
+		 * Filter for a subsystem of the device to exclude from the list
+		 * @return false on success
+		 */
+		[CCode (cname = "udev_enumerate_add_nomatch_subsystem")]
+		public bool add_nomatch_subsystem (string subsystem);
+		/**
+		 * Filter for a sys attribute at the device to exclude from the list
+		 * @return false on success
+		 */
+		[CCode (cname = "udev_enumerate_add_nomatch_sysattr")]
+		public bool add_nomatch_sysattr (string sysattr, string @value);
+		/**
+		 * Add a device to the list of devices, to retrieve it back sorted in dependency order.
+		 * @return false on success
+		 */
+		[CCode (cname = "udev_enumerate_add_syspath")]
+		public bool add_syspath (string syspath);
+		/**
+		 * Take a reference of a enumeration context.
+		 */
+		[CCode (cname = "udev_enumerate_ref")]
+		public void ref ();
+		/**
+		 * Run enumeration with active filters
+		 * @return false on success
+		 */
+		[CCode (cname = "udev_enumerate_scan_devices")]
+		public bool scan_devices ();
+		/**
+		 * Run enumeration with active filters
+		 * @return false on success
+		 */
+		[CCode (cname = "udev_enumerate_scan_subsystems")]
+		public bool scan_subsystems ();
+		/**
+		 * Drop a reference of an enumeration context.
+		 */
+		[CCode (cname = "udev_enumerate_unref")]
+		public void unref ();
+	}
+
+	[CCode (cname = "struct udev_list_entry", free_function = "")]
+	[Compact]
+	public class List {
+		[CCode (cname = "udev_list_entry_get_by_name")]
+		public List? get (string name);
+		public string name {
+			[CCode (cname = "udev_list_entry_get_name")]
+			get;
+		}
+		public List? next {
+			[CCode (cname = "udev_list_entry_get_next")]
+			get;
+		}
+		public string @value {
+			[CCode (cname = "udev_list_entry_get_value")]
+			get;
+		}
+	}
+
+	/**
+	 * Connection to a device event source.
+	 */
+	[CCode (cname = "struct udev_monitor", ref_function = "udev_monitor_ref", unref_function = "udev_monitor_unref", has_type_id = false)]
+	public class Monitor {
+		/**
+		 * The udev library context with which the monitor was created.
+		 */
+		public Context context {
+			[CCode (cname = "udev_monitor_get_udev")]
+			get;
+		}
+
+		/**
+		 * The socket file descriptor associated with the monitor.
+		 */
+		public int fd {
+			[CCode (cname = "udev_monitor_get_fd")]
+			get;
+		}
+
+		/**
+		 * This filter is efficiently executed inside the kernel, and libudev
+		 * subscribers will usually not be woken up for devices which do not match.
+		 *
+		 * The filter must be installed before the monitor is switched to listening mode.
+		 * @return false on success
+		 */
+		[CCode (cname = "udev_monitor_filter_add_match_subsystem_devtype")]
+		public bool add_match_subsystem_devtype (string subsystem, string? devtype = null);
+		/**
+		 * This filter is efficiently executed inside the kernel, and libudev
+		 * subscribers will usually not be woken up for devices which do not match.
+		 *
+		 * The filter must be installed before the monitor is switched to listening mode.
+		 * @return false on success
+		 */
+		[CCode (cname = "udev_monitor_filter_add_match_tag")]
+		public bool add_match_tag (string tag);
+		/**
+		 * Binds the monitor socket to the event source.
+		 * @return false on success
+		 */
+		[CCode (cname = "udev_monitor_enable_receiving")]
+		public bool enable_receiving ();
+		/**
+		 * Receive data from the udev monitor socket, allocate a new udev device,
+		 * fill in the received data, and return the device.
+		 *
+		 * Only socket connections with uid=0 are accepted.
+		 * @return a new udev device, or null, in case of an error
+		 */
+		[CCode (cname = "udev_monitor_receive_device")]
+		public Device? receive_device ();
+		/**
+		 * Take a reference of a udev monitor.
+		 */
+		[CCode (cname = "udev_monitor_ref")]
+		public void ref ();
+		/**
+		 * Remove all filters from monitor.
+		 * @return false on success
+		 */
+		[CCode (cname = "udev_monitor_filter_remove")]
+		public bool remove_filter ();
+		/**
+		 * Set the size of the kernel socket buffer.
+		 *
+		 * This call needs the appropriate privileges to succeed.
+		 * @return false on success
+		 */
+		[CCode (cname = "udev_monitor_set_receive_buffer_size")]
+		public bool set_receive_buffer_size (int size);
+		/**
+		 * Drop a reference of a udev monitor.
+		 */
+		[CCode (cname = "udev_monitor_unref")]
+		public void unref ();
+		/**
+		 * Update the installed socket filter.
+		 *
+		 * This is only needed, if the filter was removed or changed.
+		 * @return false on success
+		 */
+		[CCode (cname = "udev_monitor_filter_update")]
+		public bool update_filter ();
+	}
+	/**
+	 * Access to currently active events
+	 *
+	 * The udev daemon processes events asynchronously. All events which do not
+	 * have interdependencies run in parallel. This exports the current state of
+	 * the event processing queue, and the current event sequence numbers from
+	 * the kernel and the udev daemon.
+	 */
+	[CCode (cname = "struct udev_queue", ref_function = "udev_queue_ref", unref_function = "udev_queue_unref", has_type_id = false)]
+	public class Queue {
+		/**
+		 * The udev library context with which the queue context was created.
+		 */
+		public Context context {
+			[CCode (cname = "udev_queue_get_udev")]
+			get;
+		}
+		/**
+		 * The list of queued events.
+		 */
+		public List? events {
+			[CCode (cname = "udev_queue_get_queued_list_entry")]
+			get;
+		}
+		public bool is_active {
+			[CCode (cname = "udev_queue_get_udev_is_active")]
+			get;
+		}
+		public bool is_empty {
+			[CCode (cname = "udev_queue_get_queue_is_empty")]
+			get;
+		}
+		/**
+		 * The current kernel event sequence number.
+		 */
+		public uint64 kernel_seqnum {
+			[CCode (cname = "udev_queue_get_kernel_seqnum")]
+			get;
+		}
+		/**
+		 * The last known udev event sequence number.
+		 */
+		public uint64 udev_seqnum {
+			[CCode (cname = "udev_queue_get_udev_seqnum")]
+			get;
+		}
+		/**
+		 * Indicates whether the given sequence number is currently active.
+		 */
+		[CCode (cname = "udev_queue_get_seqnum_is_finished")]
+		public bool is_finished (uint64 seqnum);
+		/**
+		 * Indicates if any of the sequence numbers in the given range is currently active.
+		 */
+		[CCode (cname = "udev_queue_get_seqnum_sequence_is_finished")]
+		public bool is_sequence_finished (uint64 start, uint64 end);
+		/**
+		 * Take a reference of a udev queue context.
+		 */
+		[CCode (cname = "udev_queue_ref")]
+		public void ref ();
+		/**
+		 * Drop a reference of a udev queue context.
+		 */
+		[CCode (cname = "udev_queue_unref")]
+		public void unref ();
+	}
+	/**
+	 * Internal class to make sysattrs easy to access
+	 */
+	[CCode (cname = "struct udev_device", ref_function = "udev_device_ref", unref_function = "udev_device_unref", has_type_id = false)]
+	public class SysAttr {
+		/**
+		 * The content of a sys attribute file, null if there is a sys attribute value.
+		 *
+		 * The retrieved value is cached in the device. Repeated calls will return the same
+		 * value and not open the attribute again.
+		 */
+		[CCode (cname = "udev_device_get_sysattr_value")]
+		public unowned string? get (string sysattr);
+	}
+
+	public delegate void Logger (Context udev, int priority, string file, int line, string fn, string format, va_list args);
+
+	/**
+	 * Encode all potentially unsafe characters of a string to the corresponding 2 char hex value prefixed by '\x'.
+	 * @param buffer the output buffer to store the string which might be four times the length of the input.
+	 * @return true on error
+	 */
+	[CCode (cname = "udev_util_encode_string")]
+	public bool encode_string (string str, char[] buffer);
+}