Changeset bf45993 in mainline for uspace/srv/hid/compositor/compositor.c

Timestamp:

2014-09-19T10:56:30Z (11 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

6b646dc

Parents:

824208bf (diff), 58f26cb (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

• uspace/srv/hid/compositor/compositor.c (modified) (1 diff)

uspace/srv/hid/compositor/compositor.c

@@ -1820 +1820 @@
         bool viewport_change = (mods & KM_ALT) && (
             key == KC_O || key == KC_P);
-        bool kconsole_switch = (mods & KM_ALT) && (key == KC_M);
+        bool kconsole_switch = (key == KC_PAUSE) || (key == KC_BREAK);
         bool filter_switch = (mods & KM_ALT) && (key == KC_Y);