uh 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d1bdf3fc9dbfc55b459073bd692630415184c49
-  data.tar.gz: a0e9eb2a0dd64f446df63900fe1986082cd75a95
+  metadata.gz: 2f36e4f78b43d16a0075b8b5d3b0a0b015956ac1
+  data.tar.gz: 610557a1bb46d231584acb65b144b622f7fd4219
 SHA512:
-  metadata.gz: 8308d3da480d36c5aad1b81ff866692516b641069f39c18a6f60ef3f7ef29d25d7d6066c7acf4e4be276560f4ac8e247261d3afae009575b20b0846967cd3216
-  data.tar.gz: aaf4e16c251f97d6d0678b277d68382b00c26a65d99ab7c385b1defb43df45e567c529a01d87cc908d6d9f25de11793612c69f513b872f2e1e4a65bdf8a63ab3
+  metadata.gz: 9bcadc9bb615c09ad13babacc2aa9d6b12fb0bf414288a738e10b2d606ac400cbd0b525dc56405ae1488129ce09edc33c78ca1101565f2d99a37b2a959c82129
+  data.tar.gz: 2b2610163cff45597f98923f8a0aa8134db231779478bccff7934c09a017a5ca01820fe40b0e07889f7f047508c0b126359a8ea3c89c227694704cccde67ab77

data/.travis.yml

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

data/ext/uh/display.c

@@ -1,6 +1,10 @@
 #include "uh.h"
 
 
+#define SET_DISPLAY(x) \
+  UhDisplay *display;\
+  Data_Get_Struct(x, UhDisplay, display);
+
 #define DPY display->dpy
 
 
@@ -25,7 +29,7 @@ VALUE display_alloc(VALUE klass) {
 
 
 VALUE display_close(VALUE self) {
-  set_display(self);
+  SET_DISPLAY(self);
 
   if (DPY) {
     XCloseDisplay(DPY);
@@ -38,9 +42,9 @@ VALUE display_close(VALUE self) {
 }
 
 VALUE display_color_by_name(VALUE self, VALUE rcolor) {
-  set_display(self);
   Colormap  map;
   XColor    color;
+  SET_DISPLAY(self);
 
   map = DefaultColormap(DPY, SCREEN_DEFAULT);
 
@@ -51,8 +55,8 @@ VALUE display_color_by_name(VALUE self, VALUE rcolor) {
 }
 
 VALUE display_create_pixmap(VALUE self, VALUE width, VALUE height) {
-  set_display(self);
   Pixmap pixmap;
+  SET_DISPLAY(self);
 
   pixmap = XCreatePixmap(DPY, ROOT_DEFAULT, FIX2INT(width), FIX2INT(height),
     DefaultDepth(DPY, SCREEN_DEFAULT)
@@ -62,20 +66,20 @@ VALUE display_create_pixmap(VALUE self, VALUE width, VALUE height) {
 }
 
 VALUE display_fileno(VALUE self) {
-  set_display(self);
+  SET_DISPLAY(self);
 
   return INT2FIX(XConnectionNumber(DPY));
 }
 
 VALUE display_flush(VALUE self) {
-  set_display(self);
+  SET_DISPLAY(self);
 
   return INT2FIX(XFlush(DPY));
 }
 
 VALUE display_each_event(VALUE self) {
-  set_display(self);
   XEvent xev;
+  SET_DISPLAY(self);
 
   while (1) {
     XNextEvent(DPY, &xev);
@@ -86,9 +90,9 @@ VALUE display_each_event(VALUE self) {
 }
 
 VALUE display_grab_key(VALUE self, VALUE key, VALUE modifier) {
-  set_display(self);
   KeySym      ks;
   KeyCode     kc;
+  SET_DISPLAY(self);
 
   ks = XStringToKeysym(RSTRING_PTR(key));
   if (ks == NoSymbol)
@@ -105,11 +109,11 @@ VALUE display_grab_key(VALUE self, VALUE key, VALUE modifier) {
 }
 
 VALUE display_listen_events(int argc, VALUE *argv, VALUE self) {
-  set_display(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);
@@ -126,8 +130,8 @@ VALUE display_listen_events(int argc, VALUE *argv, VALUE self) {
 }
 
 VALUE display_next_event(VALUE self) {
-  set_display(self);
   XEvent xev;
+  SET_DISPLAY(self);
 
   XNextEvent(DPY, &xev);
 
@@ -135,7 +139,7 @@ VALUE display_next_event(VALUE self) {
 }
 
 VALUE display_open(VALUE self) {
-  set_display(self);
+  SET_DISPLAY(self);
 
   if (!(DPY = XOpenDisplay(NULL))) {
     rb_raise(eDisplayError, "Can't open display");
@@ -147,15 +151,15 @@ VALUE display_open(VALUE self) {
 }
 
 VALUE display_pending(VALUE self) {
-  set_display(self);
+  SET_DISPLAY(self);
 
   return INT2FIX(XPending(DPY));
 }
 
 VALUE display_query_font(VALUE self) {
-  set_display(self);
   XFontStruct *xfs;
   VALUE       font;
+  SET_DISPLAY(self);
 
   if (!(xfs = XQueryFont(DPY,
       XGContextFromGC(DefaultGC(DPY, SCREEN_DEFAULT)))))
@@ -168,17 +172,17 @@ VALUE display_query_font(VALUE self) {
 }
 
 VALUE display_root(VALUE self) {
-  set_display(self);
+  SET_DISPLAY(self);
 
   return window_make(DPY, ROOT_DEFAULT);
 }
 
 VALUE display_screens(VALUE self) {
-  set_display(self);
   XineramaScreenInfo  *xsi;
   int                 n;
   VALUE               screens = rb_ary_new();
   VALUE               args[5];
+  SET_DISPLAY(self);
 
   if (XineramaIsActive(DPY)) {
     xsi = XineramaQueryScreens(DPY, &n);
@@ -207,7 +211,7 @@ VALUE display_screens(VALUE self) {
 }
 
 VALUE display_sync(VALUE self, VALUE discard) {
-  set_display(self);
+  SET_DISPLAY(self);
 
   XSync(display->dpy, RTEST(discard));
 

data/ext/uh/event.c

@@ -1,7 +1,7 @@
 #include "uh.h"
 
 
-#define set_xev(x) \
+#define SET_XEV(x) \
   XEvent *xev;\
   Data_Get_Struct(x, XEvent, xev);
 
@@ -18,7 +18,7 @@ VALUE event_make(XEvent *xev) {
     VALUE klass;
     void  (*function)(VALUE self);
   } EvClass;
-  EvClass ev_classes[] = {
+  EvClass       ev_classes[] = {
     {ConfigureRequest,  cConfigureRequest,  event_make_configure_request},
     {DestroyNotify,     cDestroyNotify,     NULL},
     {Expose,            cExpose,            NULL},
@@ -28,8 +28,8 @@ VALUE event_make(XEvent *xev) {
     {PropertyNotify,    cPropertyNotify,    NULL},
     {UnmapNotify,       cUnmapNotify,       NULL}
   };
-  int   i;
-  VALUE event;
+  unsigned int  i;
+  VALUE         event;
 
   for (i = 0; i < (sizeof ev_classes / sizeof ev_classes[0]); i++) {
     if (ev_classes[i].type == xev->type) {
@@ -46,8 +46,8 @@ VALUE event_make(XEvent *xev) {
 }
 
 VALUE event_make_event(VALUE klass, XEvent *xev) {
-  char *type_descs[LASTEvent];
-  VALUE event;
+  const char  *type_descs[LASTEvent];
+  VALUE       event;
 
   type_descs[KeyPress]          = "key_press";
   type_descs[KeyRelease]        = "key_release";
@@ -92,7 +92,7 @@ VALUE event_make_event(VALUE klass, XEvent *xev) {
 }
 
 void event_make_configure_request(VALUE self) {
-  set_xev(self);
+  SET_XEV(self);
 
   if (xev->xconfigurerequest.value_mask & CWX)
     rb_ivar_set(self, rb_intern("@x"), INT2FIX(xev->xconfigurerequest.x));
@@ -117,8 +117,8 @@ void event_make_configure_request(VALUE self) {
 }
 
 void event_make_key_any(VALUE self) {
-  set_xev(self);
   KeySym ks;
+  SET_XEV(self);
 
   ks = XkbKeycodeToKeysym(xev->xany.display, xev->xkey.keycode, 0, 0);
   if (ks == NoSymbol)
@@ -129,8 +129,8 @@ void event_make_key_any(VALUE self) {
 }
 
 void event_make_win_any(VALUE self) {
-  set_xev(self);
   Window window;
+  SET_XEV(self);
 
   switch (xev->type) {
     case ConfigureRequest:
@@ -154,6 +154,9 @@ void event_make_win_any(VALUE self) {
     case UnmapNotify:
       window = xev->xunmap.window;
       break;
+    default:
+      window = xev->xany.window;
+      break;
   }
 
   rb_ivar_set(self, rb_intern("@window"),

data/ext/uh/extconf.rb

@@ -3,8 +3,6 @@ require 'mkmf'
 fail 'libX11 is required'       unless have_library 'X11'
 fail 'libXinerama is required'  unless have_library 'Xinerama'
 
-# FIXME: -pendantic will warn "named variadic macros are a GNU extension"
-#$CFLAGS << ' -std=c99 -pedantic -Wall'
 $CFLAGS << ' -std=c99 -Wall'
 if %w[DEBUG VALGRIND].any? { |e| ENV.key? e }
   $CFLAGS.gsub! /-O\d\s/, '-g '

data/ext/uh/pixmap.c

@@ -1,7 +1,7 @@
 #include "uh.h"
 
 
-#define set_pixmap(x) \
+#define SET_PIXMAP(x) \
   UhPixmap *pixmap;\
   Data_Get_Struct(x, UhPixmap, pixmap);
 
@@ -14,7 +14,7 @@ void pixmap_deallocate(UhPixmap *p);
 
 
 VALUE pixmap_draw_rect(VALUE self, VALUE x, VALUE y, VALUE w, VALUE h) {
-  set_pixmap(self);
+  SET_PIXMAP(self)
 
   XFillRectangle(DPY, PIXMAP, GC,
     FIX2INT(x), FIX2INT(y), FIX2INT(w), FIX2INT(h)
@@ -24,7 +24,7 @@ VALUE pixmap_draw_rect(VALUE self, VALUE x, VALUE y, VALUE w, VALUE h) {
 }
 
 VALUE pixmap_draw_string(VALUE self, VALUE x, VALUE y, VALUE str) {
-  set_pixmap(self);
+  SET_PIXMAP(self)
 
   XDrawString(DPY, PIXMAP, GC,
     FIX2INT(x), FIX2INT(y), RSTRING_PTR(str), RSTRING_LEN(str)
@@ -34,7 +34,7 @@ VALUE pixmap_draw_string(VALUE self, VALUE x, VALUE y, VALUE str) {
 }
 
 VALUE pixmap_gc_black(VALUE self) {
-  set_pixmap(self);
+  SET_PIXMAP(self)
 
   XSetForeground(DPY, GC, BlackPixel(DPY, SCREEN_DEFAULT));
 
@@ -42,7 +42,7 @@ VALUE pixmap_gc_black(VALUE self) {
 }
 
 VALUE pixmap_gc_color(VALUE self, VALUE rcolor) {
-  set_pixmap(self);
+  SET_PIXMAP(self)
 
   XSetForeground(DPY, GC, NUM2LONG(rb_ivar_get(rcolor, rb_intern("@pixel"))));
 
@@ -50,7 +50,7 @@ VALUE pixmap_gc_color(VALUE self, VALUE rcolor) {
 }
 
 VALUE pixmap_gc_white(VALUE self) {
-  set_pixmap(self);
+  SET_PIXMAP(self)
 
   XSetForeground(DPY, GC, WhitePixel(DPY, SCREEN_DEFAULT));
 
@@ -59,7 +59,7 @@ VALUE pixmap_gc_white(VALUE self) {
 
 
 VALUE pixmap__copy(VALUE self, VALUE rwindow_id, VALUE rwidth, VALUE rheight) {
-  set_pixmap(self);
+  SET_PIXMAP(self)
 
   XCopyArea(DPY, PIXMAP, FIX2INT(rwindow_id), GC,
     0, 0, FIX2INT(rwidth), FIX2INT(rheight), 0, 0

data/ext/uh/uh.h

@@ -9,10 +9,6 @@
 #include <X11/extensions/Xinerama.h>
 
 
-#define set_display(x) \
-  UhDisplay *display;\
-  Data_Get_Struct(x, UhDisplay, display);
-
 #define ROOT_DEFAULT    DefaultRootWindow(DPY)
 #define SCREEN_DEFAULT  DefaultScreen(DPY)
 

data/ext/uh/window.c

@@ -1,7 +1,7 @@
 #include "uh.h"
 
 
-#define set_window(x) \
+#define SET_WINDOW(x) \
   UhWindow *window;\
   Data_Get_Struct(x, UhWindow, window);
 
@@ -10,7 +10,7 @@
 
 
 VALUE window_focus(VALUE self) {
-  set_window(self);
+  SET_WINDOW(self);
 
   XSetInputFocus(DPY, WINDOW, RevertToPointerRoot, CurrentTime);
 
@@ -18,8 +18,8 @@ VALUE window_focus(VALUE self) {
 }
 
 VALUE window_icccm_wm_delete(VALUE self) {
-  set_window(self);
   XEvent xev;
+  SET_WINDOW(self);
 
   xev.type = ClientMessage;
   xev.xclient.window = WINDOW;
@@ -33,12 +33,13 @@ VALUE window_icccm_wm_delete(VALUE self) {
 }
 
 VALUE window_icccm_wm_protocols(VALUE self) {
-  set_window(self);
   Atom  *win_protocols;
   int   count;
   int   i;
   char  *atom_name;
-  VALUE protocols = rb_ary_new();
+  VALUE protocols;
+  SET_WINDOW(self);
+  protocols = rb_ary_new();
 
   if (XGetWMProtocols(DPY, WINDOW, &win_protocols, &count)) {
     for (i = 0; i < count; i++) {
@@ -52,7 +53,7 @@ VALUE window_icccm_wm_protocols(VALUE self) {
 }
 
 VALUE window_kill(VALUE self) {
-  set_window(self);
+  SET_WINDOW(self);
 
   XKillClient(DPY, WINDOW);
 
@@ -60,7 +61,7 @@ VALUE window_kill(VALUE self) {
 }
 
 VALUE window_map(VALUE self) {
-  set_window(self);
+  SET_WINDOW(self);
 
   XMapWindow(DPY, WINDOW);
 
@@ -68,8 +69,8 @@ VALUE window_map(VALUE self) {
 }
 
 VALUE window_mask_set(VALUE self, VALUE mask) {
-  set_window(self);
   XSetWindowAttributes attrs;
+  SET_WINDOW(self);
 
   attrs.event_mask = FIX2LONG(mask);
   XChangeWindowAttributes(DPY, WINDOW, CWEventMask, &attrs);
@@ -78,9 +79,9 @@ VALUE window_mask_set(VALUE self, VALUE mask) {
 }
 
 VALUE window_name(VALUE self) {
-  set_window(self);
   char        *wxname;
   VALUE       wname;
+  SET_WINDOW(self);
 
   if (!XFetchName(DPY, WINDOW, &wxname))
     return Qnil;
@@ -92,8 +93,8 @@ VALUE window_name(VALUE self) {
 }
 
 VALUE window_override_redirect(VALUE self) {
-  set_window(self);
   XWindowAttributes wa;
+  SET_WINDOW(self);
 
   if (!XGetWindowAttributes(DPY, WINDOW, &wa))
     return Qnil;
@@ -102,7 +103,7 @@ VALUE window_override_redirect(VALUE self) {
 }
 
 VALUE window_raise(VALUE self) {
-  set_window(self);
+  SET_WINDOW(self);
 
   XRaiseWindow(DPY, WINDOW);
 
@@ -110,7 +111,7 @@ VALUE window_raise(VALUE self) {
 }
 
 VALUE window_unmap(VALUE self) {
-  set_window(self);
+  SET_WINDOW(self);
 
   XUnmapWindow(DPY, WINDOW);
 
@@ -118,9 +119,9 @@ VALUE window_unmap(VALUE self) {
 }
 
 VALUE window_wclass(VALUE self) {
-  set_window(self);
   XClassHint  ch;
   VALUE       wclass;
+  SET_WINDOW(self);
 
   if (!XGetClassHint(DPY, WINDOW, &ch))
     return Qnil;
@@ -134,9 +135,9 @@ VALUE window_wclass(VALUE self) {
 
 
 VALUE window__configure(VALUE self, VALUE rx, VALUE ry, VALUE rw, VALUE rh) {
-  set_window(self);
   XWindowChanges  wc;
   unsigned int    mask;
+  SET_WINDOW(self);
 
   mask = CWX | CWY | CWWidth | CWHeight | CWBorderWidth | CWStackMode;
   wc.x            = FIX2INT(rx);
@@ -151,8 +152,8 @@ VALUE window__configure(VALUE self, VALUE rx, VALUE ry, VALUE rw, VALUE rh) {
 }
 
 VALUE window__configure_event(VALUE self, VALUE rx, VALUE ry, VALUE rw, VALUE rh) {
-  set_window(self);
   XConfigureEvent ev;
+  SET_WINDOW(self);
 
   ev.type               = ConfigureNotify;
   ev.display            = DPY;
@@ -171,9 +172,9 @@ VALUE window__configure_event(VALUE self, VALUE rx, VALUE ry, VALUE rw, VALUE rh
 }
 
 VALUE window__create_sub(VALUE self, VALUE x, VALUE y, VALUE w, VALUE h) {
-  set_window(self);
   XSetWindowAttributes  wa;
   Window                sub_win;
+  SET_WINDOW(self);
 
   wa.override_redirect  = True;
   wa.background_pixmap  = ParentRelative;
@@ -189,8 +190,8 @@ VALUE window__create_sub(VALUE self, VALUE x, VALUE y, VALUE w, VALUE h) {
 }
 
 VALUE window__moveresize(VALUE self, VALUE x, VALUE y, VALUE width, VALUE height) {
-  set_window(self);
   XWindowChanges wc;
+  SET_WINDOW(self);
 
   wc.x      = NUM2INT(x);
   wc.y      = NUM2INT(y);
@@ -203,7 +204,7 @@ VALUE window__moveresize(VALUE self, VALUE x, VALUE y, VALUE width, VALUE height
 
 
 int window_id(VALUE self) {
-  set_window(self);
+  SET_WINDOW(self);
 
   return WINDOW;
 }

data/lib/uh/geo.rb

@@ -36,6 +36,7 @@ module Uh
     private
 
     def check_value(name, value)
+      return if value.nil?
       fail ArgumentError, "invalid #{name.to_s}: #{value}" unless value > 0
     end
   end

data/lib/uh/version.rb

@@ -1,3 +1,3 @@
 module Uh
-  VERSION = '0.1.4'.freeze
+  VERSION = '0.1.5'.freeze
 end

data/test/uh/test_geo.rb

@@ -11,6 +11,10 @@ describe Uh::Geo do
     it 'raises error when invalid height is given' do
       assert_raises(Uh::ArgumentError) { Uh::Geo.new(0, 0, 640, 0) }
     end
+
+    it 'builds a geo without arguments' do
+      assert_instance_of Uh::Geo, Uh::Geo.new
+    end
   end
 
   describe '.format_xgeometry' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uh
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Thibault Jouan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-04 00:00:00.000000000 Z
+date: 2015-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake