more send methods

ahk/keyboard.py

@@ -63,33 +63,35 @@ def key_wait(self, key, timeout: float=None, logical_state=False, pressed=None,
         script = self.render_template('keyboard/key_wait.ahk', key, timeout, options)
         return self.run_script(script)
 
-    def write(self, s):
+    def type(self, s):
         """
         Sends keystrokes using send_input, also escaping the string for use in AHK.
         """
         s = escape_sequence_replace(s)
         self.send_input(s)
 
-    def send(self, s, delay=None):
-        script = self.render_template('keyboard/send.ahk', s=s, delay=delay)
+    def send(self, s, raw=False, delay=None):
+        script = self.render_template('keyboard/send.ahk', s=s, raw=raw, delay=delay)
         return self.run_script(script)
 
-    def send_raw(self, s):
-        raise NotImplementedError
+    def send_raw(self, s, delay=None):
+        return self.send(s, raw=True, delay=delay)
 
     def send_input(self, s):
         if len(s) > 5000:
             warnings.warn('String length greater than allowed. Characters beyond 5000 may not be sent. '
                           'See https://autohotkey.com/docs/commands/Send.htm#SendInputDetail for details.')
 
         script = self.render_template('keyboard/send_input.ahk', s=s)
-        return self.run_script(script)
+        self.run_script(script)
 
     def send_play(self, s):
-        raise NotImplementedError
+        script = self.render_template('keyboard/send_play.ahk', s=s)
+        self.run_script(script)
 
-    def send_event(self, s):
-        raise NotImplementedError
+    def send_event(self, s, delay=None):
+        script = self.render_template('keyboard/send_event.ahk', s=s, delay=delay)
+        self.run_script(script)
 
     def key_press(self, key, release=True):
         """

ahk/templates/keyboard/send.ahk

@@ -2,5 +2,5 @@
 {% block body %}
 {% if delay %}SetKeyDelay, {{ delay }}{% endif %}
 
-Send {{ s }}
+Send{% if raw %}Raw{% endif %} {{ s }}
 {% endblock body %}

ahk/templates/keyboard/send_event.ahk

@@ -0,0 +1,6 @@
+{% extends "base.ahk" %}
+{% block body %}
+{% if delay %}SetKeyDelay, {{ delay }}{% endif %}
+
+SendEvent {{ s }}
+{% endblock body %}

ahk/templates/keyboard/send_play.ahk

@@ -0,0 +1,6 @@
+{% extends "base.ahk" %}
+{% block body %}
+{% if delay %}SetKeyDelay, {{ delay }}{% endif %}
+
+SendPlay {{ s }}
+{% endblock body %}

ahk/window.py

@@ -79,8 +79,6 @@ def send(self, raw=False):
         raise NotImplementedError
 
 
-
-
 class Window(object):
     _subcommands = {
         'id': 'ID',
@@ -261,13 +259,13 @@ def move(self, x='', y='', width=None, height=None):
         script = self._render_template('window/win_move.ahk', x=x, y=y, width=width, height=height)
         self.engine.run_script(script)
 
-    def send(self, keys, delay=None, raw=False, blocking=False):
+    def send(self, keys, delay=None, raw=False, blocking=False, escape=True):
         """
         Send keystrokes directly to the window.
         Uses ControlSend
         https://autohotkey.com/docs/commands/Send.htm
         """
-        if not raw:
+        if escape:
             keys = escape_sequence_replace(keys)
         script = self._render_template('window/win_send.ahk', keys=keys, raw=raw, delay=delay, blocking=blocking)
         return self.engine.run_script(script, blocking=blocking)