reflexion 0.1.40 → 0.1.41

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ea18222490d3f1689a552d31ee11f0e0c2386998c88420a117aca12175436ce
-  data.tar.gz: 5105528ff4c1f233d25d79a9aa8aef72239cf4256db5c1cb5c126a7359e7c31a
+  metadata.gz: b412c2e913baaeacdd4afff628c339c01a6ce7359572901d6193fc97d772a426
+  data.tar.gz: f8cba434ac873919a9bd75ea5c5e08d0436eb672313e60541d5634b210b81b76
 SHA512:
-  metadata.gz: 2be5d8353933e987684d2f5f81cb4cf7a52cc1db615c31c4ec6ed70998d783c4d5d631c25c4ab9b02258b8c5d70c4988abe47ec8fa7e6b807dfd12acba66e5de
-  data.tar.gz: 91263b61d34e37ea8900ff626edc2a6fb0c302a49e2cfe531ec1c502a47c3409e8f7d7caf049e67fb9bc56efc3132e5d8d1f2290746498eba5d301305bfa6298
+  metadata.gz: 7b6f7fd46e08e459010a98facf5c8e800c326f93d0482b0649c4f20a6bc54537947e5e3316285db7e759870c7739c68ab5284fba8f4640fb88e5dc02c106b598
+  data.tar.gz: a30e5f7bde2f8f9b09ff0e76847d2bbbfefe9187e3888224409ebfe04a72c05e36387ab4a976f0dd385f1ead5aa749d1ba8478182030e73058879792b0ca051e

data/.doc/ext/reflex/native.cpp

@@ -32,6 +32,7 @@ void Init_reflex_rect_shape ();
 void Init_reflex_ellipse_shape ();
 
 void Init_reflex_application ();
+void Init_reflex_screen ();
 void Init_reflex_window ();
 void Init_reflex_view ();
 
@@ -80,6 +81,7 @@ extern "C" void
 	Init_reflex_ellipse_shape();
 
 	Init_reflex_application();
+	Init_reflex_screen();
 	Init_reflex_window();
 	Init_reflex_view();
 

data/.doc/ext/reflex/screen.cpp

@@ -0,0 +1,53 @@
+#include "reflex/ruby/screen.h"
+
+
+#include <rays/ruby/bounds.h>
+#include "defs.h"
+
+
+RUCY_DEFINE_VALUE_FROM_TO(Reflex::Screen)
+
+#define THIS  to<Reflex::Screen*>(self)
+
+#define CHECK RUCY_CHECK_OBJECT(Reflex::Screen, self)
+
+
+static
+VALUE alloc(VALUE klass)
+{
+	Reflex::reflex_error(__FILE__, __LINE__, "can not instantiate Screen class.");
+}
+
+static
+VALUE get_frame(VALUE self)
+{
+	CHECK;
+	return value(THIS->frame());
+}
+
+
+static Class cScreen;
+
+void
+Init_reflex_screen ()
+{
+	Module mReflex = rb_define_module("Reflex");
+
+	cScreen = rb_define_class_under(mReflex, "Screen", rb_cObject);
+	rb_define_alloc_func(cScreen, alloc);
+	rb_define_method(cScreen, "frame", RUBY_METHOD_FUNC(get_frame), 0);
+}
+
+
+namespace Reflex
+{
+
+
+	Class
+	screen_class ()
+	{
+		return cScreen;
+	}
+
+
+}// Reflex

data/.doc/ext/reflex/window.cpp

@@ -3,6 +3,7 @@
 
 #include <rays/ruby/bounds.h>
 #include <rays/ruby/painter.h>
+#include "reflex/ruby/screen.h"
 #include "reflex/ruby/view.h"
 #include "defs.h"
 
@@ -38,6 +39,13 @@ VALUE hide(VALUE self)
 	return self;
 }
 
+static
+VALUE hidden(VALUE self)
+{
+	CHECK;
+	return value(THIS->hidden());
+}
+
 static
 VALUE close(VALUE self)
 {
@@ -98,44 +106,89 @@ VALUE get_frame(VALUE self)
 	return value(THIS->frame());
 }
 
+static
+VALUE set_closable(VALUE self, VALUE state)
+{
+	CHECK;
+
+	if (state)
+		THIS->   add_flag(Reflex::Window::FLAG_CLOSABLE);
+	else
+		THIS->remove_flag(Reflex::Window::FLAG_CLOSABLE);
+
+	return state;
+}
+
+static
+VALUE is_closable(VALUE self)
+{
+	CHECK;
+	return value(THIS->has_flag(Reflex::Window::FLAG_CLOSABLE));
+}
+
+static
+VALUE set_minimizable(VALUE self, VALUE state)
+{
+	CHECK;
+
+	if (state)
+		THIS->   add_flag(Reflex::Window::FLAG_MINIMIZABLE);
+	else
+		THIS->remove_flag(Reflex::Window::FLAG_MINIMIZABLE);
+
+	return state;
+}
+
+static
+VALUE is_minimizable(VALUE self)
+{
+	CHECK;
+	return value(THIS->has_flag(Reflex::Window::FLAG_MINIMIZABLE));
+}
+
 static
 VALUE set_resizable(VALUE self, VALUE state)
 {
 	CHECK;
-	THIS->set_resizable(to<bool>(state));
-	return value(THIS->is_resizable());
+
+	if (state)
+		THIS->   add_flag(Reflex::Window::FLAG_RESIZABLE);
+	else
+		THIS->remove_flag(Reflex::Window::FLAG_RESIZABLE);
+
+	return state;
 }
 
 static
 VALUE is_resizable(VALUE self)
 {
 	CHECK;
-	return value(THIS->is_resizable());
+	return value(THIS->has_flag(Reflex::Window::FLAG_RESIZABLE));
 }
 
 static
-VALUE hidden(VALUE self)
+VALUE get_screen(VALUE self)
 {
 	CHECK;
-	return value(THIS->hidden());
+	return value(THIS->screen());
 }
 
 static
-VALUE root(VALUE self)
+VALUE get_root(VALUE self)
 {
 	CHECK;
 	return value(THIS->root());
 }
 
 static
-VALUE focus(VALUE self)
+VALUE get_focus(VALUE self)
 {
 	CHECK;
 	return value(THIS->focus());
 }
 
 static
-VALUE painter(VALUE self)
+VALUE get_painter(VALUE self)
 {
 	CHECK;
 	return value(THIS->painter());
@@ -277,12 +330,17 @@ Init_reflex_window ()
 	rb_define_method(cWindow, "title", RUBY_METHOD_FUNC(get_title), 0);
 	rb_define_method(cWindow, "frame=", RUBY_METHOD_FUNC(set_frame), -1);
 	rb_define_method(cWindow, "frame", RUBY_METHOD_FUNC(get_frame), 0);
+	rb_define_method(cWindow, "closable=", RUBY_METHOD_FUNC(set_closable), 1);
+	cWindow.define_method("closable?",     is_closable);
+	rb_define_method(cWindow, "minimizable=", RUBY_METHOD_FUNC(set_minimizable), 1);
+	cWindow.define_method("minimizable?",  is_minimizable);
 	rb_define_method(cWindow, "resizable=", RUBY_METHOD_FUNC(set_resizable), 1);
-	cWindow.define_method("resizable?",  is_resizable);
+	cWindow.define_method("resizable?",    is_resizable);
 	rb_define_method(cWindow, "hidden", RUBY_METHOD_FUNC(hidden), 0);
-	rb_define_method(cWindow, "root", RUBY_METHOD_FUNC(root), 0);
-	rb_define_method(cWindow, "focus", RUBY_METHOD_FUNC(focus), 0);
-	rb_define_method(cWindow, "painter", RUBY_METHOD_FUNC(painter), 0);
+	rb_define_method(cWindow, "screen", RUBY_METHOD_FUNC(get_screen), 0);
+	rb_define_method(cWindow, "root", RUBY_METHOD_FUNC(get_root), 0);
+	rb_define_method(cWindow, "focus", RUBY_METHOD_FUNC(get_focus), 0);
+	rb_define_method(cWindow, "painter", RUBY_METHOD_FUNC(get_painter), 0);
 	rb_define_method(cWindow, "on_show", RUBY_METHOD_FUNC(on_show), 1);
 	rb_define_method(cWindow, "on_hide", RUBY_METHOD_FUNC(on_hide), 1);
 	rb_define_method(cWindow, "on_close", RUBY_METHOD_FUNC(on_close), 1);

data/ChangeLog.md

@@ -1,6 +1,13 @@
 # reflex ChangeLog
 
 
+## [v0.1.41] - 2023-05-29
+
+- Add Reflex::Screen class
+- Add Window#closable and Window#minimizable accessors
+- Fix that non-closable, non-minimizable, or non-resizable buttons raise error on clicking them
+
+
 ## [v0.1.40] - 2023-05-27
 
 - required_ruby_version >= 3.0.0

data/VERSION

@@ -1 +1 @@
-0.1.40
+0.1.41

data/ext/reflex/native.cpp

@@ -32,6 +32,7 @@ void Init_reflex_rect_shape ();
 void Init_reflex_ellipse_shape ();
 
 void Init_reflex_application ();
+void Init_reflex_screen ();
 void Init_reflex_window ();
 void Init_reflex_view ();
 
@@ -80,6 +81,7 @@ extern "C" void
 	Init_reflex_ellipse_shape();
 
 	Init_reflex_application();
+	Init_reflex_screen();
 	Init_reflex_window();
 	Init_reflex_view();
 

data/ext/reflex/screen.cpp

@@ -0,0 +1,55 @@
+#include "reflex/ruby/screen.h"
+
+
+#include <rays/ruby/bounds.h>
+#include "defs.h"
+
+
+RUCY_DEFINE_VALUE_FROM_TO(Reflex::Screen)
+
+#define THIS  to<Reflex::Screen*>(self)
+
+#define CHECK RUCY_CHECK_OBJECT(Reflex::Screen, self)
+
+
+static
+RUCY_DEF_ALLOC(alloc, klass)
+{
+	Reflex::reflex_error(__FILE__, __LINE__, "can not instantiate Screen class.");
+}
+RUCY_END
+
+static
+RUCY_DEF0(get_frame)
+{
+	CHECK;
+	return value(THIS->frame());
+}
+RUCY_END
+
+
+static Class cScreen;
+
+void
+Init_reflex_screen ()
+{
+	Module mReflex = define_module("Reflex");
+
+	cScreen = mReflex.define_class("Screen");
+	cScreen.define_alloc_func(alloc);
+	cScreen.define_method("frame", get_frame);
+}
+
+
+namespace Reflex
+{
+
+
+	Class
+	screen_class ()
+	{
+		return cScreen;
+	}
+
+
+}// Reflex

data/ext/reflex/window.cpp

@@ -3,6 +3,7 @@
 
 #include <rays/ruby/bounds.h>
 #include <rays/ruby/painter.h>
+#include "reflex/ruby/screen.h"
 #include "reflex/ruby/view.h"
 #include "defs.h"
 
@@ -41,6 +42,14 @@ RUCY_DEF0(hide)
 }
 RUCY_END
 
+static
+RUCY_DEF0(hidden)
+{
+	CHECK;
+	return value(THIS->hidden());
+}
+RUCY_END
+
 static
 RUCY_DEF0(close)
 {
@@ -109,12 +118,61 @@ RUCY_DEF0(get_frame)
 }
 RUCY_END
 
+static
+RUCY_DEF1(set_closable, state)
+{
+	CHECK;
+
+	if (state)
+		THIS->   add_flag(Reflex::Window::FLAG_CLOSABLE);
+	else
+		THIS->remove_flag(Reflex::Window::FLAG_CLOSABLE);
+
+	return state;
+}
+RUCY_END
+
+static
+RUCY_DEF0(is_closable)
+{
+	CHECK;
+	return value(THIS->has_flag(Reflex::Window::FLAG_CLOSABLE));
+}
+RUCY_END
+
+static
+RUCY_DEF1(set_minimizable, state)
+{
+	CHECK;
+
+	if (state)
+		THIS->   add_flag(Reflex::Window::FLAG_MINIMIZABLE);
+	else
+		THIS->remove_flag(Reflex::Window::FLAG_MINIMIZABLE);
+
+	return state;
+}
+RUCY_END
+
+static
+RUCY_DEF0(is_minimizable)
+{
+	CHECK;
+	return value(THIS->has_flag(Reflex::Window::FLAG_MINIMIZABLE));
+}
+RUCY_END
+
 static
 RUCY_DEF1(set_resizable, state)
 {
 	CHECK;
-	THIS->set_resizable(to<bool>(state));
-	return value(THIS->is_resizable());
+
+	if (state)
+		THIS->   add_flag(Reflex::Window::FLAG_RESIZABLE);
+	else
+		THIS->remove_flag(Reflex::Window::FLAG_RESIZABLE);
+
+	return state;
 }
 RUCY_END
 
@@ -122,20 +180,20 @@ static
 RUCY_DEF0(is_resizable)
 {
 	CHECK;
-	return value(THIS->is_resizable());
+	return value(THIS->has_flag(Reflex::Window::FLAG_RESIZABLE));
 }
 RUCY_END
 
 static
-RUCY_DEF0(hidden)
+RUCY_DEF0(get_screen)
 {
 	CHECK;
-	return value(THIS->hidden());
+	return value(THIS->screen());
 }
 RUCY_END
 
 static
-RUCY_DEF0(root)
+RUCY_DEF0(get_root)
 {
 	CHECK;
 	return value(THIS->root());
@@ -143,7 +201,7 @@ RUCY_DEF0(root)
 RUCY_END
 
 static
-RUCY_DEF0(focus)
+RUCY_DEF0(get_focus)
 {
 	CHECK;
 	return value(THIS->focus());
@@ -151,7 +209,7 @@ RUCY_DEF0(focus)
 RUCY_END
 
 static
-RUCY_DEF0(painter)
+RUCY_DEF0(get_painter)
 {
 	CHECK;
 	return value(THIS->painter());
@@ -310,12 +368,17 @@ Init_reflex_window ()
 	cWindow.define_method("title", get_title);
 	cWindow.define_method("frame=", set_frame);
 	cWindow.define_method("frame",  get_frame);
-	cWindow.define_method("resizable=", set_resizable);
-	cWindow.define_method("resizable?",  is_resizable);
+	cWindow.define_method("closable=",    set_closable);
+	cWindow.define_method("closable?",     is_closable);
+	cWindow.define_method("minimizable=", set_minimizable);
+	cWindow.define_method("minimizable?",  is_minimizable);
+	cWindow.define_method("resizable=",   set_resizable);
+	cWindow.define_method("resizable?",    is_resizable);
 	cWindow.define_method("hidden", hidden);
-	cWindow.define_method("root", root);
-	cWindow.define_method("focus", focus);
-	cWindow.define_method("painter", painter);
+	cWindow.define_method("screen",  get_screen);
+	cWindow.define_method("root",    get_root);
+	cWindow.define_method("focus",   get_focus);
+	cWindow.define_method("painter", get_painter);
 	cWindow.define_method("on_show",  on_show);
 	cWindow.define_method("on_hide",  on_hide);
 	cWindow.define_method("on_close", on_close);

data/include/reflex/ruby/screen.h

@@ -0,0 +1,40 @@
+// -*- c++ -*-
+#pragma once
+#ifndef __REFLEX_RUBY_SCREEN_H__
+#define __REFLEX_RUBY_SCREEN_H__
+
+
+#include <rucy/class.h>
+#include <rucy/extension.h>
+#include <reflex/screen.h>
+
+
+RUCY_DECLARE_VALUE_FROM_TO(Reflex::Screen)
+
+
+namespace Reflex
+{
+
+
+	Rucy::Class screen_class ();
+	// class Reflex::Screen
+
+
+}// Reflex
+
+
+namespace Rucy
+{
+
+
+	template <> inline Class
+	get_ruby_class<Reflex::Screen> ()
+	{
+		return Reflex::screen_class();
+	}
+
+
+}// Rucy
+
+
+#endif//EOH

data/include/reflex/screen.h

@@ -0,0 +1,43 @@
+// -*- c++ -*-
+#pragma once
+#ifndef __REFLEX_SCREEN_H__
+#define __REFLEX_SCREEN_H__
+
+
+#include <xot/pimpl.h>
+#include <rays/bounds.h>
+#include <reflex/defs.h>
+
+
+namespace Reflex
+{
+
+
+	class Screen
+	{
+
+		typedef Screen This;
+
+		public:
+
+			Screen ();
+
+			virtual ~Screen ();
+
+			virtual Bounds frame () const;
+
+			operator bool () const;
+
+			bool operator ! () const;
+
+			struct Data;
+
+			Xot::PSharedImpl<Data> self;
+
+	};// Screen
+
+
+}// Reflex
+
+
+#endif//EOH

data/include/reflex/window.h

@@ -11,6 +11,7 @@
 #include <rays/painter.h>
 #include <reflex/defs.h>
 #include <reflex/event.h>
+#include <reflex/screen.h>
 
 
 namespace Reflex
@@ -29,12 +30,27 @@ namespace Reflex
 
 			typedef Xot::Ref<This> Ref;
 
+			enum Flag
+			{
+
+				FLAG_CLOSABLE    = Xot::bit(0),
+
+				FLAG_MINIMIZABLE = Xot::bit(1),
+
+				FLAG_RESIZABLE   = Xot::bit(2),
+
+				FLAG_LAST        = FLAG_RESIZABLE
+
+			};// Flag
+
 			Window ();
 
 			virtual void show ();
 
 			virtual void hide ();
 
+			virtual bool hidden () const;
+
 			virtual void close (bool force = false);
 
 			virtual void redraw ();
@@ -53,11 +69,13 @@ namespace Reflex
 
 			virtual Bounds   frame () const;
 
-			virtual void set_resizable (bool state = true);
+			virtual void    add_flag (uint flags);
 
-			virtual bool  is_resizable () const;
+			virtual void remove_flag (uint flags);
 
-			virtual bool hidden () const;
+			virtual bool    has_flag (uint flags) const;
+
+			virtual Screen screen () const;
 
 			virtual       View* root ();
 

data/lib/reflex/screen.rb

@@ -0,0 +1,21 @@
+require 'forwardable'
+
+
+module Reflex
+
+
+  class Screen
+
+    extend Forwardable
+
+    def_delegators :frame,
+      :x, :y, :z, :w, :h, :d, :width, :height, :depth,
+      :left, :top, :back, :right, :bottom, :front,
+      :left_top, :right_top, :left_bottom, :right_bottom,
+      :lt, :lr, :lb, :rb,
+      :position, :pos, :size, :center
+
+  end# Screen
+
+
+end# Reflex

data/lib/reflex/window.rb

@@ -62,7 +62,9 @@ module Reflex
       :restitution=, :restitution
 
     universal_accessor :title, :frame,
-      resizable: {reader: :resizable?}
+      closable:    {reader: :closable?},
+      minimizable: {reader: :minimizable?},
+      resizable:   {reader: :resizable?}
 
     def initialize(options = nil, &block)
       super()

data/lib/reflex.rb

@@ -47,6 +47,7 @@ require 'reflex/model'
 require 'reflex/model_owner'
 
 require 'reflex/application'
+require 'reflex/screen'
 require 'reflex/window'
 require 'reflex/view'
 

data/reflex.gemspec

@@ -1,10 +1,7 @@
 # -*- mode: ruby -*-
 
 
-File.expand_path('lib', __dir__)
-  .tap {|s| $:.unshift s if !$:.include?(s) && File.directory?(s)}
-
-require 'reflex/extension'
+require_relative 'lib/reflex/extension'
 
 
 Gem::Specification.new do |s|
@@ -28,10 +25,10 @@ Gem::Specification.new do |s|
   s.platform              = Gem::Platform::RUBY
   s.required_ruby_version = '>= 3.0.0'
 
-  s.add_runtime_dependency 'xot',   '~> 0.1.37'
-  s.add_runtime_dependency 'rucy',  '~> 0.1.37'
-  s.add_runtime_dependency 'beeps', '~> 0.1.38'
-  s.add_runtime_dependency 'rays',  '~> 0.1.38'
+  s.add_runtime_dependency 'xot',   '~> 0.1.38'
+  s.add_runtime_dependency 'rucy',  '~> 0.1.38'
+  s.add_runtime_dependency 'beeps', '~> 0.1.39'
+  s.add_runtime_dependency 'rays',  '~> 0.1.39'
 
   s.add_development_dependency 'rake'
   s.add_development_dependency 'test-unit'

data/src/osx/native_window.mm

@@ -12,13 +12,13 @@
 #import "opengl_view.h"
 
 
-static const NSUInteger WINDOW_STYLE_MASK =
-	NSTitledWindowMask |
-	NSClosableWindowMask |
-	NSMiniaturizableWindowMask |
-	NSResizableWindowMask |
-	0;//NSTexturedBackgroundWindowMask
-
+static NSWindowStyleMask
+default_style_mask ()
+{
+	return Window_make_style_mask(
+		Reflex::Window::Data::FLAG_DEFAULT,
+		NSTitledWindowMask | NSTexturedBackgroundWindowMask);
+}
 
 static int
 count_mouse_buttons (const Reflex::PointerEvent& e)
@@ -67,7 +67,7 @@ update_pixel_density (Reflex::Window* window)
 	{
 		self = [super
 			initWithContentRect: NSMakeRect(0, 0, 0, 0)
-			styleMask: WINDOW_STYLE_MASK
+			styleMask: default_style_mask()
 			backing: NSBackingStoreBuffered
 			defer: NO];
 		if (!self) return nil;
@@ -368,7 +368,7 @@ update_pixel_density (Reflex::Window* window)
 		if (clicking_count == 0)
 			++pointer_id;
 		else if (clicking_count < 0)
-			Reflex::invalid_state_error(__FILE__, __LINE__);
+			return;//Reflex::invalid_state_error(__FILE__, __LINE__);
 
 		Window_call_pointer_event(win, &e);
 	}
@@ -420,7 +420,7 @@ update_pixel_density (Reflex::Window* window)
 	{
 		return [NSWindow
 			frameRectForContentRect: contentRect
-			styleMask: WINDOW_STYLE_MASK];
+			styleMask: default_style_mask()];
 	}
 
 @end// NativeWindow

data/src/osx/screen.h

@@ -0,0 +1,21 @@
+// -*- c++ -*-
+#pragma once
+#ifndef __REFLEX_SRC_OSX_SCREEN_H__
+#define __REFLEX_SRC_OSX_SCREEN_H__
+
+
+#import <AppKit/NSScreen.h>
+#include "reflex/screen.h"
+
+
+namespace Reflex
+{
+
+
+	void Screen_initialize (Screen* pthis, NSScreen* screen);
+
+
+}// Reflex
+
+
+#endif//EOH

data/src/osx/screen.mm

@@ -0,0 +1,58 @@
+// -*- mode: objc -*-
+#include "screen.h"
+
+
+namespace Reflex
+{
+
+
+	struct Screen::Data
+	{
+
+		NSScreen* screen = nil;
+
+		~Data ()
+		{
+			if (screen) [screen release];
+		}
+
+	};// Screen::Data
+
+
+	void
+	Screen_initialize (Screen* pthis, NSScreen* screen)
+	{
+		pthis->self->screen = [screen retain];
+	}
+
+
+	Screen::Screen ()
+	{
+	}
+
+	Screen::~Screen ()
+	{
+	}
+
+	Bounds
+	Screen::frame () const
+	{
+		NSRect frame = self->screen.frame;
+		return Bounds(
+			frame.origin.x,   frame.origin.y,
+			frame.size.width, frame.size.height);
+	}
+
+	Screen::operator bool () const
+	{
+		return self->screen;
+	}
+
+	bool
+	Screen::operator ! () const
+	{
+		return !operator bool();
+	}
+
+
+}// Reflex

data/src/osx/window.h

@@ -4,6 +4,7 @@
 #define __REFLEX_SRC_OSX_WINDOW_H__
 
 
+#import <AppKit/NSWindow.h>
 #include "../window.h"
 
 
@@ -35,6 +36,9 @@ namespace Reflex
 
 	const WindowData& Window_get_data (const Window* window);
 
+	NSWindowStyleMask Window_make_style_mask (
+		uint flags, NSWindowStyleMask styleMask = 0);
+
 
 }// Reflex
 

data/src/osx/window.mm

@@ -4,6 +4,7 @@
 
 #import <Cocoa/Cocoa.h>
 #include "reflex/exception.h"
+#include "screen.h"
 #import "native_window.h"
 
 
@@ -31,6 +32,27 @@ namespace Reflex
 		return Window_get_data(const_cast<Window*>(window));
 	}
 
+	NSWindowStyleMask
+	Window_make_style_mask (uint flags, NSWindowStyleMask styleMask)
+	{
+		if (Xot::has_flag(flags, Window::FLAG_CLOSABLE))
+			styleMask |=  NSWindowStyleMaskClosable;
+		else
+			styleMask &= ~NSWindowStyleMaskClosable;
+
+		if (Xot::has_flag(flags, Window::FLAG_MINIMIZABLE))
+			styleMask |=  NSWindowStyleMaskMiniaturizable;
+		else
+			styleMask &= ~NSWindowStyleMaskMiniaturizable;
+
+		if (Xot::has_flag(flags, Window::FLAG_RESIZABLE))
+			styleMask |=  NSWindowStyleMaskResizable;
+		else
+			styleMask &= ~NSWindowStyleMaskResizable;
+
+		return styleMask;
+	}
+
 	static NativeWindow*
 	get_native (const Window* window)
 	{
@@ -113,19 +135,23 @@ namespace Reflex
 	}
 
 	void
-	Window_set_resizable (Window* window, bool state)
+	Window_set_flags (Window* window, uint flags)
 	{
-		NativeWindow* native = get_native(window);
-		if (state)
-			native.styleMask |= NSResizableWindowMask;
-		else
-			native.styleMask &= ~NSResizableWindowMask;
+		NativeWindow* native        = get_native(window);
+		NSWindowStyleMask styleMask =
+			Window_make_style_mask(window->self->flags, native.styleMask);
+
+		if (styleMask != native.styleMask)
+			native.styleMask = styleMask;
 	}
 
-	bool
-	Window_is_resizable (const Window& window)
+	Screen
+	Window_get_screen (const Window& window)
 	{
-		return get_native(&window).styleMask & NSResizableWindowMask;
+		Screen s;
+		NativeWindow* native = get_native(&window);
+		if (native && native.screen) Screen_initialize(&s, native.screen);
+		return s;
 	}
 
 	float

data/src/window.cpp

@@ -450,6 +450,12 @@ namespace Reflex
 		self->hide_count = new_count;
 	}
 
+	bool
+	Window::hidden () const
+	{
+		return self->hide_count > 0;
+	}
+
 	void
 	Window::close (bool force)
 	{
@@ -512,21 +518,31 @@ namespace Reflex
 	}
 
 	void
-	Window::set_resizable (bool state)
+	Window::add_flag (uint flags)
 	{
-		Window_set_resizable(this, state);
+		Xot::add_flag(&self->flags, flags);
+
+		Window_set_flags(this, self->flags);
 	}
 
-	bool
-	Window::is_resizable () const
+	void
+	Window::remove_flag (uint flags)
 	{
-		return Window_is_resizable(*this);
+		Xot::remove_flag(&self->flags, flags);
+
+		Window_set_flags(this, self->flags);
 	}
 
 	bool
-	Window::hidden () const
+	Window::has_flag (uint flags) const
 	{
-		return self->hide_count > 0;
+		return Xot::has_flag(self->flags, flags);
+	}
+
+	Screen
+	Window::screen () const
+	{
+		return Window_get_screen(*this);
 	}
 
 	View*

data/src/window.h

@@ -37,6 +37,8 @@ namespace Reflex
 
 		typedef std::map<View::Ref, TargetPointerMap> CaptureMap;
 
+		enum {FLAG_DEFAULT = FLAG_CLOSABLE | FLAG_MINIMIZABLE | FLAG_RESIZABLE};
+
 		int hide_count = 1;
 
 		bool redraw = true;
@@ -51,6 +53,8 @@ namespace Reflex
 
 		CaptureMap captures;
 
+		uint flags = FLAG_DEFAULT;
+
 		Data ()
 		{
 			prev_time_update = prev_time_draw = Xot::time();
@@ -94,9 +98,9 @@ namespace Reflex
 
 	Bounds Window_get_frame (const Window& window);
 
-	void Window_set_resizable (Window* window, bool state);
+	Screen Window_get_screen (const Window& window);
 
-	bool Window_is_resizable (const Window& window);
+	void Window_set_flags (Window* window, uint flags);
 
 	void Window_set_focus (Window* window, View* view);
 

data/test/test_event.rb

@@ -7,6 +7,10 @@ class TestEvent < Test::Unit::TestCase
     Reflex::UpdateEvent.new 0, 0
   end
 
+  def test_initialize()
+    assert_raise(Reflex::ReflexError) {Reflex::Event.new}
+  end
+
   def test_dup()
     e1 = event
     e2 = e1.dup

data/test/test_screen.rb

@@ -0,0 +1,18 @@
+require_relative 'helper'
+
+
+class TestScreen < Test::Unit::TestCase
+
+  def screen()
+    Reflex::Window.new.screen
+  end
+
+  def test_initialize()
+    assert_raise(Reflex::ReflexError) {Reflex::Screen.new}
+  end
+
+  def test_frame()
+    assert_raise(Rucy::InvalidObjectError) {screen.frame}
+  end
+
+end# TestScreen

data/test/test_view.rb

@@ -28,21 +28,21 @@ class TestView < Test::Unit::TestCase
 
   def test_show_hide_hidden()
     v = view
-    assert_equal false, v.hidden?
+    assert_false v.hidden?
     v.hide
-    assert_equal true, v.hidden?
+    assert_true  v.hidden?
     v.show
-    assert_equal false, v.hidden?
+    assert_false v.hidden?
   end
 
   def test_hidden_count()
     v = view
     v.show
-    assert_equal false, v.hidden?
+    assert_false v.hidden?
     v.hide
-    assert_equal false, v.hidden?
+    assert_false v.hidden?
     v.hide
-    assert_equal true, v.hidden?
+    assert_true v.hidden?
   end
 
   def test_coord_conversion()

data/test/test_window.rb

@@ -12,17 +12,21 @@ class TestWindow < Test::Unit::TestCase
 
   def test_show_hide_hidden()
     w = win
-    assert_equal true,  w.hidden
+    assert_true  w.hidden
     w.show
-    assert_equal false, w.hidden
+    assert_false w.hidden
     w.hide
-    assert_equal true,  w.hidden
+    assert_true  w.hidden
+  end
+
+  def test_hidden_count()
+    w = win
     w.hide
-    assert_equal true,  w.hidden
+    assert_true  w.hidden
     w.show
-    assert_equal true,  w.hidden
+    assert_true  w.hidden
     w.show
-    assert_equal false, w.hidden
+    assert_false w.hidden
   end
 
   def test_coord_conversion()
@@ -66,6 +70,40 @@ class TestWindow < Test::Unit::TestCase
     w.frame = [bounds(1, 2, 3, 4, 5, 6)]; assert_equal [1, 2, 0, 4, 5, 0], w.frame.to_a(3)
   end
 
+  def test_closable?()
+    w = win
+    assert_true  w.closable?
+
+    w.closable = false
+    assert_false w.closable?
+
+    w.closable = true
+    assert_true  w.closable?
+
+    w.closable false
+    assert_false w.closable?
+
+    w.closable true
+    assert_true  w.closable?
+  end
+
+  def test_minimizable?()
+    w = win
+    assert_true  w.minimizable?
+
+    w.minimizable = false
+    assert_false w.minimizable?
+
+    w.minimizable = true
+    assert_true  w.minimizable?
+
+    w.minimizable false
+    assert_false w.minimizable?
+
+    w.minimizable true
+    assert_true  w.minimizable?
+  end
+
   def test_resizable?()
     w = win
     assert_true  w.resizable?
@@ -83,6 +121,10 @@ class TestWindow < Test::Unit::TestCase
     assert_true  w.resizable?
   end
 
+  def test_screen()
+    assert_not_nil win.screen
+  end
+
   def test_root()
     w = win
     assert_not_nil       w.root

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reflexion
 version: !ruby/object:Gem::Version
-  version: 0.1.40
+  version: 0.1.41
 platform: ruby
 authors:
 - xordog
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-27 00:00:00.000000000 Z
+date: 2023-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xot
@@ -16,56 +16,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.37
+        version: 0.1.38
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.37
+        version: 0.1.38
 - !ruby/object:Gem::Dependency
   name: rucy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.37
+        version: 0.1.38
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.37
+        version: 0.1.38
 - !ruby/object:Gem::Dependency
   name: beeps
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.38
+        version: 0.1.39
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.38
+        version: 0.1.39
 - !ruby/object:Gem::Dependency
   name: rays
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.38
+        version: 0.1.39
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.38
+        version: 0.1.39
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -120,6 +120,7 @@ extra_rdoc_files:
 - ".doc/ext/reflex/polygon_shape.cpp"
 - ".doc/ext/reflex/rect_shape.cpp"
 - ".doc/ext/reflex/reflex.cpp"
+- ".doc/ext/reflex/screen.cpp"
 - ".doc/ext/reflex/scroll_event.cpp"
 - ".doc/ext/reflex/selector.cpp"
 - ".doc/ext/reflex/shape.cpp"
@@ -152,6 +153,7 @@ files:
 - ".doc/ext/reflex/polygon_shape.cpp"
 - ".doc/ext/reflex/rect_shape.cpp"
 - ".doc/ext/reflex/reflex.cpp"
+- ".doc/ext/reflex/screen.cpp"
 - ".doc/ext/reflex/scroll_event.cpp"
 - ".doc/ext/reflex/selector.cpp"
 - ".doc/ext/reflex/shape.cpp"
@@ -194,6 +196,7 @@ files:
 - ext/reflex/polygon_shape.cpp
 - ext/reflex/rect_shape.cpp
 - ext/reflex/reflex.cpp
+- ext/reflex/screen.cpp
 - ext/reflex/scroll_event.cpp
 - ext/reflex/selector.cpp
 - ext/reflex/selector.h
@@ -225,12 +228,14 @@ files:
 - include/reflex/ruby/image_view.h
 - include/reflex/ruby/pointer.h
 - include/reflex/ruby/reflex.h
+- include/reflex/ruby/screen.h
 - include/reflex/ruby/selector.h
 - include/reflex/ruby/shape.h
 - include/reflex/ruby/style.h
 - include/reflex/ruby/timer.h
 - include/reflex/ruby/view.h
 - include/reflex/ruby/window.h
+- include/reflex/screen.h
 - include/reflex/selector.h
 - include/reflex/shape.h
 - include/reflex/style.h
@@ -276,6 +281,7 @@ files:
 - lib/reflex/polyline.rb
 - lib/reflex/rect_shape.rb
 - lib/reflex/reflex.rb
+- lib/reflex/screen.rb
 - lib/reflex/scroll_event.rb
 - lib/reflex/selector.rb
 - lib/reflex/shader.rb
@@ -364,6 +370,8 @@ files:
 - src/osx/opengl_view.h
 - src/osx/opengl_view.mm
 - src/osx/reflex.mm
+- src/osx/screen.h
+- src/osx/screen.mm
 - src/osx/window.h
 - src/osx/window.mm
 - src/pointer.cpp
@@ -404,6 +412,7 @@ files:
 - test/test_pointer.rb
 - test/test_pointer_event.rb
 - test/test_reflex_init.rb
+- test/test_screen.rb
 - test/test_scroll_event.rb
 - test/test_selector.rb
 - test/test_shape.rb
@@ -453,6 +462,7 @@ test_files:
 - test/test_pointer.rb
 - test/test_pointer_event.rb
 - test/test_reflex_init.rb
+- test/test_screen.rb
 - test/test_scroll_event.rb
 - test/test_selector.rb
 - test/test_shape.rb