--- microwin/src/nanox/Makefile	2003-09-10 05:15:53.000000000 +0200
+++ ipaq-microwin/src/nanox/Makefile	2004-08-25 12:56:50.000000000 +0200
@@ -32,6 +32,7 @@
 	$(MW_DIR_OBJ)/nanox/srvfunc.o \
 	$(MW_DIR_OBJ)/nanox/srvutil.o \
 	$(MW_DIR_OBJ)/nanox/srvevent.o \
+	$(MW_DIR_OBJ)/nanox/nxtransform.o \
 	$(MW_DIR_OBJ)/nanox/srvclip.o
 
 # Nano-X client files
--- microwin/src/nanox/srvmain.c	2003-08-11 22:38:38.000000000 +0200
+++ ipaq-microwin/src/nanox/srvmain.c	2004-08-25 13:38:30.000000000 +0200
@@ -93,6 +93,7 @@
 int		autoportrait = FALSE;	/* auto portrait mode switching*/
 MWCOORD		nxres;			/* requested server x resolution*/
 MWCOORD		nyres;			/* requested server y resolution*/
+GR_TRANSFORM	trans;			/* mouse transform for ts pointer */
 
 #if MW_FEATURE_TIMERS
 GR_TIMEOUT	screensaver_delay;	/* time before screensaver activates */
@@ -113,8 +114,21 @@
 static void
 usage(void)
 {
-	printf("Usage: %s [-e] [-p] [-A] [-NLRD] [-x#] [-y#] [-c <fontconfig-file> ...]\n",
-		progname);
+	printf("Usage: %s [OPTIONS]...\n\n", progname);
+
+	printf("OPTIONS are:\n");
+	printf("\t-e\t\t\thitting ESC terminates nano server\n");
+	printf("\t-p\t\t\tdo not terminate nano server when last client exits\n");
+	printf("\t-A\t\t\tauto portrait mode switching\n");
+	printf("\t-N\t\t\tset screen portrait mode to NONE\n");
+	printf("\t-L\t\t\tset screen portrait mode to LEFT\n");
+	printf("\t-R\t\t\tset screen portrait mode to RIGHT\n");
+	printf("\t-D\t\t\tset screen portrait mode to DOWN\n");
+	printf("\t-x #\t\t\trequest server x resolution\n");
+	printf("\t-y #\t\t\trequest server y resolution\n");
+	printf("\t-C <fontconfig-file>\tfont configuration file\n");
+	printf("\t-d <calibration-file>\ttouchscreen calibration data file\n");
+
 	exit(1);
 }
 
@@ -180,6 +194,15 @@
 			++t;
 			continue;
 		}
+		if ( !strcmp("-d",argv[t]) ) {
+			if (++t >= argc)
+				usage();
+			int ret = GrLoadTransformData(argv[t], &trans);
+			if (!ret)
+				GrSetTransform(&trans);
+			++t;
+			continue;
+		}
 #if FONTMAPPER
 		if ( !strcmp("-c",argv[t]) ) {
 			int read_configfile(char *file);