Getting touchpanel module ready for real devices

src/machine/qemuarm.cmake

@@ -24,4 +24,5 @@ set(MODULE_KEYS_WEBOS_LINUX			YES)
 set(MODULE_TOUCHPANEL_WEBOS_LINUX		YES)
 
 add_definitions(-DKEYPAD_INPUT_DEVICE=\"/dev/input/event0\")
-
+add_definitions(-DSCREEN_HORIZONTAL_RES=1024)
+add_definitions(-DSCREEN_VERTICAL_RES=768)

src/machine/qemux86.cmake

@@ -24,3 +24,5 @@ set(MODULE_KEYS_WEBOS_LINUX			YES)
 set(MODULE_TOUCHPANEL_WEBOS_LINUX		YES)
 
 add_definitions(-DKEYPAD_INPUT_DEVICE=\"/dev/input/event1\")
+add_definitions(-DSCREEN_HORIZONTAL_RES=1024)
+add_definitions(-DSCREEN_VERTICAL_RES=768)

src/rockhopper/touchpanel/CMakeLists.txt

@@ -16,6 +16,7 @@
 #
 # LICENSE@@@
 
-if(${WEBOS_TARGET_MACHINE_IMPL} STREQUAL emulator)
-	nyx_create_module(TouchpanelMain emulator/touchpanel_common.c emulator/touchpanel_gestures.c emulator/touchpanel.c)
+
+if(${WEBOS_TARGET_MACHINE_IMPL} STREQUAL emulator OR ${WEBOS_TARGET_MACHINE_IMPL} STREQUAL device)
+	nyx_create_module(TouchpanelMain evdev/touchpanel_common.c evdev/touchpanel_gestures.c evdev/touchpanel.c)
 endif()

src/rockhopper/touchpanel/emulator/touchpanel.c → src/rockhopper/touchpanel/evdev/touchpanel.c

@@ -166,17 +166,16 @@ static general_settings_t sGeneralSettings =
 
 static float scaleX, scaleY;
 
-/* Using hardcoded values for now ,since ioctl FBIOGET_VSCREENINFO 
-   on /dev/fb0 is returning invalid values in qemux86 */
-
-#define SCREEN_HORIZONTAL_RES	1024
-#define SCREEN_VERTICAL_RES	768
-
 static int
 init_touchpanel(void)
 {
 	struct input_absinfo abs;
 	int  maxX, maxY, ret = -1;
+#if !defined(SCREEN_HORIZONTAL_RES) && !defined(SCREEN_VERTICAL_RES)
+	struct fb_var_screeninfo scr_info;
+	int16_t fd;
+#endif
+
 
 	touchpanel_event_fd = open("/dev/input/touchscreen0", O_RDWR);
 	if(touchpanel_event_fd < 0) {
@@ -200,8 +199,27 @@ init_touchpanel(void)
 
     	init_gesture_state_machine(&sGeneralSettings, 1);
 
+#if !defined(SCREEN_HORIZONTAL_RES) && !defined(SCREEN_VERTICAL_RES)
+	fd = open("/dev/fb0", O_RDWR);
+	if (fd < 0) {
+		return NYX_ERROR_INVALID_FILE_ACCESS;
+	}
+
+	memset(&scr_info,0,sizeof(struct fb_var_screeninfo));
+
+	if (ioctl(fd, FBIOGET_VSCREENINFO, &scr_info) != 0) {
+		ret = NYX_ERROR_INVALID_OPERATION;
+		goto error;
+	}
+
+	close(fd);
+
+	scaleX = (float)scr_info.xres / (float)maxX;
+	scaleY = (float)scr_info.yres / (float)maxY;
+#else
 	scaleX = (float)SCREEN_HORIZONTAL_RES / (float)maxX;
 	scaleY = (float)SCREEN_VERTICAL_RES / (float)maxY;
+#endif
 
 	return 0;
 error: