Merge branch 'master' into gregoa
authorgregor herrmann <gregoa@debian.org>
Thu, 14 Jul 2011 21:04:51 +0000 (23:04 +0200)
committergregor herrmann <gregoa@debian.org>
Thu, 14 Jul 2011 21:04:51 +0000 (23:04 +0200)
README
debian/zavai.1
src/CMakeLists.txt
src/devkit-power-gobject.vapi [deleted file]
src/lua5.1.vapi [deleted symlink]
src/power.vala
src/x11.vapi [deleted file]
test/CMakeLists.txt

diff --git a/README b/README
index 1c727fbc24b38de214042fee8588e2121e99d33f..45bf69e1ab52112744e4fb9bcb9181e8e3f2e82e 100644 (file)
--- a/README
+++ b/README
@@ -13,12 +13,9 @@ Getting it to work:
 
    # Build time
    apt-get install valac libglib2.0-dev libdbus-glib-1-dev libgee-dev libgtk2.0-dev \
-                   libwnck-dev libdevkit-power-gobject-dev \
+                   libwnck-dev \
                    libomhacks-dev liblua5.1-dev
 
-   # Runtime
-   apt-get install devicekit-power
-
    # Optional runtime
    apt-get install polygen polygen-data
 
@@ -240,7 +237,7 @@ using vala-dbus-binding-tool:
    (-> learn/test libalsamixer something)
    /usr/share/vala/vapi/alsa.vapi
  - space buttons from sliders, to avoid shutting down instead of lowering the volume
- - battery without devkit: do the parsing via lua
+ - battery: do the parsing via lua
  - contacts: show as a fancy focus+context list (see prefuse)
     - vcard on e-vcard.{h,c}
     - ical on libical-dev
index 32ef4de2549944404980a6821cd663de60f9af08..b046b50370fd0baf6ccfe92abcbb497f4c0e60bb 100644 (file)
@@ -196,7 +196,7 @@ fisheye list music player
     - save playlist to file to reload later
     - pause with headset button
 .IP \(bu
-battery without devkit: do the parsing via lua
+battery: do the parsing via lua
 .IP \(bu
 contacts: show as a fancy focus+context list (see prefuse)
     - vcard on e-vcard.{h,c}
index 882e2f331c203d3347fa68713e94c08f77c96459..b19726749e30727c40c6687154f8eeae1c959367 100644 (file)
@@ -4,7 +4,7 @@ include(../vala.cmake)
 set(zavai_version 0.1)
 
 set(packages gtk+-2.0 gdk-pixbuf-2.0 dbus-glib-1>=0.80 libwnck-1.0>=2.26.0 libomhacks x11 gdk-x11-2.0 libgps gstreamer-0.10)
-add_packages(ZAVAI ${packages})
+add_packages(ZAVAI ${packages} lua5.1)
 
 set(VALA_PACKAGES x11 ${packages} posix linux-input dbus-extra gtkfisheyelist lua)
 set(VFLAGS --vapidir=${zavai_SOURCE_DIR} --vapidir=${gtkfisheyelist_BINARY_DIR})
@@ -22,7 +22,7 @@ add_definitions(-Wall)
 #  message("-- Not using upower-glib")
 #endif ()
 
-add_definitions(-DWNCK_I_KNOW_THIS_IS_UNSTABLE -DI_KNOW_THE_DEVICEKIT_POWER_API_IS_SUBJECT_TO_CHANGE -I${gtkfisheyelist_BINARY_DIR} -I${zavai_BINARY_DIR})
+add_definitions(-DWNCK_I_KNOW_THIS_IS_UNSTABLE -I${gtkfisheyelist_BINARY_DIR} -I${zavai_BINARY_DIR})
 link_libraries(gtkfisheyelist-static)
 
 file(GLOB zavala *.vala)
diff --git a/src/devkit-power-gobject.vapi b/src/devkit-power-gobject.vapi
deleted file mode 100644 (file)
index 139abc2..0000000
+++ /dev/null
@@ -1,232 +0,0 @@
-/* devkit-power-gobject.vapi generated by vapigen, do not modify. */
-
-[CCode (cprefix = "Dkp", lower_case_cprefix = "dkp_")]
-namespace Dkp {
-       [CCode (cheader_filename = "devkit-power-gobject/devicekit-power.h")]
-       public class Client : GLib.Object {
-               [CCode (has_construct_function = false)]
-               public Client ();
-               public unowned GLib.PtrArray enumerate_devices () throws GLib.Error;
-               [CCode (cname = "dkp_client_can_hibernate")]
-               public bool get_can_hibernate ();
-               [CCode (cname = "dkp_client_can_suspend")]
-               public bool get_can_suspend ();
-               public unowned string get_daemon_version ();
-               [CCode (cname = "dkp_client_lid_is_closed")]
-               public bool get_lid_is_closed ();
-               [CCode (cname = "dkp_client_on_battery")]
-               public bool get_on_battery ();
-               [CCode (cname = "dkp_client_on_low_battery")]
-               public bool get_on_low_battery ();
-               public bool hibernate () throws GLib.Error;
-               public bool suspend () throws GLib.Error;
-               [NoAccessorMethod]
-               public bool can_hibernate { get; }
-               [NoAccessorMethod]
-               public bool can_suspend { get; }
-               public string daemon_version { get; }
-               [NoAccessorMethod]
-               public bool lid_is_closed { get; }
-               [NoAccessorMethod]
-               public bool lid_is_present { get; }
-               [NoAccessorMethod]
-               public bool on_battery { get; }
-               [NoAccessorMethod]
-               public bool on_low_battery { get; }
-               public virtual signal void changed ();
-               public virtual signal void device_added (void* device);
-               public virtual signal void device_changed (void* device);
-               public virtual signal void device_removed (void* device);
-       }
-       [CCode (cheader_filename = "devkit-power-gobject/devicekit-power.h")]
-       public class Device : GLib.Object {
-               [CCode (has_construct_function = false)]
-               public Device ();
-               public unowned GLib.PtrArray get_history (string type, uint timespec, uint resolution) throws GLib.Error;
-               public unowned string get_object_path ();
-               public unowned GLib.PtrArray get_statistics (string type) throws GLib.Error;
-               public bool print ();
-               public bool refresh () throws GLib.Error;
-               public bool set_object_path (string object_path) throws GLib.Error;
-               public static Dkp.DeviceState state_from_text (string state);
-               public static unowned string state_to_text (Dkp.DeviceState state_enum);
-               public static Dkp.DeviceTechnology technology_from_text (string technology);
-               public static unowned string technology_to_text (Dkp.DeviceTechnology technology_enum);
-               public static Dkp.DeviceType type_from_text (string type);
-               public static unowned string type_to_text (Dkp.DeviceType type_enum);
-               [NoAccessorMethod]
-               public double capacity { get; set; }
-               [NoAccessorMethod]
-               public double energy { get; set; }
-               [NoAccessorMethod]
-               public double energy_empty { get; set; }
-               [NoAccessorMethod]
-               public double energy_full { get; set; }
-               [NoAccessorMethod]
-               public double energy_full_design { get; set; }
-               [NoAccessorMethod]
-               public double energy_rate { get; set; }
-               [NoAccessorMethod]
-               public bool has_history { get; set; }
-               [NoAccessorMethod]
-               public bool has_statistics { get; set; }
-               [NoAccessorMethod]
-               public bool is_present { get; set; }
-               [NoAccessorMethod]
-               public bool is_rechargeable { get; set; }
-               [NoAccessorMethod]
-               public string model { owned get; set; }
-               [NoAccessorMethod]
-               public string native_path { owned get; set; }
-               [NoAccessorMethod]
-               public bool online { get; set; }
-               [NoAccessorMethod]
-               public double percentage { get; set; }
-               [NoAccessorMethod]
-               public bool power_supply { get; set; }
-               [NoAccessorMethod]
-               public bool recall_notice { get; set; }
-               [NoAccessorMethod]
-               public string recall_url { owned get; set; }
-               [NoAccessorMethod]
-               public string recall_vendor { owned get; set; }
-               [NoAccessorMethod]
-               public string serial { owned get; set; }
-               [NoAccessorMethod]
-               public uint state { get; set; }
-               [NoAccessorMethod]
-               public uint technology { get; set; }
-               [NoAccessorMethod]
-               public int64 time_to_empty { get; set; }
-               [NoAccessorMethod]
-               public int64 time_to_full { get; set; }
-               [NoAccessorMethod]
-               public uint type { get; set; }
-               [NoAccessorMethod]
-               public uint64 update_time { get; set; }
-               [NoAccessorMethod]
-               public string vendor { owned get; set; }
-               [NoAccessorMethod]
-               public double voltage { get; set; }
-               public virtual signal void changed (void* obj);
-       }
-       [Compact]
-       [CCode (copy_function = "dkp_history_obj_copy", cheader_filename = "devkit-power-gobject/devicekit-power.h")]
-       public class HistoryObj {
-               public Dkp.DeviceState state;
-               public uint time;
-               public double value;
-               [CCode (has_construct_function = false)]
-               public HistoryObj ();
-               public bool clear ();
-               public unowned Dkp.HistoryObj copy ();
-               public static unowned Dkp.HistoryObj create (double value, Dkp.DeviceState state);
-               public bool equal (Dkp.HistoryObj obj2);
-               public static unowned Dkp.HistoryObj from_string (string text);
-               public bool print ();
-               public unowned string to_string ();
-       }
-       [Compact]
-       [CCode (copy_function = "dkp_qos_obj_copy", cheader_filename = "devkit-power-gobject/devicekit-power.h")]
-       public class QosObj {
-               public weak string cmdline;
-               public uint cookie;
-               public bool persistent;
-               public uint pid;
-               public weak string sender;
-               public uint64 timespec;
-               public Dkp.QosType type;
-               public uint uid;
-               public int value;
-               [CCode (has_construct_function = false)]
-               public QosObj ();
-               public unowned Dkp.QosObj copy ();
-               public bool equal (Dkp.QosObj obj2);
-               public bool print ();
-       }
-       [Compact]
-       [CCode (copy_function = "dkp_stats_obj_copy", cheader_filename = "devkit-power-gobject/devicekit-power.h")]
-       public class StatsObj {
-               public double accuracy;
-               public double value;
-               [CCode (has_construct_function = false)]
-               public StatsObj ();
-               public unowned Dkp.StatsObj copy ();
-               public static unowned Dkp.StatsObj create (double value, double accuracy);
-               public static unowned Dkp.StatsObj from_string (string text);
-               public unowned string to_string ();
-       }
-       [CCode (cheader_filename = "devkit-power-gobject/devicekit-power.h")]
-       public class Wakeups : GLib.Object {
-               [CCode (has_construct_function = false)]
-               public Wakeups ();
-               public unowned GLib.PtrArray get_data () throws GLib.Error;
-               public uint get_total () throws GLib.Error;
-               public bool has_capability ();
-               public virtual signal void data_changed ();
-               public virtual signal void total_changed (uint value);
-       }
-       [Compact]
-       [CCode (copy_function = "dkp_wakeups_obj_copy", cheader_filename = "devkit-power-gobject/devicekit-power.h")]
-       public class WakeupsObj {
-               public weak string cmdline;
-               public weak string details;
-               public uint id;
-               public bool is_userspace;
-               public uint old;
-               public float value;
-               [CCode (has_construct_function = false)]
-               public WakeupsObj ();
-               public unowned Dkp.WakeupsObj copy ();
-               public bool equal (Dkp.WakeupsObj obj2);
-               public bool print ();
-       }
-       [CCode (cprefix = "DKP_DEVICE_STATE_", has_type_id = "0", cheader_filename = "devkit-power-gobject/devicekit-power.h")]
-       public enum DeviceState {
-               UNKNOWN,
-               CHARGING,
-               DISCHARGING,
-               EMPTY,
-               FULLY_CHARGED,
-               PENDING_CHARGE,
-               PENDING_DISCHARGE,
-               LAST
-       }
-       [CCode (cprefix = "DKP_DEVICE_TECHNOLOGY_", has_type_id = "0", cheader_filename = "devkit-power-gobject/devicekit-power.h")]
-       public enum DeviceTechnology {
-               UNKNOWN,
-               LITHIUM_ION,
-               LITHIUM_POLYMER,
-               LITHIUM_IRON_PHOSPHATE,
-               LEAD_ACID,
-               NICKEL_CADMIUM,
-               NICKEL_METAL_HYDRIDE,
-               LAST
-       }
-       [CCode (cprefix = "DKP_DEVICE_TYPE_", has_type_id = "0", cheader_filename = "devkit-power-gobject/devicekit-power.h")]
-       public enum DeviceType {
-               UNKNOWN,
-               LINE_POWER,
-               BATTERY,
-               UPS,
-               MONITOR,
-               MOUSE,
-               KEYBOARD,
-               PDA,
-               PHONE,
-               LAST
-       }
-       [CCode (cprefix = "DKP_QOS_TYPE_", has_type_id = "0", cheader_filename = "devkit-power-gobject/devicekit-power.h")]
-       public enum QosType {
-               UNKNOWN,
-               NETWORK,
-               CPU_DMA,
-               LAST
-       }
-       [CCode (cheader_filename = "devkit-power-gobject/devicekit-power.h")]
-       public const int COMPILE_VERSION;
-       [CCode (cheader_filename = "devkit-power-gobject/devicekit-power.h")]
-       public static Dkp.QosType qos_type_from_text (string type);
-       [CCode (cheader_filename = "devkit-power-gobject/devicekit-power.h")]
-       public static unowned string qos_type_to_text (Dkp.QosType type);
-}
diff --git a/src/lua5.1.vapi b/src/lua5.1.vapi
deleted file mode 120000 (symlink)
index e730dfc..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/vala/vapi/lua.vapi
\ No newline at end of file
index 55711179666fbf4b54287c8070b02f2e18b30b9e..9f467a4b6c5549b08dc1a9b2b247f98c9e67bf80 100644 (file)
@@ -66,7 +66,7 @@ public class Power : Service
         } else {
             if (battery_device == null)
             {
-                zavai.log.warning("No battery device found that I know how to read: try building with devkit-power");
+                zavai.log.warning("No battery device found that I know how to read");
                 poll_time = 0;
             } else {
                 zavai.log.info("Polling battery device only");
diff --git a/src/x11.vapi b/src/x11.vapi
deleted file mode 100644 (file)
index ec8b074..0000000
+++ /dev/null
@@ -1,883 +0,0 @@
-/* x11.vapi
- *
- * Copyright (C) 2009  Jürg Billeter
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
- *
- * Author:
- *     Jürg Billeter <j@bitron.ch>
- */
-
-[CCode (cprefix = "", lower_case_cprefix = "", cheader_filename = "X11/Xlib.h,X11/Xatom.h,X11/Xutil.h")]
-namespace X {
-       // Note: must be called before opening a display or calling any other Xlib function,
-       // see http://tronche.com/gui/x/xlib/display/XInitThreads.html
-       [CCode (cname = "XInitThreads")]
-       public Status init_threads ();
-
-       [Compact]
-       [CCode (cname = "Display", ref_function = "", unref_function = "")]
-       public class Display {
-               [CCode (cname = "XOpenDisplay")]
-               public Display (string? name = null);
-
-               [CCode (cname = "XGetAtomName")]
-               public string get_atom_name(Atom a);
-
-               [CCode (cname = "XAllPlanes")]
-               public static ulong get_all_planes ();
-
-               [CCode (cname = "XAddToSaveSet")]
-               public int add_to_save_set (Window w);
-
-               [CCode (cname = "XAllowEvents")]
-               public int allow_events (int event_mode, int time);
-
-               [CCode (cname = "XBitmapBitOrder")]
-               public int bitmap_bit_order ();
-
-               [CCode (cname = "XBitmapUnit")]
-               public int bitmap_scanline_unit ();
-
-               [CCode (cname = "XBitmapPad")]
-               public int bitmap_scanline_padding ();
-
-               [CCode (cname = "XChangeProperty")]
-               public int change_property (Window w, Atom property, Atom type, int format, int mode, [CCode (array_length = false)] uchar[] data, int nelements);
-
-               [CCode (cname = "XChangeWindowAttributes")]
-               public int change_window_attributes (Window w, ulong valuemask, SetWindowAttributes attributes);
-
-               [CCode (cname = "XConfigureWindow")]
-               public int configure_window (Window w, uint value_mask, WindowChanges values);
-
-               [CCode (cname = "ConnectionNumber")]
-               public int connection_number ();
-
-               [CCode (cname = "DefaultRootWindow")]
-               public Window default_root_window ();
-
-               [CCode (cname = "XDefaultScreenOfDisplay")]
-               public unowned Screen default_screen ();
-
-               [CCode (cname = "XScreenOfDisplay")]
-               public unowned Screen screen_by_id (int screen_number);
-
-               [CCode (cname = "DisplayString")]
-               public string display_string ();
-
-               [CCode (cname = "XQLength")]
-               public int event_queue_length ();
-
-               [CCode (cname = "XFlush")]
-               public int flush ();
-
-               [CCode (cname = "XGetKeyboardMapping", array_length = false)]
-               public weak uint[] get_keyboard_mapping (uint first_keycode, int keycode_count, ref int keysyms_per_keycode_return);
-
-               [CCode (cname = "XGetModifierMapping")]
-               public ModifierKeymap get_modifier_mapping ();
-
-               [CCode (cname = "XGetSelectionOwner")]
-               public Window get_selection_owner (Atom selection);
-
-               [CCode (cname = "XGetWindowAttributes")]
-               public void get_window_attributes (Window w, out WindowAttributes window_attributes_return);
-
-               [CCode (cname = "XGetWindowProperty")]
-               public int get_window_property (Window w, Atom property, long long_offset, long long_length, bool delete, Atom req_type, out Atom actual_type_return, out int actual_format_return, out ulong nitems_return, out ulong bytes_after_return, out void* prop_return);
-
-               [CCode (cname = "XGrabButton")]
-               public int grab_button (uint button, uint modifiers, Window grab_window, bool owner_events, uint event_mask, int pointer_mode, int keyboard_mode, Window confine_to, uint cursor);
-
-               [CCode (cname = "XGrabKey")]
-               public int grab_key (int keycode, uint modifiers, Window grab_window, bool owner_events, int pointer_mode, int keyboard_mode);
-
-               [CCode (cname = "XGrabPointer")]
-               public int grab_pointer (Window grab_window, bool owner_events, uint event_mask, int pointer_mode, int keyboard_mode, Window confine_to, uint cursor, int time);
-
-               [CCode (cname = "XGrabServer")]
-               public int grab_server ();
-
-               [CCode (cname = "XImageByteOrder")]
-               public int image_byte_order ();
-
-               [CCode (cname = "XInternAtom")]
-               public Atom intern_atom (string atom_name, bool only_if_exists);
-
-               [CCode (cname = "XInternAtoms")]
-               public void intern_atoms (string[] names, bool only_if_exists, [CCode (array_length = false)] Atom[] atoms_return);
-
-               [CCode (cname = "XInternalConnectionNumbers")]
-               public Status internal_connection_numbers (ref int[] fd_return);
-
-               [CCode (cname = "XDisplayKeycodes")]
-               public int keycodes (ref int min_keycodes_return, ref int max_keycodes_return);
-
-               [CCode (cname = "XKeysymToKeycode")]
-               public int keysym_to_keycode (uint keysym);
-
-               [CCode (cname = "XLastKnownRequestProcessed")]
-               public ulong last_known_request_processed ();
-
-               [CCode (cname = "XLockDisplay")]
-               public void lock_display ();
-
-               [CCode (cname = "XMapWindow")]
-               public int map_window (Window w);
-
-               [CCode (cname = "XMaxRequestSize")]
-               public long max_request_size ();
-
-               [CCode (cname = "XExtendedMaxRequestSize")]
-               public long max_extended_request_size ();
-
-               [CCode (cname = "XNextEvent")]
-               public int next_event (ref Event event_return);
-
-               [CCode (cname = "XNextRequest")]
-               public ulong next_request ();
-
-               [CCode (cname = "XNoOp")]
-               public void no_operation ();
-
-               [CCode (cname = "XScreenCount")]
-               public int number_of_screens ();
-
-               [CCode (cname = "XPending")]
-               public int pending ();
-
-               [CCode (cname = "XProcessInternalConnection")]
-               public void process_internal_connection (int fd);
-
-               [CCode (cname = "XProtocolVersion")]
-               public int protocol_version ();
-
-               [CCode (cname = "XProtocolRevision")]
-               public int protocol_revision ();
-
-               [CCode (cname = "XRaiseWindow")]
-               public int raise_window (Window w);
-
-               [CCode (cname = "XReparentWindow")]
-               public int reparent_window (Window w, Window parent, int x, int y);
-
-               [CCode (cname = "XResizeWindow")]
-               public int resize_window (Window w, uint width, uint height);
-
-               [CCode (cname = "XRootWindow")]
-               public Window root_window (int screen_number);
-
-               [CCode (cname = "ScreenCount")]
-               public int screen_count ();
-
-               [CCode (cname = "XScreenOfDisplay")]
-               public weak Screen screen_of_display (int screen_number);
-
-               [CCode (cname = "XSelectInput")]
-               public int select_input (Window w, long event_mask);
-
-               [CCode (cname = "XSendEvent")]
-               public void send_event (Window w, bool prpagate, long event_mask, ref Event event_send);
-
-               [CCode (cname = "XSetCloseDownMode")]
-               public void set_close_down_mode (int close_mode);
-
-               [CCode (cname = "XSetSelectionOwner")]
-               public Window set_selection_owner (Atom selection, Window owner, int time);
-
-               [CCode (cname = "XSetInputFocus")]
-               public int set_input_focus (Window focus, int revert_to, int time);
-
-               [CCode (cname = "XUngrabButton")]
-               public int ungrab_button (uint button, uint modifiers, Window grab_window);
-
-               [CCode (cname = "XUngrabPointer")]
-               public int ungrab_pointer (int time);
-
-               [CCode (cname = "XUngrabServer")]
-               public int ungrab_server ();
-
-               [CCode (cname = "XUnlockDisplay")]
-               public void unlock_display ();
-
-               [CCode (cname = "XUnmapWindow")]
-               public int unmap_window (Window w);
-
-               [CCode (cname = "XQueryTree")]
-               public void query_tree (Window w, out Window root_return, out Window parent_return, out Window[] children_return);
-
-               [CCode (cname = "XWindowEvent")]
-               public int window_event (Window w, EventMask event_mask, out Event event_return);
-
-               [CCode (cname = "XServerVendor")]
-               public string xserver_vendor_name ();
-
-               [CCode (cname = "XVendorRelease")]
-               public string xserver_vendor_release ();
-
-               [CCode (cname = "XMoveWindow")]
-               public void move_window (Window window, int x, int y);
-       }
-
-       [Compact]
-       [CCode (cname = "XModifierKeymap", free_function = "XFreeModifiermap")]
-       public class ModifierKeymap {
-               // The server's max # of keys per modifier
-               public int max_keypermod;
-               // An 8 by max_keypermod array of modifiers
-               public uchar[] modifiermap;
-       }
-
-       [SimpleType]
-       [IntegerType (rank = 9)]
-       [CCode (cname = "Atom")]
-       public struct Atom {
-       }
-
-       [SimpleType]
-       [IntegerType (rank = 9)]
-       [CCode (cname = "Colormap")]
-       public struct Colormap {
-       }
-
-       [SimpleType]
-       [CCode (cname = "GC")]
-       public struct GC {
-       }
-
-       [SimpleType]
-       [IntegerType (rank = 9)]
-       [CCode (cname = "Status")]
-       public struct Status {
-       }
-
-       [SimpleType]
-       [IntegerType (rank = 9)]
-       [CCode (cname = "Window", type_id = "G_TYPE_INT",
-               marshaller_type_name = "INT",
-               get_value_function = "g_value_get_int",
-               set_value_function = "g_value_set_int", default_value = "0",
-               type_signature = "i")]
-       public struct Window {
-       }
-
-       public struct Visual {
-       }
-
-       public struct WindowChanges {
-               public int x;
-               public int y;
-               public int width;
-               public int height;
-               public int border_width;
-               public Window sibling;
-               public int stack_mode;
-       }
-       public struct SizeHints {
-               public long @flags;
-               public int x;
-               public int y;
-               public int width;
-               public int height;
-       }
-
-       [CCode (cname = "XCreateWindow")]
-       public Window create_window (Display display, Window parent, int x, int y, uint width, uint height, uint border_width, int depth, uint @class, Visual? visual, X.CW valuemask, ref SetWindowAttributes attributes);
-
-       [CCode (cname = "XSetWindowAttributes")]
-       public struct SetWindowAttributes {
-               // public Pixmap background_pixmap;     /* background or None or ParentRelative */
-               public ulong background_pixel;  /* background pixel */
-               // public Pixmap border_pixmap; /* border of the window */
-               public ulong border_pixel;      /* border pixel value */
-               public int bit_gravity;         /* one of bit gravity values */
-               public int win_gravity;         /* one of the window gravity values */
-               public int backing_store;               /* NotUseful, WhenMapped, Always */
-               public ulong backing_planes;/* planes to be preseved if possible */
-               public ulong backing_pixel;/* value to use in restoring planes */
-               public bool save_under;         /* should bits under be saved? (popups) */
-               public long event_mask;         /* set of events that should be saved */
-               public long do_not_propagate_mask;      /* set of events that should not propagate */
-               public bool override_redirect;  /* boolean value for override-redirect */
-               // public Colormap colormap;            /* color map to be associated with window */
-               // public Cursor cursor;                /* cursor to be displayed (or None) */
-       }
-
-       [CCode(cname = "XWindowAttributes",
-              cheader_filename = "X11/Xlib.h,X11/Xatom.h,X11/Xutil.h")]
-       public struct WindowAttributes {
-               public int x;
-               public int y;                   /* location of window */
-               public int width;
-               public int height;              /* width and height of window */
-               public int border_width;                /* border width of window */
-               public int depth;               /* depth of window */
-               public Visual visual;           /* the associated visual structure */
-               public Window root;             /* root of screen containing window */
-               public int @class;                      /* InputOutput, InputOnly*/
-               public int bit_gravity;         /* one of bit gravity values */
-               public int win_gravity;         /* one of the window gravity values */
-               public int backing_store;               /* NotUseful, WhenMapped, Always */
-               public ulong backing_planes;/* planes to be preserved if possible */
-               public ulong backing_pixel;/* value to be used when restoring planes */
-               public bool save_under;         /* boolean, should bits under be saved? */
-               // public Colormap colormap;            /* color map to be associated with window */
-               public bool map_installed;              /* boolean, is color map currently installed*/
-               public int map_state;           /* IsUnmapped, IsUnviewable, IsViewable */
-               public long all_event_masks;    /* set of events all people have interest in*/
-               public long your_event_mask;    /* my event mask */
-               public long do_not_propagate_mask; /* set of events that should not propagate */
-               public bool override_redirect;  /* boolean value for override-redirect */
-               // public Screen screen;                /* back pointer to correct screen */
-       }
-
-       [CCode (cname = "CopyFromParent")]
-       public const int COPY_FROM_PARENT;
-
-       [CCode (cname = "CurrentTime")]
-       public const ulong CURRENT_TIME;
-
-       [CCode (cname = "Success")]
-       public int Success;
-
-       [CCode (cname = "XFree")]
-       public int free (void* data);
-
-       [CCode (cprefix = "CW", cname = "int")]
-       public enum CW {
-               BackPixmap,
-               BackPixel,
-               BackingStore,
-               BackingPlanes,
-               BackingPixel,
-               BitGravity,
-               BorderPixmap,
-               BorderPixel,
-               BorderWidth,
-               Colormap,
-               Cursor,
-               DontPropagate,
-               EventMask,
-               Height,
-               OverrideRedirect,
-               SaveUnder,
-               Sibling,
-               StackMode,
-               X,
-               Y,
-               Width,
-               WinGravity
-       }
-
-       [CCode (cprefix = "GrabMode")]
-       public enum GrabMode {
-               Sync,
-               Async
-       }
-
-       [CCode (cprefix = "")]
-       public enum EventMask {
-               NoEventMask,
-               KeyPressMask,
-               KeyReleaseMask,
-               ButtonPressMask,
-               ButtonReleaseMask,
-               EnterWindowMask,
-               LeaveWindowMask,
-               PointerMotionMask,
-               PointerMotionHintMask,
-               Button1MotionMask,
-               Button2MotionMask,
-               Button3MotionMask,
-               Button4MotionMask,
-               Button5MotionMask,
-               ButtonMotionMask,
-               KeymapStateMask,
-               ExposureMask,
-               VisibilityChangeMask,
-               StructureNotifyMask,
-               ResizeRedirectMask,
-               SubstructureNotifyMask,
-               SubstructureRedirectMask,
-               FocusChangeMask,
-               PropertyChangeMask,
-               ColormapChangeMask,
-               OwnerGrabButtonMask
-       }
-
-       [CCode (cprefix = "")]
-       public enum KeyMask {
-               ShiftMask,
-               LockMask,
-               ControlMask,
-               Mod1Mask,
-               Mod2Mask,
-               Mod3Mask,
-               Mod4Mask,
-               Mod5Mask
-       }
-
-       [CCode (cprefix = "")]
-       public enum EventType {
-               KeyPress,
-               KeyRelease,
-               ButtonPress,
-               ButtonRelease,
-               MotionNotify,
-               EnterNotify,
-               LeaveNotify,
-               FocusIn,
-               FocusOut,
-               KeymapNotify,
-               Expose,
-               GraphicsExpose,
-               NoExpose,
-               VisibilityNotify,
-               CreateNotify,
-               DestroyNotify,
-               UnmapNotify,
-               MapNotify,
-               MapRequest,
-               ReparentNotify,
-               ConfigureNotify,
-               ConfigureRequest,
-               GravityNotify,
-               ResizeRequest,
-               CirculateNotify,
-               CirculateRequest,
-               PropertyNotify,
-               SelectionClear,
-               SelectionRequest,
-               SelectionNotify,
-               ColormapNotify,
-               ClientMessage,
-               MappingNotify
-       }
-
-       // union
-       [CCode (cname = "XEvent")]
-       public struct Event {
-               public int type;
-               public AnyEvent xany;
-               public KeyEvent xkey;
-               public ButtonEvent xbutton;
-               public MotionEvent xmotion;
-               public CrossingEvent xcrossing;
-               public CreateWindowEvent xcreatewindow;
-               public DestroyWindowEvent xdestroywindow;
-               public UnmapEvent xunmap;
-               public MapEvent xmap;
-               public MapRequestEvent xmaprequest;
-               public ReparentEvent xreparent;
-               public ConfigureEvent xconfigure;
-               public GravityEvent xgravity;
-               public ConfigureRequestEvent xconfigurerequest;
-               public CirculateEvent xcirculate;
-               public CirculateRequestEvent xcirculaterequest;
-               public PropertyEvent xproperty;
-               public SelectionEvent xselection;
-               public ClientMessageEvent xclient;
-       }
-
-       [CCode (cname = "XAnyEvent")]
-       public struct AnyEvent {
-               public int type;
-               public ulong serial;
-               public bool send_event;
-               public unowned Display display;
-               public Window window;
-       }
-
-       [CCode (cname = "XKeyEvent")]
-       public struct KeyEvent {
-               public int type;
-               public ulong serial;
-               public bool send_event;
-               public unowned Display display;
-               public Window window;
-               public Window root;
-               public Window subwindow;
-               public ulong time;
-               public int x;
-               public int y;
-               public int x_root;
-               public int y_root;
-               public uint state;
-               public uint keycode;
-               public bool same_screen;
-       }
-
-       [CCode (cname = "XButtonEvent")]
-       public struct ButtonEvent {
-               public int type;
-               public ulong serial;
-               public bool send_event;
-               public unowned Display display;
-               public Window window;
-               public Window subwindow;
-               public ulong time;
-               public int x;
-               public int y;
-               public int x_root;
-               public int y_root;
-               public uint state;
-               public uint button;
-               public bool same_screen;
-       }
-
-       [CCode (cname = "XMotionEvent")]
-       public struct MotionEvent {
-               public int type;
-               public ulong serial;
-               public bool send_event;
-               public unowned Display display;
-               public Window window;
-               public Window subwindow;
-               public ulong time;
-               public int x;
-               public int y;
-               public int x_root;
-               public int y_root;
-               public uint state;
-               public char is_hint;
-               public bool same_screen;
-       }
-
-       [CCode (cname = "XCrossingEvent")]
-       public struct CrossingEvent {
-               public int type;
-               public ulong serial;
-               public bool send_event;
-               public unowned Display display;
-               public Window window;
-               public Window root;
-               public Window subwindow;
-               public ulong time;
-               public int x;
-               public int y;
-               public int x_root;
-               public int y_root;
-               public int mode;
-               public int detail;
-               public bool same_screen;
-               public bool focus;
-               public uint state;
-       }
-
-       [CCode (cname = "XCreateWindowEvent")]
-       public struct CreateWindowEvent {
-               public int type;
-               public ulong serial;
-               public bool send_event;
-               public unowned Display display;
-               public Window parent;
-               public Window window;
-               public int x;
-               public int y;
-               public int width;
-               public int height;
-               public int border_width;
-               public bool override_redirect;
-       }
-
-       [CCode (cname = "XDestroyWindowEvent")]
-       public struct DestroyWindowEvent {
-               public int type;
-               public ulong serial;
-               public bool send_event;
-               public unowned Display display;
-               public Window event;
-               public Window window;
-       }
-
-       [CCode (cname = "XUnmapEvent")]
-       public struct UnmapEvent {
-               public int type;
-               public ulong serial;
-               public bool send_event;
-               public unowned Display display;
-               public Window event;
-               public Window window;
-               public bool from_configure;
-       }
-
-       [CCode (cname = "XMapEvent")]
-       public struct MapEvent {
-               public int type;
-               public ulong serial;
-               public bool send_event;
-               public unowned Display display;
-               public Window event;
-               public Window window;
-               public bool override_redirect;
-       }
-
-       [CCode (cname = "XMapRequestEvent")]
-       public struct MapRequestEvent {
-               public int type;
-               public ulong serial;
-               public bool send_event;
-               public unowned Display display;
-               public Window parent;
-               public Window window;
-       }
-
-       [CCode (cname = "XReparentEvent")]
-       public struct ReparentEvent {
-               public int type;
-               public ulong serial;
-               public bool send_event;
-               public unowned Display display;
-               public Window event;
-               public Window window;
-               public Window parent;
-               public int x;
-               public int y;
-               public bool override_redirect;
-       }
-
-       [CCode (cname = "XConfigureEvent")]
-       public struct ConfigureEvent {
-               public int type;
-               public ulong serial;
-               public bool send_event;
-               public unowned Display display;
-               public Window event;
-               public Window window;
-               public int x;
-               public int y;
-               public int width;
-               public int height;
-               public int border_width;
-               public Window above;
-               public bool override_redirect;
-       }
-
-       [CCode (cname = "XGravityEvent")]
-       public struct GravityEvent {
-               public int type;
-               public ulong serial;
-               public bool send_event;
-               public unowned Display display;
-               public Window event;
-               public Window window;
-               public int x;
-               public int y;
-       }
-
-       [CCode (cname = "XConfigureRequestEvent")]
-       public struct ConfigureRequestEvent {
-               public int type;
-               public ulong serial;
-               public bool send_event;
-               public unowned Display display;
-               public Window parent;
-               public Window window;
-               public int x;
-               public int y;
-               public int width;
-               public int height;
-               public int border_width;
-               public Window above;
-               public int detail;
-               public ulong value_mask;
-       }
-
-       [CCode (cname = "XCirculateEvent")]
-       public struct CirculateEvent {
-               public int type;
-               public ulong serial;
-               public bool send_event;
-               public unowned Display display;
-               public Window event;
-               public Window window;
-               public int place;
-       }
-
-       [CCode (cname = "XCirculateRequestEvent")]
-       public struct CirculateRequestEvent {
-               public int type;
-               public ulong serial;
-               public bool send_event;
-               public unowned Display display;
-               public Window parent;
-               public Window window;
-               public int place;
-       }
-
-       [CCode (cname = "XPropertyEvent")]
-       public struct PropertyEvent {
-               public int type;
-               public ulong serial;
-               public bool send_event;
-               public unowned Display display;
-               public Window window;
-               public Atom atom;
-               public ulong time;
-               public int state;
-       }
-
-       [CCode (cname = "XSelectionEvent")]
-       public struct SelectionEvent {
-               public int type;
-               public ulong serial;
-               public bool send_event;
-               public unowned Display display;
-               public Window requestor;
-               public Atom selection;
-               public Atom target;
-               public Atom property;
-               public ulong time;
-       }
-
-       [CCode (cname = "XClientMessageEvent")]
-       public struct ClientMessageEvent {
-               public int type;
-               public ulong serial;    /* # of last request processed by server */
-               public bool send_event; /* true if this came from a SendEvent request */
-               public unowned Display display; /* Display the event was read from */
-               public Window window;
-               public Atom message_type;
-               public int format;
-               public ClientMessageEventData data;
-       }
-
-       // union
-       public struct ClientMessageEventData {
-               public unowned char[] b;
-               public unowned short[] s;
-               public unowned long[] l;
-       }
-
-       [CCode (cprefix = "PropMode")]
-       public enum PropMode {
-               Replace,
-               Prepend,
-               Append
-       }
-
-       [CCode (cprefix = "")]
-       public enum AllowEventsMode {
-               AsyncPointer,
-               SyncPointer,
-               ReplayPointer,
-               AsyncKeyboard,
-               SyncKeyboard,
-               ReplayKeyboard,
-               AsyncBoth,
-               SyncBoth
-       }
-
-       [CCode (cprefix = "")]
-       public enum MapState {
-               IsUnmapped,
-               IsUnviewable,
-               IsViewable
-       }
-
-       [CCode (cprefix = "RevertTo")]
-       public enum RevertTo {
-               None,
-               PointerRoot,
-               Parent
-       }
-
-       [Compact]
-       [CCode (cname = "Screen")]
-       public class Screen {
-               public Display display;
-               public Window root;
-               public int width;
-               public int height;
-
-               [CCode (cname = "XScreenOfDisplay")]
-               public static unowned Screen get_screen (Display disp, int screen_number);
-
-               [CCode (cname = "XBlackPixelOfScreen")]
-               public ulong black_pixel_of_screen ();
-
-               [CCode (cname = "XCellsOfScreen")]
-               public int cells_of_screen ();
-
-               [CCode (cname = "XDefaultColormapOfScreen")]
-               public Colormap default_colormap_of_screen ();
-
-               [CCode (cname = "XDefaultDepthOfScreen")]
-               public int default_depth_of_screen ();
-
-               [CCode (cname = "XDefaultGCOfScreen")]
-               public GC default_gc_of_screen ();
-
-               [CCode (cname = "XDefaultVisualOfScreen")]
-               public Visual default_visual_of_screen ();
-
-               [CCode (cname = "XDisplayOfScreen")]
-               public unowned Display display_of_screen ();
-
-               [CCode (cname = "XDoesBackingStore")]
-               public int does_backing_store ();
-
-               [CCode (cname = "XDoesSaveUnders")]
-               public bool does_save_unders ();
-
-               [CCode (cname = "XEventMaskOfScreen")]
-               public long event_mask_of_Screen ();
-
-               [CCode (cname = "XHeightMMOfScreen")]
-               public int height_in_mm_of_screen ();
-
-               [CCode (cname = "XHeightOfScreen")]
-               public int height_of_screen ();
-
-               [CCode (cname = "XMaxCmapsOfScreen")]
-               public int max_colormaps_of_screen ();
-
-               [CCode (cname = "XMinCmapsOfScreen")]
-               public int min_colormaps_of_screen ();
-
-               [CCode (cname = "XPlanesOfScreen")]
-               public int planes_of_screen ();
-
-               [CCode (cname = "XRootWindowOfScreen")]
-               public Window root_window_of_screen ();
-
-               [CCode (cname = "XScreenNumberOfScreen")]
-               public int screen_number_of_screen ();
-
-               [CCode (cname = "XWhitePixelOfScreen")]
-               public ulong white_pixel_of_screen ();
-
-               [CCode (cname = "XWidthMMOfScreen")]
-               public int width_in_mm_of_screen ();
-
-               [CCode (cname = "XWidthOfScreen")]
-               public int width_of_screen ();
-       }
-
-       public const X.Atom XA_ATOM;
-       public const X.Atom XA_CARDINAL;
-       public const X.Atom XA_WINDOW;
-       public const X.Atom XA_WM_CLASS;
-       public const X.Atom XA_WM_HINTS;
-       public const X.Atom XA_WM_ICON_NAME;
-       public const X.Atom XA_WM_NAME;
-       public const X.Atom XA_WM_NORMAL_HINTS;
-       public const X.Atom XA_WM_TRANSIENT_FOR;
-
-       public const uint XK_Num_Lock;
-       public const uint XK_Scroll_Lock;
-}
-
index 64e95e89c66f91ae7140631a8977adfd80ee9641..d2c1d6b3360b18addaa82a60840b1726d6d0eac3 100644 (file)
@@ -1,7 +1,7 @@
 project(tests)
 include(../vala.cmake)
 
-set(packages gtk+-2.0 dbus-glib-1>=0.80 libwnck-1.0>=2.26.0 lua5.1 libomhacks x11 gdk-x11-2.0 libgps gstreamer-0.10)
+set(packages gtk+-2.0 dbus-glib-1>=0.80 libwnck-1.0>=2.26.0 lua libomhacks x11 gdk-x11-2.0 libgps gstreamer-0.10)
 add_packages(ZAVAI ${packages})
 
 set(VALA_PACKAGES ${packages} posix linux-input dbus-extra gtkfisheyelist)
@@ -9,18 +9,7 @@ set(VFLAGS --vapidir=${gtkfisheyelist_BINARY_DIR} --vapidir=${zavai_SOURCE_DIR}
 add_definitions(-Wall)
 # -Werror 
 
-pkg_check_modules(DKP devkit-power-gobject>=010)
-if (DKP_VERSION)
-  message("-- Using devkit-power-gobject version ${DKP_VERSION}")
-  set(VFLAGS ${VFLAGS} --define=USE_DKP)
-  set(VALA_PACKAGES ${VALA_PACKAGES} devkit-power-gobject)
-  add_definitions(-DUSE_DKP ${DKP_CFLAGS})
-  link_libraries(${DKP_LDFLAGS})
-else()
-  message("-- Not using devkit-power-gobject")
-endif ()
-
-add_definitions(-DWNCK_I_KNOW_THIS_IS_UNSTABLE -DI_KNOW_THE_DEVICEKIT_POWER_API_IS_SUBJECT_TO_CHANGE -I${gtkfisheyelist_BINARY_DIR} -I${zavai_BINARY_DIR})
+add_definitions(-DWNCK_I_KNOW_THIS_IS_UNSTABLE -I${gtkfisheyelist_BINARY_DIR} -I${zavai_BINARY_DIR})
 
 file(GLOB gsm-receive test-gsm-receive.vala)
 add_vala_program(test-gsm-receive ${gsm-receive})