Skip to content
This repository has been archived by the owner on Jul 10, 2023. It is now read-only.

Commit

Permalink
Auto merge of #86 - Eijebong:bitflags, r=jdm
Browse files Browse the repository at this point in the history
Bump bitflags to 0.9 and bump version

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/core-graphics-rs/86)
<!-- Reviewable:end -->
  • Loading branch information
bors-servo authored Jul 3, 2017
2 parents 18acb4f + 77d66fc commit 93b2636
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 13 deletions.
4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name = "core-graphics"
description = "Bindings to Core Graphics for OS X"
homepage = "https://github.com/servo/core-graphics-rs"
repository = "https://github.com/servo/core-graphics-rs"
version = "0.8.1"
version = "0.8.2"
authors = ["The Servo Project Developers"]
license = "MIT / Apache-2.0"

Expand All @@ -14,4 +14,4 @@ elcapitan = []
[dependencies]
libc = "0.2"
core-foundation = "0.3"
bitflags = "0.8"
bitflags = "0.9"
22 changes: 11 additions & 11 deletions src/event.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,25 +12,25 @@ pub type CGKeyCode = libc::uint16_t;
///
/// [Ref](http://opensource.apple.com/source/IOHIDFamily/IOHIDFamily-700/IOHIDSystem/IOKit/hidsystem/IOLLEvent.h)
bitflags! {
pub flags CGEventFlags: u64 {
const CGEventFlagNull = 0,
pub struct CGEventFlags: u64 {
const CGEventFlagNull = 0;

// Device-independent modifier key bits.
const CGEventFlagAlphaShift = 0x00010000,
const CGEventFlagShift = 0x00020000,
const CGEventFlagControl = 0x00040000,
const CGEventFlagAlternate = 0x00080000,
const CGEventFlagCommand = 0x00100000,
const CGEventFlagAlphaShift = 0x00010000;
const CGEventFlagShift = 0x00020000;
const CGEventFlagControl = 0x00040000;
const CGEventFlagAlternate = 0x00080000;
const CGEventFlagCommand = 0x00100000;

// Special key identifiers.
const CGEventFlagHelp = 0x00400000,
const CGEventFlagSecondaryFn = 0x00800000,
const CGEventFlagHelp = 0x00400000;
const CGEventFlagSecondaryFn = 0x00800000;

// Identifies key events from numeric keypad area on extended keyboards.
const CGEventFlagNumericPad = 0x00200000,
const CGEventFlagNumericPad = 0x00200000;

// Indicates if mouse/pen movement events are not being coalesced
const CGEventFlagNonCoalesced = 0x00000100,
const CGEventFlagNonCoalesced = 0x00000100;
}
}

Expand Down

0 comments on commit 93b2636

Please sign in to comment.