Integrate John Brant's fix for meta key release on X11:

changing unix key handling for Ctrl-letter and releasing the ctrl & shift keys

Fix a missing external declaration in sqOpenGLRenderer.c.
Fix some printf compiler warnings (long argument, int format)
Revert the use of script in build.linux32x86/squeak.cog.spur/build.debug/mvm
Add a couple of convenience build scripts.

Author: eliotmiranda

build.linux32x86/squeak.cog.spur/build.debug/mvm

@@ -33,7 +33,4 @@ rm -f vm/sqUnixMain.o # nuke version info
 rm -rf ../../../products/$INSTALLDIR
 # prefer make install prefix=`readlink -f \`pwd\`/../../../products/$INSTALLDIR`
 # but older linux readlinks lack the -f flag
-exec \
-    script -f -q -e -c \
-    "make install-squeak install-plugins prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR" \
-    >(sed "s/\x1B\[\([0-9]\{1,2\}\(;[0-9]\{1,2\}\)\?\)\?[mGK]//g" > LOG)
+make install-squeak install-plugins prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG

build.linux32x86/squeak.cog.spur/makethbdirty

@@ -0,0 +1,15 @@
+#!/bin/sh -e
+trap 'exit 2' HUP INT PIPE TERM
+if [ "$1" = -fork ]; then
+	shift
+	for d in build.debug build.assert build; do
+		(cd ./$d
+		 echo n | ./mvm "$@") &
+	done
+	wait
+else
+	for d in build.debug build.assert build; do
+		(cd ./$d
+		 echo n | ./mvm "$@")
+	done
+fi

build.linux64x64/squeak.cog.spur/makethbdirty

@@ -0,0 +1,15 @@
+#!/bin/sh -e
+trap 'exit 2' HUP INT PIPE TERM
+if [ "$1" = -fork ]; then
+	shift
+	for d in build.debug build.assert build; do
+		(cd ./$d
+		 echo n | ./mvm "$@") &
+	done
+	wait
+else
+	for d in build.debug build.assert build; do
+		(cd ./$d
+		 echo n | ./mvm "$@")
+	done
+fi

platforms/Cross/plugins/B3DAcceleratorPlugin/sqOpenGLRenderer.c

@@ -84,6 +84,10 @@ closelog(void)
 # endif
 #endif
 
+#if defined(SQUEAK_BUILTIN_PLUGIN)
+extern char *getImageName(void);
+#endif
+
 int
 print3Dlog(char *fmt, ...)
 {	va_list args;

platforms/unix/vm-display-X11/sqUnixX11.c

@@ -2062,6 +2062,17 @@ static int x2sqKeyPlain(XKeyEvent *xevt, KeySym *symbolic)
       return -1;	/* unknown key */
   if ((charCode == 127) && mapDelBs)
     charCode= 8;
+  if (charCode >= 1 && charCode <= 26) {
+    /* check for Ctrl-letter that gets translated into charCode 1-26 instead of letters a-z */
+    KeySym keysym = *symbolic;
+    if (keysym >= XK_a && keysym <= XK_z)
+      return (int)'a' + (keysym - XK_a);
+    if (keysym >= XK_A && keysym <= XK_Z)
+      return (int)'A' + (keysym - XK_A);
+  }
+  if (charCode >= 246 /* XK_Alt_R */ && charCode <= 255 /* XK_Shift_L */) /* hard coded values from translateCode */
+    /* The shift, ctrl, alt keys shouldn't be translated by the recode below */
+    return charCode;
   return nConv == 0 && (modifierState & (CommandKeyBit+CtrlKeyBit+OptionKeyBit))
 			? charCode
 			: recode(charCode);
@@ -4792,7 +4803,7 @@ static sqInt display_ioFormPrint(sqInt bitsIndex, sqInt width, sqInt height, sqI
   copyFn copy= ((depth > 0) && (depth <= 32)) ? copyFns[depth] : 0;
   if (!copy)
     {
-      fprintf(stderr, "ioFormPrint: depth %d not supported\n", depth);
+      fprintf(stderr, "ioFormPrint: depth %ld not supported\n", depth);
       return false;
     }
 
@@ -4834,7 +4845,7 @@ static sqInt display_ioFormPrint(sqInt bitsIndex, sqInt width, sqInt height, sqI
     }
 
   /* print the PPM magic number */
-  fprintf(ppm, "P3\n%d %d 255\n", width, height);
+  fprintf(ppm, "P3\n%ld %ld 255\n", width, height);
 
   /* write the pixmap */
   {
@@ -5485,7 +5496,7 @@ static sqInt display_ioShowDisplay(sqInt dispBitsIndex, sqInt width, sqInt heigh
   if (!(depth == 1 || depth == 2 || depth == 4
 	|| depth == 8 || depth == 16 || depth == 32))
     {
-      fprintf(stderr, "depth %d is not supported\n", depth);
+      fprintf(stderr, "depth %ld is not supported\n", depth);
       exit(1);
       return 0;
     }
@@ -5818,7 +5829,7 @@ static sqInt display_ioHasDisplayDepth(sqInt i)
 
 static sqInt display_ioSetDisplayMode(sqInt width, sqInt height, sqInt depth, sqInt fullscreenFlag)
 {
-  fprintf(stderr, "ioSetDisplayMode(%d, %d, %d, %d)\n",
+  fprintf(stderr, "ioSetDisplayMode(%ld, %ld, %ld, %ld)\n",
 	  width, height, depth, fullscreenFlag);
   setSavedWindowSize((width << 16) + (height & 0xFFFF));
   setFullScreenFlag(fullScreen);
@@ -6925,6 +6936,7 @@ closelog(void)
 static int
 myPrint3Dlog(char *fmt, ...)
 {	va_list args;
+	int n;
 
 	if (!logfile) {
 		char *slash;
@@ -6949,10 +6961,11 @@ myPrint3Dlog(char *fmt, ...)
 		atexit(closelog);
 	}
 	va_start(args,fmt);
-	vfprintf(logfile, fmt, args);
+	n = vfprintf(logfile, fmt, args);
 	va_end(args);
 	if (forceFlush) /* from sqOpenGLRenderer.h */
 		fflush(logfile);
+	return n;
 }
 
 # include <GL/gl.h>
@@ -7261,7 +7274,7 @@ static long display_hostWindowSetTitle(long windowIndex, char *newTitle, long si
   XChangeProperty(stDisplay, stParent,
 		  XInternAtom(stDisplay, "_NET_WM_NAME", False),
 		  XInternAtom(stDisplay, "UTF8_STRING",  False),
-		  8, PropModeReplace, newTitle, sizeOfTitle);
+		  8, PropModeReplace, (unsigned char *)newTitle, sizeOfTitle);
 
   return 0;
 }
@@ -7279,7 +7292,7 @@ static long display_ioSizeOfNativeWindow(void *windowHandle)
    * width.
    */
   real_border_width= attrs.border_width ? attrs.border_width : attrs.x;
-  return (attrs.width + 2 * real_border_width << 16)
+  return ((attrs.width + 2 * real_border_width) << 16)
     | (attrs.height + attrs.y + real_border_width);
 }
 
@@ -7295,7 +7308,7 @@ static long display_ioPositionOfNativeWindow(void *windowHandle)
 				&rootx, &rooty, &neglected_child))
     return -1;
 
-  return (rootx - attrs.x << 16) | (rooty - attrs.y);
+  return ((rootx - attrs.x) << 16) | (rooty - attrs.y);
 }
 
 #endif /* (SqDisplayVersionMajor >= 1 && SqDisplayVersionMinor >= 2) */

platforms/unix/vm-display-X11/sqUnixXdnd.c

@@ -755,7 +755,7 @@ struct { char *fileName; Window sourceWindow; } *launchDrops = 0;
 static int numLaunchDrops = 0;
 
 /* drastically simplified case of dndInDrop that leaves out the 8 step dance
- * (see http://www.newplanetsoftware.com/xdnd/).  Instead grab the fileName in
+ * (see http://www.freedesktop.org/xdnd/).  Instead grab the fileName in
  * the XdndSqueakLaunchDrop property and send an ack message.
  */
 enum XdndState
@@ -800,6 +800,7 @@ dndInLaunchDrop(XClientMessageEvent *evt)
 		launchDrops[i].fileName = fileName;
 		launchDrops[i].sourceWindow = xdndDrop_sourceWindow(evt);
 	}
+    return XdndStateIdle; /* Added by eem 2018/12/14 to remove a compiler warning; Is this correct? */
 }
 
 /* Send a XdndSqueakLaunchAck essage back to the launch dropper if the filename
@@ -1032,7 +1033,7 @@ windowHasLabel(Window w, char *label)
 	 */
 	if (win_text.nitems <= 0)
 		return 0;
-	hasLabel = !strcmp(label, win_text.value);
+	hasLabel = !strcmp(label, (char *)win_text.value);
 	(void)XFree(win_text.value);
 	return hasLabel;
 }

platforms/unix/vm/sqUnixMain.c

@@ -988,14 +988,14 @@ static void *
 printRegisterState(ucontext_t *uap)
 {
 #if __linux__ && __i386__
-	gregset_t *regs = &uap->uc_mcontext.gregs;
+	greg_t *regs = (greg_t *)&uap->uc_mcontext.gregs;
 	printf(	"\teax 0x%08x ebx 0x%08x ecx 0x%08x edx 0x%08x\n"
 			"\tedi 0x%08x esi 0x%08x ebp 0x%08x esp 0x%08x\n"
 			"\teip 0x%08x\n",
 			regs[REG_EAX], regs[REG_EBX], regs[REG_ECX], regs[REG_EDX],
 			regs[REG_EDI], regs[REG_EDI], regs[REG_EBP], regs[REG_ESP],
 			regs[REG_EIP]);
-	return regs[REG_EIP];
+	return (void *)regs[REG_EIP];
 #elif __FreeBSD__ && __i386__
 	struct mcontext *regs = &uap->uc_mcontext;
 	printf(	"\teax 0x%08x ebx 0x%08x ecx 0x%08x edx 0x%08x\n"
@@ -1006,18 +1006,18 @@ printRegisterState(ucontext_t *uap)
 			regs->mc_eip);
 	return regs->mc_eip;
 #elif __linux__ && __x86_64__
-	gregset_t *regs = &uap->uc_mcontext.gregs;
-	printf(	"\trax 0x%08x rbx 0x%08x rcx 0x%08x rdx 0x%08x\n"
-			"\trdi 0x%08x rsi 0x%08x rbp 0x%08x rsp 0x%08x\n"
-			"\tr8  0x%08x r9  0x%08x r10 0x%08x r11 0x%08x\n"
-			"\tr12 0x%08x r13 0x%08x r14 0x%08x r15 0x%08x\n"
-			"\trip 0x%08x\n",
+	greg_t *regs = (greg_t *)&uap->uc_mcontext.gregs;
+	printf(	"\trax 0x%08lx rbx 0x%08lx rcx 0x%08lx rdx 0x%08lx\n"
+			"\trdi 0x%08lx rsi 0x%08lx rbp 0x%08lx rsp 0x%08lx\n"
+			"\tr8  0x%08lx r9  0x%08lx r10 0x%08lx r11 0x%08lx\n"
+			"\tr12 0x%08lx r13 0x%08lx r14 0x%08lx r15 0x%08lx\n"
+			"\trip 0x%08lx\n",
 			regs[REG_RAX], regs[REG_RBX], regs[REG_RCX], regs[REG_RDX],
 			regs[REG_RDI], regs[REG_RDI], regs[REG_RBP], regs[REG_RSP],
 			regs[REG_R8 ], regs[REG_R9 ], regs[REG_R10], regs[REG_R11],
 			regs[REG_R12], regs[REG_R13], regs[REG_R14], regs[REG_R15],
 			regs[REG_RIP]);
-	return regs[REG_RIP];
+	return (void *)regs[REG_RIP];
 # elif __linux__ && (defined(__arm64__))
  	printf("@@FIXME@@: derive register state from a ucontext_t on aarch64 \n");
 	return 0;