xlib-objects 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d9c4da9ee32958e2f1e4e43b8835fdd448296e97
-  data.tar.gz: 785ff3eebe82631886e79e7dbb557c32b61bc6d0
+  metadata.gz: 618e5374b429ba0d48824d30e13d755e4664408e
+  data.tar.gz: 915a8a62603ae84bab9a479f6298a38a3417f3bd
 SHA512:
-  metadata.gz: 14374fec2bf80b0107b7c6caff07e1c9a0d532a9378cd85a70a9bf41491526043f48dc82b6d9203467e93d1ff449f2d3ea002d77a040e1512d74887413110482
-  data.tar.gz: 2acfd879198ce45c68c55230eff53d429d4c40fe128fa7272c910b5ad59a1485dc1f2673f445db33ec3cec06f56ad44341c12566a120bbec464eca6bdb151e81
+  metadata.gz: 25ee4211bff0abea0ae06c1e9d19501e21128580207afc41cfa049d7d1e5b79a9b261202025eed789746634c9266ff97f9c761aef65aeb7c94868f065d172740
+  data.tar.gz: 02387a2ad113840131cf87501f433746e10e4eb9759e11c87953ce6df0f83fb4f3f8afcb2d665782c352f2f1c66bdc813555e4659e112eb77794fe474b4bafb7

data/lib/display.rb

@@ -45,7 +45,35 @@ module XlibObj
       handle_event(next_event) while pending_events > 0
     end
 
+    def on_error(&callback)
+      @error_handler = if callback
+        FFI::Function.new(:pointer, [:pointer, :pointer]) do |display_ptr, error_ptr|
+          next if display_ptr != to_native
+          x_error = Xlib::XErrorEvent.new(error_ptr)
+          callback.call Error.new(self, x_error)
+        end
+      else
+        nil
+      end
+
+      Xlib.XSetErrorHandler(@error_handler)
+    end
+
+    def on_io_error(&callback)
+      @io_error_handler = if callback
+        FFI::Function.new(:pointer, [:pointer]) do |display_ptr|
+          next if display_ptr != to_native
+          callback.call
+        end
+      else
+        nil
+      end
+
+      Xlib.XSetIOErrorHandler(@io_error_handler)
+    end
+
     private
+
     def pending_events
       Xlib.XPending(to_native)
     end

data/lib/error.rb

@@ -0,0 +1,87 @@
+#
+# Copyright (c) 2014 Christopher Aue <mail@christopheraue.net>
+#
+# This file is part of the ruby xlib-objects gem. It is subject to the license
+# terms in the LICENSE file found in the top-level directory of this
+# distribution and at http://github.com/christopheraue/ruby-xlib-objects.
+#
+
+module XlibObj
+  class Error
+    def initialize(display, error)
+      @display = display
+      @error = error
+    end
+
+    def code
+      @error[:error_code]
+    end
+
+    def minor_code
+      @error[:minor_code]
+    end
+
+    def request
+      @error[:request_code]
+    end
+
+    def resource
+      @error[:resourceid]
+    end
+
+    def description
+      "#{general_description}\n" <<
+      " #{code_description}\n" <<
+      ((code >= 128) ? " #{minor_code_description}\n" : "") <<
+      " #{resource_description}"
+    end
+
+    def general_description
+      type_size = 2**16
+      type = FFI::MemoryPointer.new(:char, type_size)
+      Xlib.XGetErrorDatabaseText(@display.to_native, @display.name, 'XError', 'X Error', type,
+        type_size)
+
+      details_size = 2**16
+      details = FFI::MemoryPointer.new(:char, details_size)
+      Xlib.XGetErrorText(@display.to_native, code, details, details_size)
+
+      "#{type.read_string}: #{details.read_string}"
+    end
+
+    def code_description
+      message_size = 2**16
+      message = FFI::MemoryPointer.new(:char, message_size)
+      Xlib.XGetErrorDatabaseText(@display.to_native, @display.name, 'MajorCode',
+        'Request Major code %d', message, message_size)
+      message.read_string.gsub('%d', code.to_s)
+    end
+
+    def minor_code_description
+      message_size = 2**16
+      message = FFI::MemoryPointer.new(:char, message_size)
+      Xlib.XGetErrorDatabaseText(@display.to_native, @display.name, 'MinorCode',
+        'Request Minor code %d', message, message_size)
+      message.read_string.gsub('%d', minor_code.to_s)
+    end
+
+    def resource_description
+      message_size = 2**16
+      message = FFI::MemoryPointer.new(:char, message_size)
+
+      if [Xlib::BadWindow, Xlib::BadPixmap, Xlib::BadCursor, Xlib::BadFont, Xlib::BadDrawable,
+        Xlib::BadColor, Xlib::BadGC, Xlib::BadIDChoice].include?(code)
+        Xlib.XGetErrorDatabaseText(@display.to_native, @display.name, "ResourceID",
+          "ResourceID 0x%x", message, message_size)
+      elsif code == Xlib::BadValue
+        Xlib.XGetErrorDatabaseText(@display.to_native, @display.name, "Value", "Value 0x%x",
+          message, message_size)
+      elsif code == Xlib::BadAtom
+        Xlib.XGetErrorDatabaseText(@display.to_native, @display.name, "AtomID", "AtomID 0x%x",
+          message, message_size)
+      end
+
+      message.read_string.gsub('%x', resource.to_s)
+    end
+  end
+end

data/lib/xlib-objects.rb

@@ -13,6 +13,7 @@ module XlibObj; end
 require_relative 'atom'
 require_relative 'display'
 require_relative 'event'
+require_relative 'error'
 require_relative 'event/client_message'
 require_relative 'screen'
 require_relative 'screen/crtc'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xlib-objects
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Christopher Aue
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-29 00:00:00.000000000 Z
+date: 2015-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xlib
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -74,6 +74,7 @@ extra_rdoc_files: []
 files:
 - lib/atom.rb
 - lib/display.rb
+- lib/error.rb
 - lib/event.rb
 - lib/event/client_message.rb
 - lib/screen.rb
@@ -103,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: A light object wrapper around xlib