uh 2.0.0.pre → 2.0.0.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1fac46367eac28fe3f697da45b08ed7250a5f8ac
-  data.tar.gz: 6d68b1ac9b0627154a98715662a3dd686b4d91b7
+  metadata.gz: 2fc046078c7d4c3b9c91826b14cacb8c114820ae
+  data.tar.gz: 7f0f09757ee40f4c5dc5f8f303a6bee3f8fb342e
 SHA512:
-  metadata.gz: 1009fe21fd3c74988921ae694ea8aff50c953d6777a5ba629dc5a256789aa12b097ec8879099032c4879470bb248dd70dbe9950cf81c146bac9beae2bc951387
-  data.tar.gz: 0ff9b73c6acc2475c794f25e05c01626a20859f74da948af929865062b28512bdd975d6de9b0c41ac59653170c21ee5fd92565d5b96572d7abe8377b5f565bc1
+  metadata.gz: b7d9e2e8aa2a75f4332e2a17851f651ae1759336c0aaa88f216f7290d8d9dd2b2756e13a2e08b271d19b034163eb3044791e60560202fe3b301fa674d83ccd4a
+  data.tar.gz: c61bc88493bdf8d047f5b88a6d47b91ef034eb9fb54b01954aaa706c00b6358062bf91c7abcf1f3c6babb539306bc7a4ae0240f3884d80232fc996633c469c48

data/ext/uh/uh.c

@@ -123,8 +123,10 @@ void uh_window() {
   rb_define_method(cWindow, "focus", window_focus, 0);
   rb_define_method(cWindow, "kill", window_kill, 0);
   rb_define_method(cWindow, "map", window_map, 0);
+  rb_define_method(cWindow, "mask", window_mask, 0);
   rb_define_method(cWindow, "mask=", window_mask_set, 1);
   rb_define_method(cWindow, "name", window_name, 0);
+  rb_define_method(cWindow, "name=", window_name_set, 1);
   rb_define_method(cWindow, "override_redirect?", window_override_redirect, 0);
   rb_define_method(cWindow, "raise", window_raise, 0);
   rb_define_method(cWindow, "unmap", window_unmap, 0);
@@ -134,6 +136,7 @@ void uh_window() {
   rb_define_private_method(cWindow, "_configure", window__configure, 4);
   rb_define_private_method(cWindow, "_configure_event",
     window__configure_event, 4);
+  rb_define_private_method(cWindow, "_create", window__create, 4);
   rb_define_private_method(cWindow, "_create_sub", window__create_sub, 4);
   rb_define_private_method(cWindow, "_moveresize", window__moveresize, 4);
 }

data/ext/uh/uh.h

@@ -85,14 +85,17 @@ VALUE window_icccm_wm_delete(VALUE self);
 VALUE window_icccm_wm_protocols(VALUE self);
 VALUE window_kill(VALUE self);
 VALUE window_map(VALUE self);
+VALUE window_mask(VALUE self);
 VALUE window_mask_set(VALUE self, VALUE mask);
 VALUE window_name(VALUE self);
+VALUE window_name_set(VALUE self, VALUE name);
 VALUE window_override_redirect(VALUE self);
 VALUE window_raise(VALUE self);
 VALUE window_unmap(VALUE self);
 VALUE window_wclass(VALUE self);
 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);
+VALUE window__create(VALUE self, VALUE x, VALUE y, VALUE w, VALUE h);
 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);
 int window_id(VALUE window);

data/ext/uh/window.c

@@ -68,6 +68,17 @@ VALUE window_map(VALUE self) {
   return Qnil;
 }
 
+VALUE window_mask(VALUE self) {
+  XWindowAttributes wa;
+  SET_WINDOW(self);
+
+  if (!XGetWindowAttributes(DPY, WINDOW, &wa)) {
+    rb_raise(rb_eArgError, "cannot get window attributes for `0x%08lx'", WINDOW);
+  }
+
+  return LONG2FIX(wa.your_event_mask);
+}
+
 VALUE window_mask_set(VALUE self, VALUE mask) {
   XSetWindowAttributes attrs;
   SET_WINDOW(self);
@@ -92,6 +103,14 @@ VALUE window_name(VALUE self) {
   return wname;
 }
 
+VALUE window_name_set(VALUE self, VALUE name) {
+  SET_WINDOW(self);
+
+  XStoreName(DPY, WINDOW, RSTRING_PTR(name));
+
+  return Qnil;
+}
+
 VALUE window_override_redirect(VALUE self) {
   XWindowAttributes wa;
   SET_WINDOW(self);
@@ -171,6 +190,18 @@ VALUE window__configure_event(VALUE self, VALUE rx, VALUE ry, VALUE rw, VALUE rh
   return Qnil;
 }
 
+VALUE window__create(VALUE self, VALUE x, VALUE y, VALUE w, VALUE h) {
+  Window win;
+  SET_WINDOW(self);
+
+  win = XCreateSimpleWindow(DPY, WINDOW,
+    FIX2INT(x), FIX2INT(y), FIX2INT(w), FIX2INT(h),
+    0, BlackPixel(DPY, SCREEN_DEFAULT), BlackPixel(DPY, SCREEN_DEFAULT)
+  );
+
+  return window_make(DPY, win);
+}
+
 VALUE window__create_sub(VALUE self, VALUE x, VALUE y, VALUE w, VALUE h) {
   XSetWindowAttributes  wa;
   Window                sub_win;

data/lib/uh/display.rb

@@ -4,6 +4,10 @@ module Uh
       ENV['DISPLAY']
     end
 
+    def create_window(geo)
+      root.create geo
+    end
+
     def create_subwindow(geo)
       root.create_sub geo
     end

data/lib/uh/version.rb

@@ -1,3 +1,3 @@
 module Uh
-  VERSION = '2.0.0.pre'.freeze
+  VERSION = '2.0.0.pre1'.freeze
 end

data/lib/uh/window.rb

@@ -18,6 +18,10 @@ module Uh
       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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uh
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre
+  version: 2.0.0.pre1
 platform: ruby
 authors:
 - Thibault Jouan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-09 00:00:00.000000000 Z
+date: 2015-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -130,4 +130,3 @@ summary: Xlib simplified toolkit
 test_files:
 - test/test_helper.rb
 - test/uh/test_geo.rb
-has_rdoc: