toxblh/MTMR
1
0
Fork 0
mirror of https://github.com/Toxblh/MTMR.git synced 2026-01-10 17:08:39 +00:00
Code Issues Releases Wiki Activity

Fix #164

Browse Source
This commit is contained in:
Toxblh 2019-05-09 22:14:48 +01:00
parent 5a8117ac7f
commit 40fa61fcb5
4 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MTMR/Info.plist
View File

@ -17,7 +17,7 @@
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>APPL</string> <string>APPL</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>0.20.2</string> <string>0.20.3</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>197</string> <string>197</string>
<key>LSApplicationCategoryType</key> <key>LSApplicationCategoryType</key>

5
MTMR/ItemsParsing.swift
View File

@ -51,7 +51,7 @@ class SupportedTypesHolder {
private var supportedTypes: [String: ParametersDecoder] = [ private var supportedTypes: [String: ParametersDecoder] = [
"escape": { _ in ( "escape": { _ in (
item: .staticButton(title: "esc"), item: .staticButton(title: "esc"),
action: .keyPress(keycode: 53), action: .keyPressSession(keycode: 53),
longAction: .none, longAction: .none,
parameters: [.align: .align(.left)] parameters: [.align: .align(.left)]
) }, ) },
@ -447,7 +447,7 @@ enum ItemType: Decodable {
let workTime = try container.decodeIfPresent(Double.self, forKey: .workTime) ?? 1500.0 let workTime = try container.decodeIfPresent(Double.self, forKey: .workTime) ?? 1500.0
let restTime = try container.decodeIfPresent(Double.self, forKey: .restTime) ?? 600.0 let restTime = try container.decodeIfPresent(Double.self, forKey: .restTime) ?? 600.0
self = .pomodoro(workTime: workTime, restTime: restTime) self = .pomodoro(workTime: workTime, restTime: restTime)
case .network: case .network:
let flip = try container.decodeIfPresent(Bool.self, forKey: .flip) ?? false let flip = try container.decodeIfPresent(Bool.self, forKey: .flip) ?? false
self = .network(flip: flip) self = .network(flip: flip)
@ -459,6 +459,7 @@ enum ActionType: Decodable {
case none case none
case hidKey(keycode: Int32) case hidKey(keycode: Int32)
case keyPress(keycode: Int) case keyPress(keycode: Int)
case keyPressSession(keycode: Int)
case appleScript(source: SourceProtocol) case appleScript(source: SourceProtocol)
case shellScript(executable: String, parameters: [String]) case shellScript(executable: String, parameters: [String])
case custom(closure: () -> Void) case custom(closure: () -> Void)

10
MTMR/KeyPress.swift
View File

@ -23,6 +23,16 @@ extension KeyPress {
let keyDown = CGEvent(keyboardEventSource: src, virtualKey: keyCode, keyDown: true) let keyDown = CGEvent(keyboardEventSource: src, virtualKey: keyCode, keyDown: true)
let keyUp = CGEvent(keyboardEventSource: src, virtualKey: keyCode, keyDown: false) let keyUp = CGEvent(keyboardEventSource: src, virtualKey: keyCode, keyDown: false)
let loc: CGEventTapLocation = .cghidEventTap
keyDown?.post(tap: loc)
keyUp?.post(tap: loc)
}
func sendSession() {
let src = CGEventSource(stateID: .hidSystemState)
let keyDown = CGEvent(keyboardEventSource: src, virtualKey: keyCode, keyDown: true)
let keyUp = CGEvent(keyboardEventSource: src, virtualKey: keyCode, keyDown: false)
let loc: CGEventTapLocation = .cgAnnotatedSessionEventTap let loc: CGEventTapLocation = .cgAnnotatedSessionEventTap
keyDown?.post(tap: loc) keyDown?.post(tap: loc)
keyUp?.post(tap: loc) keyUp?.post(tap: loc)

2
MTMR/TouchBarController.swift
View File

@ -319,6 +319,8 @@ class TouchBarController: NSObject, NSTouchBarDelegate {
return { HIDPostAuxKey(keycode) } return { HIDPostAuxKey(keycode) }
case let .keyPress(keycode: keycode): case let .keyPress(keycode: keycode):
return { GenericKeyPress(keyCode: CGKeyCode(keycode)).send() } return { GenericKeyPress(keyCode: CGKeyCode(keycode)).send() }
case let .keyPressSession(keycode: keycode):
return { GenericKeyPress(keyCode: CGKeyCode(keycode)).sendSession() }
case let .appleScript(source: source): case let .appleScript(source: source):
guard let appleScript = source.appleScript else { guard let appleScript = source.appleScript else {
print("cannot create apple script for item \(item)") print("cannot create apple script for item \(item)")