server: fix uninitialized uinput on some webOS versions

Author: Informatic

src/server.c

@@ -118,7 +118,11 @@ int server_start(server_t* server, settings_t* settings) {
 	rfbLogEnable(0);
 
 	rfbScreenInfoPtr screen = rfbGetScreen(NULL, NULL, settings->width, settings->height, 8, 3, bpp);
-	assert(screen != NULL);
+
+	if (screen == NULL) {
+		ERR("rfbGetScreen() initialization failed");
+		return -3;
+	}
 
 	server->active_clients = 0;
 	server->settings = settings;
@@ -127,9 +131,10 @@ int server_start(server_t* server, settings_t* settings) {
 
 	screen->newClientHook = server_client_incoming;
 
-	assert(initialize_uinput() >= 0);
-
-	// signal(SIGINT, intHandler);
+	if ((ret = initialize_uinput()) != 0) {
+		ERR("uinput initialization failed: %d", ret);
+		return -4;
+	}
 
 	// switch red and blue channels
 	int tmp = screen->serverFormat.redShift;

src/uinput.c

@@ -25,10 +25,6 @@ int initialize_uinput(void)
 	char *s;
 	struct uinput_user_dev udev;
 
-	//if (fd >= 0) {
-	//	shutdown_uinput();
-	//}
-
 	fd = open("/dev/uinput", O_WRONLY | O_NDELAY);
 
 	if (fd < 0) {
@@ -64,25 +60,19 @@ int initialize_uinput(void)
 	ioctl(fd, UI_SET_KEYBIT, BTN_BACK);
 	ioctl(fd, UI_SET_KEYBIT, KEY_PREVIOUS);
 
-
-	//if (uinput_touchscreen) {
-		ioctl(fd, UI_SET_KEYBIT, BTN_TOUCH);
-	//}
-	//if (uinput_touchscreen || uinput_abs) {
-		ioctl(fd, UI_SET_EVBIT, EV_ABS);
-		ioctl(fd, UI_SET_ABSBIT, ABS_X);
-		ioctl(fd, UI_SET_ABSBIT, ABS_Y);
-		udev.absmin[ABS_X] = 0;
-		udev.absmax[ABS_X] = 1920; // XXX: hardcoded
-		udev.absfuzz[ABS_X] = 0;
-		udev.absflat[ABS_X] = 0;
-		udev.absmin[ABS_Y] = 0;
-		udev.absmax[ABS_Y] = 1080; // XXX: hardcoded
-		udev.absfuzz[ABS_Y] = 0;
-		udev.absflat[ABS_Y] = 0;
-		//set_uinput_accel_xy(1.0, 1.0);
-	//}
-
+	ioctl(fd, UI_SET_KEYBIT, BTN_TOUCH);
+
+	ioctl(fd, UI_SET_EVBIT, EV_ABS);
+	ioctl(fd, UI_SET_ABSBIT, ABS_X);
+	ioctl(fd, UI_SET_ABSBIT, ABS_Y);
+	udev.absmin[ABS_X] = 0;
+	udev.absmax[ABS_X] = 1920; // XXX: hardcoded
+	udev.absfuzz[ABS_X] = 0;
+	udev.absflat[ABS_X] = 0;
+	udev.absmin[ABS_Y] = 0;
+	udev.absmax[ABS_Y] = 1080; // XXX: hardcoded
+	udev.absfuzz[ABS_Y] = 0;
+	udev.absflat[ABS_Y] = 0;
 
 	write(fd, &udev, sizeof(udev));