From 9323828a9f6118313d431f13a1f309da9c79ba09 Mon Sep 17 00:00:00 2001
From: "Kenneth B. Russell" <kbrussel@alum.mit.edu>
Date: Sun, 2 Mar 2008 20:21:15 +0000
Subject: Changes to enable Jake2 to run well as an applet inside the
 next-generation Java Plug-In. Added Globals.appletMode, Globals.applet and
 Globals.sizeChangeListener to be able to easily pass around the knowledge
 that the system is running in applet mode, and the applet itself, which
 becomes the parent container for the output. Most changes were in
 Jsr231Driver to support putting the Display into a preexisting parent
 container rather than a new Frame each time. Changed JOGLKBD to allow manual
 initialization of the parent container rather than obtaining it from a
 CreateNotify or ConfigureNotify event since these will never be generated in
 the applet case. Removed various calls to System.exit(), although strictly
 speaking this is no longer necessary because it is expected that the
 separate_jvm parameter will be used in conjunction with the new Java Plug-In
 to create a fresh JVM instance for each run of Jake2. Video mode switching in
 applet mode is working; the applet resizes (via JavaScript) to accommodate
 the newly selected resolution. Full screen mode when running as an applet is
 not implemented at this point, as the intent was to show this inside the
 browser, though support could be added very straightforwardly.

---
 src/jake2/sys/JOGLKBD.java | 60 ++++++++++++++++++++++++++++++++--------------
 src/jake2/sys/Sys.java     | 12 ++++++----
 2 files changed, 50 insertions(+), 22 deletions(-)

(limited to 'src/jake2/sys')

diff --git a/src/jake2/sys/JOGLKBD.java b/src/jake2/sys/JOGLKBD.java
index 8fda765..dbf54fb 100644
--- a/src/jake2/sys/JOGLKBD.java
+++ b/src/jake2/sys/JOGLKBD.java
@@ -1,5 +1,6 @@
 package jake2.sys;
 
+import jake2.Globals;
 import jake2.client.Key;
 
 import java.awt.*;
@@ -21,13 +22,21 @@ final public class JOGLKBD extends KBD
 		try {
 			robot = new Robot();
 		} catch (AWTException e) {
+                    if (!Globals.appletMode) {
 			System.exit(1);
+                    }
 		}
 	}
 		
 	public void Init() {
 	}
 
+        // Used only for the applet case
+        public static void Init(Component component) {
+            c = component;
+            handleCreateAndConfigureNotify(component);
+        }
+
 	public void Update() {
 		// get events
 		HandleEvents();
@@ -85,24 +94,7 @@ final public class JOGLKBD extends KBD
 					 
 				case Jake2InputEvent.CreateNotify :
 				case Jake2InputEvent.ConfigureNotify :
-					Component c = ((ComponentEvent)event.ev).getComponent();
-					win_x = 0;
-					win_y = 0;
-					win_w2 = c.getWidth() / 2;
-					win_h2 = c.getHeight() / 2;
-					int left = 0; int top = 0;
-					while (c != null) {
-						if (c instanceof Container) {
-							Insets insets = ((Container)c).getInsets();
-							left += insets.left;
-							top += insets.top;
-						}
-						win_x += c.getX();
-						win_y += c.getY();
-						c = c.getParent();
-					}
-					win_x += left; win_y += top;
-					win_w2 -= left / 2; win_h2 -= top / 2;
+                                        handleCreateAndConfigureNotify(((ComponentEvent)event.ev).getComponent());
 					break;
 			}
 		}
@@ -113,6 +105,38 @@ final public class JOGLKBD extends KBD
 		}		
 	}
 
+        private static void handleCreateAndConfigureNotify(Component component) {
+            // Probably could unify this code better, but for now just
+            // leave the two code paths separate
+            if (!Globals.appletMode) {
+                win_x = 0;
+                win_y = 0;
+                win_w2 = component.getWidth() / 2;
+                win_h2 = component.getHeight() / 2;
+                int left = 0; int top = 0;
+                while (component != null) {
+                    if (component instanceof Container) {
+                        Insets insets = ((Container)component).getInsets();
+                        left += insets.left;
+                        top += insets.top;
+                    }
+                    win_x += component.getX();
+                    win_y += component.getY();
+                    component = component.getParent();
+                }
+                win_x += left; win_y += top;
+                win_w2 -= left / 2; win_h2 -= top / 2;
+            } else {
+                win_x = 0;
+                win_y = 0;
+                win_w2 = component.getWidth() / 2;
+                win_h2 = component.getHeight() / 2;
+                Point p = component.getLocationOnScreen();
+                win_x = p.x;
+                win_y = p.y;
+            }
+        }
+
 	// strange button numbering in java.awt.MouseEvent
 	// BUTTON1(left) BUTTON2(center) BUTTON3(right)
 	// K_MOUSE1      K_MOUSE3        K_MOUSE2
diff --git a/src/jake2/sys/Sys.java b/src/jake2/sys/Sys.java
index 498750a..8ac8fb1 100644
--- a/src/jake2/sys/Sys.java
+++ b/src/jake2/sys/Sys.java
@@ -2,7 +2,7 @@
  * Sys.java
  * Copyright (C) 2003
  * 
- * $Id: Sys.java,v 1.11 2005-07-01 14:20:54 hzi Exp $
+ * $Id: Sys.java,v 1.12 2008-03-02 20:21:15 kbrussel Exp $
  */
 /*
  Copyright (C) 1997-2001 Id Software, Inc.
@@ -45,13 +45,17 @@ public final class Sys extends Defines {
         CL.Shutdown();
         //StackTrace();
         new Exception(error).printStackTrace();
-        System.exit(1);
+        if (!Globals.appletMode) {
+            System.exit(1);
+        }
     }
 
     public static void Quit() {
         CL.Shutdown();
 
-        System.exit(0);
+        if (!Globals.appletMode) {
+            System.exit(0);
+        }
     }
 
     //ok!
@@ -240,4 +244,4 @@ public final class Sys extends Defines {
         System.out.print(msg);
     }
 
-}
\ No newline at end of file
+}
-- 
cgit v1.2.3