glimmer-dsl-opal 0.26.0 → 0.26.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0deb6c6d04586f92d01c22a4228072fcfa145359121f33d92265c580fc1abd91
-  data.tar.gz: fc11c74ce51115dc92548debd2bf3a1d590ba638915de71f33455ee62a82c5fb
+  metadata.gz: e1bec8104295a4c2f4a5b3f6d1464c9e0b0f5175092e93b7dd9508a5c4feabd0
+  data.tar.gz: 778f2026c647b7454d0586cf2310297d143d122a4b8937ec6189abdba260667d
 SHA512:
-  metadata.gz: e7849b84f8ee8c749c69636abbe7490a3ac2585957fa7c526b1a2a322eb40d7d1bfdba66e344c8f1f3b76095fb1a2ed5210ae62c08db093828be823f10fd9e33
-  data.tar.gz: 12125b86cdd30f321311e3909b8f50e4383eb2fea2938b4983d02a5860f0d3a056d50dce9d94abe7a68f557d1c374d998e3fcfb25de90edc1d3b936cc033f1b6
+  metadata.gz: 33e3f1b4bd51b3cfdc34d9f24403bb47d0a889c235e169232a3e8b8dae6db26617110dd55f8ed4a40d752c2e5f60569ea70c2b95db7a4435f1a2fddac25e3d7f
+  data.tar.gz: 8fafbadda7e92fcf19ac96b994e3dcb67ed25febcdd521a97e94f57a66f272312cbc6763a341c30b1f1cf46e27ff62928eaed02cf8f1aa91c72590794e6ec7ee

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change Log
 
+## 0.26.1
+
+- Support display on_swt_keydown event keyCode/key_code values for arrow keys and alt/shift/ctrl
+- Use arrow keys for movement in Tetris
+- Use alt/shift keys for rotate right in Tetris
+
 ## 0.26.0
 
 - Tetris elaborate sample (minimal initial version of the one in Glimmer DSL for SWT)

data/README.md

@@ -145,7 +145,7 @@ Hello, Table! Game Booked
 
 NOTE: Glimmer DSL for Opal is an alpha project. Please help make better by contributing, adopting for small or low risk projects, and providing feedback. It is still an early alpha, so the more feedback and issues you report the better.
 
-**Alpha Version** 0.25.4 only supports bare-minimum capabilities for the included [samples](https://github.com/AndyObtiva/glimmer-dsl-opal#samples) (originally written for [glimmer-dsl-swt](https://github.com/AndyObtiva/glimmer-dsl-swt))
+**Alpha Version** 0.26.1 only supports bare-minimum capabilities for the included [samples](https://github.com/AndyObtiva/glimmer-dsl-opal#samples) (originally written for [glimmer-dsl-swt](https://github.com/AndyObtiva/glimmer-dsl-swt))
 
 Other [Glimmer](https://github.com/AndyObtiva/glimmer) DSL gems:
 - [glimmer-dsl-swt](https://github.com/AndyObtiva/glimmer-dsl-swt): Glimmer DSL for SWT (JRuby Desktop Development GUI Framework)
@@ -269,7 +269,7 @@ gem 'opal', '1.0.5'
 gem 'opal-rails', '1.1.2'
 gem 'opal-async', '~> 1.4.0'
 gem 'opal-jquery', '~> 0.4.4'
-gem 'glimmer-dsl-opal', '~> 0.25.4'
+gem 'glimmer-dsl-opal', '~> 0.26.1'
 gem 'glimmer-dsl-xml', '~> 1.2.0', require: false
 gem 'glimmer-dsl-css', '~> 1.2.0', require: false
 

data/VERSION

@@ -1 +1 @@
-0.26.0
+0.26.1

data/lib/glimmer/swt/display_proxy.rb

@@ -1,8 +1,19 @@
 require 'glimmer/swt/widget_proxy'
+require 'glimmer/swt/swt_proxy'
 
 module Glimmer
   module SWT
     class DisplayProxy < WidgetProxy
+      JS_KEY_CODE_TO_SWT_KEY_CODE_MAP = {
+        16 => SWTProxy[:shift],
+        17 => SWTProxy[:ctrl],
+        18 => SWTProxy[:alt],
+        37 => SWTProxy[:arrow_left],
+        38 => SWTProxy[:arrow_up],
+        39 => SWTProxy[:arrow_right],
+        40 => SWTProxy[:arrow_down],
+      }
+    
       class << self
         def instance
           @instance ||= new
@@ -95,9 +106,10 @@ module Glimmer
                   event.singleton_class.define_method(:character) do
                     which || key_code
                   end
-                  event.define_singleton_method(:keyCode) {event.which}
+                  event.define_singleton_method(:keyCode) {
+                    JS_KEY_CODE_TO_SWT_KEY_CODE_MAP[event.which] || event.which
+                  }
                   event.define_singleton_method(:key_code, &event.method(:keyCode))
-                  # TODO support alt/ctrl/shift/command & arrow keys in keyCode
                   event.define_singleton_method(:character) {event.which.chr}
                   event.define_singleton_method(:stateMask) do
                     state_mask = 0
@@ -134,9 +146,10 @@ module Glimmer
                   event.singleton_class.define_method(:character) do
                     which || key_code
                   end
-                  event.define_singleton_method(:keyCode) {event.which}
+                  event.define_singleton_method(:keyCode) {
+                    JS_KEY_CODE_TO_SWT_KEY_CODE_MAP[event.which] || event.which
+                  }
                   event.define_singleton_method(:key_code, &event.method(:keyCode))
-                  # TODO support alt/ctrl/shift/command & arrow keys in keyCode
                   event.define_singleton_method(:character) {event.which.chr}
                   event.define_singleton_method(:stateMask) do
                     state_mask = 0
@@ -152,7 +165,7 @@ module Glimmer
                     doit = value
                   end
                   event.define_singleton_method(:doit) { doit }
-                  event_listener.call(event) if event.key_code != 13 && (event.key_code == 127 || event.key_code <= 31)
+                  event_listener.call(event) if event.which != 13 && (event.which == 127 || event.which <= 40)
                   
                     # TODO Fix doit false, it's not stopping input
                   unless doit

data/lib/glimmer-dsl-opal/samples/elaborate/tetris/view/block.rb

@@ -19,8 +19,6 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-# require_relative 'bevel'
-
 class Tetris
   module View
     class Block
@@ -31,9 +29,6 @@ class Tetris
       body {
         canvas { |canvas_proxy|
           background <= [game_playfield[row][column], :color]
-#           bevel(size: block_size) {
-#             base_color <= [game_playfield[row][column], :color]
-#           }
         }
       }
     end

data/lib/glimmer-dsl-opal/samples/elaborate/tetris/view/playfield.rb

@@ -29,7 +29,7 @@ class Tetris
       options :game_playfield, :playfield_width, :playfield_height, :block_size
   
       body {
-        composite((:double_buffered unless OS.mac?)) {
+        composite {
           grid_layout {
             num_columns playfield_width
             make_columns_equal_width true

data/lib/glimmer-dsl-opal/samples/elaborate/tetris/view/score_lane.rb

@@ -39,10 +39,6 @@ class Tetris
           row_layout {
             type :vertical
             center true
-#             fill true
-#             margin_width 0
-#             margin_right block_size
-#             margin_height block_size
           }
           label(:center) {
             text 'Next'

data/lib/glimmer-dsl-opal/samples/elaborate/tetris.rb

@@ -25,8 +25,11 @@ require_relative 'tetris/view/playfield'
 require_relative 'tetris/view/score_lane'
 require_relative 'tetris/view/high_score_dialog'
 require_relative 'tetris/view/tetris_menu_bar'
-
-# Tetris App View Custom Shell (represents `tetris` keyword)
+class Event
+  def location
+    `#@native.location`
+  end
+end
 class Tetris
   include Glimmer::UI::CustomShell
   
@@ -49,7 +52,7 @@ class Tetris
     display {
       on_swt_keydown do |key_event|
         case key_event.keyCode
-        when 'w'.bytes.first
+        when swt(:arrow_up), 'w'.bytes.first
           case game.up_arrow_action
           when :instant_down
             game.down!(instant: true)
@@ -58,16 +61,18 @@ class Tetris
           when :rotate_left
             game.rotate!(:left)
           end
-        when 's'.bytes.first
+        when swt(:arrow_down), 's'.bytes.first
           game.down!
-        when 'a'.bytes.first
+        when swt(:arrow_left), 'a'.bytes.first
           game.left!
-        when 'd'.bytes.first
+        when swt(:arrow_right), 'd'.bytes.first
           game.right!
         when 'q'.bytes.first
           game.rotate!(:left)
         when 'e'.bytes.first
           game.rotate!(:right)
+        when swt(:shift), swt(:alt)
+          game.rotate!(:right)
         end
       end
     }
@@ -102,8 +107,6 @@ class Tetris
       }
       
       text 'Glimmer Tetris'
-#       minimum_size 475, 500
-#       image tetris_icon
       background rgb(236, 236, 236)
 
       tetris_menu_bar(game: game)
@@ -119,30 +122,11 @@ class Tetris
       }
     }
   }
-  
-#   def tetris_icon
-#     icon_block_size = 64
-#     icon_bevel_size = icon_block_size.to_f / 25.to_f
-#     icon_bevel_pixel_size = 0.16*icon_block_size.to_f
-#     icon_size = 8
-#     icon_pixel_size = icon_block_size * icon_size
-#     image(icon_pixel_size, icon_pixel_size) {
-#       icon_size.times { |row|
-#         icon_size.times { |column|
-#           colored = row >= 1 && column.between?(1, 6)
-#           color = colored ? color(([:white] + Model::Tetromino::LETTER_COLORS.values).sample) : color(:white)
-#           x = column * icon_block_size
-#           y = row * icon_block_size
-#           bevel(x: x, y: y, base_color: color, size: icon_block_size)
-#         }
-#       }
-#     }
-#   end
 
   def start_moving_tetrominos_down
     Async::Task.new do
       work = lambda do
-        @game.down! # unless @game.paused?
+        @game.down!
         Async::Task.new(delay: @game.delay * 1000.0, &work) unless @game.game_over? || body_root.disposed?
       end
       Async::Task.new(delay: @game.delay * 1000.0, &work)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-opal
 version: !ruby/object:Gem::Version
-  version: 0.26.0
+  version: 0.26.1
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-23 00:00:00.000000000 Z
+date: 2021-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glimmer