[Python-apps-commits] r8822 - in packages/autokey/trunk/debian (3 files)
lfaraone at users.alioth.debian.org
lfaraone at users.alioth.debian.org
Sun Jun 3 05:15:59 UTC 2012
Date: Sunday, June 3, 2012 @ 05:15:56
Author: lfaraone
Revision: 8822
releasing version 0.90.1-1
Modified:
packages/autokey/trunk/debian/autokey-common.install
packages/autokey/trunk/debian/changelog
Deleted:
packages/autokey/trunk/debian/autokey-common.autokey.init
Deleted: packages/autokey/trunk/debian/autokey-common.autokey.init
===================================================================
--- packages/autokey/trunk/debian/autokey-common.autokey.init 2012-06-03 00:19:16 UTC (rev 8821)
+++ packages/autokey/trunk/debian/autokey-common.autokey.init 2012-06-03 05:15:56 UTC (rev 8822)
@@ -1,167 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-### BEGIN INIT INFO
-# Provides: autokey
-# Required-Start: $local_fs
-# Required-Stop: $local_fs
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
-# Short-Description: Start AutoKey daemon.
-# Description: Enable AutoKey's EvDev interface daemon.
-### END INIT INFO
-
-import sys, os, socket, glob, shutil, time
-try:
- from autokey import evdev, daemon, configmanager
- from autokey.common import DOMAIN_SOCKET_PATH, PACKET_SIZE
-except ImportError:
- # Per DPM § 9.3.2 script should fail gracefully if not installed.
- print "It does not seem Autokey is installed. Exiting..."
- sys.exit(0)
-
-PACKET_STRING = "%s,%s,%s"
-
-BUTTON_MAP = {
- "BTN_LEFT" : '1',
- "BTN_MIDDLE": '2',
- "BTN_RIGHT" : '3'
- }
-
-class AutoKeyDaemon(daemon.Daemon):
-
- def __init__(self):
- logFile = "/var/log/autokey-daemon.log"
- daemon.Daemon.__init__(self, '/var/run/autokey-daemon.pid', stdout=logFile, stderr=logFile)
-
- def canrecord(self):
- return configmanager._chooseInterface() == "XRecord"
-
- def get_device_paths(self):
- keyboardLocations = glob.glob("/dev/input/by-path/*-event-kbd")
- mouseLocations = glob.glob("/dev/input/by-path/*-event-mouse")
-
- sys.stdout.write("Keyboards: %s\nMice: %s\n" % (repr(keyboardLocations), repr(mouseLocations)))
- return keyboardLocations + mouseLocations
-
- def run(self):
- print "AutoKey daemon starting"
-
- if os.path.exists(self.stdout):
- shutil.move(self.stdout, self.stdout + '.old')
-
- if os.path.exists(DOMAIN_SOCKET_PATH):
- os.remove(DOMAIN_SOCKET_PATH)
- s = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
- s.bind(DOMAIN_SOCKET_PATH)
- os.chmod(DOMAIN_SOCKET_PATH, 0777)
- print "Created domain socket"
-
- while True:
- time.sleep(5) # sleep 5 seconds, waiting for devices to appear after resume from S3
- s.listen(1)
- try:
- conn, addr = s.accept()
- print "Accepted connection"
- except Exception, e:
- print "Fatal error while accepting connections - daemon shutting down"
- print str(e)
- break
-
- devices = evdev.DeviceGroup(self.get_device_paths())
- sys.stdout.flush()
- sys.stderr.flush()
-
- while True:
- try:
- event = devices.next_event()
- except OSError:
- print "Unable to read from device(s). Connection will be closed and restarted"
- break
-
- if event is not None:
- if event.type == "EV_KEY" and isinstance(event.code, str):
- if event.code.startswith("KEY"):
- # Keyboard event
- code = event.scanCode
- button = ''
- state = event.value
-
- try:
- self.send_packet(conn, code, button, state)
- except:
- break
-
- elif event.code.startswith("BTN") and event.value == 1:
- # Mouse event - only care about button press, not release
- code = ''
- if event.code in BUTTON_MAP:
- button = BUTTON_MAP[event.code]
- else:
- button = -1
- state = event.value
-
- try:
- self.send_packet(conn, code, button, state)
- except:
- break
-
- conn.close()
- devices.close()
- print "Connection closed"
- sys.stdout.flush()
- sys.stderr.flush()
-
- def send_packet(self, conn, code, button, state):
- if code:
- code = self.translate_keycode(code)
- sendData = PACKET_STRING % (code, button, state)
- sendData += (PACKET_SIZE - len(sendData)) * ' '
- conn.send(sendData)
-
- def translate_keycode(self, keyCode):
- if keyCode < 151:
- keyCode += 8
- else:
- print "Got untranslatable evdev keycode: %d\n" % keyCode
- keyCode = 0
- return keyCode
-
-
-if __name__ == "__main__":
- #daemon = AutoKeyDaemon('/tmp/autokey-daemon.pid', stdout=sys.__stdout__, stderr=sys.__stderr__)
- daemon = AutoKeyDaemon()
- if len(sys.argv) == 2:
- if 'start' == sys.argv[1]:
- daemon.start()
- elif 'stop' == sys.argv[1]:
- daemon.stop()
- elif 'restart' == sys.argv[1]:
- daemon.restart()
- elif 'force-reload' == sys.argv[1]:
- # we don't support on-the-fly reloading,
- # so just restart the daemon per DPM 9.3.2
- daemon.restart()
- elif 'status' == sys.argv[1]:
- if daemon.checkpid():
- print "AutoKey daemon is running"
- else:
- print "AutoKey daemon is stopped"
- sys.exit(3)
- elif 'status-xrecord' == sys.argv[1]:
- if not daemon.canrecord():
- print "XRecord not available"
- sys.exit(1)
- else:
- print "XRecord is available"
- else:
- print "Unknown command"
- sys.exit(2)
- sys.exit(0)
- else:
- print "usage: %s {status|start|stop|restart|force-reload}" % sys.argv[0]
- sys.exit(2)
-
- sys.exit(0)
-
-
Modified: packages/autokey/trunk/debian/autokey-common.install
===================================================================
--- packages/autokey/trunk/debian/autokey-common.install 2012-06-03 00:19:16 UTC (rev 8821)
+++ packages/autokey/trunk/debian/autokey-common.install 2012-06-03 05:15:56 UTC (rev 8822)
@@ -1,7 +1,5 @@
usr/lib/python*/*-packages/autokey/common.py
usr/lib/python*/*-packages/autokey/configmanager.py
-usr/lib/python*/*-packages/autokey/daemon.py
-usr/lib/python*/*-packages/autokey/evdev.py
usr/lib/python*/*-packages/autokey/__init__.py
usr/lib/python*/*-packages/autokey/interface.py
usr/lib/python*/*-packages/autokey/iomediator.py
Modified: packages/autokey/trunk/debian/changelog
===================================================================
--- packages/autokey/trunk/debian/changelog 2012-06-03 00:19:16 UTC (rev 8821)
+++ packages/autokey/trunk/debian/changelog 2012-06-03 05:15:56 UTC (rev 8822)
@@ -1,3 +1,10 @@
+autokey (0.90.1-1) unstable; urgency=low
+
+ * New upstream version.
+ - Remove EvDev interface and daemon.
+
+ -- Luke Faraone <lfaraone at debian.org> Sat, 02 Jun 2012 22:06:13 -0700
+
autokey (0.82.2-3) unstable; urgency=low
* Team upload.
More information about the Python-apps-commits
mailing list