Ticket #3176: keymap.diff

File keymap.diff, 1.3 KB (added by karmak, 11 years ago)

missing part of diff for Keymap.cpp

  • src/add-ons/input_server/devices/keyboard/Keymap.cpp

     
    159159uint32
    160160Keymap::KeyForModifier(uint32 modifier)
    161161{
    162     if (modifier == B_LEFT_COMMAND_KEY)
     162    if (modifier == B_CAPS_LOCK)
     163        return fKeys.caps_key;
     164    if (modifier == B_NUM_LOCK)
     165        return fKeys.num_key;
     166    if (modifier == B_SCROLL_LOCK)
     167        return fKeys.scroll_key;
     168    if (modifier == B_LEFT_SHIFT_KEY || modifier == B_SHIFT_KEY)
     169        return fKeys.left_shift_key;
     170    if (modifier == B_RIGHT_SHIFT_KEY)
     171        return fKeys.right_shift_key;
     172    if (modifier == B_LEFT_COMMAND_KEY || modifier == B_COMMAND_KEY)
    163173        return fKeys.left_command_key;
    164174    if (modifier == B_RIGHT_COMMAND_KEY)
    165175        return fKeys.right_command_key;
    166     if (modifier == B_LEFT_CONTROL_KEY)
     176    if (modifier == B_LEFT_CONTROL_KEY || modifier == B_CONTROL_KEY)
    167177        return fKeys.left_control_key;
    168178    if (modifier == B_RIGHT_CONTROL_KEY)
    169179        return fKeys.right_control_key;
     180    if (modifier == B_LEFT_OPTION_KEY || modifier == B_OPTION_KEY)
     181        return fKeys.left_option_key;
     182    if (modifier == B_RIGHT_OPTION_KEY)
     183        return fKeys.right_option_key;
     184    if (modifier == B_MENU_KEY)
     185        return fKeys.menu_key;
    170186
    171187    return 0;
    172188}