uh 2.0.0.pre2 → 2.0.0.pre3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae8112ff62f6b50b0350600aac2b425a32c849a0
-  data.tar.gz: 7d8b94bfd7fb873c1ec83c46be51864342c64f5f
+  metadata.gz: 822c274d968c118bede18ca1963d4581d57a50a7
+  data.tar.gz: 70602803d3ef15b5b3af601ae4fc770b606cc36e
 SHA512:
-  metadata.gz: f61e009049dbc020a4b09b5b6848f8adc398e98899cf10740325b3e1767497a1b499fcef7f76a6f64562ac3e7253fa75eba99e7041d826eb0fe1771d4470ebb3
-  data.tar.gz: 3d68373f04fbbe0214b02c76468166502cd0b33e51dd53c50c6b2d4a017311bb80af2b983e634e72df28f1231135dfec748128f5d18ade7b72b721263e990737
+  metadata.gz: 85142b605aac3ebbc9937d1a5243e8c4efaa32378fec1c356a410e39c7fd90c558d36d0beac3379cb160ca5777fcaa7e3109d5ce0ccc37e4eb4362c284c782eb
+  data.tar.gz: 87e3ae605479e288ecd2ae0d2ae75b4428bdac14515d7a94a3ebd7dd02d9df4ad494e25c2607455616fcfcc4d8af9b52cca1ebc76808d26efe3b77d312f94b3a

data/README.md

@@ -0,0 +1,18 @@
+uh
+==
+
+[![Version      ][badge-version-img]][badge-version-uri]
+[![Build status ][badge-build-img]][badge-build-uri]
+[![Code Climate ][badge-cclimate-img]][badge-cclimate-uri]
+
+
+  Minimalistic Xlib toolkit.
+
+
+
+[badge-version-img]:  https://img.shields.io/gem/v/uh.svg?style=flat-square
+[badge-version-uri]:  https://rubygems.org/gems/uh
+[badge-build-img]:    https://img.shields.io/travis/tjouan/uh/master.svg?style=flat-square
+[badge-build-uri]:    https://travis-ci.org/tjouan/uh
+[badge-cclimate-img]: https://img.shields.io/codeclimate/github/tjouan/uh.svg?style=flat-square
+[badge-cclimate-uri]: https://codeclimate.com/github/tjouan/uh

data/ext/uh/extconf.rb

@@ -1,7 +1,6 @@
 require 'mkmf'
 
-fail 'libX11 is required'       unless have_library 'X11'
-fail 'libXinerama is required'  unless have_library 'Xinerama'
+%w[X11 Xinerama].each { |e| fail "lib#{e} is required" unless have_library e }
 
 $CFLAGS << ' -std=c99 -Wall'
 if %w[DEBUG VALGRIND].any? { |e| ENV.key? e }

data/lib/uh.rb

@@ -1,21 +1,15 @@
 require 'uh/uh'
 require 'uh/display'
-require 'uh/drawable'
 require 'uh/events'
 require 'uh/events/event'
 require 'uh/font'
 require 'uh/geo'
 require 'uh/geo_accessors'
-require 'uh/pixmap'
 require 'uh/screen'
 require 'uh/version'
 require 'uh/window'
 
 module Uh
-  Error               = Class.new(StandardError)
-  RuntimeError        = Class.new(RuntimeError)
-  ArgumentError       = Class.new(Error)
-
   KEY_MODIFIERS = {
     shift:  1 << 0,
     lock:   1 << 1,

data/lib/uh/display.rb

@@ -4,6 +4,18 @@ module Uh
       ENV['DISPLAY']
     end
 
+    def check!
+      fail DisplayError, 'display not opened' unless opened?
+    end
+
+    def color_by_name(color_name)
+      Color.new(self, color_name)
+    end
+
+    def create_pixmap(width, height)
+      Pixmap.new(self, width, height)
+    end
+
     def create_window(geo)
       root.create geo
     end
@@ -19,5 +31,9 @@ module Uh
     def pending?
       pending > 0
     end
+
+    def query_font
+      Font.new(self)
+    end
   end
 end

data/lib/uh/version.rb

@@ -1,3 +1,3 @@
 module Uh
-  VERSION = '2.0.0.pre2'.freeze
+  VERSION = '2.0.0.pre3'.freeze
 end

data/lib/uh/window.rb

@@ -7,33 +7,5 @@ module Uh
     def ==(other)
       id == other.id
     end
-
-    def configure(geo)
-      _configure geo.x, geo.y, geo.width, geo.height
-      self
-    end
-
-    def configure_event(geo)
-      _configure_event geo.x, geo.y, geo.width, geo.height
-      self
-    end
-
-    def create(geo)
-      _create geo.x, geo.y, geo.width, geo.height
-    end
-
-    def create_sub(geo)
-      _create_sub geo.x, geo.y, geo.width, geo.height
-    end
-
-    def moveresize(geo)
-      _moveresize geo.x, geo.y, geo.width, geo.height
-      self
-    end
-
-    def show
-      map
-      self
-    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uh
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre2
+  version: 2.0.0.pre3
 platform: ruby
 authors:
 - Thibault Jouan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-21 00:00:00.000000000 Z
+date: 2015-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.5'
+        version: '5.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.5'
+        version: '5.6'
 - !ruby/object:Gem::Dependency
   name: minitest-reporters
   requirement: !ruby/object:Gem::Requirement
@@ -66,46 +66,43 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: headless
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 description: uh
 email: tj@a13.fr
 executables: []
 extensions:
 - ext/uh/extconf.rb
-extra_rdoc_files: []
+extra_rdoc_files:
+- README.md
 files:
-- ".gitignore"
-- ".travis.yml"
-- Gemfile
-- Guardfile
-- LICENSE
-- Rakefile
-- ext/uh/color.c
-- ext/uh/display.c
-- ext/uh/event.c
+- README.md
 - ext/uh/extconf.rb
-- ext/uh/font.c
-- ext/uh/pixmap.c
-- ext/uh/screen.c
-- ext/uh/uh.c
-- ext/uh/uh.h
-- ext/uh/window.c
 - lib/uh.rb
 - lib/uh/display.rb
-- lib/uh/drawable.rb
 - lib/uh/events.rb
 - lib/uh/events/event.rb
 - lib/uh/font.rb
 - lib/uh/geo.rb
 - lib/uh/geo_accessors.rb
-- lib/uh/pixmap.rb
 - lib/uh/screen.rb
 - lib/uh/version.rb
 - lib/uh/window.rb
-- test/test_helper.rb
-- test/uh/test_geo.rb
-- uh.gemspec
 homepage: https://rubygems.org/gems/uh
-licenses: []
+licenses:
+- BSD-3-Clause
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -127,6 +124,4 @@ rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Xlib simplified toolkit
-test_files:
-- test/test_helper.rb
-- test/uh/test_geo.rb
+test_files: []

data/.gitignore

@@ -1,4 +0,0 @@
-/Gemfile-custom.rb
-/Gemfile.lock
-/lib/uh/*.so
-/tmp/

data/.travis.yml

@@ -1,7 +0,0 @@
-language: ruby
-rvm:
-  - 2.2
-  - ruby-head
-  - 2.0
-  - 2.1
-  - rbx-2

data/Gemfile

@@ -1,5 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec
-
-eval File.read('Gemfile-custom.rb') if File.exist?('Gemfile-custom.rb')

data/Guardfile

@@ -1,7 +0,0 @@
-directories %w[lib test]
-
-guard :minitest do
-  watch(%r{\Atest/(.*)\/?test_(.*)\.rb$})
-  watch(%r{\Alib/(.*/)?([^/]+)\.rb$})     { |m| "test/#{m[1]}test_#{m[2]}.rb" }
-  watch(%r{\Atest/test_helper\.rb$})      { 'test' }
-end

data/LICENSE

@@ -1,30 +0,0 @@
-Copyright 2014 Thibault Jouan. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-  * Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-
-  * Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in
-    the documentation and/or other materials provided with the
-    distribution.
-
-  * Neither the name of the software nor the names of its contributors
-    may be used to endorse or promote products derived from this
-    software without specific prior written permission.
-
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS
-BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

data/Rakefile

@@ -1,13 +0,0 @@
-require 'rake/extensiontask'
-require 'rake/testtask'
-
-task default: :test
-
-Rake::ExtensionTask.new('uh') do |t|
-  t.lib_dir = 'lib/uh'
-end
-
-Rake::TestTask.new(test: :compile) do |t|
-  t.libs      << 'lib' << 'test'
-  t.pattern   = 'test/**/test_*.rb'
-end

data/ext/uh/color.c

@@ -1,12 +0,0 @@
-#include "uh.h"
-
-
-VALUE color_make(unsigned long pixel) {
-  VALUE obj;
-  VALUE args[0];
-
-  obj = rb_class_new_instance(0, args, cColor);
-  rb_ivar_set(obj, rb_intern("@pixel"), LONG2NUM(pixel));
-
-  return obj;
-}

data/ext/uh/display.c

@@ -1,242 +0,0 @@
-#include "uh.h"
-
-
-#define SET_DISPLAY(x) \
-  UhDisplay *display;\
-  Data_Get_Struct(x, UhDisplay, display);
-
-#define DPY display->dpy
-
-
-VALUE rdisplay_error_handler = Qnil;
-
-int display_x_error_handler(Display *dpy, XErrorEvent *e);
-
-
-VALUE display_s_on_error(VALUE klass) {
-  if (!rb_block_given_p()) {
-    rb_raise(rb_eArgError, "no block given");
-  }
-
-  rdisplay_error_handler = rb_block_proc();
-  rb_global_variable(&rdisplay_error_handler);
-
-  return Qnil;
-}
-
-
-VALUE display_alloc(VALUE klass) {
-  UhDisplay *display;
-
-  return Data_Make_Struct(klass, UhDisplay, 0, free, display);
-}
-
-
-VALUE display_close(VALUE self) {
-  SET_DISPLAY(self);
-
-  if (DPY) {
-    XCloseDisplay(DPY);
-  }
-  else {
-    rb_raise(eDisplayError, "cannot close display");
-  }
-
-  return self;
-}
-
-VALUE display_color_by_name(VALUE self, VALUE rcolor) {
-  Colormap  map;
-  XColor    color;
-  SET_DISPLAY(self);
-
-  map = DefaultColormap(DPY, SCREEN_DEFAULT);
-
-  if (!XAllocNamedColor(DPY, map, RSTRING_PTR(rcolor), &color, &color))
-    rb_raise(rb_eArgError, "invalid color name `%s'", RSTRING_PTR(rcolor));
-
-  return color_make(color.pixel);
-}
-
-VALUE display_create_pixmap(VALUE self, VALUE width, VALUE height) {
-  Pixmap pixmap;
-  SET_DISPLAY(self);
-
-  pixmap = XCreatePixmap(DPY, ROOT_DEFAULT, FIX2INT(width), FIX2INT(height),
-    DefaultDepth(DPY, SCREEN_DEFAULT)
-  );
-
-  return pixmap_make(DPY, pixmap, width, height);
-}
-
-VALUE display_fileno(VALUE self) {
-  SET_DISPLAY(self);
-
-  return INT2FIX(XConnectionNumber(DPY));
-}
-
-VALUE display_flush(VALUE self) {
-  SET_DISPLAY(self);
-
-  return INT2FIX(XFlush(DPY));
-}
-
-VALUE display_each_event(VALUE self) {
-  XEvent xev;
-  SET_DISPLAY(self);
-
-  while (1) {
-    XNextEvent(DPY, &xev);
-    rb_yield(event_make(&xev));
-  }
-
-  return Qnil;
-}
-
-VALUE display_grab_key(VALUE self, VALUE key, VALUE modifier) {
-  KeySym      ks;
-  KeyCode     kc;
-  SET_DISPLAY(self);
-
-  ks = XStringToKeysym(RSTRING_PTR(key));
-  if (ks == NoSymbol)
-    rb_raise(rb_eArgError, "invalid KeySym %s", RSTRING_PTR(key));
-
-  kc = XKeysymToKeycode(DPY, ks);
-  if (kc == 0)
-    rb_raise(rb_eArgError, "keysym XK_%s has no keycode", RSTRING_PTR(key));
-
-  XGrabKey(DPY, kc, FIX2INT(modifier), ROOT_DEFAULT, True,
-    GrabModeAsync, GrabModeAsync);
-
-  return Qnil;
-}
-
-VALUE display_listen_events(int argc, VALUE *argv, VALUE self) {
-  VALUE   arg1;
-  VALUE   arg2;
-  Window  window;
-  long    mask;
-  SET_DISPLAY(self);
-
-  if (rb_scan_args(argc, argv, "11", &arg1, &arg2) == 2) {
-    window = window_id(arg1);
-    mask   = FIX2LONG(arg2);
-  }
-  else {
-    window = ROOT_DEFAULT;
-    mask   = FIX2LONG(arg1);
-  }
-
-  XSelectInput(DPY, window, mask);
-
-  return Qnil;
-}
-
-VALUE display_next_event(VALUE self) {
-  XEvent xev;
-  SET_DISPLAY(self);
-
-  XNextEvent(DPY, &xev);
-
-  return event_make(&xev);
-}
-
-VALUE display_open(VALUE self) {
-  SET_DISPLAY(self);
-
-  if (!(DPY = XOpenDisplay(NULL))) {
-    rb_raise(eDisplayError, "cannot open display");
-  }
-
-  XSetErrorHandler(display_x_error_handler);
-
-  return self;
-}
-
-VALUE display_pending(VALUE self) {
-  SET_DISPLAY(self);
-
-  return INT2FIX(XPending(DPY));
-}
-
-VALUE display_query_font(VALUE self) {
-  XFontStruct *xfs;
-  VALUE       font;
-  SET_DISPLAY(self);
-
-  if (!(xfs = XQueryFont(DPY,
-      XGContextFromGC(DefaultGC(DPY, SCREEN_DEFAULT)))))
-    return Qnil;
-
-  font = font_make(xfs->max_bounds.width, xfs->ascent, xfs->descent);
-  XFreeFontInfo(NULL, xfs, 1);
-
-  return font;
-}
-
-VALUE display_root(VALUE self) {
-  SET_DISPLAY(self);
-
-  return window_make(DPY, ROOT_DEFAULT);
-}
-
-VALUE display_screens(VALUE self) {
-  XineramaScreenInfo  *xsi;
-  int                 n;
-  VALUE               screens = rb_ary_new();
-  VALUE               args[5];
-  SET_DISPLAY(self);
-
-  if (XineramaIsActive(DPY)) {
-    xsi = XineramaQueryScreens(DPY, &n);
-
-    for (int i = 0; i < n; i++) {
-      args[0] = INT2FIX(i);
-      args[1] = INT2FIX(xsi[i].x_org);
-      args[2] = INT2FIX(xsi[i].y_org);
-      args[3] = INT2FIX(xsi[i].width);
-      args[4] = INT2FIX(xsi[i].height);
-
-      rb_ary_push(screens, rb_class_new_instance(5, args, cScreen));
-    }
-  }
-  else {
-    args[0] = INT2FIX(SCREEN_DEFAULT);
-    args[1] = INT2FIX(0);
-    args[2] = INT2FIX(0);
-    args[3] = INT2FIX(XDisplayWidth(DPY, SCREEN_DEFAULT));
-    args[4] = INT2FIX(XDisplayHeight(DPY, SCREEN_DEFAULT));
-
-    rb_ary_push(screens, rb_class_new_instance(5, args, cScreen));
-  }
-
-  return screens;
-}
-
-VALUE display_sync(VALUE self, VALUE discard) {
-  SET_DISPLAY(self);
-
-  XSync(display->dpy, RTEST(discard));
-
-  return Qnil;
-}
-
-
-int display_x_error_handler(Display *dpy, XErrorEvent *e) {
-  char msg[80];
-  char req[80];
-  char nb[80];
-
-  XGetErrorText(dpy, e->error_code, msg, sizeof msg);
-  sprintf(nb, "%d", e->request_code);
-  XGetErrorDatabaseText(dpy, "XRequest", nb, "<unknown>", req, sizeof req);
-
-  rb_funcall(rdisplay_error_handler, rb_intern("call"), 3,
-    rb_str_new_cstr(req),
-    LONG2NUM(e->resourceid),
-    rb_str_new_cstr(msg)
-  );
-
-  return 0;
-}