state + click

Changed files (2)

• modified birdfont/GtkWindow.vala
• modified libbirdfont/Supplement.vala

Diff

diff --git a/birdfont/GtkWindow.vala b/birdfont/GtkWindow.valaindex 3e77b98..ffc6f00 100644--- a/birdfont/GtkWindow.vala+++ b/birdfont/GtkWindow.vala@@ -865,20 +865,27 @@ public class GlyphCanvasArea : DrawingArea  { 	}  	static void set_modifier (int k) {+		KeyBindings.set_modifier (NONE);+ 		// MOD5 is logo button on Linux 		// MOD2 is logo button on Mac OS X-		uint logo = (Supplement.mac) ? ModifierType.MOD2_MASK : ModifierType.MOD5_MASK;-		-		if (has_flag (k, logo)) {-			KeyBindings.set_modifier (LOGO);-		} else if (has_flag (k, ModifierType.SHIFT_MASK)) {++		if (Supplement.mac) {+			if (has_flag (k, ModifierType.MOD2_MASK)) {+				KeyBindings.set_modifier (LOGO);+			}+		} else {+			if (has_flag (k, ModifierType.MOD5_MASK)) {+				KeyBindings.set_modifier (LOGO);+			}			+		}+				+		if (has_flag (k, ModifierType.SHIFT_MASK)) { 			KeyBindings.set_modifier (SHIFT); 		} else if (has_flag (k, ModifierType.CONTROL_MASK)) { 			KeyBindings.set_modifier (CTRL); 		} else if (has_flag (k, ModifierType.CONTROL_MASK | ModifierType.SHIFT_MASK)) { 			KeyBindings.set_modifier (SHIFT | CTRL);-		} else {-			KeyBindings.set_modifier (NONE); 		}  	} }diff --git a/libbirdfont/Supplement.vala b/libbirdfont/Supplement.valaindex 354115c..1fdd940 100644--- a/libbirdfont/Supplement.vala+++ b/libbirdfont/Supplement.vala@@ -42,11 +42,7 @@ public class Supplement { 
 		stdout.printf ("birdfont version %s\n", VERSION);
 		stdout.printf ("built on %s\n", BUILD_TIMESTAMP);
-		-#if MAC-		mac = true;-#endif-		
+
 		init_gettext ();		
 		
 		args = new Argument.command_line (arg);
@@ -73,7 +69,12 @@ public class Supplement { 		show_coordinates = args.has_argument ("--show-coordinates");
 		fatal_wanings = args.has_argument ("--fatal-warning");
 		win32 = (arg[0].index_of (".exe") > -1) || arg[0] == "wine";
+
+#if MAC
+		mac = true;
+#else
 		mac = args.has_argument ("--mac");
+#endif
 		
 		exec_path = "";