X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosuilib%2FAltosUILib.java;h=ccadf07cc851e8e678522b35bdd11a0d5cf1396f;hp=5d5f9aaaa6cef61df18b93022f3299910087776f;hb=e2562ee43b8558df0836217ea3a187b36e2669b3;hpb=2bd6aca54fc465995d6985c8799cd0d016c9a543

diff --git a/altosuilib/AltosUILib.java b/altosuilib/AltosUILib.java
index 5d5f9aaa..ccadf07c 100644
--- a/altosuilib/AltosUILib.java
+++ b/altosuilib/AltosUILib.java
@@ -15,12 +15,12 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altosuilib;
+package org.altusmetrum.altosuilib_3;
 
 import java.awt.*;
 import libaltosJNI.*;
 
-import org.altusmetrum.AltosLib.*;
+import org.altusmetrum.altoslib_5.*;
 
 public class AltosUILib extends AltosLib {
 
@@ -36,7 +36,17 @@ public class AltosUILib extends AltosLib {
 	final public static int font_size_medium = 2;
 	final public static int font_size_large = 3;
 
-	static void set_fonts(int size) {
+	final public static int position_top_left = 0;
+	final public static int position_top = 1;
+	final public static int position_top_right = 2;
+	final public static int position_left = 3;
+	final public static int position_center = 4;
+	final public static int position_right = 5;
+	final public static int position_bottom_left = 6;
+	final public static int position_bottom = 7;
+	final public static int position_bottom_right = 8;
+
+	public static void set_fonts(int size) {
 		int	brief_size;
 		int	table_size;
 		int	status_size;
@@ -66,26 +76,46 @@ public class AltosUILib extends AltosLib {
 		table_value_font = new Font("Monospaced", Font.PLAIN, table_size);
 	}
 
-	static final int text_width = 20;
+	static public final int text_width = 20;
 
 	static public boolean initialized = false;
 	static public boolean loaded_library = false;
+	static public boolean has_bluetooth = false;
+
+	static final String[] library_names_32 = { "altos", "altos32", "altos64" };
+	static final String[] library_names_64 = { "altos", "altos64", "altos32" };
 
 	public static boolean load_library() {
 		if (!initialized) {
-			try {
-				System.loadLibrary("altos");
-				libaltos.altos_init();
-				loaded_library = true;
-			} catch (UnsatisfiedLinkError e) {
+			String model = System.getProperty("sun.arch.data.model", "missing");
+			boolean is_64 = false;
+			if (model.equals("64")) {
+				is_64 = true;
+			} else if (model.equals("32")) {
+				;
+			} else {
+				String arch = System.getProperty("os.arch", "missing");
+				if (arch.endsWith("64"))
+					is_64 = true;
+			}
+			for (String name : is_64 ? library_names_64 : library_names_32) {
 				try {
-					System.loadLibrary("altos64");
+					System.loadLibrary(name);
 					libaltos.altos_init();
 					loaded_library = true;
-				} catch (UnsatisfiedLinkError e2) {
+					break;
+				} catch (UnsatisfiedLinkError e) {
+					System.out.printf("Link error %s\n", e.getMessage());
 					loaded_library = false;
 				}
 			}
+
+			String OS = System.getProperty("os.name");
+
+			if (OS.startsWith("Linux")) {
+				has_bluetooth = true;
+			}
+
 			initialized = true;
 		}
 		return loaded_library;