File kbd-1.15.2-setfont-no-cruft.patch of Package kbd

Overview Repositories Revisions Requests Users Attributes Meta

File kbd-1.15.2-setfont-no-cruft.patch of Package kbd (Revision 5215926532c2534f7fa2874dde654d84)

Currently displaying revision 5215926532c2534f7fa2874dde654d84 , Show latest

Index: kbd-2.0.4/src/kdfontop.c
===================================================================
--- kbd-2.0.4.orig/src/kdfontop.c
+++ kbd-2.0.4/src/kdfontop.c
@@ -168,6 +168,23 @@ int putfont(int fd, unsigned char *buf,
 			return 0;
 	}
 
+#if 1
+	// We no longer try PIO_FONT* calls.
+	// A former patch even added a possible 5 seconds delay loop here, in an attempt to
+	// gain victory over kdm. We no do this fight, as it can only result in races.
+	// https://bugzilla.novell.com/show_bug.cgi?id=302010
+	//
+	// Two effects:
+	// a) Without the delay loop, we are fast enough to run early. 
+	//    Moving setfont calls to an earlier point most likly
+	//    avoids the race.
+	// b) Without the old compat calls, it should be easier to 
+	//    fix this in kernel side.
+	//
+	fprintf(stderr, "%s: putfont: %d,%dx%d:  failed: %d\n", progname, count, width, height, i);
+	perror("putfont: KDFONTOP");
+	return -1;
+#else
 	/* Second attempt: PIO_FONTX */
 	cfd.charcount  = count;
 	cfd.charheight = height;
@@ -190,4 +207,5 @@ int putfont(int fd, unsigned char *buf,
 		return -1;
 	}
 	return 0;
+#endif
 }

Places

File kbd-1.15.2-setfont-no-cruft.patch of Package kbd (Revision 5215926532c2534f7fa2874dde654d84)

Places