rkremap 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9cb72d3bf69bf2d0641eb7856903d110f0a253d5377c2d97ea452a1f0fd5c13
-  data.tar.gz: 1dd89d3569fc5396a6c314618bcc975e04b63b0f2a55d9c3dd8cd5497f1e2164
+  metadata.gz: d204d310504030119a941b532fec985cae5747c1d1e04958baefbb112327a629
+  data.tar.gz: c98176cf3e753eb59da16e614159a5516e9bc1701e63806ec02d3e3bd8c4d076
 SHA512:
-  metadata.gz: 8cf20b635b0aa1584e81cc0317040931f62f011e004189e30428534c04456159cde7ac37c5f790cc1af06d396b9d60c36c4398a5d51947dcf99309eb3edb584b
-  data.tar.gz: cde725ba50b0d5b2fd3daf837af9e1244a1cc5cb3d40f497d9dbf00e6655edc0e436dcdc94056b8bc9efa3887ec2419fd7e53b11e8289c142217be2dd577f8ef
+  metadata.gz: e04feb18bbae681fc1b5bbd2f8a95ea85b58aff976865d857fd044274214eb9f2502c34bb7ff4cb9b620f3658e55f82157b4c6b98dbe4eb5dce8ce8446ff042d
+  data.tar.gz: 941f5b2893c031a7891151635b8cfb83d5ce410d8c0751da86a2b2699ce440a10221684dba881849bd54f4afa10f3b18cd8defe98b0a7601cfed4f5eb15bd7b6

data/example/tmtms.rb

@@ -159,16 +159,16 @@ rk.start do |code, mod, app|
 
   # Ctrl は他のキーに変換
   if mod[KEY_LEFTCTRL] || mod[KEY_RIGHTCTRL]
-    # Ctrl+K は行末まで削除 (日本語変換時はそのまま)
+    # Ctrl-K/I/O は日本語変換時はそのまま
+    if (code == KEY_K || code == KEY_I || code ==KEY_O) && File.exist?('/tmp/fcitx-enabled')
+      rk.key(code, mod)
+      next
+    end
+    # Ctrl+K は行末まで削除
     if code == KEY_K
-      if File.exist?('/tmp/fcitx-enabled')
-        rk.key(code, mod)
-        next
-      else
-        rk.key(KEY_END, mod_disable_all.merge({KEY_LEFTSHIFT => true}))
-        rk.key(KEY_X, mod_disable_all.merge({KEY_LEFTCTRL => true}))
-        next
-      end
+      rk.key(KEY_END, mod_disable_all.merge({KEY_LEFTSHIFT => true}))
+      rk.key(KEY_X, mod_disable_all.merge({KEY_LEFTCTRL => true}))
+      next
     end
     # 単純な変換
     if ctrl_map[code]

data/lib/rkremap/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class Rkremap
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/lib/rkremap/winattr.rb

@@ -11,26 +11,26 @@ class Rkremap
 
     # @return [Integer] Window
     def focus_win
-      win_buf = ' ' * X11.sizeof('Window')
-      X11.XGetInputFocus(@display, win_buf, @buf)
-      win_buf.unpack1('L')
+      win = X11::Window.malloc(Fiddle::RUBY_FREE)
+      X11.XGetInputFocus(@display, win, @buf)
+      win.window
     end
 
     # @return [Array<window, name, class>]
     def app_win(window)
       return @app_win[window] if @app_win[window]
-      class_hint = X11::XClassHint.malloc
-      parent = ' ' * X11.sizeof('Window')
-      children = ' ' * X11.sizeof('void*')
+      class_hint = X11::XClassHint.malloc(Fiddle::RUBY_FREE)
+      parent = X11::Window.malloc(Fiddle::RUBY_FREE)
+      children = X11::Pointer.malloc(Fiddle::RUBY_FREE)
       win = window
       while win > 0
         class_hint.name = nil
         class_hint.class_name = nil
         X11.XGetClassHint(@display, win, class_hint)
         X11.XQueryTree(@display, win, @buf, parent, children, @buf)
-        X11.XFree(Fiddle::Pointer[children].ptr)
+        X11.XFree(children.ptr)
         break unless class_hint.name.null? && class_hint.class_name.null?
-        win = parent.unpack1('L')
+        win = parent.window
       end
       unless class_hint.name.null?
         win_name = class_hint.name.to_s
@@ -46,25 +46,27 @@ class Rkremap
     # @return [String]
     def app_title(window)
       win = app_win(window)[0]
-      prop = X11::XTextProperty.malloc
-      text_list = ' ' * X11.sizeof('void*')
+      prop = X11::XTextProperty.malloc(Fiddle::RUBY_FREE)
+      text_list = X11::Pointer.malloc(Fiddle::RUBY_FREE)
       X11.XGetWMName(@display, win, prop)
       X11.Xutf8TextPropertyToTextList(@display, prop, text_list, @buf)
-      title = Fiddle::Pointer[text_list].ptr.ptr.to_s.force_encoding('utf-8')
-      X11.XFreeStringList(Fiddle::Pointer[text_list].ptr)
+      title = text_list.ptr.ptr.to_s.force_encoding('utf-8')
+      X11.XFreeStringList(text_list.ptr)
       title
     end
   end
 
   module X11
     extend Fiddle::Importer
-    dlload 'libX11.so'
+    dlload 'libX11.so.6'
     typealias 'XID', 'unsigned long'
     typealias 'Window', 'XID'
     typealias 'Status', 'int'
     typealias 'Atom', 'unsigned long'
-    XClassHint = struct(['char *name', 'char *class_name'])
-    XTextProperty = struct(['unsigned char *value', 'Atom encoding', 'int format', 'unsigned long nitems'])
+    Window = struct ['Window window']
+    Pointer = struct ['void *ptr']
+    XClassHint = struct ['char *name', 'char *class_name']
+    XTextProperty = struct ['unsigned char *value', 'Atom encoding', 'int format', 'unsigned long nitems']
 
     extern 'Display* XOpenDisplay(char*)'
     extern 'int XGetInputFocus(Display*, Window*, int*)'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rkremap
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - TOMITA Masahiro
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-01-12 00:00:00.000000000 Z
+date: 2022-01-29 00:00:00.000000000 Z
 dependencies: []
 description: key remapper
 email: