newt 1.0.0.pre1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3836472466affef8783a15165b2e1281b65c29d15d621638ba8e06f816ffb364
-  data.tar.gz: 639199de30d0e7e88f6a05d7e2d957af06235b4b08f1cc3b86b7f81ab2896ef2
+  metadata.gz: cfea6e7753c0686afc0a58ad7f83c8a3e0c364ef7eeeb92e1073106d74b82286
+  data.tar.gz: ace1bcde9cc75ea4bd3183b671acea3a2cc2f89062d709195f99665b978e0e01
 SHA512:
-  metadata.gz: 4d843ba26cb1bfd186bed6a06474ee928568adac9b207418c29ef7e3f760cfb313e5e01934901106bf4d7f69ea031e31763e536e6b80f1b14ea0075e08391a27
-  data.tar.gz: a668be2a8be9faeef2b3aa7219140abbf32247b1e4e01e180ee9720bb3f855ecff1c0637e0d064ef92d78cad3e262f86b56317ccc465eb15e89a1505ddf1e0d9
+  metadata.gz: 29641680f8695cc982d04735eeb7b02ebbdeca99e1c54972868ac5f6bcd5b328ffba84478611459b99e38f2677f71a0254185a89f0326e6692fbecd148b4d359
+  data.tar.gz: 7e3436704b5649ca1c67f8e81077c51c08760f46cd8fc196e3f412a48bbf68c38bf6e7c9e67582282a6670a1fc466d3a74b39d8f76d806899c830fc765bbcb73

data/README.rdoc

@@ -21,6 +21,7 @@ See http://github.com/theforeman/ruby-newt/tree/master/examples for usage exampl
 
 === From source
 
+  $ gem install rake rake-compiler
   $ git clone git://github.com/theforeman/ruby-newt
   $ cd ruby-newt
   $ gem build newt.gemspec
@@ -28,7 +29,9 @@ See http://github.com/theforeman/ruby-newt/tree/master/examples for usage exampl
 
 === Development
 
-  $ rake compile
+  $ bundle install
+  $ bundle exec rake compile
+  $ bundle exec rake test
 
 == REQUIREMENTS
 
@@ -77,6 +80,8 @@ programs using the ruby-newt library may need to be changed.
   modify this hash directly will break.
 * The various _add_callback_ methods no longer return the previously set
   callback when called with no parameters.
+* Use +get_current+ instead of +get+ for radiobuttons.
+* Use +set_current+ instead of +set+ for radiobuttons.
 
 == AUTHORS
 

data/examples/test-e.rb

@@ -49,7 +49,7 @@ e1 = Newt::Entry.new(12, 6, '', 20, 0)
 e2 = Newt::Entry.new(12, 7, 'Default', 20, Newt::FLAG_SCROLL)
 e3 = Newt::Entry.new(12, 8, '', 20, Newt::FLAG_HIDDEN)
 
-cs[0].callback( proc { disableCallback(cs[0], e1) } )
+cs[0].callback( proc { disable_callback(cs[0], e1) } )
 scale = Newt::Scale.new(3, 14, 32, 100)
 
 chklist.set_height(3)
@@ -93,13 +93,17 @@ end
 Newt::Screen.pop_window
 Newt::Screen.pop_window
 
+e1 = e1.get
+e2 = e2.get
+e3 = e3.get
+selected_list = lb.get_selection
+
 Newt::Screen.finish
 
-printf "got string 1: %s\n", e1.get
-printf "got string 2: %s\n", e2.get
-printf "got string 3: %s\n", e3.get
+printf "got string 1: %s\n", e1
+printf "got string 2: %s\n", e2
+printf "got string 3: %s\n", e3
 
-selected_list = lb.get_selection
 if selected_list.count > 0
   print "\nSelected listbox items:\n"
   selected_list.each do |item|

data/examples/test-j.rb

@@ -49,7 +49,7 @@ e1 = Newt::Entry.new(12, 6, '', 20, 0)
 e2 = Newt::Entry.new(12, 7, 'ɸ½à', 20, Newt::FLAG_SCROLL)
 e3 = Newt::Entry.new(12, 8, '', 20, Newt::FLAG_HIDDEN)
 
-cs[0].callback( proc { disableCallback(cs[0], e1) } )
+cs[0].callback( proc { disable_callback(cs[0], e1) } )
 scale = Newt::Scale.new(3, 14, 32, 100)
 
 chklist.set_height(3)
@@ -93,13 +93,17 @@ end
 Newt::Screen.pop_window
 Newt::Screen.pop_window
 
+e1 = e1.get
+e2 = e2.get
+e3 = e3.get
+selected_list = lb.get_selection
+
 Newt::Screen.finish
 
-printf "got string 1: %s\n", e1.get
-printf "got string 2: %s\n", e2.get
-printf "got string 3: %s\n", e3.get
+printf "got string 1: %s\n", e1
+printf "got string 2: %s\n", e2
+printf "got string 3: %s\n", e3
 
-selected_list = lb.get_selection
 if selected_list.count > 0
   print "\nSelected listbox items:\n"
   selected_list.each do |item|

data/examples/test_method/Checkbox.rb

@@ -20,8 +20,14 @@ begin
   f.add(cb1, cb2, cb3, cb4, cb5, b)
 
   f.run
+
+  cb1 = cb1.get
+  cb2 = cb2.get
+  cb3 = cb3.get
+  cb4 = cb4.get
+  cb5 = cb5.get
 ensure
   Newt::Screen.finish
 end
 
-p cb1.get, cb2.get, cb3.get, cb4.get, cb5.get
+p cb1, cb2, cb3, cb4, cb5

data/examples/test_method/CheckboxTree.rb

@@ -20,8 +20,9 @@ begin
   f.add(ct, b)
 
   f.run
+  selection = ct.get_selection
 ensure
   Newt::Screen.finish
 end
 
-p ct.get_selection
+p selection

data/examples/test_method/CheckboxTreeMulti.rb

@@ -18,8 +18,9 @@ begin
   f.add(ct, b)
 
   f.run
+  selection = ct.get_selection('a')
 ensure
   Newt::Screen.finish
 end
 
-p ct.get_selection('a')
+p selection

data/examples/test_method/Entry.rb

@@ -49,11 +49,15 @@ begin
   f.add(e1, e2, e3, b)
 
   f.run
+
+  e1 = e1.get
+  e2 = e2.get
+  e3 = e3.get
 ensure
   Newt::Screen.finish
 end
 
-p e1.get, e2.get, e3.get
+p e1, e2, e3
 puts
 puts "$widget = #{$widget}"
 puts "$data = #{$data}"

data/examples/test_method/Form_ExitStruct.rb

@@ -21,6 +21,7 @@ begin
   f.add(b1, b2, b)
 
   rv = f.run
+  current = f.get_current
 ensure
   Newt::Screen.finish
 end
@@ -29,7 +30,7 @@ puts rv.inspect
 puts 'Button1' if rv == b1
 puts 'Button2' if b2 == rv
 puts 'Exit' if rv == b
-puts 'Exit button is current button' if b == f.get_current
+puts 'Exit button is current button' if b == current
 puts 'Escape' if rv.reason == Newt::EXIT_HOTKEY && rv.key == ?\e.ord
 puts 'Timeout' if rv.reason == Newt::EXIT_TIMER
 puts 'FD Watch' if rv.reason == Newt::EXIT_FDREADY

data/examples/test_method/Listbox.rb

@@ -25,8 +25,9 @@ begin
   f.add(l1, b)
 
   f.run
+  item_count = l1.item_count
 ensure
   Newt::Screen.finish
 end
 
-puts "number of list items = #{l1.item_count}"
+puts "number of list items = #{item_count}"

data/examples/test_method/RadioButton.rb

@@ -16,8 +16,10 @@ begin
   f.add(rb1, rb2, b)
 
   f.run
+  current = rb1.get_current
 ensure
   Newt::Screen.finish
 end
 
-puts "selected: #{rb1.get_current}"
+puts "selected: #{current}"
+puts "current == rb1?: #{current == rb1}"

data/examples/test_method/ReflowText.rb

@@ -3,22 +3,12 @@
 require 'rubygems'
 require 'newt'
 
-text = ''
-width = 0
-height = 0
-
-begin
-  Newt::Screen.new
-
-  text, width, height = Newt.reflow_text('This is a quite a bit of text. It is 40 ' \
-					 'columns long, so some wrapping should be ' \
-					 'done. Did you know that the quick, brown ' \
-					 "fox jumped over the lazy dog?\n\n" \
-					 "In other news, it's pretty important that we " \
-					 'can properly force a line break.', 40, 5, 5)
-ensure
-  Newt::Screen.finish
-end
+text, width, height = Newt.reflow_text('This is a quite a bit of text. It is 40 ' \
+                                       'columns long, so some wrapping should be ' \
+                                       'done. Did you know that the quick, brown ' \
+                                       "fox jumped over the lazy dog?\n\n" \
+                                       "In other news, it's pretty important that we " \
+                                       'can properly force a line break.', 40, 5, 5)
 
 p text
 p width

data/examples/testgrid-e.rb

@@ -26,7 +26,6 @@ f.add(b1, b2, b3, b4)
 grid.wrapped_window('first window')
 f.run
 
-# f.destroy
 Newt::Screen.pop_window
 
 flowed_text, text_width, text_height = Newt.reflow_text('This is a quite a bit of text. It is 40 ' \
@@ -58,7 +57,6 @@ f.add(b1, t, b2)
 f.run
 
 Newt::Screen.pop_window
-# f.destroy
 
 Newt::Screen.win_message('Simple', 'Ok', 'This is a simple message window')
 result = Newt::Screen.win_choice('Simple', 'Ok', 'Cancel', 'This is a simple choice window')

data/ext/ruby_newt/extconf.rb

@@ -6,4 +6,6 @@ dir_config('newt')
 have_library('slang', 'SLsmg_refresh')
 have_library('newt', 'newtInit')
 
+append_cflags(ENV['CFLAGS'])
+append_ldflags(ENV['LDFLAGS'])
 create_makefile('ruby_newt/ruby_newt')

data/ext/ruby_newt/ruby_newt.c

@@ -6,6 +6,8 @@
 #include <ruby.h>
 #include <newt.h>
 
+static VALUE initialized = Qfalse;
+
 static VALUE mNewt;
 static VALUE mScreen;
 static VALUE cWidget;
@@ -29,6 +31,7 @@ static VALUE cGrid;
 static VALUE rb_ext_sCallback;
 static struct newtColors newtColors;
 
+#define PTR2NUM(ptr)      (SIZET2NUM((size_t)(ptr)))
 #define SYMBOL(str)       (ID2SYM(rb_intern(str)))
 #define PROC_CALL         (rb_intern("call"))
 #define RECEIVER(context) (rb_funcall((context), rb_intern("receiver"), 0))
@@ -36,14 +39,20 @@ static struct newtColors newtColors;
 #define IVAR_COLS   (rb_intern("newt_ivar_cols"))
 #define IVAR_ROWS   (rb_intern("newt_ivar_rows"))
 #define IVAR_FILTER_CALLBACK  (rb_intern("newt_ivar_filter_callback"))
-#define IVAR_SUSPEND_CALLBACK (rb_intern("newt_ivar_suspend_callback"))
-#define IVAR_HELP_CALLBACK    (rb_intern("newt_ivar_help_callback"))
-#define IVAR_WIDGET_CALLBACK  (rb_intern("newt_ivar_widget_callback"))
+#define CVAR_SUSPEND_CALLBACK (rb_intern("newt_cvar_suspend_callback"))
+#define CVAR_HELP_CALLBACK    (rb_intern("newt_cvar_help_callback"))
+#define CVAR_WIDGET_CALLBACK  (rb_intern("newt_cvar_widget_callback"))
 
 #define ARG_ERROR(given, expected) \
   rb_raise(rb_eArgError, "wrong number of arguments (given %d, expected %s)", \
            (given), (expected))
 
+#define INIT_GUARD() do { \
+  if (initialized == Qfalse) { \
+      rb_raise(rb_eRuntimeError, "libnewt is not initialized"); \
+  } \
+} while (0)
+
 #define FLAG_GC_FREE       (1 << 0)
 #define FLAG_ADDED_TO_FORM (1 << 1)
 
@@ -55,6 +64,12 @@ struct Widget_data_s {
   int flags;
 };
 
+typedef struct rb_newt_ExitStruct_s rb_newt_ExitStruct;
+struct rb_newt_ExitStruct_s {
+    struct newtExitStruct es;
+    VALUE components;
+};
+
 static void free_widget(void *ptr);
 static void form_destroy(Widget_data *form);
 
@@ -76,6 +91,7 @@ static const rb_data_type_t Widget_type = {
 
 #define Get_newtComponent(self, component) do { \
   Widget_data *data; \
+  INIT_GUARD(); \
   Get_Widget_Data((self), data); \
   (component) = data->co; \
 } while (0)
@@ -85,6 +101,7 @@ static inline VALUE widget_data_make(VALUE klass, newtComponent co, bool gc_free
   Widget_data *data;
   VALUE self = TypedData_Make_Struct(klass, Widget_data, &Widget_type, data);
   data->self = self;
+  data->components = Qnil;
   data->co = co;
   data->flags |= gc_free;
   return self;
@@ -122,6 +139,12 @@ static void form_destroy(Widget_data *form)
   rb_gc_unregister_address(&form->components);
 }
 
+static void rb_newt_es_free(rb_newt_ExitStruct *rb_es)
+{
+  rb_gc_unregister_address(&rb_es->components);
+  xfree(rb_es);
+}
+
 #define Data_Attach(self, data) do { \
   VALUE ivar = get_newt_ivar((self)); \
   rb_ary_push(ivar, (data)); \
@@ -161,23 +184,27 @@ static VALUE rb_ext_ColorSetCustom(VALUE self, VALUE id)
   return INT2NUM(NEWT_COLORSET_CUSTOM(NUM2INT(id)));
 }
 
-static VALUE rb_ext_Screen_new()
+static VALUE rb_ext_Screen_Init()
 {
+  if (initialized == Qtrue)
+    return Qnil;
+
   newtInit();
-  newtCls();
   memcpy(&newtColors, &newtDefaultColorPalette, sizeof(struct newtColors));
+  initialized = Qtrue;
   return Qnil;
 }
 
-static VALUE rb_ext_Screen_Init()
+static VALUE rb_ext_Screen_new()
 {
-  newtInit();
-  memcpy(&newtColors, &newtDefaultColorPalette, sizeof(struct newtColors));
+  rb_ext_Screen_Init();
+  newtCls();
   return Qnil;
 }
 
 static VALUE rb_ext_Screen_Cls()
 {
+  INIT_GUARD();
   newtCls();
   return Qnil;
 }
@@ -185,17 +212,20 @@ static VALUE rb_ext_Screen_Cls()
 static VALUE rb_ext_Screen_Finished()
 {
   newtFinished();
+  initialized = Qfalse;
   return Qnil;
 }
 
 static VALUE rb_ext_Screen_WaitForKey()
 {
+  INIT_GUARD();
   newtWaitForKey();
   return Qnil;
 }
 
 static VALUE rb_ext_Screen_ClearKeyBuffer()
 {
+  INIT_GUARD();
   newtClearKeyBuffer();
   return Qnil;
 }
@@ -203,17 +233,20 @@ static VALUE rb_ext_Screen_ClearKeyBuffer()
 static VALUE rb_ext_Screen_OpenWindow(VALUE self, VALUE left, VALUE top,
     VALUE width, VALUE height, VALUE title)
 {
+  INIT_GUARD();
   return INT2NUM(newtOpenWindow(NUM2INT(left), NUM2INT(top), NUM2INT(width),
                                 NUM2INT(height), StringValuePtr(title)));
 }
 
 static VALUE rb_ext_Screen_CenteredWindow(VALUE self, VALUE width, VALUE height, VALUE title)
 {
+  INIT_GUARD();
   return INT2NUM(newtCenteredWindow(NUM2INT(width), NUM2INT(height), StringValuePtr(title)));
 }
 
 static VALUE rb_ext_Screen_PopWindow(VALUE self)
 {
+  INIT_GUARD();
   newtPopWindow();
   return Qnil;
 }
@@ -361,43 +394,50 @@ static VALUE rb_ext_Screen_SetColors(VALUE self, VALUE colors)
 {
   Check_Type(colors, T_HASH);
   rb_hash_foreach(colors, rb_ext_Colors_callback_function, (VALUE) &newtColors);
+
+  INIT_GUARD();
   newtSetColors(newtColors);
   return Qnil;
 }
 
 static VALUE rb_ext_Screen_SetColor(VALUE self, VALUE colorset, VALUE fg, VALUE bg)
 {
+  INIT_GUARD();
   newtSetColor(NUM2INT(colorset), StringValuePtr(fg), StringValuePtr(bg));
   return Qnil;
 }
 
 static VALUE rb_ext_Screen_Resume()
 {
+  INIT_GUARD();
   newtResume();
   return Qnil;
 }
 
 static VALUE rb_ext_Screen_Suspend()
 {
+  INIT_GUARD();
   newtSuspend();
   return Qnil;
 }
 
 static VALUE rb_ext_Screen_Refresh()
 {
+  INIT_GUARD();
   newtRefresh();
   return Qnil;
 }
 
 static VALUE rb_ext_Screen_DrawRootText(VALUE self, VALUE col, VALUE row, VALUE text)
 {
-
+  INIT_GUARD();
   newtDrawRootText(NUM2INT(col), NUM2INT(row), StringValuePtr(text));
   return Qnil;
 }
 
 static VALUE rb_ext_Screen_PushHelpLine(VALUE self, VALUE text)
 {
+  INIT_GUARD();
   newtPushHelpLine(StringValuePtr(text));
 
   return Qnil;
@@ -405,30 +445,35 @@ static VALUE rb_ext_Screen_PushHelpLine(VALUE self, VALUE text)
 
 static VALUE rb_ext_Screen_RedrawHelpLine(VALUE self)
 {
+  INIT_GUARD();
   newtRedrawHelpLine();
   return Qnil;
 }
 
 static VALUE rb_ext_Screen_PopHelpLine(VALUE self)
 {
+  INIT_GUARD();
   newtPopHelpLine();
   return Qnil;
 }
 
 static VALUE rb_ext_Screen_Bell(VALUE self)
 {
+  INIT_GUARD();
   newtBell();
   return Qnil;
 }
 
 static VALUE rb_ext_Screen_CursorOff(VALUE self)
 {
+  INIT_GUARD();
   newtCursorOff();
   return Qnil;
 }
 
 static VALUE rb_ext_Screen_CursorOn(VALUE self)
 {
+  INIT_GUARD();
   newtCursorOn();
   return Qnil;
 }
@@ -437,12 +482,14 @@ static VALUE rb_ext_Screen_Size(VALUE self)
 {
   int cols, rows;
 
+  INIT_GUARD();
   newtGetScreenSize(&cols, &rows);
   return rb_ary_new_from_args(2, INT2NUM(cols), INT2NUM(rows));
 }
 
 static VALUE rb_ext_Screen_WinMessage(VALUE self, VALUE title, VALUE button, VALUE text)
 {
+  INIT_GUARD();
   newtWinMessage(StringValuePtr(title), StringValuePtr(button), StringValuePtr(text));
   return Qnil;
 }
@@ -450,6 +497,8 @@ static VALUE rb_ext_Screen_WinMessage(VALUE self, VALUE title, VALUE button, VAL
 static VALUE rb_ext_Screen_WinChoice(VALUE self, VALUE title, VALUE button1, VALUE button2, VALUE text)
 {
   int result;
+
+  INIT_GUARD();
   result = newtWinChoice(StringValuePtr(title), StringValuePtr(button1),
                          StringValuePtr(button2), StringValuePtr(text));
   return INT2NUM(result);
@@ -467,6 +516,7 @@ static VALUE rb_ext_Screen_WinMenu(VALUE self, VALUE args)
   if (len < 8 || len > 9)
     ARG_ERROR(len, "8..9");
 
+  INIT_GUARD();
   title = StringValuePtr(RARRAY_PTR(args)[0]);
   text = StringValuePtr(RARRAY_PTR(args)[1]);
   width = NUM2INT(RARRAY_PTR(args)[2]);
@@ -504,6 +554,7 @@ static VALUE rb_ext_Screen_WinEntries(VALUE self, VALUE args)
   if (len < 8 || len > 9)
     ARG_ERROR(len, "8..9");
 
+  INIT_GUARD();
   title = StringValuePtr(RARRAY_PTR(args)[0]);
   text = StringValuePtr(RARRAY_PTR(args)[1]);
   width = NUM2INT(RARRAY_PTR(args)[2]);
@@ -555,7 +606,7 @@ void rb_ext_Screen_help_callback_function(newtComponent co, void *data)
   VALUE context, callback;
 
   widget = Make_Widget_Ref(cForm, co);
-  cb = rb_ivar_get(mScreen, IVAR_HELP_CALLBACK);
+  cb = rb_cvar_get(mScreen, CVAR_HELP_CALLBACK);
   context = RSTRUCT_GET((VALUE) cb, 1);
   callback = RSTRUCT_GET((VALUE) cb, 2);
 
@@ -610,19 +661,23 @@ static VALUE rb_ext_Screen_SuspendCallback(int argc, VALUE *argv, VALUE self)
   if (argc < 1 || argc > 2)
     ARG_ERROR(argc, "1 or 2");
 
+  INIT_GUARD();
   if (argc == 2)
     data = argv[1];
 
   cb = rb_struct_new(rb_ext_sCallback, self, rb_binding_new(), argv[0], data, NULL);
-  rb_ivar_set(self, IVAR_SUSPEND_CALLBACK, cb);
+  rb_obj_freeze(cb);
+  rb_cvar_set(self, CVAR_SUSPEND_CALLBACK, cb);
   newtSetSuspendCallback(rb_ext_Screen_suspend_callback_function, (void *) cb);
   return Qnil;
 }
 
 static VALUE rb_ext_Screen_HelpCallback(VALUE self, VALUE cb)
 {
+  INIT_GUARD();
   cb = rb_struct_new(rb_ext_sCallback, Qnil, rb_binding_new(), cb, Qnil, NULL);
-  rb_ivar_set(self, IVAR_HELP_CALLBACK, cb);
+  rb_obj_freeze(cb);
+  rb_cvar_set(self, CVAR_HELP_CALLBACK, cb);
   newtSetHelpCallback(rb_ext_Screen_help_callback_function);
   return Qnil;
 }
@@ -635,12 +690,14 @@ static VALUE rb_ext_Widget_callback(int argc, VALUE *argv, VALUE self)
   if (argc < 1 || argc > 2)
     ARG_ERROR(argc, "1 or 2");
 
+  INIT_GUARD();
   if (argc == 2)
     data = argv[1];
 
   Get_newtComponent(self, co);
   cb = rb_struct_new(rb_ext_sCallback, self, rb_binding_new(), argv[0], data, NULL);
-  rb_ivar_set(self, IVAR_WIDGET_CALLBACK, cb);
+  rb_obj_freeze(cb);
+  rb_cvar_set(self, CVAR_WIDGET_CALLBACK, cb);
   newtComponentAddCallback(co, rb_ext_Widget_callback_function, (void *) cb);
   return Qnil;
 }
@@ -683,94 +740,117 @@ static VALUE rb_ext_Widget_equal(VALUE self, VALUE obj)
   if (self == obj) return Qtrue;
 
   if (rb_obj_is_kind_of(obj, cWidget) || rb_obj_is_kind_of(obj, cExitStruct)) {
-    Get_newtComponent(self, co);
+    Get_Widget_Data(self, data);
+    co = ((Widget_data *) data)->co;
     if (rb_obj_is_kind_of(obj, cExitStruct)) {
-      Data_Get_Struct(obj, struct newtExitStruct, data);
-      if (co == ((struct newtExitStruct *) data)->u.co)
+      Data_Get_Struct(obj, rb_newt_ExitStruct, data);
+      if (co == (((rb_newt_ExitStruct *) data)->es.u.co))
         return Qtrue;
     } else {
-      Get_newtComponent(obj, cco);
+      Get_Widget_Data(obj, data);
+      cco = ((Widget_data *) data)->co;
       if (co == cco) return Qtrue;
     }
   }
   return Qfalse;
 }
 
+static VALUE rb_ext_Widget_inspect(VALUE self)
+{
+  newtComponent co;
+  void *data;
+
+  VALUE classname = rb_class_name(rb_obj_class(self));
+  char *class = StringValuePtr(classname);
+
+  Get_Widget_Data(self, data);
+  co = ((Widget_data *) data)->co;
+  return rb_sprintf("#<%s:%p component=%p>", class, (void *) self, co);
+}
+
 static VALUE rb_ext_ExitStruct_reason(VALUE self)
 {
-  struct newtExitStruct *es;
+  rb_newt_ExitStruct *rb_es;
 
-  Data_Get_Struct(self, struct newtExitStruct, es);
-  return INT2NUM(es->reason);
+  Data_Get_Struct(self, rb_newt_ExitStruct, rb_es);
+  return INT2NUM(rb_es->es.reason);
 }
 
 static VALUE rb_ext_ExitStruct_watch(VALUE self)
 {
-  struct newtExitStruct *es;
+  rb_newt_ExitStruct *rb_es;
 
-  Data_Get_Struct(self, struct newtExitStruct, es);
-  if (es->reason == NEWT_EXIT_FDREADY)
-    return INT2NUM(es->u.watch);
+  Data_Get_Struct(self, rb_newt_ExitStruct, rb_es);
+  if (rb_es->es.reason == NEWT_EXIT_FDREADY)
+    return INT2NUM(rb_es->es.u.watch);
   else
     return Qnil;
 }
 
 static VALUE rb_ext_ExitStruct_key(VALUE self)
 {
-  struct newtExitStruct *es;
+  rb_newt_ExitStruct *rb_es;
 
-  Data_Get_Struct(self, struct newtExitStruct, es);
-  if (es->reason == NEWT_EXIT_HOTKEY)
-    return INT2NUM(es->u.key);
+  Data_Get_Struct(self, rb_newt_ExitStruct, rb_es);
+  if (rb_es->es.reason == NEWT_EXIT_HOTKEY)
+    return INT2NUM(rb_es->es.u.key);
   else
     return Qnil;
 }
 
 static VALUE rb_ext_ExitStruct_component(VALUE self)
 {
-  struct newtExitStruct *es;
+  rb_newt_ExitStruct *rb_es;
 
-  Data_Get_Struct(self, struct newtExitStruct, es);
-  if (es->reason == NEWT_EXIT_COMPONENT)
-    return Make_Widget(cWidget, es->u.co);
-  else
-    return Qnil;
+  Data_Get_Struct(self, rb_newt_ExitStruct, rb_es);
+  if (rb_es->es.reason == NEWT_EXIT_COMPONENT) {
+      return rb_hash_aref(rb_es->components, PTR2NUM(rb_es->es.u.co));
+  } else {
+      return Qnil;
+  }
 }
 
 static VALUE rb_ext_ExitStruct_equal(VALUE self, VALUE obj)
 {
-  struct newtExitStruct *es;
+  rb_newt_ExitStruct *rb_es;
   newtComponent co;
+  void *data;
 
   if (NIL_P(obj)) return Qfalse;
   if (self == obj) return Qtrue;
 
   /* Compare components for backwards compatibility with newtRunForm(). */
   if (rb_obj_is_kind_of(obj, cWidget)) {
-    Data_Get_Struct(self, struct newtExitStruct, es);
-    Get_newtComponent(obj, co);
-    if (es->reason == NEWT_EXIT_COMPONENT && es->u.co == co) return Qtrue;
+    Data_Get_Struct(self, rb_newt_ExitStruct, rb_es);
+    Get_Widget_Data(obj, data);
+    co = ((Widget_data *) data)->co;
+    if (rb_es->es.reason == NEWT_EXIT_COMPONENT
+        && rb_es->es.u.co == co) return Qtrue;
   }
   return Qfalse;
 }
 
 static VALUE rb_ext_ExitStruct_inspect(VALUE self)
 {
-  struct newtExitStruct *es;
+  rb_newt_ExitStruct *rb_es;
   VALUE classname = rb_class_name(rb_obj_class(self));
   char *class = StringValuePtr(classname);
 
-  Data_Get_Struct(self, struct newtExitStruct, es);
-  switch(es->reason) {
+  Data_Get_Struct(self, rb_newt_ExitStruct, rb_es);
+  switch(rb_es->es.reason) {
     case NEWT_EXIT_HOTKEY:
-      return rb_sprintf("#<%s reason=%d, key=%d>", class, es->reason, es->u.key);
+      return rb_sprintf("#<%s:%p reason=%d, key=%d>", class, (void *) self,
+                        rb_es->es.reason, rb_es->es.u.key);
     case NEWT_EXIT_COMPONENT:
-      return rb_sprintf("#<%s reason=%d, component=%p>", class, es->reason, es->u.co);
+      return rb_sprintf("#<%s:%p reason=%d, component=%p>", class, (void *) self,
+                        rb_es->es.reason, rb_es->es.u.co);
     case NEWT_EXIT_FDREADY:
-      return rb_sprintf("#<%s reason=%d, watch=%d>", class, es->reason, es->u.watch);
+      return rb_sprintf("#<%s:%p reason=%d, watch=%d>", class, (void *) self,
+                        rb_es->es.reason, rb_es->es.u.watch);
     case NEWT_EXIT_TIMER:
     case NEWT_EXIT_ERROR:
-      return rb_sprintf("#<%s reason=%d>", class, es->reason);
+      return rb_sprintf("#<%s:%p reason=%d>", class, (void *) self,
+                        rb_es->es.reason);
     default:
       return rb_call_super(0, NULL);
   }
@@ -780,16 +860,17 @@ static VALUE rb_ext_Label_new(VALUE self, VALUE left, VALUE top, VALUE text)
 {
   newtComponent co;
 
+  INIT_GUARD();
   co = newtLabel(NUM2INT(left), NUM2INT(top), StringValuePtr(text));
   return Make_Widget(self, co);
 }
 
 static VALUE rb_ext_Label_SetText(VALUE self, VALUE text)
 {
-  Widget_data *data;
+  newtComponent co;
 
-  Get_Widget_Data(self, data);
-  newtLabelSetText(data->co, StringValuePtr(text));
+  Get_newtComponent(self, co);
+  newtLabelSetText(co, StringValuePtr(text));
   return Qnil;
 }
 
@@ -806,6 +887,7 @@ static VALUE rb_ext_CompactButton_new(VALUE self, VALUE left, VALUE top, VALUE t
 {
   newtComponent co;
 
+  INIT_GUARD();
   co = newtCompactButton(NUM2INT(left), NUM2INT(top), StringValuePtr(text));
   return Make_Widget(self, co);
 }
@@ -814,6 +896,7 @@ static VALUE rb_ext_Button_new(VALUE self, VALUE left, VALUE top, VALUE text)
 {
   newtComponent co;
 
+  INIT_GUARD();
   co = newtButton(NUM2INT(left), NUM2INT(top), StringValuePtr(text));
   return Make_Widget(self, co);
 }
@@ -827,6 +910,7 @@ static VALUE rb_ext_Checkbox_new(int argc, VALUE *argv, VALUE self)
   if (argc < 3 || argc > 5)
     ARG_ERROR(argc, "3..5");
 
+  INIT_GUARD();
   if (argc > 3 && !NIL_P(argv[3]))
     defValue = StringValuePtr(argv[3])[0];
 
@@ -883,6 +967,7 @@ static VALUE rb_ext_RadioButton_new(int argc, VALUE *argv, VALUE self)
   if (argc < 3 || argc > 5)
     ARG_ERROR(argc, "3..5");
 
+  INIT_GUARD();
   if (argc >= 4)
     is_default = NUM2INT(argv[3]);
 
@@ -919,7 +1004,9 @@ static VALUE rb_ext_Listbox_new(int argc, VALUE *argv, VALUE self)
   if (argc < 3 || argc > 4)
     ARG_ERROR(argc, "3..4");
 
+  INIT_GUARD();
   flags = (argc == 4) ? NUM2INT(argv[3]) : 0;
+
   co = newtListbox(NUM2INT(argv[0]), NUM2INT(argv[1]), NUM2INT(argv[2]), flags);
   return Make_Widget(self, co);
 }
@@ -1091,7 +1178,9 @@ static VALUE rb_ext_CheckboxTree_new(int argc, VALUE *argv, VALUE self)
   if (argc < 3 || argc > 4)
     ARG_ERROR(argc, "3..4");
 
+  INIT_GUARD();
   flags = (argc == 4) ? NUM2INT(argv[3]) : 0;
+
   co = newtCheckboxTree(NUM2INT(argv[0]), NUM2INT(argv[1]), NUM2INT(argv[2]), flags);
   return Make_Widget(self, co);
 }
@@ -1213,11 +1302,13 @@ static VALUE rb_ext_CheckboxTreeMulti_new(int argc, VALUE *argv, VALUE self)
   if (argc < 3 || argc > 5)
     ARG_ERROR(argc, "3..5");
 
+  INIT_GUARD();
   seq = NULL;
   if (argc >= 4 && !NIL_P(argv[3]) && RSTRING_LEN(argv[3]))
     seq = StringValuePtr(argv[3]);
 
   flags = (argc == 5) ? NUM2INT(argv[4]) : 0;
+
   co = newtCheckboxTreeMulti(NUM2INT(argv[0]), NUM2INT(argv[1]), NUM2INT(argv[2]), seq, flags);
   return Make_Widget(self, co);
 }
@@ -1241,7 +1332,9 @@ static VALUE rb_ext_Textbox_new(int argc, VALUE *argv, VALUE self)
   if (argc < 4 || argc > 5)
     ARG_ERROR(argc, "4..5");
 
+  INIT_GUARD();
   flags = (argc == 5) ? NUM2INT(argv[4]) : 0;
+
   co = newtTextbox(NUM2INT(argv[0]), NUM2INT(argv[1]), NUM2INT(argv[2]), NUM2INT(argv[3]), flags);
   return Make_Widget(self, co);
 }
@@ -1289,7 +1382,9 @@ static VALUE rb_ext_TextboxReflowed_new(int argc, VALUE *argv, VALUE self)
   if (argc < 6 || argc > 7)
     ARG_ERROR(argc, "6..7");
 
+  INIT_GUARD();
   flags = (argc == 7) ? NUM2INT(argv[6]) : 0;
+
   co = newtTextboxReflowed(NUM2INT(argv[0]), NUM2INT(argv[1]),
                            StringValuePtr(argv[2]), NUM2INT(argv[3]),
                            NUM2INT(argv[4]), NUM2INT(argv[5]), flags);
@@ -1306,6 +1401,7 @@ static VALUE rb_ext_Form_new(int argc, VALUE *argv, VALUE self)
   if (argc > 3)
     ARG_ERROR(argc, "0..3");
 
+  INIT_GUARD();
   helpTag = (argc >= 2) ? argv[1] : Qnil;
   flags = (argc == 3) ? NUM2INT(argv[2]) : 0;
 
@@ -1329,9 +1425,10 @@ static VALUE rb_ext_Form_AddComponents(VALUE self, VALUE components)
   VALUE str;
   int i;
 
+  INIT_GUARD();
   Get_Widget_Data(self, form);
-  if (RARRAY_LEN(components) > 0 && (void *) form->components == NULL) {
-    form->components = rb_ary_new();
+  if (RARRAY_LEN(components) > 0 && form->components == Qnil) {
+    form->components = rb_hash_new();
     rb_gc_register_address(&form->components);
   }
 
@@ -1345,7 +1442,7 @@ static VALUE rb_ext_Form_AddComponents(VALUE self, VALUE components)
 
     co->flags ^= FLAG_GC_FREE;
     co->flags |= FLAG_ADDED_TO_FORM;
-    rb_ary_push(form->components, RARRAY_PTR(components)[i]);
+    rb_hash_aset(form->components, PTR2NUM(co->co), RARRAY_PTR(components)[i]);
     newtFormAddComponent(form->co, co->co);
   }
   return Qnil;
@@ -1399,13 +1496,16 @@ static VALUE rb_ext_Form_SetWidth(VALUE self, VALUE width)
 
 static VALUE rb_ext_Form_Run(VALUE self)
 {
-  newtComponent form;
-  struct newtExitStruct *es;
+  Widget_data *data;
+  rb_newt_ExitStruct *rb_es;
 
-  Get_newtComponent(self, form);
-  es = ALLOC(struct newtExitStruct);
-  newtFormRun(form, es);
-  return Data_Wrap_Struct(cExitStruct, 0, xfree, es);
+  INIT_GUARD();
+  Get_Widget_Data(self, data);
+  rb_es = ALLOC(rb_newt_ExitStruct);
+  newtFormRun(data->co, &rb_es->es);
+  rb_es->components = data->components;
+  rb_gc_register_address(&rb_es->components);
+  return Data_Wrap_Struct(cExitStruct, 0, rb_newt_es_free, rb_es);
 }
 
 static VALUE rb_ext_Form_DrawForm(VALUE self)
@@ -1457,7 +1557,9 @@ static VALUE rb_ext_Entry_new(int argc, VALUE *argv, VALUE self)
   if (argc < 4 || argc > 5)
     ARG_ERROR(argc, "4..5");
 
+  INIT_GUARD();
   flags = (argc == 5) ? NUM2INT(argv[4]) : 0;
+
   co = newtEntry(NUM2INT(argv[0]), NUM2INT(argv[1]), StringValuePtr(argv[2]),
                  NUM2INT(argv[3]), NULL, flags);
 
@@ -1507,6 +1609,7 @@ static VALUE rb_ext_Entry_SetFilter(int argc, VALUE *argv, VALUE self)
 
   Get_newtComponent(self, co);
   cb = rb_struct_new(rb_ext_sCallback, self, rb_binding_new(), argv[0], data, NULL);
+  rb_obj_freeze(cb);
   rb_ivar_set(self, IVAR_FILTER_CALLBACK, cb);
   newtEntrySetFilter(co, rb_ext_Entry_filter_function, (void *) cb);
   return Qnil;
@@ -1558,6 +1661,7 @@ static VALUE rb_ext_Scale_new(VALUE self, VALUE left, VALUE top, VALUE width, VA
 {
   newtComponent co;
 
+  INIT_GUARD();
   co = newtScale(NUM2INT(left), NUM2INT(top), NUM2INT(width), NUM2INT(fullValue));
   return Make_Widget(self, co);
 }
@@ -1592,6 +1696,7 @@ static VALUE rb_ext_Grid_new(VALUE self, VALUE cols, VALUE rows)
   if (num_cols <= 0 || num_rows <= 0)
     rb_raise(rb_eRuntimeError, "specified number of columns or rows should be greater than 0");
 
+  INIT_GUARD();
   grid = newtCreateGrid(num_cols, num_rows);
   widget = Data_Wrap_Struct(self, 0, 0, grid);
   rb_ivar_set(widget, IVAR_COLS, cols);
@@ -1615,10 +1720,13 @@ static VALUE rb_ext_Grid_SetField(VALUE self, VALUE col, VALUE row, VALUE type,
   if (icol >= cols || irow >= rows)
     rb_raise(rb_eRuntimeError, "attempting to set a field at an invalid position (%d, %d)", icol, irow);
 
-  if (itype == NEWT_GRID_SUBGRID)
+  INIT_GUARD();
+  if (itype == NEWT_GRID_SUBGRID) {
     Data_Get_Struct(val, struct grid_s, co);
-  else
-    Get_newtComponent(val, co);
+  } else {
+    Get_Widget_Data(val, co);
+    co = ((Widget_data *) co)->co;
+  }
 
   Data_Get_Struct(self, struct grid_s, grid);
   newtGridSetField(grid, icol, irow, itype, co, NUM2INT(padLeft),
@@ -1636,6 +1744,7 @@ static VALUE rb_ext_Grid_WrappedWindow(int argc, VALUE *argv, VALUE self)
   if (argc != 1 && argc != 3)
     ARG_ERROR(argc, "1 or 3");
 
+  INIT_GUARD();
   title = StringValuePtr(argv[0]);
   Data_Get_Struct(self, struct grid_s, grid);
   if (argc == 1) {
@@ -1651,6 +1760,7 @@ static VALUE rb_ext_Grid_GetSize(VALUE self)
   newtGrid grid;
   int width, height;
 
+  INIT_GUARD();
   Data_Get_Struct(self, struct grid_s, grid);
   newtGridGetSize(grid, &width, &height);
   return rb_ary_new_from_args(2, INT2NUM(width), INT2NUM(height));
@@ -1658,12 +1768,14 @@ static VALUE rb_ext_Grid_GetSize(VALUE self)
 
 void Init_ruby_newt(){
   mNewt = rb_define_module("Newt");
+  rb_define_module_function(mNewt, "init", rb_ext_Screen_Init, 0);
+  rb_define_module_function(mNewt, "finish", rb_ext_Screen_Finished, 0);
   rb_define_module_function(mNewt, "delay", rb_ext_Delay, 1);
   rb_define_module_function(mNewt, "reflow_text", rb_ext_ReflowText, 4);
 
   mScreen = rb_define_class_under(mNewt, "Screen", rb_cObject);
-  rb_define_module_function(mScreen, "new", rb_ext_Screen_new, 0);
   rb_define_module_function(mScreen, "init", rb_ext_Screen_Init, 0);
+  rb_define_module_function(mScreen, "new", rb_ext_Screen_new, 0);
   rb_define_module_function(mScreen, "cls", rb_ext_Screen_Cls, 0);
   rb_define_module_function(mScreen, "finish", rb_ext_Screen_Finished, 0);
   rb_define_module_function(mScreen, "wait_for_key", rb_ext_Screen_WaitForKey, 0);
@@ -1691,7 +1803,7 @@ void Init_ruby_newt(){
   rb_define_module_function(mScreen, "win_menu", rb_ext_Screen_WinMenu, -2);
   rb_define_module_function(mScreen, "win_entries", rb_ext_Screen_WinEntries, -2);
 
-  rb_ext_sCallback = rb_struct_define(NULL, "widget", "context", "callback", "data", NULL);
+  rb_ext_sCallback = rb_struct_define("NewtCallback", "widget", "context", "callback", "data", NULL);
 
   cWidget = rb_define_class_under(mNewt, "Widget", rb_cObject);
   rb_define_method(cWidget, "callback", rb_ext_Widget_callback, -1);
@@ -1699,6 +1811,7 @@ void Init_ruby_newt(){
   rb_define_method(cWidget, "get_position", rb_ext_Widget_GetPosition, 0);
   rb_define_method(cWidget, "get_size", rb_ext_Widget_GetSize, 0);
   rb_define_method(cWidget, "==", rb_ext_Widget_equal, 1);
+  rb_define_method(cWidget, "inspect", rb_ext_Widget_inspect, 0);
 
   cCompactButton = rb_define_class_under(mNewt, "CompactButton", cWidget);
   rb_define_singleton_method(cCompactButton, "new", rb_ext_CompactButton_new, 3);

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Newt
-  VERSION = '1.0.0.pre1'
+  VERSION = '1.0.0'
 end

metadata

@@ -1,16 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: newt
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre1
+  version: 1.0.0
 platform: ruby
 authors:
 - Noritsugu Nakamura
 - Eric Sperano
 - Lukas Zapletal
-autorequire: 
+- Robert Gill
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-03-06 00:00:00.000000000 Z
+date: 2022-03-02 00:00:00.000000000 Z
 dependencies: []
 description: Ruby bindings for newt TUI library
 email: foreman-dev@googlegroups.com
@@ -66,7 +67,7 @@ homepage: https://github.com/theforeman/ruby-newt
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -78,13 +79,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: Ruby bindings for newt
 test_files: []