OSDneo2: Skript sucht sich jetzt die richtige Library heraus

git-svn-id: https://svn.neo-layout.org@2352 b9310e46-f624-0410-8ea1-cfbb3a30dc96

4 files changed, 23 insertions, 10 deletions

diff --git a/linux/osd/ChangeLog b/linux/osd/ChangeLog
index 430d54b..4f906e1 100644
--- a/linux/osd/ChangeLog
+++ b/linux/osd/ChangeLog
@@ -1,3 +1,11 @@
+2010-10-15  Martin Zuther  <code@mzuther.de>
+
+	* Version 0.13
+
+	* SimpleXkbWrapper.py: the "X Keyboard Extension" functions have
+	been moved from "libXxf86misc" to "libX11", so the code now checks
+	which library to link to
+
 2009-09-07  Martin Zuther  <code@mzuther.de>
 
 	* Version 0.12
diff --git a/linux/osd/OSDneo2.py b/linux/osd/OSDneo2.py
index e2b69ff..904b7de 100755
--- a/linux/osd/OSDneo2.py
+++ b/linux/osd/OSDneo2.py
@@ -5,7 +5,7 @@
    ========
    On screen display for learning the keyboard layout Neo2
 
-   Copyright (c) 2009 Martin Zuther (http://www.mzuther.de/)
+   Copyright (c) 2009-2010 Martin Zuther (http://www.mzuther.de/)
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/linux/osd/Settings.py b/linux/osd/Settings.py
index e20bccc..8eaf6be 100644
--- a/linux/osd/Settings.py
+++ b/linux/osd/Settings.py
@@ -4,7 +4,7 @@
    ========
    On screen display for learning the keyboard layout Neo2
 
-   Copyright (c) 2009 Martin Zuther (http://www.mzuther.de/)
+   Copyright (c) 2009-2010 Martin Zuther (http://www.mzuther.de/)
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -59,8 +59,8 @@ class Settings:
         # common application copyrights and information (only set here, private)
         self.__application__ = 'OSD Neo2'
         self.__cmd_line__ = 'OSDneo2'
-        self.__version__ = '0.12'
-        self.__years__ = '2009'
+        self.__version__ = '0.13'
+        self.__years__ = '2009-2010'
         self.__authors__ = 'Martin Zuther'
         self.__license_short__ = 'GPL version 3 (or later)'
         self.__license_long__ = """This program is free software: you can redistribute it and/or modify
diff --git a/linux/osd/SimpleXkbWrapper.py b/linux/osd/SimpleXkbWrapper.py
index 9ce9572..12870c3 100755
--- a/linux/osd/SimpleXkbWrapper.py
+++ b/linux/osd/SimpleXkbWrapper.py
@@ -5,7 +5,7 @@
    ========
    On screen display for learning the keyboard layout Neo2
 
-   Copyright (c) 2009 Martin Zuther (http://www.mzuther.de/)
+   Copyright (c) 2009-2010 Martin Zuther (http://www.mzuther.de/)
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -139,13 +139,18 @@ class SimpleXkbWrapper:
 
 
     def __init__(self):
-        # dynamically link to "X Keyboard Extension" library
-        library_xf86misc = ctypes.CDLL(ctypes.util.find_library('Xxf86misc'))
+        # dynamically link to "X Keyboard Extension" library while at
+        # the same time checking which library to use
+        xkbd_library_location = ctypes.util.find_library('Xxf86misc')
+        if not xkbd_library_location:
+            xkbd_library_location = ctypes.util.find_library('X11')
+
+        xkbd_library = ctypes.CDLL(xkbd_library_location)
 
         # print debugging information if requested
         if self.DEBUG_XKB:
             print
-            print '  %s' % library_xf86misc
+            print '  %s' % xkbd_library
 
 
 
@@ -181,7 +186,7 @@ class SimpleXkbWrapper:
 
         # set-up function (low-level)
         self.__XkbOpenDisplay__ = prototype_xkbopendisplay( \
-            ('XkbOpenDisplay', library_xf86misc), \
+            ('XkbOpenDisplay', xkbd_library), \
                 paramflags_xkbopendisplay \
                 )
 
@@ -253,7 +258,7 @@ class SimpleXkbWrapper:
 
         # set-up function (low-level)
         self.__XkbGetState__ = prototype_xkbgetstate( \
-            ('XkbGetState', library_xf86misc), \
+            ('XkbGetState', xkbd_library), \
                 paramflags_xkbgetstate \
                 )