[Lcdproc] g15 updates

[Anthony J. Mirabella]

This is an OpenPGP/MIME signed message (RFC 2440 and 3156)
--------------enigDA0EDC90757463DB7ADBF5C6
Content-Type: multipart/mixed;
 boundary="------------030504000003010802050601"

This is a multi-part message in MIME format.
--------------030504000003010802050601
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: quoted-printable

Here's a patch that deals with a change in behavior in the upcoming
g15daemon release.  The old behavior is handled via a version check so
it works regardless which version of g15daemon is used.  The first part
of the patch, removing a couple of free() calls, fixes a double free
error that I've seen when exiting LCDd.

--------------030504000003010802050601
Content-Type: text/x-patch;
 name="g15.diff"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: inline;
 filename="g15.diff"

Index: g15.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsroot/lcdproc/lcdproc/server/drivers/g15.c,v
retrieving revision 1.1
diff -a -u -r1.1 g15.c
--- g15.c	13 Aug 2006 15:55:47 -0000	1.1
+++ g15.c	12 Nov 2006 01:25:53 -0000
@@ -30,6 +30,7 @@
 #include <errno.h>
 #include <syslog.h>
 #include <sys/socket.h>
+#include <sys/types.h>
 #include <libg15.h>
 #include <g15daemon_client.h>
 #include <libg15render.h>
@@ -109,15 +110,8 @@
 =09
 	g15_close_screen(p->g15screen_fd);
 =09
-	if (p !=3D NULL) {
-		if (p->canvas)
-			free(p->canvas);
-	=09
-		if (p->backingstore)
-			free(p->backingstore);
-
-		free(p);
-	}
+	if (p !=3D NULL)
+	  free(p);
 	drvthis->store_private_ptr(drvthis, NULL);
 }
=20
@@ -372,14 +366,36 @@
 MODULE_EXPORT const char * g15_get_key (Driver *drvthis)
 {
 	PrivateData *p =3D drvthis->private_data;
-=09
+	const char *g15d_ver =3D g15daemon_version();
+	int toread =3D 0;
 	unsigned int key_state =3D 0;
-=09
-	if(send(p->g15screen_fd, "k", 1, MSG_OOB)<1) /* request key status */
-        report(RPT_INFO, "%s: Error in send to g15daemon", drvthis->name=
);   =20
=20
-    	recv(p->g15screen_fd, &key_state , sizeof(key_state),0);
+	if ((strncmp("1.2", g15d_ver, 3)))
+	  {	/* other than g15daemon-1.2 (should be >=3D1.9) */
+		fd_set fds;
+		struct timeval tv;
+		memset (&tv, 0, sizeof(struct timeval));
+
+		FD_ZERO(&fds);
+		FD_SET(p->g15screen_fd, &fds);
+=09
+		toread =3D select(FD_SETSIZE, &fds, NULL, NULL, &tv);
+	  }
+	else
+	  {	/* g15daemon-1.2 */
+		if(send(p->g15screen_fd, "k", 1, MSG_OOB)<1) /* request key status */
+		  {
+	 	  	report(RPT_INFO, "%s: Error in send to g15daemon", drvthis->name);=

+			return NULL;
+		  }
+		toread =3D 1;
+	  }
 =09
+	if (toread >=3D 1)
+	  read(p->g15screen_fd, &key_state, sizeof(key_state));
+	else
+	  return NULL;
+
 	if (key_state & G15_KEY_G1)
 		return "Escape";
 	else if (key_state & G15_KEY_L1)

--------------030504000003010802050601--

--------------enigDA0EDC90757463DB7ADBF5C6
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: OpenPGP digital signature
Content-Disposition: attachment; filename="signature.asc"

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFFVnikSdAxC41Y09ERArYpAKDNzgqh/oFG30Pi3sI4Tsy1rcNGjACgm/vP
B1pA6AUAyf693GVMvzanLVU=
=0dcR
-----END PGP SIGNATURE-----

--------------enigDA0EDC90757463DB7ADBF5C6--