PhysicalKeyboard and VirtualKeyboard types for linux input subsystem

Author: StefanoBelli

src/input.cpp

@@ -22,6 +22,9 @@
 #define COPY_INPUT_EVENT(from_stream,dest) \
 	 for(unsigned i=0;i<sizeof(struct input_event);i++) \
 		  ((char*)&dest)[i] = fgetc(from_stream)
+
+using ERTypePhysicalKeyboard = erebos::input::PhysicalKeyboard;
+using ERTypeVirtualKeyboard = erebos::input::VirtualKeyboard;
 #endif
 
 using eikey = erebos::input::Key;
@@ -70,14 +73,14 @@ static int get_keyboard_evpath_s(char* target) {
 	 return 0;
 }
 
-FILE* erebos::input::getev_physical_keyboard() {
+ERTypePhysicalKeyboard erebos::input::getev_physical_keyboard() {
 	 char path[PATH_MAX];
 	 int ret = get_keyboard_evpath_s(path);
 
 	 return ret ? nullptr : fopen(path,"r");
 }
 
-int erebos::input::new_virtual_kb_device(const char* name, const bool& after_wait,
+ERTypeVirtualKeyboard erebos::input::new_virtual_kb_device(const char* name, const bool& after_wait,
 		const u16& bus_type, const u16& vendor,
 		const u16& product, const u16& version) {
 	 int fd=open("/dev/uinput",O_WRONLY | O_NONBLOCK);
@@ -113,7 +116,7 @@ int erebos::input::new_virtual_kb_device(const char* name, const bool& after_wai
 	 return fd;
 }
 
-bool erebos::input::destroy_virtual_kb_device(const int& devfd) {
+bool erebos::input::destroy_virtual_kb_device(const VirtualKeyboard& devfd) {
 	 if(ioctl(devfd,UI_DEV_DESTROY) < 0)
 		  return false;
 
@@ -145,7 +148,7 @@ eikey erebos::input::get_key(const unsigned& delta) {
 	}
 }
 #elif defined(LINUX)
-eikey erebos::input::get_key(FILE *physkb) {
+eikey erebos::input::get_key(PhysicalKeyboard physkb) {
 	 struct input_event current;
 
 	 while(true) {
@@ -174,7 +177,7 @@ bool erebos::input::fake_put(const Key& key) {
 	return res != 0;
 }
 #elif defined(LINUX)
-bool erebos::input::fake_put(const int& devfd, const Key& key,
+bool erebos::input::fake_put(const VirtualKeyboard& devfd, const Key& key,
 		const KeyPressType& type) {
 	 static struct input_event event;
 

src/input.h

@@ -583,6 +583,8 @@ namespace erebos {
 		ERAPI bool fake_put(const Key& key);
 
 #elif defined(LINUX)
+                using PhysicalKeyboard = FILE*;
+                using VirtualKeyboard = int;
 
 		  /*!
 			* @brief determine which kind of event, see fake_put
@@ -595,14 +597,14 @@ namespace erebos {
 		  /*!
 			* @return retrieve physical connected keyboard event path (see also get_key)
 			*/
-		FILE* getev_physical_keyboard();
+		PhysicalKeyboard getev_physical_keyboard();
 
 		  /*!
 			*
 			* @param physkb : the opened stream to keyboard event file
 			* @return pressed key
 			*/
-		Key get_key(FILE* physkb);
+		Key get_key(PhysicalKeyboard physkb);
 
 		  /*!
 			*
@@ -614,7 +616,7 @@ namespace erebos {
 			* @param version (default 0x03)
 			* @return a new file descriptor, representing the virtual keyboard, -1 otherwise
 			*/
-		int new_virtual_kb_device(const char* name,
+		VirtualKeyboard new_virtual_kb_device(const char* name,
 								  const bool& after_wait = true,
 								  const u16& bus_type = 0x03, //USB
 								  const u16& vendor = 0x01,
@@ -627,21 +629,21 @@ namespace erebos {
 			* @param type : press or release? (see KeyPressType)
 			* @return true if key pressed, false otherwise
 			*/
-		bool fake_put(const int& devfd, const Key& key, const KeyPressType& type);
+		bool fake_put(const VirtualKeyboard& devfd, const Key& key, const KeyPressType& type);
 
 		  /*!
 			* @param devfd : the virtual keyboard fd
 			* @return true if correctly destroyed, false otherwise
 			*/
-		bool destroy_virtual_kb_device(const int& devfd);
+		bool destroy_virtual_kb_device(const VirtualKeyboard& devfd);
 
 		  /*!
 			*
 			* @param devfd : the virtual keyboard fd
 			* @param key : key you wanna put
 			* @return true if key event emitted, false otherwise
 			*/
-		inline bool fake_put(const int& devfd, const Key& key) {
+		inline bool fake_put(const VirtualKeyboard& devfd, const Key& key) {
 			if(!fake_put(devfd, key, KeyPressType::KEY_PRESS))
 				return false;