libx11 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5470e66191c0df5203bc4201954f1af174ceb01f
-  data.tar.gz: 18233f3455a6506909fd94069fb27948adbd40c0
+  metadata.gz: 996d4981cc702796abf6b30fb2b661e5361ae55b
+  data.tar.gz: 84f21999388262f0e1160a20edc1cd78e9aac4aa
 SHA512:
-  metadata.gz: 6e3f28123a72e3685d4559dc657e49d9aaa332583f87b2138bede8655b7218755c127d006f6333111fbb2d651d1d332748be8e6ef8302f32ba1be39efb2fd27e
-  data.tar.gz: 7264300898eae2f4aba5a28d662f0754fe15fdfc257f4c31644819a7d3aa068335799f15ccca6ffc0b089980c04779c9562572fd9cbc6bf5b879f5e84f8cb19b
+  metadata.gz: b2f137d6b53df72a7b4253346eef3b438ebce9900ea88d9e0324d8390230253f138f726acc7721b0ea13991a1e9bad6130010f057c0c9bcb419b592e961a905a
+  data.tar.gz: 6017df38ffec47e0d79bc41f1fdfad7c2a048f220799ba8bcfe5ae0fa249a9a504dad401d56e488f2eebaf7712d224eb363bd9caeab2205160f5eb61cf1c2d30

data/.travis.yml

@@ -2,3 +2,6 @@ language: ruby
 rvm:
   - 2.3.0
 before_install: gem install bundler -v 1.11.2
+script:
+  - bundle install
+  - bundle exec rake compile

data/README.md

@@ -1,6 +1,6 @@
-# LibX11
+# LibX11 [![Build Status](https://travis-ci.org/k0kubun/libx11-ruby.svg?branch=master)](https://travis-ci.org/k0kubun/libx11-ruby)
 
-Ruby binding for libx11 including xlib.
+Ruby binding of libx11 mostly for xlib.
 
 ## Status
 

data/bin/console

@@ -1,14 +1,7 @@
 #!/usr/bin/env ruby
 
-require "bundler/setup"
-require "libx11"
+require 'bundler/setup'
+require 'libx11'
 
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
-require "irb"
-IRB.start
+require 'pry'
+Pry.start

data/example/window_manager.rb

@@ -0,0 +1,53 @@
+require 'libx11'
+
+class XServer
+  def self.with_connection
+    display = LibX11.xopen_display
+    yield(display)
+  ensure
+    LibX11.xclose_display(display)
+  end
+
+  def self.bind_events(display, window, event_mask)
+    wm_detected = false
+    LibX11.xset_error_handler do |display, error|
+      if error.error_code == LibX11::XErrorEvent::BAD_ACCESS
+        wm_detected = true
+      end
+    end
+
+    display.xselect_input(window, event_mask)
+    display.xsync(false)
+
+    if wm_detected
+      abort "Another window manager detected!\n#{display.xdisplay_string}"
+    end
+  end
+end
+
+XServer.with_connection do |display|
+  XServer.bind_events(
+    display, display.default_root_window,
+    LibX11::XEvent::KEY_PRESS_MASK |
+    LibX11::XEvent::SUBSTRUCTURE_REDIRECT_MASK |
+    LibX11::XEvent::SUBSTRUCTURE_NOTIFY_MASK,
+  )
+
+  LibX11.xset_error_handler do |display, error|
+    $stderr.puts "Error detected: (error_code=#{error.error_code})"
+  end
+
+  loop do
+    event = LibX11.xnext_event(display)
+    case event.type
+    when LibX11::XEvent::CREATE_NOTIFY
+      # hook creation
+    when LibX11::XEvent::DESTROY_NOTIFY
+      # hook destruction
+    when LibX11::XEvent::REPARENT_NOTIFY
+      # hook reparenting
+    when LibX11::XEvent::KEY_PRESS
+      break
+    end
+  end
+end

data/ext/libx11_ruby/display.c

@@ -27,12 +27,20 @@ const rb_data_type_t display_type = {
  * Xlib XOpenDisplay
  */
 static VALUE
-rb_libx11_xopen_display(VALUE self, VALUE display_name)
+rb_libx11_xopen_display(int argc, VALUE *argv, RB_UNUSED_VAR(VALUE self))
 {
   Display *display;
-  Check_Type(display_name, T_STRING);
 
-  display = XOpenDisplay(RSTRING_PTR(display_name));
+  if (argc == 0) {
+    display = XOpenDisplay(NULL);
+  } else {
+    VALUE display_name;
+
+    rb_check_arity(argc, 1, 1);
+    rb_scan_args(argc, argv, "10", &display_name);
+    Check_Type(display_name, T_STRING);
+    display = XOpenDisplay(RSTRING_PTR(display_name));
+  }
   return TypedData_Wrap_Struct(rb_cDisplay, &display_type, display);
 }
 
@@ -62,6 +70,18 @@ rb_display_default_screen(VALUE self)
   return INT2NUM(DefaultScreen(display));
 }
 
+/*
+ * Xlib XDisplayString
+ */
+static VALUE
+rb_display_xdisplay_string(VALUE self)
+{
+  Display *display;
+
+  TypedData_Get_Struct(self, Display, &display_type, display);
+  return rb_str_new_cstr(XDisplayString(display));
+}
+
 /*
  * Xlib DefaultRootWindow
  */
@@ -130,17 +150,33 @@ rb_display_xmap_window(VALUE self, VALUE window)
   return INT2NUM(ret);
 }
 
+/*
+ * Xlib XSync
+ */
+static VALUE
+rb_display_xsync(VALUE self, VALUE discard)
+{
+  Display *display;
+  int ret;
+
+  TypedData_Get_Struct(self, Display, &display_type, display);
+  ret = XSync(display, RTEST(discard));
+  return INT2NUM(ret);
+}
+
 void
 Init_libx11_display(void)
 {
-  rb_define_singleton_method(rb_mLibX11, "xopen_display", rb_libx11_xopen_display, 1);
+  rb_define_singleton_method(rb_mLibX11, "xopen_display", rb_libx11_xopen_display, -1);
   rb_define_singleton_method(rb_mLibX11, "xclose_display", rb_libx11_xclose_display, 1);
 
   rb_cDisplay = rb_define_class_under(rb_mLibX11, "Display", rb_cData);
   rb_define_method(rb_cDisplay, "default_root_window", rb_display_default_root_window, 0);
   rb_define_method(rb_cDisplay, "default_screen", rb_display_default_screen, 0);
+  rb_define_method(rb_cDisplay, "xdisplay_string", rb_display_xdisplay_string, 0);
   rb_define_method(rb_cDisplay, "black_pixel", rb_display_black_pixel, 1);
   rb_define_method(rb_cDisplay, "white_pixel", rb_display_white_pixel, 1);
   rb_define_method(rb_cDisplay, "xmap_window", rb_display_xmap_window, 1);
   rb_define_method(rb_cDisplay, "xselect_input", rb_display_xselect_input, 2);
+  rb_define_method(rb_cDisplay, "xsync", rb_display_xsync, 1);
 }

data/ext/libx11_ruby/libx11_ruby.c

@@ -6,6 +6,7 @@ Init_libx11_ruby(void)
   rb_mLibX11 = rb_define_module("LibX11");
 
   Init_libx11_display();
-  Init_libx11_event();
   Init_libx11_window();
+  Init_libx11_xerror_event();
+  Init_libx11_xevent();
 }

data/ext/libx11_ruby/libx11_ruby.h

@@ -2,12 +2,12 @@
 #define LIBX11_RUBY_H 1
 
 #include "ruby.h"
-#include <X11/Xlib.h>
 
 VALUE rb_mLibX11;
 
 void Init_libx11_display(void);
-void Init_libx11_event(void);
 void Init_libx11_window(void);
+void Init_libx11_xerror_event(void);
+void Init_libx11_xevent(void);
 
 #endif /* LIBX11_RUBY_H */

data/ext/libx11_ruby/xerror_event.c

@@ -0,0 +1,104 @@
+#include "libx11_ruby.h"
+#include <X11/Xlib.h>
+
+extern VALUE rb_cDisplay;
+VALUE rb_cXErrorEvent;
+
+extern rb_data_type_t display_type;
+
+static size_t
+xerror_event_dsize(const void *arg)
+{
+  const XErrorEvent *event = arg;
+  return sizeof(event);
+}
+
+const rb_data_type_t xerror_event_type = {
+  .wrap_struct_name = "libx11_xerror_event",
+  .function = {
+    .dmark = NULL,
+    .dfree = NULL,
+    .dsize = xerror_event_dsize,
+    .reserved = { NULL, NULL },
+  },
+  .parent = NULL,
+  .data = NULL,
+  .flags = RUBY_TYPED_FREE_IMMEDIATELY,
+};
+
+static VALUE error_handler_proc = Qnil;
+
+static int
+error_handler_func(Display *display, XErrorEvent *event)
+{
+  if (NIL_P(error_handler_proc)) {
+    return 1;
+  } else {
+    VALUE args = rb_ary_new();
+    rb_ary_push(args, TypedData_Wrap_Struct(rb_cDisplay, &display_type, display));
+    rb_ary_push(args, TypedData_Wrap_Struct(rb_cXErrorEvent, &xerror_event_type, event));
+    rb_proc_call(error_handler_proc, args);
+    return 0;
+  }
+}
+
+/*
+ * Xlib XSetErrorHandler
+ */
+static VALUE
+rb_libx11_xset_error_handler(int argc, VALUE *argv, VALUE self)
+{
+  rb_check_arity(argc, 0, 0);
+  rb_scan_args(argc, argv, "00&", &error_handler_proc);
+
+  XSetErrorHandler(error_handler_func);
+  return Qnil;
+}
+
+static VALUE
+rb_xerror_event_error_code(VALUE self)
+{
+  XErrorEvent *event;
+  TypedData_Get_Struct(self, XErrorEvent, &xerror_event_type, event);
+  return INT2FIX(event->error_code);
+}
+
+static VALUE
+rb_xerror_event_type(VALUE self)
+{
+  XErrorEvent *event;
+  TypedData_Get_Struct(self, XErrorEvent, &xerror_event_type, event);
+  return INT2FIX(event->type);
+}
+
+void
+Init_libx11_xerror_event(void)
+{
+  rb_define_singleton_method(rb_mLibX11, "xset_error_handler", rb_libx11_xset_error_handler, -1);
+
+  rb_cXErrorEvent = rb_define_class_under(rb_mLibX11, "XErrorEvent", rb_cData);
+  rb_define_method(rb_cXErrorEvent, "error_code", rb_xerror_event_error_code, 0);
+  rb_define_method(rb_cXErrorEvent, "type", rb_xerror_event_type, 0);
+
+  // error codes
+  rb_define_const(rb_cXErrorEvent, "SUCCESS", INT2FIX(Success));
+  rb_define_const(rb_cXErrorEvent, "BAD_REQUEST", INT2FIX(BadRequest));
+  rb_define_const(rb_cXErrorEvent, "BAD_VALUE", INT2FIX(BadValue));
+  rb_define_const(rb_cXErrorEvent, "BAD_WINDOW", INT2FIX(BadWindow));
+  rb_define_const(rb_cXErrorEvent, "BAD_PIXMAP", INT2FIX(BadPixmap));
+  rb_define_const(rb_cXErrorEvent, "BAD_ATOM", INT2FIX(BadAtom));
+  rb_define_const(rb_cXErrorEvent, "BAD_CURSOR", INT2FIX(BadCursor));
+  rb_define_const(rb_cXErrorEvent, "BAD_FONT", INT2FIX(BadFont));
+  rb_define_const(rb_cXErrorEvent, "BAD_MATCH", INT2FIX(BadMatch));
+  rb_define_const(rb_cXErrorEvent, "BAD_DRAWABLE", INT2FIX(BadDrawable));
+  rb_define_const(rb_cXErrorEvent, "BAD_ACCESS", INT2FIX(BadAccess));
+  rb_define_const(rb_cXErrorEvent, "BAD_ALLOC", INT2FIX(BadAlloc));
+  rb_define_const(rb_cXErrorEvent, "BAD_COLOR", INT2FIX(BadColor));
+  rb_define_const(rb_cXErrorEvent, "BAD_GC", INT2FIX(BadGC));
+  rb_define_const(rb_cXErrorEvent, "BAD_ID_CHOICE", INT2FIX(BadIDChoice));
+  rb_define_const(rb_cXErrorEvent, "BAD_NAME", INT2FIX(BadName));
+  rb_define_const(rb_cXErrorEvent, "BAD_LENGTH", INT2FIX(BadLength));
+  rb_define_const(rb_cXErrorEvent, "BAD_IMPLEMENTATION", INT2FIX(BadImplementation));
+  rb_define_const(rb_cXErrorEvent, "FIRST_EXTENSION_ERROR", INT2FIX(FirstExtensionError));
+  rb_define_const(rb_cXErrorEvent, "LAST_EXTENSION_ERROR", INT2FIX(LastExtensionError));
+}

data/ext/libx11_ruby/xevent.c

@@ -0,0 +1,132 @@
+#include "libx11_ruby.h"
+#include <X11/Xlib.h>
+
+VALUE rb_cXEvent;
+
+extern rb_data_type_t display_type;
+
+static void
+xevent_dfree(void *arg)
+{
+  XEvent *event = arg;
+  free(event);
+}
+
+static size_t
+xevent_dsize(const void *arg)
+{
+  const XEvent *event = arg;
+  return sizeof(event);
+}
+
+const rb_data_type_t xevent_type = {
+  .wrap_struct_name = "libx11_xevent",
+  .function = {
+    .dmark = NULL,
+    .dfree = xevent_dfree,
+    .dsize = xevent_dsize,
+    .reserved = { NULL, NULL },
+  },
+  .parent = NULL,
+  .data = NULL,
+  .flags = RUBY_TYPED_FREE_IMMEDIATELY,
+};
+
+/*
+ * Xlib XNextEvent
+ */
+static VALUE
+rb_libx11_xnext_event(VALUE self, VALUE obj)
+{
+  Display *display;
+  XEvent *event;
+
+  TypedData_Get_Struct(obj, Display, &display_type, display);
+
+  event = (XEvent *)malloc(sizeof(XEvent));
+  XNextEvent(display, event);
+  return TypedData_Wrap_Struct(rb_cXEvent, &xevent_type, event);
+}
+
+static VALUE
+rb_xevent_type(VALUE self)
+{
+  XEvent *event;
+
+  TypedData_Get_Struct(self, XEvent, &xevent_type, event);
+  return INT2NUM(event->type);
+}
+
+void
+Init_libx11_xevent(void)
+{
+  rb_define_singleton_method(rb_mLibX11, "xnext_event", rb_libx11_xnext_event, 1);
+
+  rb_cXEvent = rb_define_class_under(rb_mLibX11, "XEvent", rb_cData);
+  rb_define_method(rb_cXEvent, "type", rb_xevent_type, 0);
+
+  // event masks
+  rb_define_const(rb_cXEvent, "NO_EVENT_MASK", LONG2NUM(NoEventMask));
+  rb_define_const(rb_cXEvent, "KEY_PRESS_MASK", LONG2NUM(KeyPressMask));
+  rb_define_const(rb_cXEvent, "KEY_RELEASE_MASK", LONG2NUM(KeyReleaseMask));
+  rb_define_const(rb_cXEvent, "BUTTON_PRESS_MASK", LONG2NUM(ButtonPressMask));
+  rb_define_const(rb_cXEvent, "BUTTON_RELEASE_MASK", LONG2NUM(ButtonReleaseMask));
+  rb_define_const(rb_cXEvent, "ENTER_WINDOW_MASK", LONG2NUM(EnterWindowMask));
+  rb_define_const(rb_cXEvent, "LEAVE_WINDOW_MASK", LONG2NUM(LeaveWindowMask));
+  rb_define_const(rb_cXEvent, "POINTER_MOTION_MASK", LONG2NUM(PointerMotionMask));
+  rb_define_const(rb_cXEvent, "POINTER_MOTION_HINT_MASK", LONG2NUM(PointerMotionHintMask));
+  rb_define_const(rb_cXEvent, "BUTTON1_MOTION_MASK", LONG2NUM(Button1MotionMask));
+  rb_define_const(rb_cXEvent, "BUTTON2_MOTION_MASK", LONG2NUM(Button2MotionMask));
+  rb_define_const(rb_cXEvent, "BUTTON3_MOTION_MASK", LONG2NUM(Button3MotionMask));
+  rb_define_const(rb_cXEvent, "BUTTON4_MOTION_MASK", LONG2NUM(Button4MotionMask));
+  rb_define_const(rb_cXEvent, "BUTTON5_MOTION_MASK", LONG2NUM(Button5MotionMask));
+  rb_define_const(rb_cXEvent, "BUTTON_MOTION_MASK", LONG2NUM(ButtonMotionMask));
+  rb_define_const(rb_cXEvent, "KEYMAP_STATE_MASK", LONG2NUM(KeymapStateMask));
+  rb_define_const(rb_cXEvent, "EXPOSURE_MASK", LONG2NUM(ExposureMask));
+  rb_define_const(rb_cXEvent, "VISIBILITY_CHANGE_MASK", LONG2NUM(VisibilityChangeMask));
+  rb_define_const(rb_cXEvent, "STRUCTURE_NOTIFY_MASK", LONG2NUM(StructureNotifyMask));
+  rb_define_const(rb_cXEvent, "RESIZE_REDIRECT_MASK", LONG2NUM(ResizeRedirectMask));
+  rb_define_const(rb_cXEvent, "SUBSTRUCTURE_NOTIFY_MASK", LONG2NUM(SubstructureNotifyMask));
+  rb_define_const(rb_cXEvent, "SUBSTRUCTURE_REDIRECT_MASK", LONG2NUM(SubstructureRedirectMask));
+  rb_define_const(rb_cXEvent, "FOCUS_CHANGE_MASK", LONG2NUM(FocusChangeMask));
+  rb_define_const(rb_cXEvent, "PROPERTY_CHANGE_MASK", LONG2NUM(PropertyChangeMask));
+  rb_define_const(rb_cXEvent, "COLORMAP_CHANGE_MASK", LONG2NUM(ColormapChangeMask));
+  rb_define_const(rb_cXEvent, "OWNER_GRAB_BUTTON_MASK", LONG2NUM(OwnerGrabButtonMask));
+
+  // event
+  rb_define_const(rb_cXEvent, "KEY_PRESS", INT2FIX(KeyPress));
+  rb_define_const(rb_cXEvent, "KEY_RELEASE", INT2FIX(KeyRelease));
+  rb_define_const(rb_cXEvent, "BUTTON_PRESS", INT2FIX(ButtonPress));
+  rb_define_const(rb_cXEvent, "BUTTON_RELEASE", INT2FIX(ButtonRelease));
+  rb_define_const(rb_cXEvent, "MOTION_NOTIFY", INT2FIX(MotionNotify));
+  rb_define_const(rb_cXEvent, "ENTER_NOTIFY", INT2FIX(EnterNotify));
+  rb_define_const(rb_cXEvent, "LEAVE_NOTIFY", INT2FIX(LeaveNotify));
+  rb_define_const(rb_cXEvent, "FOCUS_IN", INT2FIX(FocusIn));
+  rb_define_const(rb_cXEvent, "FOCUS_OUT", INT2FIX(FocusOut));
+  rb_define_const(rb_cXEvent, "KEYMAP_NOTIFY", INT2FIX(KeymapNotify));
+  rb_define_const(rb_cXEvent, "EXPOSE", INT2FIX(Expose));
+  rb_define_const(rb_cXEvent, "GRAPHICS_EXPOSE", INT2FIX(GraphicsExpose));
+  rb_define_const(rb_cXEvent, "NO_EXPOSE", INT2FIX(NoExpose));
+  rb_define_const(rb_cXEvent, "VISIBILITY_NOTIFY", INT2FIX(VisibilityNotify));
+  rb_define_const(rb_cXEvent, "CREATE_NOTIFY", INT2FIX(CreateNotify));
+  rb_define_const(rb_cXEvent, "DESTROY_NOTIFY", INT2FIX(DestroyNotify));
+  rb_define_const(rb_cXEvent, "UNMAP_NOTIFY", INT2FIX(UnmapNotify));
+  rb_define_const(rb_cXEvent, "MAP_NOTIFY", INT2FIX(MapNotify));
+  rb_define_const(rb_cXEvent, "MAP_REQUEST", INT2FIX(MapRequest));
+  rb_define_const(rb_cXEvent, "REPARENT_NOTIFY", INT2FIX(ReparentNotify));
+  rb_define_const(rb_cXEvent, "CONFIGURE_NOTIFY", INT2FIX(ConfigureNotify));
+  rb_define_const(rb_cXEvent, "CONFIGURE_REQUEST", INT2FIX(ConfigureRequest));
+  rb_define_const(rb_cXEvent, "GRAVITY_NOTIFY", INT2FIX(GravityNotify));
+  rb_define_const(rb_cXEvent, "RESIZE_REQUEST", INT2FIX(ResizeRequest));
+  rb_define_const(rb_cXEvent, "CIRCULATE_NOTIFY", INT2FIX(CirculateNotify));
+  rb_define_const(rb_cXEvent, "CIRCULATE_REQUEST", INT2FIX(CirculateRequest));
+  rb_define_const(rb_cXEvent, "PROPERTY_NOTIFY", INT2FIX(PropertyNotify));
+  rb_define_const(rb_cXEvent, "SELECTION_CLEAR", INT2FIX(SelectionClear));
+  rb_define_const(rb_cXEvent, "SELECTION_REQUEST", INT2FIX(SelectionRequest));
+  rb_define_const(rb_cXEvent, "SELKECTION_NOTIFY", INT2FIX(SelectionNotify));
+  rb_define_const(rb_cXEvent, "COLORMAP_NOTIFY", INT2FIX(ColormapNotify));
+  rb_define_const(rb_cXEvent, "CLIENT_MESSAGE", INT2FIX(ClientMessage));
+  rb_define_const(rb_cXEvent, "MAPPING_NOTIFY", INT2FIX(MappingNotify));
+  rb_define_const(rb_cXEvent, "GENERIC_EVENT", INT2FIX(GenericEvent));
+  rb_define_const(rb_cXEvent, "LAST_EVENT", INT2FIX(LASTEvent));
+}

data/lib/libx11/version.rb

@@ -1,3 +1,3 @@
 module LibX11
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

data/libx11.gemspec

@@ -9,8 +9,8 @@ Gem::Specification.new do |spec|
   spec.authors       = ['Takashi Kokubun']
   spec.email         = ['takashikkbn@gmail.com']
 
-  spec.summary       = 'Ruby binding for libx11 including xlib'
-  spec.description   = 'Ruby binding for libx11 including xlib'
+  spec.summary       = 'Ruby binding of libx11 mostly for xlib'
+  spec.description   = 'Ruby binding of libx11 mostly for xlib'
   spec.homepage      = 'https://github.com/k0kubun/libx11-ruby'
   spec.license       = 'MIT'
 
@@ -24,4 +24,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rake-compiler'
   spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_development_dependency 'pry-byebug'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libx11
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Takashi Kokubun
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-06 00:00:00.000000000 Z
+date: 2016-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,7 +66,21 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-description: Ruby binding for libx11 including xlib
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Ruby binding of libx11 mostly for xlib
 email:
 - takashikkbn@gmail.com
 executables: []
@@ -84,12 +98,14 @@ files:
 - bin/console
 - bin/setup
 - example/create_window.rb
+- example/window_manager.rb
 - ext/libx11_ruby/display.c
-- ext/libx11_ruby/event.c
 - ext/libx11_ruby/extconf.rb
 - ext/libx11_ruby/libx11_ruby.c
 - ext/libx11_ruby/libx11_ruby.h
 - ext/libx11_ruby/window.c
+- ext/libx11_ruby/xerror_event.c
+- ext/libx11_ruby/xevent.c
 - lib/libx11.rb
 - lib/libx11/version.rb
 - libx11.gemspec
@@ -116,6 +132,6 @@ rubyforge_project:
 rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: Ruby binding for libx11 including xlib
+summary: Ruby binding of libx11 mostly for xlib
 test_files: []
 has_rdoc: 

data/ext/libx11_ruby/event.c

@@ -1,70 +0,0 @@
-#include "libx11_ruby.h"
-#include <X11/Xlib.h>
-
-VALUE rb_cXEvent;
-
-extern rb_data_type_t display_type;
-
-static void
-xevent_dfree(void *arg)
-{
-  XEvent *event = arg;
-  free(event);
-}
-
-static size_t
-xevent_dsize(const void *arg)
-{
-  const XEvent *event = arg;
-  return sizeof(event);
-}
-
-const rb_data_type_t xevent_type = {
-  .wrap_struct_name = "libx11_xevent",
-  .function = {
-    .dmark = NULL,
-    .dfree = xevent_dfree,
-    .dsize = xevent_dsize,
-    .reserved = { NULL, NULL },
-  },
-  .parent = NULL,
-  .data = NULL,
-  .flags = RUBY_TYPED_FREE_IMMEDIATELY,
-};
-
-/*
- * Xlib XNextEvent
- */
-static VALUE
-rb_libx11_xnext_event(VALUE self, VALUE obj)
-{
-  Display *display;
-  XEvent *event;
-
-  TypedData_Get_Struct(obj, Display, &display_type, display);
-
-  event = (XEvent *)malloc(sizeof(XEvent));
-  XNextEvent(display, event);
-  return TypedData_Wrap_Struct(rb_cXEvent, &xevent_type, event);
-}
-
-static VALUE
-rb_xevent_type(VALUE self)
-{
-  XEvent *event;
-
-  TypedData_Get_Struct(self, XEvent, &xevent_type, event);
-  return INT2NUM(event->type);
-}
-
-void
-Init_libx11_event(void)
-{
-  rb_define_singleton_method(rb_mLibX11, "xnext_event", rb_libx11_xnext_event, 1);
-
-  rb_cXEvent = rb_define_class_under(rb_mLibX11, "XEvent", rb_cData);
-  rb_define_method(rb_cXEvent, "type", rb_xevent_type, 0);
-
-  rb_define_const(rb_cXEvent, "KEY_PRESS_MASK", LONG2FIX(KeyPressMask));
-  rb_define_const(rb_cXEvent, "KEY_PRESS", INT2FIX(KeyPress));
-}