Update keyboard

This commit is contained in:
vCaesar 2016-11-13 18:37:41 +08:00
parent 338fc9f2b4
commit c7fc08adbb
4 changed files with 14 additions and 22 deletions

View File

@ -11,18 +11,12 @@
#include "../base/types.h"
// #include "keycode.h"
// #include "keypress.h"
#include "keypress_init.h"
#include "keycode_init.h"
#include "keypress_c.h"
#include "keycode_c.h"
int keyboardDelay = 10;
// struct KeyNames{
// const char* name;
// MMKeyCode key;
// };
// static KeyNames key_names[] ={
struct KeyNames{
const char* name;
MMKeyCode key;
@ -170,10 +164,8 @@ int CheckKeyFlags(char* f, MMKeyFlags* flags)
}
// //If it's not an array, it should be a single string value.
// return GetFlagsFromString(value, flags);
// }
char* aKeyTap(char *k,char *aval){
char* aKeyTap(char *k,char *akey){
MMKeyFlags flags = (MMKeyFlags) MOD_NONE;
// MMKeyFlags flags = 0;
MMKeyCode key;
@ -181,8 +173,8 @@ char* aKeyTap(char *k,char *aval){
// char *k;
// k = *kstr;
if (strcmp(aval, "null") != 0){
switch (CheckKeyFlags(aval,&flags)){
if (strcmp(akey, "null") != 0){
switch (CheckKeyFlags(akey,&flags)){
case -1:
return "Null pointer in key flag.";
break;
@ -239,7 +231,7 @@ char* aKeyToggle(char *k,char *d){
microsleep(keyboardDelay);
}
return "success";
return "0";
}
void aTypeString(char *str){

View File

@ -278,16 +278,16 @@ func Try(fun func(), handler func(interface{})) {
}
func KeyTap(args ...string) {
var apara string
var akey string
Try(func() {
apara = args[1]
akey = args[1]
}, func(e interface{}) {
// Println("err:::", e)
apara = "null"
akey = "null"
})
zkey := C.CString(args[0])
amod := C.CString(apara)
amod := C.CString(akey)
// defer func() {
C.aKeyTap(zkey, amod)
// }()
@ -297,16 +297,16 @@ func KeyTap(args ...string) {
}
func KeyToggle(args ...string) {
var apara string
var akey string
Try(func() {
apara = args[1]
akey = args[1]
}, func(e interface{}) {
// Println("err:::", e)
apara = "null"
akey = "null"
})
zkey := C.CString(args[0])
amod := C.CString(apara)
amod := C.CString(akey)
// defer func() {
str := C.aKeyToggle(zkey, amod)
Println(str)