libx11 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 996d4981cc702796abf6b30fb2b661e5361ae55b
-  data.tar.gz: 84f21999388262f0e1160a20edc1cd78e9aac4aa
+  metadata.gz: c9d16b4125d802e8312d5ef49bdcf08f435a3243
+  data.tar.gz: f0fa4853ef29d30a55e53bfe5d7517a9a29bf018
 SHA512:
-  metadata.gz: b2f137d6b53df72a7b4253346eef3b438ebce9900ea88d9e0324d8390230253f138f726acc7721b0ea13991a1e9bad6130010f057c0c9bcb419b592e961a905a
-  data.tar.gz: 6017df38ffec47e0d79bc41f1fdfad7c2a048f220799ba8bcfe5ae0fa249a9a504dad401d56e488f2eebaf7712d224eb363bd9caeab2205160f5eb61cf1c2d30
+  metadata.gz: f07f760b72743e155d5683be2dd1c57a7842d3ade1fddd13d9bdca4092931f557c3cde87099f9c09dd75f63157fd753996a69de435de414df79dc84e1a02395f
+  data.tar.gz: bb325552f120212bd0a423517087b2e4298e41ad15ada7e8a7e4fa271b9b6f2ac149ff96277b7232c65dd15a7e2652ab68318ad3834b62c85dc78f4cfa218abf

data/HACKING.md

@@ -0,0 +1,14 @@
+## Type definitions
+
+```c
+typedef unsigned char KeyCode;
+typedef unsigned long XID;
+typedef XID Window;
+typedef XID KeySym;
+```
+
+## Macros
+
+```
+RTEST : Boolean -> Bool
+```

data/bin/window-manager

@@ -0,0 +1,8 @@
+#!/usr/bin/env ruby
+
+# Write this to ~/.xinitrc and execute `startx`. (Don't execute this directly!)
+# `exec /path/to/libx11-ruby/bin/window-manager`
+
+Dir.chdir(File.expand_path('../', __dir__)) do
+  exec('bundle', 'exec', 'ruby', 'example/window_manager.rb')
+end

data/example/window_manager.rb

@@ -5,7 +5,7 @@ class XServer
     display = LibX11.xopen_display
     yield(display)
   ensure
-    LibX11.xclose_display(display)
+    LibX11.xclose_display(display) if display
   end
 
   def self.bind_events(display, window, event_mask)
@@ -26,11 +26,15 @@ class XServer
 end
 
 XServer.with_connection do |display|
+  if display.nil?
+    abort 'Failed to connect to X server.'
+  end
+
   XServer.bind_events(
     display, display.default_root_window,
-    LibX11::XEvent::KEY_PRESS_MASK |
-    LibX11::XEvent::SUBSTRUCTURE_REDIRECT_MASK |
-    LibX11::XEvent::SUBSTRUCTURE_NOTIFY_MASK,
+    LibX11::KEY_PRESS_MASK |
+    LibX11::SUBSTRUCTURE_REDIRECT_MASK |
+    LibX11::SUBSTRUCTURE_NOTIFY_MASK,
   )
 
   LibX11.xset_error_handler do |display, error|

data/ext/libx11_ruby/constants.c

@@ -0,0 +1,56 @@
+#include "libx11_ruby.h"
+#include <X11/Xlib.h>
+
+void
+Init_libx11_constants(void)
+{
+  // reserved resource and constant definitions
+  rb_define_const(rb_mLibX11, "NONE", LONG2NUM(None));
+  rb_define_const(rb_mLibX11, "PARENT_RELATIVE", LONG2NUM(ParentRelative));
+  rb_define_const(rb_mLibX11, "COPY_FROM_PARENT", LONG2NUM(CopyFromParent));
+  rb_define_const(rb_mLibX11, "POINTER_WINDOW", LONG2NUM(PointerWindow));
+  rb_define_const(rb_mLibX11, "INPUT_FOCUS", LONG2NUM(InputFocus));
+  rb_define_const(rb_mLibX11, "POINTER_ROOT", LONG2NUM(PointerRoot));
+  rb_define_const(rb_mLibX11, "ANY_PROPERTY_TYPE", LONG2NUM(AnyPropertyType));
+  rb_define_const(rb_mLibX11, "ANY_KEY", LONG2NUM(AnyKey));
+  rb_define_const(rb_mLibX11, "ANY_BUTTON", LONG2NUM(AnyButton));
+  rb_define_const(rb_mLibX11, "ALL_TEMPORARY", LONG2NUM(AllTemporary));
+  rb_define_const(rb_mLibX11, "CURRENT_TIME", LONG2NUM(CurrentTime));
+  rb_define_const(rb_mLibX11, "NO_SYMBOL", LONG2NUM(NoSymbol));
+
+  // input event masks
+  rb_define_const(rb_mLibX11, "NO_EVENT_MASK", LONG2NUM(NoEventMask));
+  rb_define_const(rb_mLibX11, "KEY_PRESS_MASK", LONG2NUM(KeyPressMask));
+  rb_define_const(rb_mLibX11, "KEY_RELEASE_MASK", LONG2NUM(KeyReleaseMask));
+  rb_define_const(rb_mLibX11, "BUTTON_PRESS_MASK", LONG2NUM(ButtonPressMask));
+  rb_define_const(rb_mLibX11, "BUTTON_RELEASE_MASK", LONG2NUM(ButtonReleaseMask));
+  rb_define_const(rb_mLibX11, "ENTER_WINDOW_MASK", LONG2NUM(EnterWindowMask));
+  rb_define_const(rb_mLibX11, "LEAVE_WINDOW_MASK", LONG2NUM(LeaveWindowMask));
+  rb_define_const(rb_mLibX11, "POINTER_MOTION_MASK", LONG2NUM(PointerMotionMask));
+  rb_define_const(rb_mLibX11, "POINTER_MOTION_HINT_MASK", LONG2NUM(PointerMotionHintMask));
+  rb_define_const(rb_mLibX11, "BUTTON1_MOTION_MASK", LONG2NUM(Button1MotionMask));
+  rb_define_const(rb_mLibX11, "BUTTON2_MOTION_MASK", LONG2NUM(Button2MotionMask));
+  rb_define_const(rb_mLibX11, "BUTTON3_MOTION_MASK", LONG2NUM(Button3MotionMask));
+  rb_define_const(rb_mLibX11, "BUTTON4_MOTION_MASK", LONG2NUM(Button4MotionMask));
+  rb_define_const(rb_mLibX11, "BUTTON5_MOTION_MASK", LONG2NUM(Button5MotionMask));
+  rb_define_const(rb_mLibX11, "BUTTON_MOTION_MASK", LONG2NUM(ButtonMotionMask));
+  rb_define_const(rb_mLibX11, "KEYMAP_STATE_MASK", LONG2NUM(KeymapStateMask));
+  rb_define_const(rb_mLibX11, "EXPOSURE_MASK", LONG2NUM(ExposureMask));
+  rb_define_const(rb_mLibX11, "VISIBILITY_CHANGE_MASK", LONG2NUM(VisibilityChangeMask));
+  rb_define_const(rb_mLibX11, "STRUCTURE_NOTIFY_MASK", LONG2NUM(StructureNotifyMask));
+  rb_define_const(rb_mLibX11, "RESIZE_REDIRECT_MASK", LONG2NUM(ResizeRedirectMask));
+  rb_define_const(rb_mLibX11, "SUBSTRUCTURE_NOTIFY_MASK", LONG2NUM(SubstructureNotifyMask));
+  rb_define_const(rb_mLibX11, "SUBSTRUCTURE_REDIRECT_MASK", LONG2NUM(SubstructureRedirectMask));
+  rb_define_const(rb_mLibX11, "FOCUS_CHANGE_MASK", LONG2NUM(FocusChangeMask));
+  rb_define_const(rb_mLibX11, "PROPERTY_CHANGE_MASK", LONG2NUM(PropertyChangeMask));
+  rb_define_const(rb_mLibX11, "COLORMAP_CHANGE_MASK", LONG2NUM(ColormapChangeMask));
+  rb_define_const(rb_mLibX11, "OWNER_GRAB_BUTTON_MASK", LONG2NUM(OwnerGrabButtonMask));
+
+  // button masks
+  rb_define_const(rb_mLibX11, "BUTTON1_MASK", LONG2NUM(Button1Mask));
+  rb_define_const(rb_mLibX11, "BUTTON2_MASK", LONG2NUM(Button2Mask));
+  rb_define_const(rb_mLibX11, "BUTTON3_MASK", LONG2NUM(Button3Mask));
+  rb_define_const(rb_mLibX11, "BUTTON4_MASK", LONG2NUM(Button4Mask));
+  rb_define_const(rb_mLibX11, "BUTTON5_MASK", LONG2NUM(Button5Mask));
+  rb_define_const(rb_mLibX11, "ANY_MODIFIER", LONG2NUM(AnyModifier));
+}

data/ext/libx11_ruby/display.c

@@ -41,6 +41,7 @@ rb_libx11_xopen_display(int argc, VALUE *argv, RB_UNUSED_VAR(VALUE self))
     Check_Type(display_name, T_STRING);
     display = XOpenDisplay(RSTRING_PTR(display_name));
   }
+  if (display == NULL) return Qnil;
   return TypedData_Wrap_Struct(rb_cDisplay, &display_type, display);
 }
 
@@ -164,6 +165,50 @@ rb_display_xsync(VALUE self, VALUE discard)
   return INT2NUM(ret);
 }
 
+/*
+ * Xlib XGrabKey
+ */
+static VALUE
+rb_display_xgrab_key(VALUE self, VALUE keycode, VALUE modifiers, VALUE grab_window,
+    VALUE owner_events, VALUE pointer_mode, VALUE keyboard_mode)
+{
+  Display *display;
+  int ret;
+
+  TypedData_Get_Struct(self, Display, &display_type, display);
+  ret = XGrabKey(display, NUM2INT(keycode), NUM2UINT(modifiers), NUM2ULONG(grab_window),
+      RTEST(owner_events), NUM2INT(pointer_mode), NUM2INT(keyboard_mode));
+  return INT2NUM(ret);
+}
+
+/*
+ * Xlib XUngrabKey
+ */
+static VALUE
+rb_display_xungrab_key(VALUE self, VALUE keycode, VALUE modifiers, VALUE grab_window)
+{
+  Display *display;
+  int ret;
+
+  TypedData_Get_Struct(self, Display, &display_type, display);
+  ret = XUngrabKey(display, NUM2INT(keycode), NUM2UINT(modifiers), NUM2ULONG(grab_window));
+  return INT2NUM(ret);
+}
+
+/*
+ * Xlib XKeysymToKeycode
+ */
+static VALUE
+rb_display_xkeysym_to_keycode(VALUE self, VALUE keysym)
+{
+  Display *display;
+  unsigned char keycode;
+
+  TypedData_Get_Struct(self, Display, &display_type, display);
+  keycode = XKeysymToKeycode(display, NUM2ULONG(keysym));
+  return INT2FIX((int)keycode);
+}
+
 void
 Init_libx11_display(void)
 {
@@ -179,4 +224,7 @@ Init_libx11_display(void)
   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);
+  rb_define_method(rb_cDisplay, "xgrab_key", rb_display_xgrab_key, 6);
+  rb_define_method(rb_cDisplay, "xungrab_key", rb_display_xungrab_key, 3);
+  rb_define_method(rb_cDisplay, "xkeysym_to_keycode", rb_display_xkeysym_to_keycode, 1);
 }

data/ext/libx11_ruby/libx11_ruby.c

@@ -5,6 +5,7 @@ Init_libx11_ruby(void)
 {
   rb_mLibX11 = rb_define_module("LibX11");
 
+  Init_libx11_constants();
   Init_libx11_display();
   Init_libx11_window();
   Init_libx11_xerror_event();

data/ext/libx11_ruby/libx11_ruby.h

@@ -5,6 +5,7 @@
 
 VALUE rb_mLibX11;
 
+void Init_libx11_constants(void);
 void Init_libx11_display(void);
 void Init_libx11_window(void);
 void Init_libx11_xerror_event(void);

data/ext/libx11_ruby/xevent.c

@@ -65,34 +65,6 @@ Init_libx11_xevent(void)
   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));

data/lib/libx11/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libx11
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Takashi Kokubun
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-07 00:00:00.000000000 Z
+date: 2016-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -92,13 +92,16 @@ files:
 - ".rspec"
 - ".travis.yml"
 - Gemfile
+- HACKING.md
 - LICENSE.txt
 - README.md
 - Rakefile
 - bin/console
 - bin/setup
+- bin/window-manager
 - example/create_window.rb
 - example/window_manager.rb
+- ext/libx11_ruby/constants.c
 - ext/libx11_ruby/display.c
 - ext/libx11_ruby/extconf.rb
 - ext/libx11_ruby/libx11_ruby.c