fix changed names

hpi-swa · Apr 24, 2016 · f041797 · f041797
1 parent 9092366
commit f041797
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 55 deletions.
diff --git a/rsqueakvm/display.py b/rsqueakvm/display.py
@@ -222,8 +222,8 @@ def handle_keyboard_event(self, c_type, event):
             key = key_constants.CTRL
         elif not system.IS_DARWIN and (sym == RSDL.K_LALT or sym == RSDL.K_RALT):
             key = key_constants.COMMAND
-        elif system.IS_DARWIN and (sym == RSDL.K_LMETA or sym == RSDL.K_RMETA):
-            key = key.constants.COMMAND
+        elif system.IS_DARWIN and (sym == RSDL.K_LGUI or sym == RSDL.K_RGUI):
+            key = key_constants.COMMAND
         elif sym == RSDL.K_DELETE:
             key = key_constants.DELETE
         elif sym == RSDL.K_BACKSPACE:
@@ -402,7 +402,7 @@ def get_modifier_mask(self, shift):
             modifier |= ShiftKeyBit
         if not system.IS_DARWIN and (mod & RSDL.KMOD_ALT != 0):
             modifier |= CommandKeyBit
-        if mod & RSDL.KMOD_META != 0:
+        if mod & RSDL.KMOD_GUI != 0:
             modifier |= CommandKeyBit
         return intmask(modifier << shift)
 

diff --git a/rsqueakvm/test/test_display.py b/rsqueakvm/test/test_display.py
@@ -291,58 +291,6 @@ def test_keyboard_chords(sut, mocked_sdl_event_queue, stub_events, stub_mod_stat
     assert_keyevent_array(sqAUp, ord('A'), display.EventKeyUp, display.CtrlKeyBit)
     assert_keyevent_array(sqCtrlUp, key_constants.CTRL, display.EventKeyUp, 0)
 
-def test_command_is_command_on_mac(sut, stub_key_event, stub_mod_state, monkeypatch):
-    from spyvm.util import system
-    monkeypatch.setattr(system, 'IS_DARWIN', True)
-    # Command down (LMETA in SDL1)
-    rffi.setintfield(stub_key_event, 'c_type', RSDL.KEYDOWN)
-    rffi.setintfield(stub_key_event.c_keysym, 'c_sym', RSDL.K_LMETA)
-    stub_mod_state.set(RSDL.KMOD_LMETA)
-    result = sut.get_next_event()
-    assert_keyevent_array(result, key_constants.COMMAND, display.EventKeyDown, display.CommandKeyBit)
-    # A down
-    rffi.setintfield(stub_key_event.c_keysym, 'c_sym', RSDL.K_a)
-    rffi.setintfield(stub_key_event.c_keysym, 'c_unicode', ord('a'))
-    result = sut.get_next_event()
-    assert_keyevent_array(result, ord('a'), display.EventKeyDown, display.CommandKeyBit)
-    result = sut.get_next_event()
-    assert_keyevent_array(result, ord('a'), display.EventKeyChar, display.CommandKeyBit)
-    # A up
-    rffi.setintfield(stub_key_event, 'c_type', RSDL.KEYUP)
-    result = sut.get_next_event()
-    assert_keyevent_array(result, ord('a'), display.EventKeyUp, display.CommandKeyBit)
-    # Command up
-    rffi.setintfield(stub_key_event.c_keysym, 'c_sym', RSDL.K_LMETA)
-    stub_mod_state.set(RSDL.KMOD_NONE)
-    result = sut.get_next_event()
-    assert_keyevent_array(result, key_constants.COMMAND, display.EventKeyUp, 0)
-
-def test_alt_is_command_on_windwos(sut, stub_key_event, stub_mod_state, monkeypatch):
-    from spyvm.util import system
-    monkeypatch.setattr(system, 'IS_WINDOWS', True)
-    # Alt down
-    rffi.setintfield(stub_key_event, 'c_type', RSDL.KEYDOWN)
-    rffi.setintfield(stub_key_event.c_keysym, 'c_sym', RSDL.K_LALT)
-    stub_mod_state.set(RSDL.KMOD_LALT)
-    result = sut.get_next_event()
-    assert_keyevent_array(result, key_constants.COMMAND, display.EventKeyDown, display.CommandKeyBit)
-    # A down
-    rffi.setintfield(stub_key_event.c_keysym, 'c_sym', RSDL.K_a)
-    rffi.setintfield(stub_key_event.c_keysym, 'c_unicode', ord('a'))
-    result = sut.get_next_event()
-    assert_keyevent_array(result, ord('a'), display.EventKeyDown, display.CommandKeyBit)
-    result = sut.get_next_event()
-    assert_keyevent_array(result, ord('a'), display.EventKeyChar, display.CommandKeyBit)
-    # A up
-    rffi.setintfield(stub_key_event, 'c_type', RSDL.KEYUP)
-    result = sut.get_next_event()
-    assert_keyevent_array(result, ord('a'), display.EventKeyUp, display.CommandKeyBit)
-    # Command up
-    rffi.setintfield(stub_key_event.c_keysym, 'c_sym', RSDL.K_LALT)
-    stub_mod_state.set(RSDL.KMOD_NONE)
-    result = sut.get_next_event()
-    assert_keyevent_array(result, key_constants.COMMAND, display.EventKeyUp, 0)
-
 @pytest.fixture
 def stub_screen_texture_creation(monkeypatch):
     capture_buffer = []