Resizing windows now works for local and galactic maps.

That said, images are still 20 pixels across and dont resize.  But targetting, direction,
and scaling of the screens works.

Author: Darrell Root

src/jtrek/visual/BasePanel.java

@@ -63,8 +63,8 @@ public void setBounds(int x, int y, int width, int height) {
 		else {
 			super.setBounds(x, y, width, height);
 		}
-		view_size.width = width - TWO_BORDERS;
-		view_size.height = height - TWO_BORDERS;
+		view_size.width = width;// - TWO_BORDERS;
+		view_size.height = height;// - TWO_BORDERS;
 		setup();
 	}
 

src/jtrek/visual/GalacticPanel.java

@@ -7,7 +7,7 @@
 import jtrek.config.*;
 
 public class GalacticPanel extends BaseMapPanel {
-	final static float SCALE = (float)500 / (float)Universe.PIXEL_SIZE;
+	static float SCALE = (float)500 / (float)Universe.PIXEL_SIZE;
 
 	GalacticBitmaps bitmaps;
 
@@ -30,17 +30,31 @@ void setup() {
 
 	/** getCourse */
 	byte getCourse() {	
+		int xclick = mx * Universe.PIXEL_SIZE / this.getWidth();
+		int yclick = my * Universe.PIXEL_SIZE / this.getHeight();
 		return (byte)Math.rint(
-			Math.atan2((double)mx - data.me.x * 0.005d, data.me.y * 0.005d - (double)my) / Math.PI * 128);
+			Math.atan2(xclick - data.me.x, data.me.y - yclick) / Math.PI * 128);
 	}
 
 	/** getTarget */
 	Object getTarget(int target_type) {
-		return data.getTarget((mx * Universe.PIXEL_SIZE) / 500, (my * Universe.PIXEL_SIZE) / 500, target_type);
+		return data.getTarget((mx * Universe.PIXEL_SIZE) / this.getWidth(), (my * Universe.PIXEL_SIZE) / this.getHeight(), target_type);
 	}
 
+	/**
+	 * Added support to rescale galactic window based on resizing
+	 */
+	private void updateScale() {
+		if (this.getWidth() < 100) { // abort recalculation if window too small
+			return;
+		}
+		GalacticPanel.SCALE = (float)this.getWidth() /  (float)Universe.PIXEL_SIZE;
+	}
 	/** update */
 	public void update(Graphics g) {
+		this.updateScale();
+		redraw_all_planets = true;
+		
 		Graphics og = offscreen.getGraphics();
 		og.setFont(getFont());
 		Graphics pg = planet_offscreen.getGraphics();

src/jtrek/visual/LocalPanel.java

@@ -11,8 +11,9 @@ public class LocalPanel extends BaseMapPanel {
 	final static Color PRESSOR_COLOR = new Color(0x888800);
 	final static int ALERT_FILTER = (Player.GREEN | Player.YELLOW | Player.RED);
 
-	final static int SCALE = 40;
-	final static int VIEW = SCALE * 250;
+	final static int TARGET_VIEW_WIDTH = 20000;
+	static int SCALE = 40;
+	static int VIEW = SCALE * 250;
 
 	LocalBitmaps bitmaps;
 	int alert = 0;
@@ -59,6 +60,22 @@ public void newShip() {
 		}
 	}
 
+	/**
+	 * Recalculates scale.  Tactical screen should cover 20,000 netrek units
+	 * and (by default) is 500 pixels wide
+	 * That's 20% across the universe.
+	 */
+	private void recalculateScale() {
+		int viewWidth = this.getWidth();
+		if (viewWidth < 100) {
+			// giving up, view too small
+			return;
+		}
+		LocalPanel.VIEW = TARGET_VIEW_WIDTH / 2;
+		LocalPanel.SCALE = TARGET_VIEW_WIDTH / viewWidth;
+		
+	}
+	
 	public void goneToOutfit() {
 		alert = 0;
 		tractor_count = 0;
@@ -72,17 +89,22 @@ public void goneToOutfit() {
 
 	/** getCourse */
 	byte getCourse() {
+		int centerX = this.getWidth() / 2;
+		int centerY = this.getHeight() / 2;
 		return (byte)Math.rint(
-			Math.atan2((double)(mx - 250), (double)(250 - my)) / Math.PI * 128);
+			Math.atan2((double)(mx - centerX), (double)(centerY - my)) / Math.PI * 128);
 	}
 
 	/** getTarget */
 	Object getTarget(int target_sype) {
-		return data.getTarget(data.me.x + ((mx - 250) * SCALE), data.me.y + ((my - 250) * SCALE), target_sype);
+		int centerX = this.getWidth() / 2;
+		int centerY = this.getHeight() / 2;
+		return data.getTarget(data.me.x + ((mx - centerX) * SCALE), data.me.y + ((my - centerY) * SCALE), target_sype);
 	}
 
 	/** update */
 	public void update(Graphics g) {
+		recalculateScale(); // added to support changing view size
 		Graphics og = offscreen.getGraphics();
 		og.setFont(getFont());
 
@@ -211,7 +233,7 @@ else if((planet.flags & Planet.AGRI) != 0) {
 		} // end draw planets
 
 		// draw the players
-		for(int p = players.length; --p >= 0;) {
+		for(int p = players.length - 1; p >= 0; p--) {
 			Player player = players[p];
 
 			// see if this player is active
@@ -263,7 +285,14 @@ else if (player.cloakphase > 0) {
 			} 
 
 			if (player.status == Player.ALIVE) {
+				
+				// if my ship image is null, create it
+				if (player.me && bitmaps.myship == null) {
+					newShip();
+				}
 				Image ship = player.me ? bitmaps.myship : bitmaps.ships[player.team.no][player.ship.type];
+				//Image ship = bitmaps.ships[player.team.no][player.ship.type];
+
 				source_y = bitmaps.rosette[player.dir];
 
 				og.drawImage(ship, 

src/jtrek/visual/NetrekFrame.java

@@ -22,7 +22,7 @@ public class NetrekFrame extends Frame {
 	public InfoPanel server_info;
 	public LocalPanel local;
 	public GalacticPanel galactic;
-	public Dashboard dashboard;
+	public Dashboard dashboard;  // also known as tstat i think
 	public WarningPanel warning;
 	public MessagePanel message;
 	public PlayerListPanel player_list;	
@@ -56,6 +56,7 @@ public class NetrekFrame extends Frame {
 	public FeatureList feature_list;
 	public Beeplite beeplite;
 	public boolean quit = false;
+	private NetrekFrame netrekFrame;
 
 	public NetrekFrame(Communications comm, Universe data) {
 		super("Netrek");
@@ -65,6 +66,8 @@ public NetrekFrame(Communications comm, Universe data) {
 		setBackground(Color.black);
 		setIconImage(ICON_IMAGE);
 
+		netrekFrame = this;
+		
 		// install the message handlers
 		dmessage = new IncomingMessageHandler(this, data, comm);
 		smessage = new SendMessage(this, data, comm);
@@ -216,6 +219,80 @@ public void windowClosing(WindowEvent e) {
 		detached_motd.addKeyListener(key_handler);
 		detached_motd.detachWindow(null).addKeyListener(key_handler);
 		setupBasePanel(detached_motd);
+		
+        this.addComponentListener(new ComponentAdapter() {
+            public void componentResized(ComponentEvent e) {
+                // This is only called when the user releases the mouse button.
+                System.out.println("componentResized");
+                netrekFrame.resizeWindows();
+            }
+        });
+
+	}
+	
+	void resizeWindows() {
+		int windowWidth = this.getWidth();
+		int windowHeight = this.getHeight();
+		
+		int leftYPosition = 0;
+		int rightYPosition = 0;
+		int halfWidth = windowWidth / 2;
+		
+		int mapDimension = Math.min(halfWidth, windowHeight * 742 / 1008); //keep maps square
+		
+		// overlapping front windows
+		
+		entry.setBounds(0, 0, mapDimension, mapDimension);
+		if (login != null) {
+			login.setBounds(0, 0, mapDimension, mapDimension);
+		}
+		information.setBounds(0, 0, mapDimension, mapDimension);
+		attached_motd.setBounds(halfWidth, 0, mapDimension, mapDimension);
+		options.setBounds(halfWidth, 0, mapDimension, mapDimension);
+		
+		// left column
+		
+		local.setBounds(0,0,mapDimension, mapDimension); 
+		leftYPosition += mapDimension;
+
+		dashboard.setBounds(0, leftYPosition, halfWidth, 51);;
+		leftYPosition += 51;
+		
+		// reviews seem to overlap
+		review.setBounds(0,leftYPosition, halfWidth, windowHeight / 4);
+		leftYPosition += windowHeight / 4;
+		
+		review_all.setBounds(0,leftYPosition, halfWidth, windowHeight / 8);
+		leftYPosition += windowHeight / 8;
+		
+		review_team.setBounds(0,leftYPosition, halfWidth, windowHeight / 8);
+		leftYPosition += windowHeight / 8;
+		
+		review_your.setBounds(0, leftYPosition, halfWidth, windowHeight / 8);
+		leftYPosition += windowHeight / 8;
+		
+		review_kill.setBounds(0, leftYPosition, halfWidth, windowHeight / 8);
+		leftYPosition += windowHeight / 8;
+		
+		review_phaser.setBounds(0, leftYPosition, halfWidth, windowHeight / 8);
+		leftYPosition += windowHeight / 8;
+
+		// right column
+		
+		galactic.setBounds(halfWidth, 0, mapDimension, mapDimension);
+		rightYPosition += mapDimension;
+		
+		warning.setBounds(halfWidth, rightYPosition, halfWidth, windowHeight / 28);
+		rightYPosition += windowHeight / 28;
+		
+		message.setBounds(halfWidth, rightYPosition, windowWidth/2, windowHeight / 28);
+		rightYPosition += windowHeight / 28;
+		
+		player_list.setBounds(halfWidth, rightYPosition, windowWidth / 2, windowHeight /4);
+		rightYPosition += windowHeight / 4;
+		
+		
+		
 	}
 
 	void shutDown() {
@@ -268,6 +345,7 @@ public void slotFound() {
 		// z-order of dialogs don't stay over this frame correctly
 		addNotify();
 		addWindows();
+		//newWindowSetup();
 		Insets insets = getInsets();
 		Rectangle rect = Defaults.getWindowGeometry("netrek");
 		rect.width += insets.left + insets.right;
@@ -278,6 +356,43 @@ public void slotFound() {
 		requestFocus();
 	}
 
+	/*public void newWindowSetup() {
+		
+		this.setBounds(0,0,1008,742);
+		
+		add(information);
+		
+		BasePanel login = (BasePanel) getWindow("login");
+		login.setVisible(false);
+		Container netrekWindow = getWindow("netrek");
+		GridBagConstraints constraints = new GridBagConstraints();
+		
+		constraints.gridx = 0;
+		constraints.gridy = 0;
+		constraints.anchor = GridBagConstraints.NORTHWEST;
+		netrekWindow.add(login,constraints);
+		
+		BasePanel local = (BasePanel) getWindow("local");
+		local.setMinimumSize(new Dimension(508,508));
+		local.setBounds(0, 0, 500, 500);
+		constraints.gridx = 0;
+		constraints.gridy = 0;
+		constraints.anchor = GridBagConstraints.NORTHWEST;
+		netrekWindow.add(local,constraints);
+		local.setVisible(true);
+
+
+		BasePanel entry = (BasePanel) getWindow("entry");
+		entry.setVisible(false);
+		
+		constraints.gridx = 0;
+		constraints.gridy = 0;
+		constraints.anchor = GridBagConstraints.NORTHWEST;
+		netrekWindow.add(entry,constraints);
+
+	}
+*/
+	
 	public void showLogin() {
 		local.setVisible(true);
 		galactic.setVisible(true);		
@@ -312,7 +427,14 @@ else if(parent_name.equalsIgnoreCase("none")) {
 				parent = this;
 			}
 			try {
-				parent.add(panel);
+				//GridBagConstraints constraints = getConstraints(panel);
+				setSize(panel);
+				//if (constraints != null) {
+				//	parent.add(panel,constraints);
+				//} else {
+					parent.add(panel);
+				//}
+				panel.setVisible(Defaults.getWindowVisible(panel.name));
 			}
 			catch(IllegalArgumentException e) {
 				System.err.println("Error adding window \"" + panel.getName() + "\" to parent, " + e.getMessage());
@@ -328,6 +450,7 @@ void setupWindows() {
 			setupBasePanel(windows[w]);
 		}
 	}
+	
 
 	/** setupBasePanel */
 	void setupBasePanel(BasePanel panel) {
@@ -342,6 +465,67 @@ void setupBasePanel(BasePanel panel) {
 		panel.setVisible(Defaults.getWindowVisible(panel.name));
 	}	
 
+	/*private GridBagConstraints getConstraints(BasePanel panel) {
+		GridBagConstraints constraints = new GridBagConstraints();
+		if (panel.name.equals("local")) {
+			constraints.gridx = 0;
+			constraints.gridy = 0;
+			constraints.anchor = GridBagConstraints.NORTHWEST;
+			return constraints;
+		} else if (panel.name.equals("map")) {
+			constraints.gridx = 0;
+			constraints.gridy = 1;
+			constraints.anchor = GridBagConstraints.NORTHEAST;
+			return constraints;
+		} else {
+			return null;
+		}
+	}*/
+	
+	void setSize(BasePanel panel) {
+		if(panel.getParent() != null) {
+			Rectangle geometry = Defaults.getWindowGeometry(panel.name);
+			if (geometry.x < 0) {
+				geometry.x = 0;
+			}
+			if (geometry.y < 0) {
+				geometry.y = 0;
+			}
+			panel.setBounds(geometry);
+		}
+	}
+	/**
+	 * New attempt to setup windows for netrek 0.9.7 to allow resizing
+	 * @param panel
+	 */
+	/*void setupBasePanel2(BasePanel panel) {
+		GridBagConstraints constraints = new GridBagConstraints();
+
+		if (panel.name.equals("local")) {
+			constraints.gridx = 0;
+			constraints.gridy = 0;
+			constraints.anchor = GridBagConstraints.NORTHWEST;
+			panel.setSize(508, 508);
+			panel.setVisible(true);
+		} else if (panel.name.equals("map")) {
+			constraints.gridx = 0;
+			constraints.gridy = 1;
+			constraints.anchor = GridBagConstraints.NORTHEAST;
+			panel.setSize(508, 508);
+			panel.setVisible(true);
+		} else {
+			if(panel.getParent() != null) {
+				Rectangle geometry = Defaults.getWindowGeometry(panel.name);
+				if(panel.getParent() == this) {
+					Insets i = getInsets();
+					geometry.translate(i.left, i.top);
+				}
+				panel.setBounds(geometry);
+			}
+			panel.setVisible(Defaults.getWindowVisible(panel.name));
+		}
+	}*/
+
 	/** loginComplete */
 	public void loginComplete() {
 		login.getParent().remove(login);