uh 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 437af62d5e0ae05ad1fbc597ae4b794527225fc5
-  data.tar.gz: bfb30aba0989bc588578b0299d42281db3769a85
+  metadata.gz: 67b8a1fabce6c90b7171ae772bb59981a4a28c66
+  data.tar.gz: 7d25eeec5e12d68dbb23cd63e031ab62df4f89e0
 SHA512:
-  metadata.gz: e114af20e2c7cde643b238eaa9be23b09c5ccd09ebd488c012d6ecf087dbf3d5b543252e7c91eea1f852e9167b318111bdf231f9d9bef2716ad0c04e529c9ce8
-  data.tar.gz: c975dc914792a5772074b355d69cfd3a2c340129f5f0469e7d52212d0acf28d44a4e7763cef0f294d46746a225924ab2dc377f2aacdfea189c92b1742a406a5e
+  metadata.gz: e7d98e8cf49dae6a056339fe944beb1d25ed2f21dea828adb4650373c68c82e90db6f8d32a4296311b21c7270371c52b8f7b1dae12c9b97c256ab21217198f4e
+  data.tar.gz: 407e4325a030e84365277cc076d1ca37d0ec1f8a3252a90d35b372efca9f178bb90cf5225a3b23bcf329237d04baffda14c7151bcd1528868addbd6209cf5535

data/README.md

@@ -1,11 +1,6 @@
 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.
 
 
@@ -18,17 +13,7 @@ Similar or related code
 * https://github.com/christopheraue/ruby-xlib (gem, FFI)
 * https://github.com/rkh/ruby-xlib (C ext)
 * https://github.com/rramsden/ruby-x11 (pure ruby)
-
 * http://ruby-xlib-wrap.sourceforge.net/ (ext, SWIG)
 * http://www.moriq.com/ruby/xlib/
 * http://artengine.ca/matju/RubyX11/
 * https://github.com/mhanne/ruby-xcb (XCB, FFI)
-
-
-
-[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/display.c

@@ -133,7 +133,7 @@ VALUE display_open(VALUE self) {
   SET_DISPLAY(self);
 
   if (!(DPY = XOpenDisplay(NULL))) {
-    rb_raise(eDisplayError, "cannot open display");
+    rb_raise(eDisplayError, "cannot open display %s", getenv("DISPLAY"));
   }
 
   XSetErrorHandler(display_x_error_handler);

data/ext/uh/event.c

@@ -7,7 +7,9 @@
 
 
 VALUE event_make_event(VALUE klass, XEvent *xev);
+void event_make_configure_notify(VALUE self);
 void event_make_configure_request(VALUE self);
+void event_make_expose(VALUE self);
 void event_make_key_any(VALUE self);
 void event_make_win_any(VALUE self);
 
@@ -19,9 +21,10 @@ VALUE event_make(XEvent *xev) {
     void  (*function)(VALUE self);
   } EvClass;
   EvClass       ev_classes[] = {
+    {ConfigureNotify,   cConfigureNotify,   event_make_configure_notify},
     {ConfigureRequest,  cConfigureRequest,  event_make_configure_request},
     {DestroyNotify,     cDestroyNotify,     NULL},
-    {Expose,            cExpose,            NULL},
+    {Expose,            cExpose,            event_make_expose},
     {KeyPress,          cKeyPress,          event_make_key_any},
     {KeyRelease,        cKeyRelease,        event_make_key_any},
     {MapRequest,        cMapRequest,        NULL},
@@ -93,6 +96,15 @@ VALUE event_make_event(VALUE klass, XEvent *xev) {
   return event;
 }
 
+void event_make_configure_notify(VALUE self) {
+  SET_XEV(self);
+
+  rb_ivar_set(self, rb_intern("@x"), INT2FIX(xev->xconfigure.x));
+  rb_ivar_set(self, rb_intern("@y"), INT2FIX(xev->xconfigure.y));
+  rb_ivar_set(self, rb_intern("@width"), INT2FIX(xev->xconfigure.width));
+  rb_ivar_set(self, rb_intern("@height"), INT2FIX(xev->xconfigure.height));
+}
+
 void event_make_configure_request(VALUE self) {
   SET_XEV(self);
 
@@ -118,6 +130,15 @@ void event_make_configure_request(VALUE self) {
     LONG2NUM(xev->xconfigurerequest.detail));
 }
 
+void event_make_expose(VALUE self) {
+  SET_XEV(self);
+
+  rb_ivar_set(self, rb_intern("@x"), INT2FIX(xev->xexpose.x));
+  rb_ivar_set(self, rb_intern("@y"), INT2FIX(xev->xexpose.y));
+  rb_ivar_set(self, rb_intern("@width"), INT2FIX(xev->xexpose.width));
+  rb_ivar_set(self, rb_intern("@height"), INT2FIX(xev->xexpose.height));
+}
+
 void event_make_key_any(VALUE self) {
   KeySym ks;
   SET_XEV(self);

data/ext/uh/extconf.rb

@@ -3,7 +3,7 @@ require 'mkmf'
 %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 }
+if ENV.key? 'DEBUG'
   $CFLAGS.gsub! /-O\d\s/, '-g '
 end
 

data/ext/uh/image.c

@@ -0,0 +1,74 @@
+#include "uh.h"
+
+
+#define SET_IMAGE(x) \
+  UhImage *image;\
+  Data_Get_Struct(x, UhImage, image);
+
+#define DPY   image->dpy
+#define IMAGE image->image
+#define GC    image->gc
+
+
+void image_deallocate(UhImage *image);
+
+
+VALUE image_s_new(VALUE klass, VALUE rdisplay, VALUE rwidth, VALUE rheight, VALUE rdata) {
+  VALUE rimage;
+  SET_DISPLAY(rdisplay);
+
+  rb_funcall(rdisplay, rb_intern("check!"), 0);
+
+  StringValue(rdata);
+  rimage = image_make(
+    display->dpy,
+    FIX2INT(rwidth),
+    FIX2INT(rheight),
+    RSTRING_PTR(rdata)
+  );
+
+  return rimage;
+}
+
+
+VALUE image_put(VALUE self, VALUE rwindow) {
+  SET_IMAGE(self);
+
+  XPutImage(
+    DPY,
+    FIX2INT(rb_funcall(rwindow, rb_intern("id"), 0)),
+    GC,
+    IMAGE,
+    0, 0,
+    0, 0,
+    IMAGE->width, IMAGE->height
+  );
+
+  return Qnil;
+}
+
+
+VALUE image_make(Display *dpy, int width, int height, char *data) {
+  UhImage *image;
+  VALUE   rimage;
+
+  rimage = Data_Make_Struct(cImage, UhImage, 0, image_deallocate, image);
+  image->dpy    = dpy;
+  image->gc     = XCreateGC(dpy, ROOT_DEFAULT, 0, NULL);
+  image->image  = XCreateImage(
+    DPY,
+    DefaultVisual(DPY, DefaultScreen(DPY)),
+    DEPTH_DEFAULT,
+    ZPixmap, 0,
+    data, width, height,
+    32, 0
+  );
+
+  return rimage;
+}
+
+
+void image_deallocate(UhImage *image) {
+  XDestroyImage(IMAGE);
+  free(image);
+}

data/ext/uh/pixmap.c

@@ -8,7 +8,6 @@
 #define DPY           pixmap->dpy
 #define PIXMAP        pixmap->pixmap
 #define GC            pixmap->gc
-#define DEPTH_DEFAULT DefaultDepth(DPY, SCREEN_DEFAULT)
 
 
 void pixmap_deallocate(UhPixmap *p);

data/ext/uh/uh.c

@@ -5,6 +5,7 @@ void uh_color();
 void uh_display();
 void uh_events();
 void uh_font();
+void uh_image();
 void uh_pixmap();
 void uh_screen();
 void uh_window();
@@ -22,6 +23,7 @@ void Init_uh(void) {
   uh_display();
   uh_events();
   uh_font();
+  uh_image();
   uh_pixmap();
   uh_screen();
   uh_window();
@@ -61,6 +63,12 @@ void uh_events() {
   rb_define_attr(cEvent, "type", 1, 0);
   rb_define_attr(cEvent, "window", 1, 0);
 
+  cConfigureNotify = rb_define_class_under(mEvents, "ConfigureNotify", cEvent);
+  rb_define_attr(cConfigureNotify, "x", 1, 0);
+  rb_define_attr(cConfigureNotify, "y", 1, 0);
+  rb_define_attr(cConfigureNotify, "width", 1, 0);
+  rb_define_attr(cConfigureNotify, "height", 1, 0);
+
   cConfigureRequest = rb_define_class_under(mEvents, "ConfigureRequest", cEvent);
   rb_define_attr(cConfigureRequest, "x", 1, 0);
   rb_define_attr(cConfigureRequest, "y", 1, 0);
@@ -73,6 +81,10 @@ void uh_events() {
   cDestroyNotify = rb_define_class_under(mEvents, "DestroyNotify", cEvent);
 
   cExpose = rb_define_class_under(mEvents, "Expose", cEvent);
+  rb_define_attr(cExpose, "x", 1, 0);
+  rb_define_attr(cExpose, "y", 1, 0);
+  rb_define_attr(cExpose, "width", 1, 0);
+  rb_define_attr(cExpose, "height", 1, 0);
 
   cKeyPress = rb_define_class_under(mEvents, "KeyPress", cEvent);
   rb_define_attr(cKeyPress, "key", 1, 0);
@@ -97,6 +109,12 @@ void uh_font() {
   rb_define_attr(cFont, "descent", 1, 0);
 }
 
+void uh_image() {
+  cImage = rb_define_class_under(mUh, "Image", rb_cObject);
+  rb_define_singleton_method(cImage, "new", image_s_new, 4);
+  rb_define_method(cImage, "put", image_put, 1);
+}
+
 void uh_pixmap() {
   cPixmap = rb_define_class_under(mUh, "Pixmap", rb_cObject);
   rb_define_singleton_method(cPixmap, "new", pixmap_s_new, 3);
@@ -128,6 +146,7 @@ void uh_window() {
   rb_define_method(cWindow, "configure_event", window_configure_event, 1);
   rb_define_method(cWindow, "create", window_create, 1);
   rb_define_method(cWindow, "create_sub", window_create_sub, 1);
+  rb_define_method(cWindow, "cursor=", window_cursor_set, 1);
   rb_define_method(cWindow, "destroy", window_destroy, 0);
   rb_define_method(cWindow, "focus", window_focus, 0);
   rb_define_method(cWindow, "icccm_wm_delete", window_icccm_wm_delete, 0);

data/ext/uh/uh.h

@@ -15,9 +15,11 @@
 
 #define ROOT_DEFAULT    DefaultRootWindow(DPY)
 #define SCREEN_DEFAULT  DefaultScreen(DPY)
+#define DEPTH_DEFAULT   DefaultDepth(DPY, SCREEN_DEFAULT)
 
 
 typedef struct s_display  UhDisplay;
+typedef struct s_image    UhImage;
 typedef struct s_pixmap   UhPixmap;
 typedef struct s_window   UhWindow;
 
@@ -25,6 +27,12 @@ struct s_display {
   Display *dpy;
 };
 
+struct s_image {
+  Display *dpy;
+  GC      gc;
+  XImage  *image;
+};
+
 struct s_pixmap {
   Display *dpy;
   Pixmap  pixmap;
@@ -40,9 +48,10 @@ struct s_window {
 VALUE mUh, mEvents,
   cColor,
   cDisplay,
-  cEvent, cConfigureRequest, cDestroyNotify, cExpose, cKeyPress, cKeyRelease,
-    cMapRequest, cPropertyNotify, cUnmapNotify,
+  cEvent, cConfigureNotify, cConfigureRequest, cDestroyNotify, cExpose,
+    cKeyPress, cKeyRelease, cMapRequest, cPropertyNotify, cUnmapNotify,
   cFont,
+  cImage,
   cPixmap,
   cScreen,
   cWindow,
@@ -72,6 +81,10 @@ VALUE event_make(XEvent *xev);
 
 VALUE font_s_new(VALUE klass, VALUE rdisplay);
 
+VALUE image_s_new(VALUE klass, VALUE rdisplay, VALUE rwidth, VALUE rheight, VALUE rdata);
+VALUE image_make(Display *dpy, int w, int h, char *data);
+VALUE image_put(VALUE self, VALUE rwindow);
+
 VALUE pixmap_s_new(VALUE klass, VALUE rdisplay, VALUE rwidth, VALUE rheight);
 VALUE pixmap_copy(VALUE self, VALUE rwindow);
 VALUE pixmap_draw_rect(VALUE self, VALUE x, VALUE y, VALUE w, VALUE h);
@@ -88,6 +101,7 @@ VALUE window_configure(VALUE self, VALUE rgeo);
 VALUE window_configure_event(VALUE self, VALUE rgeo);
 VALUE window_create(VALUE self, VALUE rgeo);
 VALUE window_create_sub(VALUE self, VALUE rgeo);
+VALUE window_cursor_set(VALUE self, VALUE cursor);
 VALUE window_destroy(VALUE self);
 VALUE window_focus(VALUE self);
 VALUE window_icccm_wm_delete(VALUE self);

data/ext/uh/window.c

@@ -92,6 +92,16 @@ VALUE window_create_sub(VALUE self, VALUE rgeo) {
   return window_make(DPY, sub_win);
 }
 
+VALUE window_cursor_set(VALUE self, VALUE rcursor) {
+  Cursor cursor;
+  SET_WINDOW(self);
+
+  cursor = XCreateFontCursor(DPY, FIX2INT(rcursor));
+  XDefineCursor(DPY, WINDOW, cursor);
+
+  return Qnil;
+}
+
 VALUE window_destroy(VALUE self) {
   SET_WINDOW(self);
 

data/lib/uh.rb

@@ -10,6 +10,87 @@ require 'uh/version'
 require 'uh/window'
 
 module Uh
+  CURSORS = {
+    num_glyphs: 154,
+    x_cursor: 0,
+    arrow: 2,
+    based_arrow_down: 4,
+    based_arrow_up: 6,
+    boat: 8,
+    bogosity: 10,
+    bottom_left_corner: 12,
+    bottom_right_corner: 14,
+    bottom_side: 16,
+    bottom_tee: 18,
+    box_spiral: 20,
+    center_ptr: 22,
+    circle: 24,
+    clock: 26,
+    coffee_mug: 28,
+    cross: 30,
+    cross_reverse: 32,
+    crosshair: 34,
+    diamond_cross: 36,
+    dot: 38,
+    dotbox: 40,
+    double_arrow: 42,
+    draft_large: 44,
+    draft_small: 46,
+    draped_box: 48,
+    exchange: 50,
+    fleur: 52,
+    gobbler: 54,
+    gumby: 56,
+    hand1: 58,
+    hand2: 60,
+    heart: 62,
+    icon: 64,
+    iron_cross: 66,
+    left_ptr: 68,
+    left_side: 70,
+    left_tee: 72,
+    leftbutton: 74,
+    ll_angle: 76,
+    lr_angle: 78,
+    man: 80,
+    middlebutton: 82,
+    mouse: 84,
+    pencil: 86,
+    pirate: 88,
+    plus: 90,
+    question_arrow: 92,
+    right_ptr: 94,
+    right_side: 96,
+    right_tee: 98,
+    rightbutton: 100,
+    rtl_logo: 102,
+    sailboat: 104,
+    sb_down_arrow: 106,
+    sb_h_double_arrow: 108,
+    sb_left_arrow: 110,
+    sb_right_arrow: 112,
+    sb_up_arrow: 114,
+    sb_v_double_arrow: 116,
+    shuttle: 118,
+    sizing: 120,
+    spider: 122,
+    spraycan: 124,
+    star: 126,
+    target: 128,
+    tcross: 130,
+    top_left_arrow: 132,
+    top_left_corner: 134,
+    top_right_corner: 136,
+    top_side: 138,
+    top_tee: 140,
+    trek: 142,
+    ul_angle: 144,
+    umbrella: 146,
+    ur_angle: 148,
+    watch: 150,
+    xterm: 152,
+  }
+
   KEY_MODIFIERS = {
     shift:  1 << 0,
     lock:   1 << 1,
@@ -20,4 +101,15 @@ module Uh
     mod4:   1 << 6,
     mod5:   1 << 7
   }.freeze
+
+  class << self
+    def open
+      display = Display.new.tap &:open
+      begin
+        yield display
+      ensure
+        display.close
+      end
+    end
+  end
 end

data/lib/uh/display.rb

@@ -8,19 +8,23 @@ module Uh
       fail DisplayError, 'display not opened' unless opened?
     end
 
-    def color_by_name(color_name)
-      Color.new(self, color_name)
+    def color_by_name color_name
+      Color.new self, color_name
     end
 
-    def create_pixmap(width, height)
-      Pixmap.new(self, width, height)
+    def create_image width, height, image
+      Image.new self, width, height, image
     end
 
-    def create_window(geo)
+    def create_pixmap width, height
+      Pixmap.new self, width, height
+    end
+
+    def create_window geo
       root.create geo
     end
 
-    def create_subwindow(geo)
+    def create_subwindow geo
       root.create_sub geo
     end
 
@@ -33,7 +37,20 @@ module Uh
     end
 
     def query_font
-      Font.new(self)
+      Font.new self
+    end
+
+    def window **opts
+      window = create_window Geo.new 0, 0, 320, 240
+      listen_events window, opts[:events] if opts.key? :events
+      window.cursor opts[:cursor] if opts.key? :cursor
+      window.map
+      begin
+        yield window
+      ensure
+        window.unmap
+        window.destroy
+      end
     end
   end
 end

data/lib/uh/geo.rb

@@ -1,7 +1,7 @@
 module Uh
-  class Geo < Struct.new(:x, :y, :width, :height)
+  class Geo < Struct.new :x, :y, :width, :height
     class << self
-      def format_xgeometry(x, y, width, height)
+      def format_xgeometry x, y, width, height
         '%sx%s+%s+%s' % [
           width   ? width.to_s  : ??,
           height  ? height.to_s : ??,
@@ -11,7 +11,7 @@ module Uh
       end
     end
 
-    def initialize(*args)
+    def initialize *args
       super
       %i[width height].each do |dimension|
         check_value dimension, send(dimension)
@@ -22,20 +22,20 @@ module Uh
       self.class.format_xgeometry *values
     end
 
-    def width=(value)
+    def width= value
       check_value :width, value
       super value
     end
 
-    def height=(value)
+    def height= value
       check_value :height, value
       super value
     end
 
 
-    private
+  private
 
-    def check_value(name, value)
+    def check_value name, value
       return if value.nil?
       fail ArgumentError, "invalid #{name.to_s}: #{value}" unless value > 0
     end

data/lib/uh/screen.rb

@@ -1,7 +1,7 @@
 module Uh
   class Screen
     def geo
-      @geo ||= Geo.new(x, y, width, height)
+      @geo ||= Geo.new x, y, width, height
     end
   end
 end

data/lib/uh/version.rb

@@ -1,3 +1,3 @@
 module Uh
-  VERSION = '2.0.2'.freeze
+  VERSION = '2.0.3'.freeze
 end

data/lib/uh/window.rb

@@ -4,8 +4,12 @@ module Uh
       id.to_s
     end
 
-    def ==(other)
+    def == other
       id == other.id
     end
+
+    def cursor cursor_name
+      self.cursor = Uh::CURSORS[cursor_name]
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uh
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - Thibault Jouan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-17 00:00:00.000000000 Z
+date: 2017-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -66,21 +66,7 @@ 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
+description: 
 email: tj@a13.fr
 executables: []
 extensions:
@@ -94,6 +80,7 @@ files:
 - ext/uh/event.c
 - ext/uh/extconf.rb
 - ext/uh/font.c
+- ext/uh/image.c
 - ext/uh/pixmap.c
 - ext/uh/screen.c
 - ext/uh/uh.c
@@ -129,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Xlib simplified toolkit