|
|
@@ -21,7 +21,6 @@ namespace Crown
|
|
|
private bool _mouse_middle;
|
|
|
private bool _mouse_right;
|
|
|
|
|
|
- private int _even;
|
|
|
private X.Window _window_id;
|
|
|
|
|
|
public uint window_id
|
|
|
@@ -29,7 +28,7 @@ namespace Crown
|
|
|
get { return (uint)_window_id; }
|
|
|
}
|
|
|
|
|
|
- private HashMap<int, bool> _keys;
|
|
|
+ private HashMap<uint, bool> _keys;
|
|
|
|
|
|
// Widgets
|
|
|
private Gtk.Socket _socket;
|
|
|
@@ -38,7 +37,7 @@ namespace Crown
|
|
|
// Signals
|
|
|
public signal void realized();
|
|
|
|
|
|
- private string key_to_string(int k)
|
|
|
+ private string key_to_string(uint k)
|
|
|
{
|
|
|
switch (k)
|
|
|
{
|
|
|
@@ -66,11 +65,9 @@ namespace Crown
|
|
|
_mouse_middle = false;
|
|
|
_mouse_right = false;
|
|
|
|
|
|
- _even = 0;
|
|
|
-
|
|
|
_window_id = 0;
|
|
|
|
|
|
- _keys = new HashMap<int, bool>();
|
|
|
+ _keys = new HashMap<uint, bool>();
|
|
|
_keys[Gdk.Key.w] = false;
|
|
|
_keys[Gdk.Key.a] = false;
|
|
|
_keys[Gdk.Key.s] = false;
|
|
|
@@ -153,35 +150,35 @@ namespace Crown
|
|
|
|
|
|
private bool on_key_press(Gdk.EventKey ev)
|
|
|
{
|
|
|
- if ((int)ev.keyval == Gdk.Key.Up)
|
|
|
+ if (ev.keyval == Gdk.Key.Up)
|
|
|
_client.send_script("LevelEditor:key_down(\"move_up\")");
|
|
|
- if ((int)ev.keyval == Gdk.Key.Down)
|
|
|
+ if (ev.keyval == Gdk.Key.Down)
|
|
|
_client.send_script("LevelEditor:key_down(\"move_down\")");
|
|
|
- if ((int)ev.keyval == Gdk.Key.Right)
|
|
|
+ if (ev.keyval == Gdk.Key.Right)
|
|
|
_client.send_script("LevelEditor:key_down(\"move_right\")");
|
|
|
- if ((int)ev.keyval == Gdk.Key.Left)
|
|
|
+ if (ev.keyval == Gdk.Key.Left)
|
|
|
_client.send_script("LevelEditor:key_down(\"move_left\")");
|
|
|
|
|
|
- if (!_keys.has_key((int)ev.keyval))
|
|
|
+ if (!_keys.has_key(ev.keyval))
|
|
|
return true;
|
|
|
|
|
|
- if (!_keys[(int)ev.keyval])
|
|
|
- _client.send_script(LevelEditorApi.key_down(key_to_string((int)ev.keyval)));
|
|
|
+ if (!_keys[ev.keyval])
|
|
|
+ _client.send_script(LevelEditorApi.key_down(key_to_string(ev.keyval)));
|
|
|
|
|
|
- _keys[(int)ev.keyval] = true;
|
|
|
+ _keys[ev.keyval] = true;
|
|
|
|
|
|
return false;
|
|
|
}
|
|
|
|
|
|
private bool on_key_release(Gdk.EventKey ev)
|
|
|
{
|
|
|
- if (!_keys.has_key((int)ev.keyval))
|
|
|
+ if (!_keys.has_key(ev.keyval))
|
|
|
return false;
|
|
|
|
|
|
- if (_keys[(int)ev.keyval])
|
|
|
- _client.send_script(LevelEditorApi.key_up(key_to_string((int)ev.keyval)));
|
|
|
+ if (_keys[ev.keyval])
|
|
|
+ _client.send_script(LevelEditorApi.key_up(key_to_string(ev.keyval)));
|
|
|
|
|
|
- _keys[(int)ev.keyval] = false;
|
|
|
+ _keys[ev.keyval] = false;
|
|
|
|
|
|
return false;
|
|
|
}
|