Menu
▾
▴
jnode-svn-commits
|
From: <fd...@us...> - 2008-07-24 22:03:25
|
Revision: 4353
http://jnode.svn.sourceforge.net/jnode/?rev=4353&view=rev
Author: fduminy
Date: 2008-07-24 22:03:21 +0000 (Thu, 24 Jul 2008)
Log Message:
-----------
- removed VESAConstants and VESAPlugin constants
- cleanup of calls to Unsafe.debug
Modified Paths:
--------------
trunk/gui/descriptors/org.jnode.driver.video.vesa.xml
trunk/gui/src/driver/org/jnode/driver/video/vesa/VESACommand.java
trunk/gui/src/driver/org/jnode/driver/video/vesa/VESACore.java
trunk/gui/src/driver/org/jnode/driver/video/vesa/VESADriver.java
Removed Paths:
-------------
trunk/gui/src/driver/org/jnode/driver/video/vesa/VESAConstants.java
trunk/gui/src/driver/org/jnode/driver/video/vesa/VESAPlugin.java
Modified: trunk/gui/descriptors/org.jnode.driver.video.vesa.xml
===================================================================
--- trunk/gui/descriptors/org.jnode.driver.video.vesa.xml 2008-07-24 21:20:06 UTC (rev 4352)
+++ trunk/gui/descriptors/org.jnode.driver.video.vesa.xml 2008-07-24 22:03:21 UTC (rev 4353)
@@ -5,9 +5,7 @@
name="JNode Video VESA driver"
version="@VERSION@"
license-name="lgpl"
- provider-name="JNode.org"
- class="org.jnode.driver.video.vesa.VESAPlugin"
- auto-start="true">
+ provider-name="JNode.org">
<requires>
<import plugin="org.jnode.driver.bus.pci"/>
Modified: trunk/gui/src/driver/org/jnode/driver/video/vesa/VESACommand.java
===================================================================
--- trunk/gui/src/driver/org/jnode/driver/video/vesa/VESACommand.java 2008-07-24 21:20:06 UTC (rev 4352)
+++ trunk/gui/src/driver/org/jnode/driver/video/vesa/VESACommand.java 2008-07-24 22:03:21 UTC (rev 4353)
@@ -146,282 +146,6 @@
}
public static short getSelector(Address address) {
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
println("getSelector point 1");
long addr = address.toLong();
println("getSelector point 2");
@@ -431,283 +155,6 @@
}
private static short getSelector(Object obj) {
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
- print(".");
-
println("getSelector point A");
if (obj == null)
return -1;
Deleted: trunk/gui/src/driver/org/jnode/driver/video/vesa/VESAConstants.java
===================================================================
--- trunk/gui/src/driver/org/jnode/driver/video/vesa/VESAConstants.java 2008-07-24 21:20:06 UTC (rev 4352)
+++ trunk/gui/src/driver/org/jnode/driver/video/vesa/VESAConstants.java 2008-07-24 22:03:21 UTC (rev 4353)
@@ -1,250 +0,0 @@
-/*
- * $Id: VMWareConstants.java,v 1.6 2006/01/01 12:40:42 epr Exp $
- *
- * JNode.org
- * Copyright (C) 2003-2006 JNode.org
- *
- * This library is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published
- * by the Free Software Foundation; either version 2.1 of the License, or
- * (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
- * License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; If not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-package org.jnode.driver.video.vesa;
-
-/**
- *
- * @author Fabien DUMINY (fduminy at jnode.org)
- *
- */
-public interface VESAConstants {
-
- public static final int SVGA_LEGACY_BASE_PORT = 0x4560;
- public static final int SVGA_INDEX_PORT = 0x0;
- public static final int SVGA_VALUE_PORT = 0x1;
- public static final int SVGA_BIOS_PORT = 0x2;
- public static final int SVGA_NUM_PORTS = 0x3;
-
- public static final int SVGA_REG_ID = 0;
- public static final int SVGA_REG_ENABLE = 1;
- public static final int SVGA_REG_WIDTH = 2;
- public static final int SVGA_REG_HEIGHT = 3;
- public static final int SVGA_REG_MAX_WIDTH = 4;
- public static final int SVGA_REG_MAX_HEIGHT = 5;
- public static final int SVGA_REG_DEPTH = 6;
- public static final int SVGA_REG_BITS_PER_PIXEL = 7;
- public static final int SVGA_REG_PSEUDOCOLOR = 8;
- public static final int SVGA_REG_RED_MASK = 9;
- public static final int SVGA_REG_GREEN_MASK = 10;
- public static final int SVGA_REG_BLUE_MASK = 11;
- public static final int SVGA_REG_BYTES_PER_LINE = 12;
- public static final int SVGA_REG_FB_START = 13;
- public static final int SVGA_REG_FB_OFFSET = 14;
- public static final int SVGA_REG_FB_MAX_SIZE = 15;
- public static final int SVGA_REG_FB_SIZE = 16;
-
- public static final int SVGA_REG_CAPABILITIES = 17;
- public static final int SVGA_REG_MEM_START = 18; /*
- * Memory for command
- * FIFO and bitmaps
- */
- public static final int SVGA_REG_MEM_SIZE = 19;
- public static final int SVGA_REG_CONFIG_DONE = 20; /*
- * Set when memory area
- * configured
- */
- public static final int SVGA_REG_SYNC = 21; /*
- * Write to force
- * synchronization
- */
- public static final int SVGA_REG_BUSY = 22; /* Read to check if sync is done */
- public static final int SVGA_REG_GUEST_ID = 23; /* Set guest OS identifier */
- public static final int SVGA_REG_CURSOR_ID = 24; /* ID of cursor */
- public static final int SVGA_REG_CURSOR_X = 25; /* Set cursor X position */
- public static final int SVGA_REG_CURSOR_Y = 26; /* Set cursor Y position */
- public static final int SVGA_REG_CURSOR_ON = 27; /* Turn cursor on/off */
-
- public static final int SVGA_REG_TOP = 28; /*
- * Must be 1 greater than the
- * last register
- */
-
- public static final int SVGA_PALETTE_BASE = 1024; /*
- * Base of SVGA color
- * map
- */
-
- public static final int SVGA_MAGIC = 0x900000;
- public static final int SVGA_ID_INVALID = 0xffffffff;
- public static final int SVGA_ID_0 = SVGA_MAGIC << 8;
- public static final int SVGA_ID_1 = (SVGA_MAGIC << 8) | 1;
- public static final int SVGA_ID_2 = (SVGA_MAGIC << 8) | 2;
-
- public static final int SVGA_FIFO_MIN = 0;
- public static final int SVGA_FIFO_MAX = 1;
- public static final int SVGA_FIFO_NEXT_CMD = 2;
- public static final int SVGA_FIFO_STOP = 3;
-
- public static final int SVGA_CMD_UPDATE = 1;
- /*
- * FIFO layout:
- */
-
- public static final int SVGA_CMD_RECT_FILL = 2;
- /*
- * FIFO layout:
- */
-
- public static final int SVGA_CMD_RECT_COPY = 3;
- /*
- * FIFO layout:
- */
-
- public static final int SVGA_CMD_DEFINE_BITMAP = 4;
- /*
- * FIFO layout:
- */
-
- public static final int SVGA_CMD_DEFINE_BITMAP_SCANLINE = 5;
- /*
- * FIFO layout:
- */
-
- public static final int SVGA_CMD_DEFINE_PIXMAP = 6;
- /*
- * FIFO layout:
- */
-
- public static final int SVGA_CMD_DEFINE_PIXMAP_SCANLINE = 7;
- /*
- * FIFO layout:
- */
-
- public static final int SVGA_CMD_RECT_BITMAP_FILL = 8;
- /*
- * FIFO layout:
- */
-
- public static final int SVGA_CMD_RECT_PIXMAP_FILL = 9;
- /*
- * FIFO layout:
- */
-
- public static final int SVGA_CMD_RECT_BITMAP_COPY = 10;
- /*
- * FIFO layout: Bitmap ID, Source X, Source Y, Dest X, Dest Y,
- */
-
- public static final int SVGA_CMD_RECT_PIXMAP_COPY = 11;
- /*
- * FIFO layout:
- */
-
- public static final int SVGA_CMD_FREE_OBJECT = 12;
- /*
- * FIFO layout:
- */
-
- public static final int SVGA_CMD_RECT_ROP_FILL = 13;
- /*
- * FIFO layout:
- */
-
- public static final int SVGA_CMD_RECT_ROP_COPY = 14;
- /*
- * FIFO layout:
- */
-
- public static final int SVGA_CMD_RECT_ROP_BITMAP_FILL = 15;
- /*
- * FIFO layout:
- */
-
- public static final int SVGA_CMD_RECT_ROP_PIXMAP_FILL = 16;
- /*
- * FIFO layout:
- */
-
- public static final int SVGA_CMD_RECT_ROP_BITMAP_COPY = 17;
- /*
- * FIFO layout: ID, Source X, Source Y,
- */
-
- public static final int SVGA_CMD_RECT_ROP_PIXMAP_COPY = 18;
- /*
- * FIFO layout:
- */
-
- public static final int SVGA_CMD_DEFINE_CURSOR = 19;
- /*
- * FIFO layout: ID, Hotspot X, Hotspot Y, Width, Height, Depth for AND mask,
- * Depth for XOR mask,
- */
-
- public static final int SVGA_CMD_DISPLAY_CURSOR = 20;
- /*
- * FIFO layout:
- */
-
- public static final int SVGA_CMD_MOVE_CURSOR = 21;
- /*
- * FIFO layout:
- */
-
- public static final int SVGA_CMD_DEFINE_ALPHA_CURSOR = 22;
- /*
- * FIFO layout: ID, Hotspot X, Hotspot Y, Width, Height,
- */
-
- public static final int SVGA_CMD_MAX = 22;
-
- public static final int GUEST_OS_OTHER = 0x5000 + 10;
-
- /*
- * Raster codes
- */
- public static final int SVGA_ROP_CLEAR = 0x00;
- public static final int SVGA_ROP_AND = 0x01;
- public static final int SVGA_ROP_AND_REVERSE = 0x02;
- public static final int SVGA_ROP_COPY = 0x03;
- public static final int SVGA_ROP_AND_INVERTED = 0x04;
- public static final int SVGA_ROP_NOOP = 0x05;
- public static final int SVGA_ROP_XOR = 0x06;
- public static final int SVGA_ROP_OR = 0x07;
- public static final int SVGA_ROP_NOR = 0x08;
- public static final int SVGA_ROP_EQUIV = 0x09;
- public static final int SVGA_ROP_INVERT = 0x0a;
- public static final int SVGA_ROP_OR_REVERSE = 0x0b;
- public static final int SVGA_ROP_COPY_INVERTED = 0x0c;
- public static final int SVGA_ROP_OR_INVERTED = 0x0d;
- public static final int SVGA_ROP_NAND = 0x0e;
- public static final int SVGA_ROP_SET = 0x0f;
-
- /*
- * Capabiities
- */
-
- public static final int SVGA_CAP_RECT_FILL = 0x0001;
- public static final int SVGA_CAP_RECT_COPY = 0x0002;
- public static final int SVGA_CAP_RECT_PAT_FILL = 0x0004;
- public static final int SVGA_CAP_OFFSCREEN = 0x0008;
- public static final int SVGA_CAP_RASTER_OP = 0x0010;
- public static final int SVGA_CAP_CURSOR = 0x0020;
- public static final int SVGA_CAP_CURSOR_BYPASS = 0x0040;
- public static final int SVGA_CAP_CURSOR_BYPASS_2 = 0x0080;
- public static final int SVGA_CAP_8BIT_EMULATION = 0x0100;
- public static final int SVGA_CAP_ALPHA_CURSOR = 0x0200;
- public static final int SVGA_CAP_GLYPH = 0x0400;
- public static final int SVGA_CAP_GLYPH_CLIPPING = 0x0800;
- public static final int SVGA_CAP_OFFSCREEN_1 = 0x1000;
- public static final int SVGA_CAP_ALPHA_BLEND = 0x2000;
-}
Modified: trunk/gui/src/driver/org/jnode/driver/video/vesa/VESACore.java
===================================================================
--- trunk/gui/src/driver/org/jnode/driver/video/vesa/VESACore.java 2008-07-24 21:20:06 UTC (rev 4352)
+++ trunk/gui/src/driver/org/jnode/driver/video/vesa/VESACore.java 2008-07-24 22:03:21 UTC (rev 4353)
@@ -47,7 +47,6 @@
import org.jnode.system.ResourceManager;
import org.jnode.system.ResourceNotFreeException;
import org.jnode.util.NumberUtils;
-import org.jnode.vm.Unsafe;
import org.vmmagic.unboxed.Address;
/**
@@ -55,7 +54,7 @@
* @author Fabien DUMINY (fduminy at jnode.org)
*
*/
-public class VESACore extends AbstractSurface implements VESAConstants, HardwareCursorAPI {
+public class VESACore extends AbstractSurface implements HardwareCursorAPI {
/** My logger */
private static final Logger log = Logger.getLogger(VESACore.class);
@@ -173,11 +172,8 @@
this.blueMaskShift = getMaskShift(blueMask);
this.alphaMaskShift = getMaskShift(alphaMask);
} catch (NameNotFoundException ex) {
- Unsafe.debugStackTrace("error in VESACore", ex);
throw new ResourceNotFreeException(ex);
}
-
- Unsafe.debug("\nVESACore created");
}
/**
@@ -258,7 +254,6 @@
new DirectColorModel(bitsPerPixel, redMask, greenMask, blueMask, alphaMask);
return new FrameBufferConfiguration[] {new VESAConfiguration(maxWidth, maxHeight, cm), };
} catch (Throwable t) {
- Unsafe.debugStackTrace("error in getConfigs()", t);
throw new RuntimeException(t);
}
}
Modified: trunk/gui/src/driver/org/jnode/driver/video/vesa/VESADriver.java
===================================================================
--- trunk/gui/src/driver/org/jnode/driver/video/vesa/VESADriver.java 2008-07-24 21:20:06 UTC (rev 4352)
+++ trunk/gui/src/driver/org/jnode/driver/video/vesa/VESADriver.java 2008-07-24 22:03:21 UTC (rev 4353)
@@ -33,7 +33,6 @@
import org.jnode.driver.video.Surface;
import org.jnode.driver.video.UnknownConfigurationException;
import org.jnode.system.ResourceNotFreeException;
-import org.jnode.vm.Unsafe;
import org.jnode.vm.x86.UnsafeX86;
import org.vmmagic.unboxed.Address;
@@ -42,7 +41,7 @@
* @author Fabien DUMINY (fduminy at jnode.org)
*
*/
-public class VESADriver extends AbstractFrameBufferDriver implements VESAConstants {
+public class VESADriver extends AbstractFrameBufferDriver {
private FrameBufferConfiguration currentConfig;
private VESACore kernel;
@@ -82,7 +81,6 @@
}
}
- Unsafe.debug("\nthrowing UnknownConfigurationException");
throw new UnknownConfigurationException();
}
@@ -125,7 +123,6 @@
throw new DriverException(
"can't start device (vbeInfoBlock is empty): grub haven't switched to graphic mode");
}
- Unsafe.debug("vbeInfoBlock=" + vbeInfoBlock);
Address vbeModeInfo = UnsafeX86.getVbeModeInfos();
modeInfoBlock = new ModeInfoBlock(vbeModeInfo);
@@ -137,10 +134,8 @@
kernel = new VESACore(this, vbeInfoBlock, modeInfoBlock, (PCIDevice) getDevice());
configs = kernel.getConfigs();
} catch (ResourceNotFreeException ex) {
- Unsafe.debugStackTrace("error in VESADriver.startDevice", ex);
throw new DriverException(ex);
} catch (Throwable t) {
- Unsafe.debugStackTrace("error in VESADriver.startDevice", t);
throw new DriverException(t);
}
final Device dev = getDevice();
Deleted: trunk/gui/src/driver/org/jnode/driver/video/vesa/VESAPlugin.java
===================================================================
--- trunk/gui/src/driver/org/jnode/driver/video/vesa/VESAPlugin.java 2008-07-24 21:20:06 UTC (rev 4352)
+++ trunk/gui/src/driver/org/jnode/driver/video/vesa/VESAPlugin.java 2008-07-24 22:03:21 UTC (rev 4353)
@@ -1,147 +0,0 @@
-/*
- * $Id: DeviceFinderPlugin.java 2224 2006-01-01 12:49:03Z epr $
- *
- * JNode.org
- * Copyright (C) 2003-2006 JNode.org
- *
- * This library is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published
- * by the Free Software Foundation; either version 2.1 of the License, or
- * (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
- * License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; If not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-package org.jnode.driver.video.vesa;
-
-import javax.naming.NameNotFoundException;
-
-import org.jnode.plugin.Plugin;
-import org.jnode.plugin.PluginDescriptor;
-import org.jnode.plugin.PluginException;
-import org.jnode.system.ResourceNotFreeException;
-import org.jnode.util.NumberUtils;
-import org.jnode.vm.Unsafe;
-import org.jnode.vm.x86.UnsafeX86;
-import org.vmmagic.unboxed.Address;
-
-/**
- *
- * @author Fabien DUMINY (fduminy at jnode.org)
- *
- */
-public class VESAPlugin extends Plugin {
- static final boolean DEBUG = false;
-
- /**
- * @param descriptor
- */
- public VESAPlugin(PluginDescriptor descriptor) {
- super(descriptor);
- }
-
- /**
- * Start this plugin
- *
- * @throws PluginException
- */
- protected void startPlugin() throws PluginException {
- /*
- * 72 | vbe_control_info | (present if flags[11] is set)
- * 76 | vbe_mode_info |
- * 80 | vbe_mode |
- * 82 | vbe_interface_seg |
- * 84 | vbe_interface_off |
- * 86 | vbe_interface_len
- */
- Unsafe.debug("\nstartPlugin. address=");
- Address vbeInfos = UnsafeX86.getVbeInfos();
- if (vbeInfos.isZero()) {
- Unsafe.debug("No vbeInfos, VESA plugin won't start");
- return;
- }
-
- Unsafe.debug(vbeInfos);
-
- dump("vbeInfos bytes", vbeInfos, 32);
-
- // Address vbeControlInfo = Address.fromInt(vbeInfos.loadInt());
- Address vbeControlInfo = UnsafeX86.getVbeControlInfos();
- VbeInfoBlock vbeInfoBlock = new VbeInfoBlock(vbeControlInfo);
- dump("vbeControlInfo", vbeControlInfo, 512); // 256 for vbe 2
-
- // Address vbeModeInfo = Address.fromInt(vbeInfos.add(4).loadInt());
- Address vbeModeInfo = UnsafeX86.getVbeModeInfos();
- ModeInfoBlock modeInfoBlock = new ModeInfoBlock(vbeModeInfo);
- dump("vbeModeInfo", vbeModeInfo, 256);
-
- short vbeMode = vbeInfos.add(8).loadShort();
- Unsafe.debug("vbeMode=" + NumberUtils.hex(vbeMode) + "\n");
-
- short vbeInterfaceSeg = vbeInfos.add(10).loadShort();
- Unsafe.debug("vbeInterfaceSeg=" + NumberUtils.hex(vbeInterfaceSeg) + "\n");
-
- short vbeInterfaceOff = vbeInfos.add(12).loadShort();
- Unsafe.debug("vbeInterfaceOff=" + NumberUtils.hex(vbeInterfaceOff) + "\n");
-
- int vbeInterfaceLen = vbeInfos.add(14).loadInt();
- // int vbeInterfaceLen = 0x000FFFFF;
- Unsafe.debug("vbeInterfaceLen=" + NumberUtils.hex(vbeInterfaceLen) + "\n");
-
- int physBasePtr = modeInfoBlock.getRamBase();
- Unsafe.debug("physBasePtr=" + NumberUtils.hex(physBasePtr) + "\n");
- Address vbeMemory = Address.fromInt(physBasePtr);
-
- Unsafe.debug(NumberUtils.hex(vbeMemory.toInt()));
-
- try {
- System.out.println("VESA detected : " + VESACommand.detect());
- } catch (NameNotFoundException e) {
- Unsafe.debugStackTrace("error in startPlugin", e);
- } catch (ResourceNotFreeException e) {
- Unsafe.debugStackTrace("error in startPlugin", e);
- }
- }
-
- /**
- * Stop this plugin
- *
- * @throws PluginException
- */
- protected void stopPlugin() throws PluginException {
- // Do nothing
- }
-
- private void dump(String message, Address address, int size) {
- if (DEBUG) {
- StringBuilder sb = new StringBuilder("\n");
- sb.append(message).append(" at address ");
-
- if (address.isZero()) {
- sb.append("NULL");
- } else {
- sb.append(NumberUtils.hex(address.toInt())).append(" :\n");
-
- Address addr = address;
- for (int i = 0; i < size; i++) {
- String str = NumberUtils.hex((byte) (addr.loadByte() & 0xFF));
- str = str.substring(str.length() - 2);
- sb.append(str).append(' ');
- if ((i % 16) == 0)
- sb.append('\n');
-
- addr = addr.add(1);
- }
- }
-
- Unsafe.debug(sb.append("\n").toString());
- }
- }
-}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ls...@us...> - 2008-07-31 19:44:20
|
Revision: 4373
http://jnode.svn.sourceforge.net/jnode/?rev=4373&view=rev
Author: lsantha
Date: 2008-07-31 19:44:15 +0000 (Thu, 31 Jul 2008)
Log Message:
-----------
Fixed security exeption at startup.
Modified Paths:
--------------
trunk/gui/descriptors/org.jnode.driver.textscreen.fb.xml
trunk/gui/src/driver/org/jnode/driver/textscreen/fb/FBConsole.java
Modified: trunk/gui/descriptors/org.jnode.driver.textscreen.fb.xml
===================================================================
--- trunk/gui/descriptors/org.jnode.driver.textscreen.fb.xml 2008-07-31 12:55:05 UTC (rev 4372)
+++ trunk/gui/descriptors/org.jnode.driver.textscreen.fb.xml 2008-07-31 19:44:15 UTC (rev 4373)
@@ -23,5 +23,12 @@
<export name="org.jnode.driver.textscreen.fb.*"/>
</library>
</runtime>
+
+ <extension point="org.jnode.security.permissions">
+ <permission class="java.lang.RuntimePermission" name="setIO"/>
+
+ <!-- fb console is experimental, TODO: fix security -->
+ <permission class="java.security.AllPermission" />
+ </extension>
</plugin>
\ No newline at end of file
Modified: trunk/gui/src/driver/org/jnode/driver/textscreen/fb/FBConsole.java
===================================================================
--- trunk/gui/src/driver/org/jnode/driver/textscreen/fb/FBConsole.java 2008-07-31 12:55:05 UTC (rev 4372)
+++ trunk/gui/src/driver/org/jnode/driver/textscreen/fb/FBConsole.java 2008-07-31 19:44:15 UTC (rev 4373)
@@ -1,10 +1,10 @@
package org.jnode.driver.textscreen.fb;
import java.io.PrintStream;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
import java.util.Collection;
-
import javax.naming.NameNotFoundException;
-
import org.apache.log4j.Logger;
import org.jnode.driver.Device;
import org.jnode.driver.DeviceManagerListener;
@@ -29,7 +29,7 @@
private static final Logger log = Logger.getLogger(FBConsole.class);
/**
- * TODO use a listener mechanism instead
+ * TODO use a listener mechanism instead
*/
private static void waitShellManagerAvailable() {
Unsafe.debug("waiting registration of a ShellManager");
@@ -43,12 +43,12 @@
} catch (NameNotFoundException e) {
// not yet available
}
-
+
// not yet available
Thread.yield();
}
}
-
+
public static void start() throws Exception {
waitShellManagerAvailable();
@@ -68,7 +68,7 @@
public void deviceRegistered(Device device) {
Unsafe.debug("device=" + device + "\n");
- if (device.implementsAPI(FrameBufferAPI.class)) {
+ if (device.implementsAPI(FrameBufferAPI.class)) {
Unsafe.debug("got a FrameBufferDevice\n");
startFBConsole(device);
}
@@ -83,7 +83,7 @@
startFBConsole(dev);
}
}
-
+
private static void startFBConsole(Device dev) {
Unsafe.debug("startFBConsole\n");
Surface g = null;
@@ -95,21 +95,26 @@
InitialNaming.unbind(TextScreenManager.NAME);
InitialNaming.bind(TextScreenManager.NAME, new FbTextScreenManager(g));
-
+
////
ConsoleManager mgr = InitialNaming.lookup(ConsoleManager.NAME);
-
+
//
final int options = ConsoleManager.CreateOptions.TEXT |
ConsoleManager.CreateOptions.SCROLLABLE;
final TextConsole first = (TextConsole) mgr.createConsole(
- null, options);
-
- mgr.registerConsole(first);
+ null, options);
+
+ mgr.registerConsole(first);
mgr.focus(first);
- System.setOut(new PrintStream(first.getOut()));
- System.setErr(new PrintStream(first.getErr()));
+ AccessController.doPrivileged(new PrivilegedAction<Object>() {
+ public Object run() {
+ System.setOut(new PrintStream(first.getOut()));
+ System.setErr(new PrintStream(first.getErr()));
+ return null;
+ }
+ });
System.out.println(VmSystem.getBootLog());
if (first.getIn() == null) {
@@ -122,11 +127,11 @@
} catch (Throwable ex) {
Unsafe.debugStackTrace("Error in FBConsole", ex);
} finally {
- Unsafe.debug("FINALLY\n");
+ Unsafe.debug("FINALLY\n");
if (g != null) {
log.info("Close graphics");
g.close();
}
- }
+ }
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ls...@us...> - 2008-08-06 19:49:33
|
Revision: 4400
http://jnode.svn.sourceforge.net/jnode/?rev=4400&view=rev
Author: lsantha
Date: 2008-08-06 19:49:26 +0000 (Wed, 06 Aug 2008)
Log Message:
-----------
Added fixed with font (provided by (Stephen Meslin-Weber) with graphic character support and integrated it with graphic consoles.
Modified Paths:
--------------
trunk/gui/src/awt/org/jnode/awt/font/bdf/BDFFontProvider.java
trunk/gui/src/driver/org/jnode/driver/textscreen/fb/FbTextScreenManager.java
trunk/gui/src/driver/org/jnode/driver/textscreen/swing/SwingPcTextScreen.java
Added Paths:
-----------
trunk/gui/fonts/6x12_FixedMedium-12.bdf
Added: trunk/gui/fonts/6x12_FixedMedium-12.bdf
===================================================================
--- trunk/gui/fonts/6x12_FixedMedium-12.bdf (rev 0)
+++ trunk/gui/fonts/6x12_FixedMedium-12.bdf 2008-08-06 19:49:26 UTC (rev 4400)
@@ -0,0 +1,3620 @@
+STARTFONT 2.1
+FONT -Misc-Fixed-Medium-R-SemiCondensed--12-110-75-75-C-60-437-0
+SIZE 12 75 75
+FONTBOUNDINGBOX 6 12 0 -2
+COMMENT "Generated by fontforge, http://fontforge.sourceforge.net"
+STARTPROPERTIES 22
+FONTNAME_REGISTRY ""
+FOUNDRY "Misc"
+FAMILY_NAME "Fixed"
+WEIGHT_NAME "Medium"
+SLANT "R"
+SETWIDTH_NAME "SemiCondensed"
+ADD_STYLE_NAME ""
+PIXEL_SIZE 12
+POINT_SIZE 120
+RESOLUTION_X 75
+RESOLUTION_Y 75
+SPACING "C"
+AVERAGE_WIDTH 60
+CHARSET_REGISTRY "437"
+CHARSET_ENCODING "0"
+COPYRIGHT "Public domain terminal emulator font. Share and enjoy."
+_XMBDFED_INFO "Edited with xmbdfed 4.5."
+CAP_HEIGHT 7
+X_HEIGHT 5
+WEIGHT 10
+RESOLUTION 103
+QUAD_WIDTH 6
+ENDPROPERTIES
+CHARS 255
+STARTCHAR char0
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 7 0 0
+BITMAP
+A8
+00
+88
+00
+88
+00
+A8
+ENDCHAR
+STARTCHAR uni0001
+ENCODING -1
+SWIDTH 1000 0
+DWIDTH 6 0
+BBX 5 9 0 -1
+BITMAP
+70
+88
+D8
+D8
+88
+D8
+A8
+88
+70
+ENDCHAR
+STARTCHAR uni0002
+ENCODING -1
+SWIDTH 1000 0
+DWIDTH 6 0
+BBX 5 9 0 -1
+BITMAP
+70
+F8
+A8
+A8
+F8
+A8
+D8
+F8
+70
+ENDCHAR
+STARTCHAR uni0003
+ENCODING -1
+SWIDTH 1000 0
+DWIDTH 6 0
+BBX 5 8 0 0
+BITMAP
+50
+F8
+F8
+F8
+F8
+70
+70
+20
+ENDCHAR
+STARTCHAR uni0004
+ENCODING -1
+SWIDTH 1000 0
+DWIDTH 6 0
+BBX 5 8 0 0
+BITMAP
+20
+70
+70
+F8
+F8
+70
+70
+20
+ENDCHAR
+STARTCHAR uni0005
+ENCODING -1
+SWIDTH 1000 0
+DWIDTH 6 0
+BBX 5 8 0 0
+BITMAP
+70
+70
+A8
+F8
+F8
+A8
+20
+70
+ENDCHAR
+STARTCHAR uni0006
+ENCODING -1
+SWIDTH 1000 0
+DWIDTH 6 0
+BBX 5 8 0 0
+BITMAP
+20
+20
+70
+70
+F8
+F8
+20
+70
+ENDCHAR
+STARTCHAR uni0007
+ENCODING -1
+SWIDTH 1000 0
+DWIDTH 6 0
+BBX 4 4 1 2
+BITMAP
+60
+F0
+F0
+60
+ENDCHAR
+STARTCHAR uni0008
+ENCODING -1
+SWIDTH 1000 0
+DWIDTH 6 0
+BBX 6 12 0 -2
+BITMAP
+FC
+FC
+FC
+FC
+CC
+84
+84
+CC
+FC
+FC
+FC
+FC
+ENDCHAR
+STARTCHAR uni0009
+ENCODING -1
+SWIDTH 1000 0
+DWIDTH 6 0
+BBX 6 6 0 0
+BITMAP
+30
+48
+84
+84
+48
+30
+ENDCHAR
+STARTCHAR uni000A
+ENCODING -1
+SWIDTH 1000 0
+DWIDTH 6 0
+BBX 6 12 0 -2
+BITMAP
+FC
+FC
+FC
+CC
+B4
+78
+78
+B4
+CC
+FC
+FC
+FC
+ENDCHAR
+STARTCHAR uni000B
+ENCODING -1
+SWIDTH 1000 0
+DWIDTH 6 0
+BBX 6 7 0 0
+BITMAP
+1C
+0C
+74
+88
+88
+88
+70
+ENDCHAR
+STARTCHAR uni000C
+ENCODING -1
+SWIDTH 1000 0
+DWIDTH 6 0
+BBX 5 8 0 -2
+BITMAP
+70
+88
+88
+88
+70
+20
+70
+20
+ENDCHAR
+STARTCHAR uni000D
+ENCODING -1
+SWIDTH 1000 0
+DWIDTH 6 0
+BBX 5 7 0 0
+BITMAP
+20
+30
+28
+20
+20
+E0
+C0
+ENDCHAR
+STARTCHAR uni000E
+ENCODING -1
+SWIDTH 1000 0
+DWIDTH 6 0
+BBX 5 8 0 0
+BITMAP
+60
+58
+48
+48
+48
+C8
+D8
+18
+ENDCHAR
+STARTCHAR uni000F
+ENCODING -1
+SWIDTH 1000 0
+DWIDTH 6 0
+BBX 5 9 0 -1
+BITMAP
+20
+20
+88
+20
+50
+20
+88
+20
+20
+ENDCHAR
+STARTCHAR uni0010
+ENCODING -1
+SWIDTH 1000 0
+DWIDTH 6 0
+BBX 6 5 0 1
+BITMAP
+C0
+F0
+FC
+F0
+C0
+ENDCHAR
+STARTCHAR uni0011
+ENCODING -1
+SWIDTH 1000 0
+DWIDTH 6 0
+BBX 6 5 0 1
+BITMAP
+0C
+3C
+FC
+3C
+0C
+ENDCHAR
+STARTCHAR uni0012
+ENCODING -1
+SWIDTH 1000 0
+DWIDTH 6 0
+BBX 5 7 0 0
+BITMAP
+20
+70
+A8
+20
+A8
+70
+20
+ENDCHAR
+STARTCHAR uni0013
+ENCODING -1
+SWIDTH 1000 0
+DWIDTH 6 0
+BBX 3 7 1 0
+BITMAP
+A0
+A0
+A0
+A0
+A0
+00
+A0
+ENDCHAR
+STARTCHAR uni0014
+ENCODING -1
+SWIDTH 1000 0
+DWIDTH 6 0
+BBX 5 8 0 0
+BITMAP
+78
+E8
+E8
+E8
+68
+28
+28
+28
+ENDCHAR
+STARTCHAR uni0015
+ENCODING -1
+SWIDTH 1000 0
+DWIDTH 6 0
+BBX 4 8 1 0
+BITMAP
+70
+80
+60
+90
+90
+60
+10
+E0
+ENDCHAR
+STARTCHAR uni0016
+ENCODING -1
+SWIDTH 1000 0
+DWIDTH 6 0
+BBX 6 5 0 1
+BITMAP
+FC
+FC
+FC
+FC
+FC
+ENDCHAR
+STARTCHAR uni0017
+ENCODING -1
+SWIDTH 1000 0
+DWIDTH 6 0
+BBX 5 7 0 0
+BITMAP
+20
+70
+A8
+20
+A8
+70
+F8
+ENDCHAR
+STARTCHAR uni0018
+ENCODING -1
+SWIDTH 1000 0
+DWIDTH 6 0
+BBX 5 7 0 0
+BITMAP
+20
+70
+A8
+20
+20
+20
+20
+ENDCHAR
+STARTCHAR uni0019
+ENCODING -1
+SWIDTH 1000 0
+DWIDTH 6 0
+BBX 5 7 0 0
+BITMAP
+20
+20
+20
+20
+A8
+70
+20
+ENDCHAR
+STARTCHAR uni001A
+ENCODING -1
+SWIDTH 1000 0
+DWIDTH 6 0
+BBX 5 5 0 1
+BITMAP
+20
+10
+F8
+10
+20
+ENDCHAR
+STARTCHAR uni001B
+ENCODING -1
+SWIDTH 1000 0
+DWIDTH 6 0
+BBX 5 5 0 1
+BITMAP
+20
+40
+F8
+40
+20
+ENDCHAR
+STARTCHAR uni001C
+ENCODING -1
+SWIDTH 1000 0
+DWIDTH 6 0
+BBX 5 5 0 0
+BITMAP
+80
+80
+80
+80
+F8
+ENDCHAR
+STARTCHAR uni001D
+ENCODING -1
+SWIDTH 1000 0
+DWIDTH 6 0
+BBX 5 3 0 2
+BITMAP
+50
+F8
+50
+ENDCHAR
+STARTCHAR uni001E
+ENCODING -1
+SWIDTH 1000 0
+DWIDTH 6 0
+BBX 5 7 0 0
+BITMAP
+20
+20
+70
+70
+F8
+F8
+F8
+ENDCHAR
+STARTCHAR uni001F
+ENCODING -1
+SWIDTH 1000 0
+DWIDTH 6 0
+BBX 5 7 0 0
+BITMAP
+F8
+F8
+F8
+70
+70
+20
+20
+ENDCHAR
+STARTCHAR space
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 1 1 5 -2
+BITMAP
+00
+ENDCHAR
+STARTCHAR exclam
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 1 7 2 0
+BITMAP
+80
+80
+80
+80
+80
+00
+80
+ENDCHAR
+STARTCHAR quotedbl
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 3 3 1 5
+BITMAP
+A0
+A0
+A0
+ENDCHAR
+STARTCHAR numbersign
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 6 0 0
+BITMAP
+50
+F8
+50
+50
+F8
+50
+ENDCHAR
+STARTCHAR dollar
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 9 0 -1
+BITMAP
+20
+70
+A8
+A0
+70
+28
+A8
+70
+20
+ENDCHAR
+STARTCHAR percent
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 7 0 0
+BITMAP
+C8
+C8
+10
+20
+40
+98
+98
+ENDCHAR
+STARTCHAR ampersand
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 7 0 0
+BITMAP
+40
+A0
+A0
+40
+A8
+90
+68
+ENDCHAR
+STARTCHAR quotesingle
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 1 3 2 5
+BITMAP
+80
+80
+80
+ENDCHAR
+STARTCHAR parenleft
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 3 9 1 -1
+BITMAP
+20
+40
+40
+80
+80
+80
+40
+40
+20
+ENDCHAR
+STARTCHAR parenright
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 3 9 1 -1
+BITMAP
+80
+40
+40
+20
+20
+20
+40
+40
+80
+ENDCHAR
+STARTCHAR asterisk
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 7 0 0
+BITMAP
+20
+A8
+70
+20
+70
+A8
+20
+ENDCHAR
+STARTCHAR plus
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 5 0 1
+BITMAP
+20
+20
+F8
+20
+20
+ENDCHAR
+STARTCHAR comma
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 3 3 0 -1
+BITMAP
+60
+60
+C0
+ENDCHAR
+STARTCHAR hyphen
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 3 1 1 3
+BITMAP
+E0
+ENDCHAR
+STARTCHAR period
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 2 2 1 0
+BITMAP
+C0
+C0
+ENDCHAR
+STARTCHAR slash
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 7 0 0
+BITMAP
+08
+10
+10
+20
+40
+40
+80
+ENDCHAR
+STARTCHAR zero
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 4 7 1 0
+BITMAP
+60
+90
+90
+90
+90
+90
+60
+ENDCHAR
+STARTCHAR one
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 3 7 1 0
+BITMAP
+40
+C0
+40
+40
+40
+40
+E0
+ENDCHAR
+STARTCHAR two
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 7 0 0
+BITMAP
+70
+88
+08
+10
+20
+40
+F8
+ENDCHAR
+STARTCHAR three
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 7 0 0
+BITMAP
+F8
+08
+10
+30
+08
+88
+70
+ENDCHAR
+STARTCHAR four
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 7 0 0
+BITMAP
+10
+30
+50
+90
+F8
+10
+10
+ENDCHAR
+STARTCHAR five
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 7 0 0
+BITMAP
+F8
+80
+F0
+08
+08
+88
+70
+ENDCHAR
+STARTCHAR six
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 7 0 0
+BITMAP
+30
+40
+80
+F0
+88
+88
+70
+ENDCHAR
+STARTCHAR seven
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 7 0 0
+BITMAP
+F8
+08
+10
+10
+20
+20
+20
+ENDCHAR
+STARTCHAR eight
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 7 0 0
+BITMAP
+70
+88
+88
+70
+88
+88
+70
+ENDCHAR
+STARTCHAR nine
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 7 0 0
+BITMAP
+70
+88
+88
+78
+08
+10
+60
+ENDCHAR
+STARTCHAR colon
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 2 5 1 0
+BITMAP
+C0
+C0
+00
+C0
+C0
+ENDCHAR
+STARTCHAR semicolon
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 3 6 0 -1
+BITMAP
+60
+60
+00
+60
+60
+C0
+ENDCHAR
+STARTCHAR less
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 3 5 1 1
+BITMAP
+20
+40
+80
+40
+20
+ENDCHAR
+STARTCHAR equal
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 3 0 2
+BITMAP
+F8
+00
+F8
+ENDCHAR
+STARTCHAR greater
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 3 5 1 1
+BITMAP
+80
+40
+20
+40
+80
+ENDCHAR
+STARTCHAR question
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 7 0 0
+BITMAP
+70
+88
+10
+20
+20
+00
+20
+ENDCHAR
+STARTCHAR at
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 7 0 0
+BITMAP
+70
+88
+B8
+A8
+B8
+80
+70
+ENDCHAR
+STARTCHAR A
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 7 0 0
+BITMAP
+70
+88
+88
+F8
+88
+88
+88
+ENDCHAR
+STARTCHAR B
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 7 0 0
+BITMAP
+F0
+48
+48
+70
+48
+48
+F0
+ENDCHAR
+STARTCHAR C
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 7 0 0
+BITMAP
+70
+88
+80
+80
+80
+88
+70
+ENDCHAR
+STARTCHAR D
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 7 0 0
+BITMAP
+F0
+48
+48
+48
+48
+48
+F0
+ENDCHAR
+STARTCHAR E
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 7 0 0
+BITMAP
+F8
+80
+80
+F0
+80
+80
+F8
+ENDCHAR
+STARTCHAR F
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 7 0 0
+BITMAP
+F8
+80
+80
+F0
+80
+80
+80
+ENDCHAR
+STARTCHAR G
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 7 0 0
+BITMAP
+70
+88
+80
+80
+98
+88
+70
+ENDCHAR
+STARTCHAR H
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 7 0 0
+BITMAP
+88
+88
+88
+F8
+88
+88
+88
+ENDCHAR
+STARTCHAR I
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 3 7 1 0
+BITMAP
+E0
+40
+40
+40
+40
+40
+E0
+ENDCHAR
+STARTCHAR J
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 7 0 0
+BITMAP
+38
+10
+10
+10
+10
+90
+60
+ENDCHAR
+STARTCHAR K
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 7 0 0
+BITMAP
+88
+90
+A0
+C0
+A0
+90
+88
+ENDCHAR
+STARTCHAR L
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 7 0 0
+BITMAP
+80
+80
+80
+80
+80
+80
+F8
+ENDCHAR
+STARTCHAR M
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 7 0 0
+BITMAP
+88
+D8
+A8
+88
+88
+88
+88
+ENDCHAR
+STARTCHAR N
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 7 0 0
+BITMAP
+88
+88
+C8
+A8
+98
+88
+88
+ENDCHAR
+STARTCHAR O
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 7 0 0
+BITMAP
+70
+88
+88
+88
+88
+88
+70
+ENDCHAR
+STARTCHAR P
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 7 0 0
+BITMAP
+F0
+88
+88
+F0
+80
+80
+80
+ENDCHAR
+STARTCHAR Q
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 7 0 0
+BITMAP
+70
+88
+88
+88
+A8
+90
+68
+ENDCHAR
+STARTCHAR R
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 7 0 0
+BITMAP
+F0
+88
+88
+F0
+A0
+90
+88
+ENDCHAR
+STARTCHAR S
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 7 0 0
+BITMAP
+70
+88
+80
+70
+08
+88
+70
+ENDCHAR
+STARTCHAR T
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 7 0 0
+BITMAP
+F8
+20
+20
+20
+20
+20
+20
+ENDCHAR
+STARTCHAR U
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 7 0 0
+BITMAP
+88
+88
+88
+88
+88
+88
+70
+ENDCHAR
+STARTCHAR V
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 7 0 0
+BITMAP
+88
+88
+88
+88
+50
+50
+20
+ENDCHAR
+STARTCHAR W
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 7 0 0
+BITMAP
+88
+88
+88
+88
+A8
+A8
+50
+ENDCHAR
+STARTCHAR X
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 7 0 0
+BITMAP
+88
+88
+50
+20
+50
+88
+88
+ENDCHAR
+STARTCHAR Y
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 7 0 0
+BITMAP
+88
+88
+50
+20
+20
+20
+20
+ENDCHAR
+STARTCHAR Z
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 7 0 0
+BITMAP
+F8
+08
+10
+20
+40
+80
+F8
+ENDCHAR
+STARTCHAR bracketleft
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 3 9 1 -1
+BITMAP
+E0
+80
+80
+80
+80
+80
+80
+80
+E0
+ENDCHAR
+STARTCHAR backslash
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 7 0 0
+BITMAP
+80
+40
+40
+20
+10
+10
+08
+ENDCHAR
+STARTCHAR bracketright
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 3 9 1 -1
+BITMAP
+E0
+20
+20
+20
+20
+20
+20
+20
+E0
+ENDCHAR
+STARTCHAR asciicircum
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 3 0 5
+BITMAP
+20
+50
+88
+ENDCHAR
+STARTCHAR underscore
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 1 0 -2
+BITMAP
+F8
+ENDCHAR
+STARTCHAR grave
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 3 3 1 5
+BITMAP
+80
+40
+20
+ENDCHAR
+STARTCHAR a
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 5 0 0
+BITMAP
+70
+08
+78
+88
+78
+ENDCHAR
+STARTCHAR b
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 7 0 0
+BITMAP
+80
+80
+F0
+88
+88
+88
+F0
+ENDCHAR
+STARTCHAR c
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 5 0 0
+BITMAP
+70
+88
+80
+88
+70
+ENDCHAR
+STARTCHAR d
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 7 0 0
+BITMAP
+08
+08
+78
+88
+88
+88
+78
+ENDCHAR
+STARTCHAR e
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 5 0 0
+BITMAP
+70
+88
+F0
+80
+70
+ENDCHAR
+STARTCHAR f
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 7 0 0
+BITMAP
+30
+48
+40
+E0
+40
+40
+40
+ENDCHAR
+STARTCHAR g
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 7 0 -2
+BITMAP
+70
+88
+88
+88
+78
+08
+70
+ENDCHAR
+STARTCHAR h
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 7 0 0
+BITMAP
+80
+80
+F0
+88
+88
+88
+88
+ENDCHAR
+STARTCHAR i
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 3 7 1 0
+BITMAP
+40
+00
+C0
+40
+40
+40
+E0
+ENDCHAR
+STARTCHAR j
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 4 9 1 -2
+BITMAP
+10
+00
+30
+10
+10
+10
+10
+90
+60
+ENDCHAR
+STARTCHAR k
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 7 0 0
+BITMAP
+80
+80
+88
+90
+E0
+90
+88
+ENDCHAR
+STARTCHAR l
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 3 7 1 0
+BITMAP
+C0
+40
+40
+40
+40
+40
+E0
+ENDCHAR
+STARTCHAR m
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 5 0 0
+BITMAP
+D0
+A8
+A8
+A8
+A8
+ENDCHAR
+STARTCHAR n
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 5 0 0
+BITMAP
+B0
+C8
+88
+88
+88
+ENDCHAR
+STARTCHAR o
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 5 0 0
+BITMAP
+70
+88
+88
+88
+70
+ENDCHAR
+STARTCHAR p
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 7 0 -2
+BITMAP
+F0
+88
+88
+88
+F0
+80
+80
+ENDCHAR
+STARTCHAR q
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 7 0 -2
+BITMAP
+78
+88
+88
+88
+78
+08
+08
+ENDCHAR
+STARTCHAR r
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 5 0 0
+BITMAP
+B0
+C8
+80
+80
+80
+ENDCHAR
+STARTCHAR s
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 5 0 0
+BITMAP
+78
+80
+70
+08
+F0
+ENDCHAR
+STARTCHAR t
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 7 0 0
+BITMAP
+20
+20
+F8
+20
+20
+20
+18
+ENDCHAR
+STARTCHAR u
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 5 0 0
+BITMAP
+88
+88
+88
+98
+68
+ENDCHAR
+STARTCHAR v
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 5 0 0
+BITMAP
+88
+88
+88
+50
+20
+ENDCHAR
+STARTCHAR w
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 5 0 0
+BITMAP
+88
+88
+A8
+A8
+50
+ENDCHAR
+STARTCHAR x
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 5 0 0
+BITMAP
+88
+50
+20
+50
+88
+ENDCHAR
+STARTCHAR y
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 7 0 -2
+BITMAP
+88
+88
+88
+50
+20
+40
+80
+ENDCHAR
+STARTCHAR z
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 5 0 0
+BITMAP
+F8
+10
+20
+40
+F8
+ENDCHAR
+STARTCHAR braceleft
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 3 9 1 -1
+BITMAP
+20
+40
+40
+40
+80
+40
+40
+40
+20
+ENDCHAR
+STARTCHAR bar
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 1 9 2 -1
+BITMAP
+80
+80
+80
+80
+80
+80
+80
+80
+80
+ENDCHAR
+STARTCHAR braceright
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 3 9 1 -1
+BITMAP
+80
+40
+40
+40
+20
+40
+40
+40
+80
+ENDCHAR
+STARTCHAR asciitilde
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 3 0 2
+BITMAP
+48
+A8
+90
+ENDCHAR
+STARTCHAR uni007F
+ENCODING -1
+SWIDTH 1000 0
+DWIDTH 6 0
+BBX 5 7 0 0
+BITMAP
+20
+50
+88
+88
+88
+88
+F8
+ENDCHAR
+STARTCHAR Ccedilla
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 9 0 -2
+BITMAP
+70
+88
+80
+80
+80
+88
+70
+10
+60
+ENDCHAR
+STARTCHAR udieresis
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 7 0 0
+BITMAP
+50
+00
+88
+88
+88
+88
+70
+ENDCHAR
+STARTCHAR eacute
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 8 0 0
+BITMAP
+10
+20
+00
+70
+88
+F0
+80
+70
+ENDCHAR
+STARTCHAR acircumflex
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 8 0 0
+BITMAP
+20
+50
+00
+70
+08
+78
+88
+78
+ENDCHAR
+STARTCHAR adieresis
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 7 0 0
+BITMAP
+50
+00
+70
+08
+78
+88
+78
+ENDCHAR
+STARTCHAR agrave
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 8 0 0
+BITMAP
+40
+20
+00
+70
+08
+78
+88
+78
+ENDCHAR
+STARTCHAR aring
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 8 0 0
+BITMAP
+20
+50
+20
+70
+08
+78
+88
+78
+ENDCHAR
+STARTCHAR ccedilla
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 7 0 -2
+BITMAP
+70
+88
+80
+88
+70
+10
+60
+ENDCHAR
+STARTCHAR ecircumflex
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 8 0 0
+BITMAP
+20
+50
+00
+70
+88
+F0
+80
+70
+ENDCHAR
+STARTCHAR edieresis
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 7 0 0
+BITMAP
+50
+00
+70
+88
+F0
+80
+70
+ENDCHAR
+STARTCHAR egrave
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 8 0 0
+BITMAP
+40
+20
+00
+70
+88
+F0
+80
+70
+ENDCHAR
+STARTCHAR idieresis
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 3 7 1 0
+BITMAP
+A0
+00
+C0
+40
+40
+40
+E0
+ENDCHAR
+STARTCHAR icircumflex
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 3 8 1 0
+BITMAP
+40
+A0
+00
+C0
+40
+40
+40
+E0
+ENDCHAR
+STARTCHAR igrave
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 3 8 1 0
+BITMAP
+80
+40
+00
+C0
+40
+40
+40
+E0
+ENDCHAR
+STARTCHAR Adieresis
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 9 0 0
+BITMAP
+50
+00
+70
+88
+88
+F8
+88
+88
+88
+ENDCHAR
+STARTCHAR Aring
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 10 0 0
+BITMAP
+20
+50
+20
+70
+88
+88
+F8
+88
+88
+88
+ENDCHAR
+STARTCHAR Eacute
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 10 0 0
+BITMAP
+10
+20
+00
+F8
+80
+80
+F0
+80
+80
+F8
+ENDCHAR
+STARTCHAR ae
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 5 0 0
+BITMAP
+70
+28
+70
+A0
+78
+ENDCHAR
+STARTCHAR AE
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 7 0 0
+BITMAP
+78
+A0
+A0
+F0
+A0
+A0
+B8
+ENDCHAR
+STARTCHAR ocircumflex
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 8 0 0
+BITMAP
+20
+50
+00
+70
+88
+88
+88
+70
+ENDCHAR
+STARTCHAR odieresis
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 7 0 0
+BITMAP
+50
+00
+70
+88
+88
+88
+70
+ENDCHAR
+STARTCHAR ograve
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 8 0 0
+BITMAP
+40
+20
+00
+70
+88
+88
+88
+70
+ENDCHAR
+STARTCHAR ucircumflex
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 8 0 0
+BITMAP
+20
+50
+00
+88
+88
+88
+88
+70
+ENDCHAR
+STARTCHAR ugrave
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 8 0 0
+BITMAP
+40
+20
+00
+88
+88
+88
+88
+70
+ENDCHAR
+STARTCHAR ydieresis
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 9 0 -2
+BITMAP
+50
+00
+88
+88
+88
+50
+20
+40
+80
+ENDCHAR
+STARTCHAR Odieresis
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 9 0 0
+BITMAP
+50
+00
+70
+88
+88
+88
+88
+88
+70
+ENDCHAR
+STARTCHAR Udieresis
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 9 0 0
+BITMAP
+50
+00
+88
+88
+88
+88
+88
+88
+70
+ENDCHAR
+STARTCHAR cent
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 7 0 -1
+BITMAP
+20
+70
+A8
+A0
+A8
+70
+20
+ENDCHAR
+STARTCHAR sterling
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 7 0 0
+BITMAP
+30
+48
+40
+E0
+40
+48
+B0
+ENDCHAR
+STARTCHAR yen
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 7 0 0
+BITMAP
+88
+50
+F8
+20
+F8
+20
+20
+ENDCHAR
+STARTCHAR peseta
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 7 0 0
+BITMAP
+60
+50
+F8
+50
+60
+40
+40
+ENDCHAR
+STARTCHAR florin
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 8 0 -1
+BITMAP
+10
+28
+20
+70
+20
+20
+A0
+40
+ENDCHAR
+STARTCHAR aacute
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 8 0 0
+BITMAP
+10
+20
+00
+70
+08
+78
+88
+78
+ENDCHAR
+STARTCHAR iacute
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 3 8 1 0
+BITMAP
+20
+40
+00
+C0
+40
+40
+40
+E0
+ENDCHAR
+STARTCHAR oacute
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 8 0 0
+BITMAP
+10
+20
+00
+70
+88
+88
+88
+70
+ENDCHAR
+STARTCHAR uacute
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 8 0 0
+BITMAP
+10
+20
+00
+88
+88
+88
+88
+70
+ENDCHAR
+STARTCHAR ntilde
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 8 0 0
+BITMAP
+68
+B0
+00
+B0
+C8
+88
+88
+88
+ENDCHAR
+STARTCHAR Ntilde
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 10 0 0
+BITMAP
+68
+B0
+00
+88
+88
+C8
+A8
+98
+88
+88
+ENDCHAR
+STARTCHAR ordfeminine
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 3 5 1 4
+BITMAP
+60
+A0
+60
+00
+E0
+ENDCHAR
+STARTCHAR ordmasculine
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 3 5 1 5
+BITMAP
+40
+A0
+40
+00
+E0
+ENDCHAR
+STARTCHAR questiondown
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 7 0 0
+BITMAP
+20
+00
+20
+20
+40
+88
+70
+ENDCHAR
+STARTCHAR revlogicalnot
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 3 0 1
+BITMAP
+F8
+80
+80
+ENDCHAR
+STARTCHAR logicalnot
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 3 0 1
+BITMAP
+F8
+08
+08
+ENDCHAR
+STARTCHAR onehalf
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 10 0 0
+BITMAP
+40
+C0
+40
+40
+50
+28
+08
+10
+20
+38
+ENDCHAR
+STARTCHAR onequarter
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 10 0 0
+BITMAP
+40
+C0
+40
+40
+50
+30
+50
+78
+10
+10
+ENDCHAR
+STARTCHAR exclamdown
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 1 7 2 0
+BITMAP
+80
+00
+80
+80
+80
+80
+80
+ENDCHAR
+STARTCHAR guillemotleft
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 5 0 0
+BITMAP
+28
+50
+A0
+50
+28
+ENDCHAR
+STARTCHAR guillemotright
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 5 0 0
+BITMAP
+A0
+50
+28
+50
+A0
+ENDCHAR
+STARTCHAR ltshade
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 6 11 0 -1
+BITMAP
+A8
+00
+54
+00
+A8
+00
+54
+00
+A8
+00
+54
+ENDCHAR
+STARTCHAR shade
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 6 12 0 -2
+BITMAP
+A8
+54
+A8
+54
+A8
+54
+A8
+54
+A8
+54
+A8
+54
+ENDCHAR
+STARTCHAR dkshade
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 6 12 0 -2
+BITMAP
+54
+FC
+A8
+FC
+54
+FC
+A8
+FC
+54
+FC
+A8
+FC
+ENDCHAR
+STARTCHAR SF110000
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 1 12 2 -2
+BITMAP
+80
+80
+80
+80
+80
+80
+80
+80
+80
+80
+80
+80
+ENDCHAR
+STARTCHAR SF090000
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 3 12 0 -2
+BITMAP
+20
+20
+20
+20
+20
+20
+E0
+20
+20
+20
+20
+20
+ENDCHAR
+STARTCHAR SF190000
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 3 12 0 -2
+BITMAP
+20
+20
+20
+20
+20
+E0
+20
+E0
+20
+20
+20
+20
+ENDCHAR
+STARTCHAR SF200000
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 4 12 0 -2
+BITMAP
+50
+50
+50
+50
+50
+50
+D0
+50
+50
+50
+50
+50
+ENDCHAR
+STARTCHAR SF210000
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 4 6 0 -2
+BITMAP
+F0
+50
+50
+50
+50
+50
+ENDCHAR
+STARTCHAR SF220000
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 3 7 0 -2
+BITMAP
+E0
+20
+E0
+20
+20
+20
+20
+ENDCHAR
+STARTCHAR SF230000
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 4 12 0 -2
+BITMAP
+50
+50
+50
+50
+50
+D0
+10
+D0
+50
+50
+50
+50
+ENDCHAR
+STARTCHAR SF240000
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 3 12 1 -2
+BITMAP
+A0
+A0
+A0
+A0
+A0
+A0
+A0
+A0
+A0
+A0
+A0
+A0
+ENDCHAR
+STARTCHAR SF250000
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 4 7 0 -2
+BITMAP
+F0
+10
+D0
+50
+50
+50
+50
+ENDCHAR
+STARTCHAR SF260000
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 4 8 0 2
+BITMAP
+50
+50
+50
+50
+50
+D0
+10
+F0
+ENDCHAR
+STARTCHAR SF270000
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 4 7 0 3
+BITMAP
+50
+50
+50
+50
+50
+50
+F0
+ENDCHAR
+STARTCHAR SF280000
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 3 8 0 2
+BITMAP
+20
+20
+20
+20
+20
+E0
+20
+E0
+ENDCHAR
+STARTCHAR SF030000
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 3 6 0 -2
+BITMAP
+E0
+20
+20
+20
+20
+20
+ENDCHAR
+STARTCHAR SF020000
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 4 7 2 3
+BITMAP
+80
+80
+80
+80
+80
+80
+F0
+ENDCHAR
+STARTCHAR SF070000
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 6 7 0 3
+BITMAP
+20
+20
+20
+20
+20
+20
+FC
+ENDCHAR
+STARTCHAR SF060000
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 6 6 0 -2
+BITMAP
+FC
+20
+20
+20
+20
+20
+ENDCHAR
+STARTCHAR SF080000
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 4 12 2 -2
+BITMAP
+80
+80
+80
+80
+80
+80
+F0
+80
+80
+80
+80
+80
+ENDCHAR
+STARTCHAR SF100000
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 6 1 0 3
+BITMAP
+FC
+ENDCHAR
+STARTCHAR SF050000
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 6 12 0 -2
+BITMAP
+20
+20
+20
+20
+20
+20
+FC
+20
+20
+20
+20
+20
+ENDCHAR
+STARTCHAR SF360000
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 4 12 2 -2
+BITMAP
+80
+80
+80
+80
+80
+F0
+80
+F0
+80
+80
+80
+80
+ENDCHAR
+STARTCHAR SF370000
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 12 1 -2
+BITMAP
+A0
+A0
+A0
+A0
+A0
+A0
+B8
+A0
+A0
+A0
+A0
+A0
+ENDCHAR
+STARTCHAR SF380000
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 8 1 2
+BITMAP
+A0
+A0
+A0
+A0
+A0
+B8
+80
+F8
+ENDCHAR
+STARTCHAR SF390000
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 7 1 -2
+BITMAP
+F8
+80
+B8
+A0
+A0
+A0
+A0
+ENDCHAR
+STARTCHAR SF400000
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 6 8 0 2
+BITMAP
+50
+50
+50
+50
+50
+DC
+00
+FC
+ENDCHAR
+STARTCHAR SF410000
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 6 7 0 -2
+BITMAP
+FC
+00
+DC
+50
+50
+50
+50
+ENDCHAR
+STARTCHAR SF420000
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 12 1 -2
+BITMAP
+A0
+A0
+A0
+A0
+A0
+B8
+80
+B8
+A0
+A0
+A0
+A0
+ENDCHAR
+STARTCHAR SF430000
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 6 3 0 2
+BITMAP
+FC
+00
+FC
+ENDCHAR
+STARTCHAR SF440000
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 6 12 0 -2
+BITMAP
+50
+50
+50
+50
+50
+DC
+00
+DC
+50
+50
+50
+50
+ENDCHAR
+STARTCHAR SF450000
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 6 8 0 2
+BITMAP
+20
+20
+20
+20
+20
+FC
+00
+FC
+ENDCHAR
+STARTCHAR SF460000
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 6 7 0 3
+BITMAP
+50
+50
+50
+50
+50
+50
+FC
+ENDCHAR
+STARTCHAR SF470000
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 6 7 0 -2
+BITMAP
+FC
+00
+FC
+20
+20
+20
+20
+ENDCHAR
+STARTCHAR SF480000
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 6 6 0 -2
+BITMAP
+FC
+50
+50
+50
+50
+50
+ENDCHAR
+STARTCHAR SF490000
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 7 1 3
+BITMAP
+A0
+A0
+A0
+A0
+A0
+A0
+F8
+ENDCHAR
+STARTCHAR SF500000
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 4 8 2 2
+BITMAP
+80
+80
+80
+80
+80
+F0
+80
+F0
+ENDCHAR
+STARTCHAR SF510000
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 4 7 2 -2
+BITMAP
+F0
+80
+F0
+80
+80
+80
+80
+ENDCHAR
+STARTCHAR SF520000
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 6 1 -2
+BITMAP
+F8
+A0
+A0
+A0
+A0
+A0
+ENDCHAR
+STARTCHAR SF530000
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 6 12 0 -2
+BITMAP
+50
+50
+50
+50
+50
+50
+FC
+50
+50
+50
+50
+50
+ENDCHAR
+STARTCHAR SF540000
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 6 12 0 -2
+BITMAP
+20
+20
+20
+20
+20
+FC
+20
+FC
+20
+20
+20
+20
+ENDCHAR
+STARTCHAR SF040000
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 3 7 0 3
+BITMAP
+20
+20
+20
+20
+20
+20
+E0
+ENDCHAR
+STARTCHAR SF010000
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 4 6 2 -2
+BITMAP
+F0
+80
+80
+80
+80
+80
+ENDCHAR
+STARTCHAR block
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 6 12 0 -2
+BITMAP
+FC
+FC
+FC
+FC
+FC
+FC
+FC
+FC
+FC
+FC
+FC
+FC
+ENDCHAR
+STARTCHAR dnblock
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 6 6 0 -2
+BITMAP
+FC
+FC
+FC
+FC
+FC
+FC
+ENDCHAR
+STARTCHAR lfblock
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 3 12 0 -2
+BITMAP
+E0
+E0
+E0
+E0
+E0
+E0
+E0
+E0
+E0
+E0
+E0
+E0
+ENDCHAR
+STARTCHAR rtblock
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 3 12 3 -2
+BITMAP
+E0
+E0
+E0
+E0
+E0
+E0
+E0
+E0
+E0
+E0
+E0
+E0
+ENDCHAR
+STARTCHAR upblock
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 6 6 0 4
+BITMAP
+FC
+FC
+FC
+FC
+FC
+FC
+ENDCHAR
+STARTCHAR alpha
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 5 0 0
+BITMAP
+68
+98
+88
+98
+68
+ENDCHAR
+STARTCHAR germandbls
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 7 0 0
+BITMAP
+70
+88
+90
+A0
+90
+88
+B0
+ENDCHAR
+STARTCHAR Gamma
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 7 0 0
+BITMAP
+F8
+80
+80
+80
+80
+80
+80
+ENDCHAR
+STARTCHAR pi
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 5 0 0
+BITMAP
+F8
+50
+50
+50
+50
+ENDCHAR
+STARTCHAR Sigma
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 7 0 0
+BITMAP
+F8
+40
+20
+10
+20
+40
+F8
+ENDCHAR
+STARTCHAR sigma
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 5 0 0
+BITMAP
+78
+90
+88
+88
+70
+ENDCHAR
+STARTCHAR uni00B5
+ENCODING -1
+SWIDTH 1000 0
+DWIDTH 6 0
+BBX 5 7 0 -2
+BITMAP
+88
+88
+88
+98
+E8
+80
+80
+ENDCHAR
+STARTCHAR tau
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 5 0 0
+BITMAP
+F8
+20
+20
+28
+10
+ENDCHAR
+STARTCHAR Phi
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 7 0 0
+BITMAP
+20
+70
+A8
+A8
+A8
+70
+20
+ENDCHAR
+STARTCHAR Theta
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 7 0 0
+BITMAP
+70
+88
+88
+F8
+88
+88
+70
+ENDCHAR
+STARTCHAR Omega
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 7 0 0
+BITMAP
+70
+88
+88
+88
+88
+50
+D8
+ENDCHAR
+STARTCHAR delta
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 7 0 0
+BITMAP
+70
+80
+70
+88
+88
+88
+70
+ENDCHAR
+STARTCHAR infinity
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 4 0 1
+BITMAP
+50
+A8
+A8
+50
+ENDCHAR
+STARTCHAR phi
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 7 0 -2
+BITMAP
+10
+A8
+A8
+A8
+70
+20
+20
+ENDCHAR
+STARTCHAR epsilon
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 5 0 0
+BITMAP
+70
+88
+60
+88
+70
+ENDCHAR
+STARTCHAR intersection
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 5 0 0
+BITMAP
+70
+88
+88
+88
+88
+ENDCHAR
+STARTCHAR equivalence
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 5 0 1
+BITMAP
+F8
+00
+F8
+00
+F8
+ENDCHAR
+STARTCHAR plusminus
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 7 0 0
+BITMAP
+20
+20
+F8
+20
+20
+00
+F8
+ENDCHAR
+STARTCHAR greaterequal
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 7 0 0
+BITMAP
+C0
+30
+08
+30
+C0
+00
+F8
+ENDCHAR
+STARTCHAR lessequal
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 7 0 0
+BITMAP
+18
+60
+80
+60
+18
+00
+F8
+ENDCHAR
+STARTCHAR integraltp
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 3 11 2 -2
+BITMAP
+40
+A0
+80
+80
+80
+80
+80
+80
+80
+80
+80
+ENDCHAR
+STARTCHAR integralbt
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 3 11 0 -1
+BITMAP
+20
+20
+20
+20
+20
+20
+20
+20
+20
+A0
+40
+ENDCHAR
+STARTCHAR divide
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 5 0 1
+BITMAP
+20
+00
+F8
+00
+20
+ENDCHAR
+STARTCHAR approxequal
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 6 0 0
+BITMAP
+48
+A8
+90
+48
+A8
+90
+ENDCHAR
+STARTCHAR degree
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 4 4 1 5
+BITMAP
+60
+90
+90
+60
+ENDCHAR
+STARTCHAR uni2219
+ENCODING -1
+SWIDTH 1000 0
+DWIDTH 6 0
+BBX 2 2 2 3
+BITMAP
+C0
+C0
+ENDCHAR
+STARTCHAR periodcentered
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 2 2 2 3
+BITMAP
+C0
+C0
+ENDCHAR
+STARTCHAR radical
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 6 11 0 -2
+BITMAP
+0C
+08
+08
+08
+08
+10
+D0
+50
+50
+20
+20
+ENDCHAR
+STARTCHAR nsuperior
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 3 4 1 5
+BITMAP
+C0
+A0
+A0
+A0
+ENDCHAR
+STARTCHAR twosuperior
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 3 5 1 5
+BITMAP
+40
+A0
+20
+40
+E0
+ENDCHAR
+STARTCHAR filledbox
+ENCODING -1
+SWIDTH 480 0
+DWIDTH 6 0
+BBX 5 5 0 0
+BITMAP
+F8
+F8
+F8
+F8
+F8
+ENDCHAR
+ENDFONT
Modified: trunk/gui/src/awt/org/jnode/awt/font/bdf/BDFFontProvider.java
===================================================================
--- trunk/gui/src/awt/org/jnode/awt/font/bdf/BDFFontProvider.java 2008-08-05 10:06:10 UTC (rev 4399)
+++ trunk/gui/src/awt/org/jnode/awt/font/bdf/BDFFontProvider.java 2008-08-06 19:49:26 UTC (rev 4400)
@@ -50,7 +50,9 @@
/**
* All system fonts
*/
- private static final String SYSTEM_FONTS[] = {"Vera-10.bdf", "Vera-12.bdf", "Vera-14.bdf", "VeraMono-12-8.bdf"};
+ private static final String SYSTEM_FONTS[] = {
+ "Vera-10.bdf", "Vera-12.bdf", "Vera-14.bdf", "VeraMono-12-8.bdf", "6x12_FixedMedium-12.bdf"
+ };
public BDFFontProvider() {
super("bdf");
Modified: trunk/gui/src/driver/org/jnode/driver/textscreen/fb/FbTextScreenManager.java
===================================================================
--- trunk/gui/src/driver/org/jnode/driver/textscreen/fb/FbTextScreenManager.java 2008-08-05 10:06:10 UTC (rev 4399)
+++ trunk/gui/src/driver/org/jnode/driver/textscreen/fb/FbTextScreenManager.java 2008-08-06 19:49:26 UTC (rev 4400)
@@ -43,9 +43,8 @@
* The font to use for rendering characters in the console :
* it must be a mono spaced font (=a font with fixed width)
*/
- private static final Font FONT = new Font(
- "-FontForge-Bitstream Vera Sans Mono-Book-R-Normal-SansMono--12-120-75-75-P-69-ISO10646",
- Font.PLAIN, 12);
+ private static final Font FONT = new Font("-Misc-Fixed-Medium-R-SemiCondensed--12-110-75-75-C-60-437-",
+ Font.PLAIN, 12);
private final FbTextScreen systemScreen;
private final Surface surface;
Modified: trunk/gui/src/driver/org/jnode/driver/textscreen/swing/SwingPcTextScreen.java
===================================================================
--- trunk/gui/src/driver/org/jnode/driver/textscreen/swing/SwingPcTextScreen.java 2008-08-05 10:06:10 UTC (rev 4399)
+++ trunk/gui/src/driver/org/jnode/driver/textscreen/swing/SwingPcTextScreen.java 2008-08-06 19:49:26 UTC (rev 4400)
@@ -81,10 +81,9 @@
int h;
{
-
- Font font = new Font(
- "-FontForge-Bitstream Vera Sans Mono-Book-R-Normal-SansMono--12-120-75-75-P-69-ISO10646", Font.PLAIN,
- 12);
+ Font font = new Font("-Misc-Fixed-Medium-R-SemiCondensed--12-110-75-75-C-60-437-", Font.PLAIN, 12);
+ //Font font = new Font(
+ //"-FontForge-Bitstream Vera Sans Mono-Book-R-Normal-SansMono--12-120-75-75-P-69-ISO10646", Font.PLAIN, 12);
//Font font = new Font("-FontForge-Bitstream Vera Sans
// Mono-Book-R-Normal-SansMono--12-120-75-75-P-69-FontSpecific", Font.PLAIN, 12);
//Font font = new Font("-FontForge-Bitstream Vera Sans
@@ -132,15 +131,9 @@
public void addNotify() {
super.addNotify();
-
- /*
FontMetrics fm = getGraphics().getFontMetrics();
w = fm.getMaxAdvance();
- h = fm.getHeight() + 1;
- */
-
- w = 7;
- h = 15;
+ h = fm.getHeight();
screen.setSize(screen.getMaximumSize());
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ls...@us...> - 2008-08-07 10:13:47
|
Revision: 4407
http://jnode.svn.sourceforge.net/jnode/?rev=4407&view=rev
Author: lsantha
Date: 2008-08-07 10:13:44 +0000 (Thu, 07 Aug 2008)
Log Message:
-----------
Changed desktop background image.
Modified Paths:
--------------
trunk/gui/images/JNode_logo_trans.png
trunk/gui/src/awt/org/jnode/awt/swingpeers/DesktopFrame.java
trunk/gui/src/desktop/org/jnode/desktop/classic/Desktop.java
Removed Paths:
-------------
trunk/gui/images/background.png
Modified: trunk/gui/src/awt/org/jnode/awt/swingpeers/DesktopFrame.java
===================================================================
--- trunk/gui/src/awt/org/jnode/awt/swingpeers/DesktopFrame.java 2008-08-07 08:57:02 UTC (rev 4406)
+++ trunk/gui/src/awt/org/jnode/awt/swingpeers/DesktopFrame.java 2008-08-07 10:13:44 UTC (rev 4407)
@@ -43,7 +43,7 @@
* @author Ewout Prangsma (ep...@us...)
*/
public final class DesktopFrame extends JFrame implements JNodeAwtContext {
- private static final Color DESKTOP_BACKGROUND_COLOR = new Color(70, 130, 180);
+ private static final Color DESKTOP_BACKGROUND_COLOR = new Color(110, 190, 235);
private final JDesktopPane desktop;
private static final Logger log = Logger.getLogger(DesktopFrame.class);
@@ -77,9 +77,16 @@
super.paintComponent(g);
if (backgroundImage != null) {
Dimension ds = desktop.getSize();
+ /* cnetered
int iw = backgroundImage.getWidth();
int ih = backgroundImage.getHeight();
g.drawImage(backgroundImage, (ds.width - iw) / 2, (ds.height - ih) / 2, desktop);
+ */
+
+ // bottom right
+ int iw = backgroundImage.getWidth();
+ int ih = backgroundImage.getHeight();
+ g.drawImage(backgroundImage, ds.width - iw - 30, ds.height - ih - 20, desktop);
}
}
};
Modified: trunk/gui/src/desktop/org/jnode/desktop/classic/Desktop.java
===================================================================
--- trunk/gui/src/desktop/org/jnode/desktop/classic/Desktop.java 2008-08-07 08:57:02 UTC (rev 4406)
+++ trunk/gui/src/desktop/org/jnode/desktop/classic/Desktop.java 2008-08-07 10:13:44 UTC (rev 4407)
@@ -289,7 +289,7 @@
}
void enableBackgroundImage(boolean b) {
- if (b) desktopFrame.setBackgroundImage(loadImage("background.png"));
+ if (b) desktopFrame.setBackgroundImage(loadImage("JNode_logo_trans.png"));
else desktopFrame.setBackgroundImage(null);
desktopPane.repaint();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fd...@us...> - 2008-08-11 21:52:05
|
Revision: 4429
http://jnode.svn.sourceforge.net/jnode/?rev=4429&view=rev
Author: fduminy
Date: 2008-08-11 21:51:41 +0000 (Mon, 11 Aug 2008)
Log Message:
-----------
removed JTextAreaTextScreen in favor of SwingConsole
Modified Paths:
--------------
trunk/gui/descriptors/org.jnode.test.gui.xml
Removed Paths:
-------------
trunk/gui/src/driver/org/jnode/driver/console/swing/JTextAreaTextScreen.java
trunk/gui/src/test/org/jnode/test/gui/ConsoleTest2.java
Modified: trunk/gui/descriptors/org.jnode.test.gui.xml
===================================================================
--- trunk/gui/descriptors/org.jnode.test.gui.xml 2008-08-11 21:03:28 UTC (rev 4428)
+++ trunk/gui/descriptors/org.jnode.test.gui.xml 2008-08-11 21:51:41 UTC (rev 4429)
@@ -28,7 +28,6 @@
<application name="Swing test" class="org.jnode.test.gui.SwingTest"/>
<application name="Swing menu test" class="org.jnode.test.gui.SwingMenuTest"/>
<application name="Console" class="org.jnode.test.gui.ConsoleTest"/>
- <application name="Console2" class="org.jnode.test.gui.ConsoleTest2"/>
<!-- application name="Thinlet" class="thinlet.ThinTest"/ -->
<!-- application name="GlyphTest" class="org.jnode.test.gui.GlyphTest"/ -->
</extension>
Deleted: trunk/gui/src/driver/org/jnode/driver/console/swing/JTextAreaTextScreen.java
===================================================================
--- trunk/gui/src/driver/org/jnode/driver/console/swing/JTextAreaTextScreen.java 2008-08-11 21:03:28 UTC (rev 4428)
+++ trunk/gui/src/driver/org/jnode/driver/console/swing/JTextAreaTextScreen.java 2008-08-11 21:51:41 UTC (rev 4429)
@@ -1,223 +0,0 @@
-/*
- * $Id$
- *
- * JNode.org
- * Copyright (C) 2005 JNode.org
- *
- * This library is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published
- * by the Free Software Foundation; either version 2.1 of the License, or
- * (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
- * License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-package org.jnode.driver.console.swing;
-
-import java.awt.Color;
-import java.awt.Component;
-import java.util.Arrays;
-
-import javax.swing.JTextArea;
-import javax.swing.text.AttributeSet;
-import javax.swing.text.BadLocationException;
-import javax.swing.text.DefaultStyledDocument;
-import javax.swing.text.Style;
-import javax.swing.text.StyleConstants;
-import javax.swing.text.StyleContext;
-import javax.swing.text.StyledDocument;
-import javax.swing.text.StyleConstants.ColorConstants;
-
-import org.jnode.driver.textscreen.ScrollableTextScreen;
-import org.jnode.driver.textscreen.TextScreen;
-
-/**
- * TODO inherits from AbstractPcTextScreen ?
- *
- * @author Fabien DUMINY (fduminy at users.sourceforge.net)
- *
- */
-public class JTextAreaTextScreen implements TextScreen {
- private StyledDocument document;
- private AttributeSet attributes;
- private JTextArea textArea;
- private Style style;
- private StyleContext context;
-
- /**
- * Initialize this instance.
- * @param width
- * @param height
- */
- public JTextAreaTextScreen(int width, int height) {
- context = StyleContext.getDefaultStyleContext();
- style = context.addStyle("defaultStyle", null);
-
- style.addAttribute(StyleConstants.Foreground, Color.WHITE);
- style.addAttribute(StyleConstants.Background, Color.BLACK);
-
- document = new DefaultStyledDocument(context);
- textArea = new JTextArea(document);
- textArea.setRows(height);
- textArea.setColumns(width);
- System.out.println("new JTextAreaTextScreen" + width + "x" + height);
- }
-
- @Override
- public char getChar(int offset) {
- try {
- return document.getText(offset, 1).charAt(0);
- } catch (BadLocationException e) {
- e.printStackTrace();
- return ' ';
- }
- }
-
- @Override
- public int getColor(int offset) {
- AttributeSet as = document.getCharacterElement(offset).getAttributes();
- return ((Color) as.getAttribute(ColorConstants.Foreground)).getRGB();
- }
-
- @Override
- public void set(int offset, char ch, int count, int color) {
- System.out.println("set1 " + offset);
- try {
- document.remove(offset, count);
-
- char[] chars = new char[count];
- Arrays.fill(chars, ch);
- document.insertString(offset, new String(chars), createAttributes(color));
- } catch (BadLocationException e) {
- e.printStackTrace();
- }
- }
-
- @Override
- public void set(int offset, char[] ch, int chOfs, int length, int color) {
- System.out.println("set2 " + offset);
- try {
- final AttributeSet as = createAttributes(color);
-
- document.remove(offset, length);
- document.insertString(offset, new String(ch), as);
- } catch (BadLocationException e) {
- e.printStackTrace();
- }
- }
-
- @Override
- public void set(int offset, char[] ch, int chOfs, int length, int[] colors, int colorsOfs) {
- System.out.println("set3 " + offset);
- try {
- // first, replace the characters
- document.remove(offset, length);
- document.insertString(offset, new String(ch, chOfs, length), style);
-
- // second, affect the color to the characters
- for (int iColor = colorsOfs; iColor < colors.length; iColor++) {
- final AttributeSet as = createAttributes(colors[iColor]);
- document.setCharacterAttributes(offset, 1, as, false);
- offset++;
- }
- } catch (BadLocationException e) {
- e.printStackTrace();
- }
- }
-
- @Override
- public void copyContent(int srcOffset, int destOffset, int length) {
- // TODO Auto-generated method stub
- }
-
- @Override
- public void copyTo(TextScreen dst, int offset, int length) {
- // TODO Auto-generated method stub
- }
-
- @Override
- public int getHeight() {
- return textArea.getRows();
- }
-
- @Override
- public int getWidth() {
- return textArea.getColumns();
- }
-
- /**
- * Calculate the offset for a given x,y coordinate. (copied from
- * AbstractPcTextScreen)
- *
- * @param x
- * @param y
- * @return
- */
- @Override
- public int getOffset(int x, int y) {
- return (y * getWidth()) + x;
- }
-
- public void sync(int offset, int length) {
- // TODO Auto-generated method stub
-
- }
-
- @Override
- public TextScreen createCompatibleBufferScreen() {
- // TODO Auto-generated method stub
- return null;
- }
-
- @Override
- public ScrollableTextScreen createCompatibleScrollableBufferScreen(int height) {
- // TODO Auto-generated method stub
- return null;
- }
-
- public void ensureVisible(int row, boolean sync) {
- }
-
- @Override
- public int setCursor(int x, int y) {
- int offset = x + y * textArea.getColumns();
- textArea.setCaretPosition(offset);
- return offset;
- }
-
- @Override
- public int setCursorVisible(boolean visible) {
- textArea.getCaret().setVisible(visible);
- return textArea.getCaretPosition();
- }
-
- //
- // Private methods
- //
-
- private AttributeSet createAttributes(int color) {
- Color defaultColor = (Color) style.getAttribute(ColorConstants.Foreground);
- if (defaultColor.getRGB() == color) {
- // default color, use the default attributes
- attributes = style;
- } else {
- // non-default color, create a new AttributeSet
- // TODO optimize it by using a cache : Color -> AttributeSet ?
- Color foreground = new Color(color);
- attributes = context.addAttribute(style, StyleConstants.Foreground, foreground);
- }
-
- return attributes;
- }
-
- public Component getTextArea() {
- return textArea;
- }
-}
Deleted: trunk/gui/src/test/org/jnode/test/gui/ConsoleTest2.java
===================================================================
--- trunk/gui/src/test/org/jnode/test/gui/ConsoleTest2.java 2008-08-11 21:03:28 UTC (rev 4428)
+++ trunk/gui/src/test/org/jnode/test/gui/ConsoleTest2.java 2008-08-11 21:51:41 UTC (rev 4429)
@@ -1,153 +0,0 @@
-/*
- * $Id$
- *
- * JNode.org
- * Copyright (C) 2003-2006 JNode.org
- *
- * This library is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published
- * by the Free Software Foundation; either version 2.1 of the License, or
- * (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
- * License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; If not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-package org.jnode.test.gui;
-
-import java.awt.BorderLayout;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.io.IOException;
-import java.io.OutputStream;
-import javax.naming.NameNotFoundException;
-import javax.swing.JButton;
-import javax.swing.JFrame;
-import javax.swing.JMenu;
-import javax.swing.JMenuBar;
-import javax.swing.JMenuItem;
-import javax.swing.JTextArea;
-import org.jnode.driver.console.ConsoleException;
-import org.jnode.driver.console.ConsoleManager;
-import org.jnode.driver.console.TextConsole;
-import org.jnode.driver.console.swing.JTextAreaTextScreen;
-import org.jnode.driver.console.textscreen.TextScreenConsole;
-import org.jnode.driver.console.textscreen.TextScreenConsoleManager;
-import org.jnode.shell.CommandShell;
-import org.jnode.shell.ShellException;
-import org.jnode.shell.ShellUtils;
-
-/**
- * @author Ewout Prangsma (ep...@us...)
- */
-public class ConsoleTest2 {
-
- static class ConsoleFrame extends JFrame {
- //private PrintStream savedOut;
- //private JTextArea textArea;
- private JTextAreaTextScreen screen;
- private ConsoleManager manager;
- private TextConsole console;
-
- public ConsoleFrame() throws ConsoleException, ShellException, NameNotFoundException {
- super("System.out");
-
- screen = new JTextAreaTextScreen(80, 24);
- manager = new TextScreenConsoleManager();
- console = new TextScreenConsole(
- manager, "test", screen, ConsoleManager.CreateOptions.TEXT);
- manager.focus(console);
-
- CommandShell commandShell = new CommandShell(console);
- new Thread(commandShell).start();
- ShellUtils.getShellManager().registerShell(commandShell);
-
- //textArea = new JTextArea( "System.out:" );
-
- getContentPane().setLayout(new BorderLayout());
- getContentPane().add(screen.getTextArea(), BorderLayout.CENTER);
- //savedOut = new PrintStream( new TextAreaOutputStream( textArea ) );
- }
-
-// public void show() {
-// super.show( );
-// claimPrintStreams();
-// }
-
-// private void claimPrintStreams() {
-// System.out.println( "Claiming print streams." );
-// AccessController.doPrivileged( new PrivilegedAction() {
-// public Object run() {
-// System.setOut( savedOut );
-// System.setErr( savedOut );
-// return null;
-// }
-// } );
-// System.out.println( "Claimed print streams." );
-// }
- }
-
-
- public static void main(String[] args) {
- try {
- final ConsoleFrame frame = new ConsoleFrame();
- frame.getRootPane().setDoubleBuffered(false);
- frame.setLocation(100, 100);
- frame.setSize(400, 400);
- JButton button = new JButton("Button");
- button.addActionListener(new ActionListener() {
- public void actionPerformed(ActionEvent event) {
- System.out.println("Button pressed.");
- }
- });
- frame.getContentPane().add(button, BorderLayout.SOUTH);
- JMenuBar mb = new JMenuBar();
- JMenu menu = new JMenu("JMenu test");
- JMenuItem mi = new JMenuItem("JMenuItem test");
- mb.add(menu);
- menu.add(mi);
- frame.setJMenuBar(mb);
- frame.validate();
- frame.show();
-
-// int count=0;
-// Timer t=new Timer( 1000,new ActionListener() {
-// public void actionPerformed( ActionEvent event ) {
-// System.out.println( "X" );
-// }
-// } );
-// t.start();
-// comp.requestFocus();
- System.out.println("Showed ConsoleTest frame.");
- } catch (Exception ex) {
- ex.printStackTrace();
- }
- }
-
- /**
- * @author epr
- * @author Levente S\u00e1ntha (ls...@us...)
- */
- public static class TextAreaOutputStream extends OutputStream {
-
- private JTextArea textArea;
-
- public TextAreaOutputStream(JTextArea console) {
- this.textArea = console;
- }
-
- public void write(int b) throws IOException {
- textArea.append("" + (char) b);
- if (b == '\n') {
- textArea.repaint();
- }
- }
- }
-
-}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ls...@us...> - 2008-10-24 13:12:23
|
Revision: 4651
http://jnode.svn.sourceforge.net/jnode/?rev=4651&view=rev
Author: lsantha
Date: 2008-10-24 13:12:13 +0000 (Fri, 24 Oct 2008)
Log Message:
-----------
Added BDF font conptributed by Stephen Meslin-Weber and added large font support to fb console and swing console.
Modified Paths:
--------------
trunk/gui/src/awt/org/jnode/awt/font/bdf/BDFFontProvider.java
trunk/gui/src/driver/org/jnode/driver/textscreen/fb/FbTextScreenManager.java
trunk/gui/src/driver/org/jnode/driver/textscreen/swing/SwingPcTextScreen.java
trunk/gui/src/font/org/jnode/font/bdf/mappings.properties
Added Paths:
-----------
trunk/gui/fonts/VGAMedium-19.bdf
trunk/gui/mapgen.sh
Added: trunk/gui/fonts/VGAMedium-19.bdf
===================================================================
--- trunk/gui/fonts/VGAMedium-19.bdf (rev 0)
+++ trunk/gui/fonts/VGAMedium-19.bdf 2008-10-24 13:12:13 UTC (rev 4651)
@@ -0,0 +1,4729 @@
+STARTFONT 2.1
+FONT -dosemu-VGA-Medium-R-Normal--19-190-75-75-C-100-IBM-CP437
+SIZE 18 75 75
+FONTBOUNDINGBOX 11 19 0 -3
+COMMENT "Generated by fontforge, http://fontforge.sourceforge.net"
+STARTPROPERTIES 8
+COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985."
+POINT_SIZE 180
+WEIGHT 10
+RESOLUTION 103
+RESOLUTION_X 75
+RESOLUTION_Y 75
+X_HEIGHT 10
+QUAD_WIDTH 11
+ENDPROPERTIES
+CHARS 256
+STARTCHAR space0
+ENCODING 0
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 1 1 10 -3
+BITMAP
+00
+ENDCHAR
+STARTCHAR vga1
+ENCODING 1
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 8 10 2 2
+BITMAP
+7E
+81
+A5
+81
+81
+A5
+99
+81
+81
+7E
+ENDCHAR
+STARTCHAR vga2
+ENCODING 2
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 8 10 2 2
+BITMAP
+7E
+FF
+DB
+FF
+FF
+DB
+E7
+FF
+FF
+7E
+ENDCHAR
+STARTCHAR vga3
+ENCODING 3
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 7 8 2 2
+BITMAP
+6C
+FE
+FE
+FE
+FE
+7C
+38
+10
+ENDCHAR
+STARTCHAR vga4
+ENCODING 4
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 7 7 2 3
+BITMAP
+10
+38
+7C
+FE
+7C
+38
+10
+ENDCHAR
+STARTCHAR vga5
+ENCODING 5
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 8 9 2 2
+BITMAP
+18
+3C
+3C
+E7
+E7
+E7
+18
+18
+3C
+ENDCHAR
+STARTCHAR vga6
+ENCODING 6
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 8 9 2 2
+BITMAP
+18
+3C
+7E
+FF
+FF
+7E
+18
+18
+3C
+ENDCHAR
+STARTCHAR vga7
+ENCODING 7
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 4 4 4 4
+BITMAP
+60
+F0
+F0
+60
+ENDCHAR
+STARTCHAR vga8
+ENCODING 8
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 8 16 2 -2
+BITMAP
+FF
+FF
+FF
+FF
+FF
+FF
+E7
+C3
+C3
+E7
+FF
+FF
+FF
+FF
+FF
+FF
+ENDCHAR
+STARTCHAR vga9
+ENCODING 9
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 6 6 3 3
+BITMAP
+78
+CC
+84
+84
+CC
+78
+ENDCHAR
+STARTCHAR vga10
+ENCODING 10
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 8 16 2 -2
+BITMAP
+FF
+FF
+FF
+FF
+FF
+C3
+99
+BD
+BD
+99
+C3
+FF
+FF
+FF
+FF
+FF
+ENDCHAR
+STARTCHAR vga11
+ENCODING 11
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 7 10 2 2
+BITMAP
+1E
+06
+0E
+1A
+78
+CC
+CC
+CC
+CC
+78
+ENDCHAR
+STARTCHAR vga12
+ENCODING 12
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 6 10 3 2
+BITMAP
+78
+CC
+CC
+CC
+CC
+78
+30
+FC
+30
+30
+ENDCHAR
+STARTCHAR vga13
+ENCODING 13
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 8 10 2 2
+BITMAP
+3F
+33
+3F
+30
+30
+30
+30
+70
+F0
+E0
+ENDCHAR
+STARTCHAR vga14
+ENCODING 14
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 8 11 2 1
+BITMAP
+7F
+63
+7F
+63
+63
+63
+63
+67
+E7
+E6
+C0
+ENDCHAR
+STARTCHAR vga15
+ENCODING 15
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 8 9 2 2
+BITMAP
+18
+18
+DB
+3C
+E7
+3C
+DB
+18
+18
+ENDCHAR
+STARTCHAR righttriangle
+ENCODING 16
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 6 11 2 1
+BITMAP
+80
+C0
+E0
+F0
+F8
+FC
+F8
+F0
+E0
+C0
+80
+ENDCHAR
+STARTCHAR lefttriangle
+ENCODING 17
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 6 11 3 1
+BITMAP
+04
+0C
+1C
+3C
+7C
+FC
+7C
+3C
+1C
+0C
+04
+ENDCHAR
+STARTCHAR updownarrow
+ENCODING 18
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 7 13 2 0
+BITMAP
+10
+38
+54
+92
+10
+10
+10
+10
+10
+92
+54
+38
+10
+ENDCHAR
+STARTCHAR vga19
+ENCODING 19
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 6 10 3 2
+BITMAP
+CC
+CC
+CC
+CC
+CC
+CC
+CC
+00
+CC
+CC
+ENDCHAR
+STARTCHAR paragraph
+ENCODING 20
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 8 15 1 -2
+BITMAP
+7F
+F9
+F9
+F9
+79
+39
+09
+09
+09
+09
+09
+09
+09
+09
+09
+ENDCHAR
+STARTCHAR section
+ENCODING 21
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 8 15 2 -2
+BITMAP
+7E
+E3
+C0
+E0
+78
+5E
+C7
+C3
+E3
+7A
+1E
+07
+03
+C7
+7E
+ENDCHAR
+STARTCHAR vga22
+ENCODING 22
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 7 4 2 2
+BITMAP
+FE
+FE
+FE
+FE
+ENDCHAR
+STARTCHAR vga23
+ENCODING 23
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 6 10 3 2
+BITMAP
+30
+78
+FC
+30
+30
+30
+FC
+78
+30
+FC
+ENDCHAR
+STARTCHAR uparrow
+ENCODING 24
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 7 13 2 0
+BITMAP
+10
+38
+54
+92
+10
+10
+10
+10
+10
+10
+10
+10
+10
+ENDCHAR
+STARTCHAR downarrow
+ENCODING 25
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 7 13 2 0
+BITMAP
+10
+10
+10
+10
+10
+10
+10
+10
+10
+92
+54
+38
+10
+ENDCHAR
+STARTCHAR vga26
+ENCODING 26
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 7 5 2 4
+BITMAP
+18
+0C
+FE
+0C
+18
+ENDCHAR
+STARTCHAR vga27
+ENCODING 27
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 7 5 2 4
+BITMAP
+30
+60
+FE
+60
+30
+ENDCHAR
+STARTCHAR vga28
+ENCODING 28
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 7 4 2 4
+BITMAP
+C0
+C0
+C0
+FE
+ENDCHAR
+STARTCHAR vga29
+ENCODING 29
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 7 5 2 4
+BITMAP
+28
+6C
+FE
+6C
+28
+ENDCHAR
+STARTCHAR vga30
+ENCODING 30
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 7 7 2 3
+BITMAP
+10
+38
+38
+7C
+7C
+FE
+FE
+ENDCHAR
+STARTCHAR vga31
+ENCODING 31
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 7 7 2 3
+BITMAP
+FE
+FE
+7C
+7C
+38
+38
+10
+ENDCHAR
+STARTCHAR space
+ENCODING 32
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 1 1 10 -3
+BITMAP
+00
+ENDCHAR
+STARTCHAR exclam
+ENCODING 33
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 2 13 5 0
+BITMAP
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+40
+00
+00
+C0
+C0
+ENDCHAR
+STARTCHAR quotedbl
+ENCODING 34
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 6 4 3 10
+BITMAP
+CC
+CC
+CC
+88
+ENDCHAR
+STARTCHAR numbersign
+ENCODING 35
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 11 13 0 0
+BITMAP
+0CC0
+0CC0
+0CC0
+0880
+7FE0
+1100
+3300
+3300
+FFC0
+2200
+6600
+6600
+6600
+ENDCHAR
+STARTCHAR dollar
+ENCODING 36
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 8 15 2 -1
+BITMAP
+08
+3E
+4B
+C8
+C8
+E8
+78
+3C
+1E
+17
+13
+13
+D2
+7C
+10
+ENDCHAR
+STARTCHAR percent
+ENCODING 37
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 11 13 0 0
+BITMAP
+7000
+D840
+8840
+8880
+8900
+DA00
+75C0
+0B60
+1220
+2220
+4220
+4360
+01C0
+ENDCHAR
+STARTCHAR ampersand
+ENCODING 38
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 11 13 0 0
+BITMAP
+3C00
+6600
+6600
+6600
+3400
+3800
+6CC0
+CCC0
+C680
+C300
+C380
+6EC0
+3860
+ENDCHAR
+STARTCHAR apostrophe
+ENCODING 39
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 3 5 4 9
+BITMAP
+E0
+E0
+E0
+60
+C0
+ENDCHAR
+STARTCHAR parenleft
+ENCODING 40
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 7 16 3 -2
+BITMAP
+06
+18
+30
+60
+60
+C0
+C0
+C0
+C0
+C0
+C0
+60
+60
+30
+18
+06
+ENDCHAR
+STARTCHAR parenright
+ENCODING 41
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 7 16 1 -2
+BITMAP
+C0
+30
+18
+0C
+0C
+06
+06
+06
+06
+06
+06
+0C
+0C
+18
+30
+C0
+ENDCHAR
+STARTCHAR asterisk
+ENCODING 42
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 7 7 2 7
+BITMAP
+10
+10
+92
+EE
+10
+6C
+44
+ENDCHAR
+STARTCHAR plus
+ENCODING 43
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 9 9 1 1
+BITMAP
+0800
+0800
+0800
+0800
+FF80
+0800
+0800
+0800
+0800
+ENDCHAR
+STARTCHAR comma
+ENCODING 44
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 3 5 4 -2
+BITMAP
+E0
+E0
+E0
+60
+C0
+ENDCHAR
+STARTCHAR minus
+ENCODING 45
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 9 1 1 5
+BITMAP
+FF80
+ENDCHAR
+STARTCHAR period
+ENCODING 46
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 3 3 4 0
+BITMAP
+E0
+E0
+E0
+ENDCHAR
+STARTCHAR slash
+ENCODING 47
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 9 16 1 -2
+BITMAP
+0080
+0180
+0100
+0300
+0200
+0600
+0400
+0C00
+1800
+1000
+3000
+2000
+6000
+4000
+C000
+8000
+ENDCHAR
+STARTCHAR zero
+ENCODING 48
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 9 13 1 0
+BITMAP
+3E00
+6300
+4100
+C180
+C180
+C180
+C180
+C180
+C180
+C180
+4100
+6300
+3E00
+ENDCHAR
+STARTCHAR one
+ENCODING 49
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 5 13 2 0
+BITMAP
+18
+F8
+18
+18
+18
+18
+18
+18
+18
+18
+18
+18
+18
+ENDCHAR
+STARTCHAR two
+ENCODING 50
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 8 13 1 0
+BITMAP
+7E
+C7
+03
+03
+03
+06
+0C
+18
+30
+60
+C0
+FF
+FF
+ENDCHAR
+STARTCHAR three
+ENCODING 51
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 8 13 1 0
+BITMAP
+7E
+C7
+03
+03
+06
+3C
+06
+03
+03
+03
+03
+C7
+7E
+ENDCHAR
+STARTCHAR four
+ENCODING 52
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 10 13 1 0
+BITMAP
+0300
+0700
+0F00
+1B00
+1300
+3300
+6300
+C300
+FFC0
+FFC0
+0300
+0300
+0300
+ENDCHAR
+STARTCHAR five
+ENCODING 53
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 8 13 2 0
+BITMAP
+FF
+FF
+80
+80
+80
+F8
+1E
+07
+03
+03
+03
+C7
+7E
+ENDCHAR
+STARTCHAR six
+ENCODING 54
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 9 13 1 0
+BITMAP
+1E00
+7300
+6000
+C000
+C000
+DE00
+E300
+C180
+C180
+C180
+E180
+7300
+3E00
+ENDCHAR
+STARTCHAR seven
+ENCODING 55
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 9 13 1 0
+BITMAP
+FF80
+FF80
+0300
+0600
+0C00
+0C00
+1800
+1800
+3000
+3000
+6000
+6000
+6000
+ENDCHAR
+STARTCHAR eight
+ENCODING 56
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 9 13 1 0
+BITMAP
+3E00
+6300
+C180
+C180
+E100
+7A00
+3E00
+6700
+C380
+C180
+C180
+6300
+3E00
+ENDCHAR
+STARTCHAR nine
+ENCODING 57
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 9 13 1 0
+BITMAP
+3E00
+6700
+C380
+C180
+C180
+C180
+6380
+3D80
+0180
+0100
+0300
+C600
+7C00
+ENDCHAR
+STARTCHAR colon
+ENCODING 58
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 3 10 4 0
+BITMAP
+E0
+E0
+00
+00
+00
+00
+00
+00
+E0
+E0
+ENDCHAR
+STARTCHAR semicolon
+ENCODING 59
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 3 12 4 -2
+BITMAP
+E0
+E0
+00
+00
+00
+00
+00
+00
+E0
+E0
+60
+C0
+ENDCHAR
+STARTCHAR less
+ENCODING 60
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 10 9 0 1
+BITMAP
+00C0
+0380
+0E00
+3800
+E000
+3800
+0E00
+0380
+00C0
+ENDCHAR
+STARTCHAR equal
+ENCODING 61
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 9 4 1 3
+BITMAP
+FF80
+0000
+0000
+FF80
+ENDCHAR
+STARTCHAR greater
+ENCODING 62
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 10 9 1 1
+BITMAP
+C000
+7000
+1C00
+0700
+01C0
+0700
+1C00
+7000
+C000
+ENDCHAR
+STARTCHAR question
+ENCODING 63
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 8 13 1 0
+BITMAP
+7E
+C7
+03
+03
+06
+18
+30
+30
+30
+00
+00
+30
+30
+ENDCHAR
+STARTCHAR at
+ENCODING 64
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 10 13 1 0
+BITMAP
+0F00
+3180
+6180
+4F80
+9980
+9980
+9980
+9980
+9F80
+4DC0
+6000
+3000
+0F80
+ENDCHAR
+STARTCHAR A
+ENCODING 65
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 10 13 1 0
+BITMAP
+0C00
+0C00
+1E00
+1600
+1300
+3300
+2300
+2180
+7F80
+4180
+C0C0
+C0C0
+C0C0
+ENDCHAR
+STARTCHAR B
+ENCODING 66
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 8 13 2 0
+BITMAP
+FE
+C7
+C3
+C3
+C3
+C6
+FC
+C6
+C3
+C3
+C3
+C7
+FE
+ENDCHAR
+STARTCHAR C
+ENCODING 67
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 9 13 1 0
+BITMAP
+1F00
+3180
+6000
+6000
+C000
+C000
+C000
+C000
+C000
+6000
+6000
+3180
+1F00
+ENDCHAR
+STARTCHAR D
+ENCODING 68
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 9 13 1 0
+BITMAP
+FC00
+C700
+C300
+C180
+C180
+C180
+C180
+C180
+C180
+C300
+C300
+CE00
+F800
+ENDCHAR
+STARTCHAR E
+ENCODING 69
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 8 13 2 0
+BITMAP
+FF
+C0
+C0
+C0
+C0
+C0
+FE
+C0
+C0
+C0
+C0
+C0
+FF
+ENDCHAR
+STARTCHAR F
+ENCODING 70
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 8 13 2 0
+BITMAP
+FF
+C0
+C0
+C0
+C0
+C0
+FE
+C0
+C0
+C0
+C0
+C0
+C0
+ENDCHAR
+STARTCHAR G
+ENCODING 71
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 9 13 1 0
+BITMAP
+1F00
+3180
+6000
+6000
+C000
+C000
+C000
+C180
+C180
+6180
+6180
+3180
+1F80
+ENDCHAR
+STARTCHAR H
+ENCODING 72
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 9 13 1 0
+BITMAP
+C180
+C180
+C180
+C180
+C180
+C180
+FF80
+C180
+C180
+C180
+C180
+C180
+C180
+ENDCHAR
+STARTCHAR I
+ENCODING 73
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 8 13 2 0
+BITMAP
+FF
+18
+18
+18
+18
+18
+18
+18
+18
+18
+18
+18
+FF
+ENDCHAR
+STARTCHAR J
+ENCODING 74
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 7 13 2 0
+BITMAP
+7E
+06
+06
+06
+06
+06
+06
+06
+06
+06
+86
+8C
+F0
+ENDCHAR
+STARTCHAR K
+ENCODING 75
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 10 13 1 0
+BITMAP
+C180
+C300
+C600
+CC00
+D800
+F000
+F000
+D800
+CC00
+C600
+C300
+C180
+C0C0
+ENDCHAR
+STARTCHAR L
+ENCODING 76
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 8 13 2 0
+BITMAP
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+FF
+ENDCHAR
+STARTCHAR M
+ENCODING 77
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 10 13 1 0
+BITMAP
+E0C0
+E1C0
+E1C0
+E1C0
+B2C0
+B2C0
+B2C0
+B2C0
+9CC0
+9CC0
+88C0
+88C0
+80C0
+ENDCHAR
+STARTCHAR N
+ENCODING 78
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 9 13 1 0
+BITMAP
+C080
+E080
+E080
+B080
+9880
+9880
+8C80
+8680
+8680
+8380
+8380
+8180
+8080
+ENDCHAR
+STARTCHAR O
+ENCODING 79
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 10 13 1 0
+BITMAP
+1E00
+3300
+6180
+6180
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+6180
+6180
+3300
+1E00
+ENDCHAR
+STARTCHAR P
+ENCODING 80
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 8 13 2 0
+BITMAP
+FE
+C7
+C3
+C3
+C3
+C3
+C6
+F8
+C0
+C0
+C0
+C0
+C0
+ENDCHAR
+STARTCHAR Q
+ENCODING 81
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 10 16 1 -3
+BITMAP
+1E00
+3300
+6180
+6180
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+6180
+6180
+3300
+1E00
+0600
+0380
+01C0
+ENDCHAR
+STARTCHAR R
+ENCODING 82
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 8 13 2 0
+BITMAP
+FC
+CE
+C6
+C6
+C6
+CC
+F0
+D8
+CC
+CC
+C6
+C3
+C3
+ENDCHAR
+STARTCHAR S
+ENCODING 83
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 8 13 2 0
+BITMAP
+3E
+63
+C0
+C0
+E0
+78
+1E
+07
+03
+03
+03
+C6
+7C
+ENDCHAR
+STARTCHAR T
+ENCODING 84
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 10 13 1 0
+BITMAP
+FFC0
+0C00
+0C00
+0C00
+0C00
+0C00
+0C00
+0C00
+0C00
+0C00
+0C00
+0C00
+0C00
+ENDCHAR
+STARTCHAR U
+ENCODING 85
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 9 13 1 0
+BITMAP
+C180
+C180
+C180
+C180
+C180
+C180
+C180
+C180
+C180
+C180
+6300
+7700
+1C00
+ENDCHAR
+STARTCHAR V
+ENCODING 86
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 10 13 1 0
+BITMAP
+C0C0
+C0C0
+C0C0
+6080
+6080
+6180
+3100
+3100
+3100
+1A00
+1A00
+0C00
+0C00
+ENDCHAR
+STARTCHAR W
+ENCODING 87
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 11 13 0 0
+BITMAP
+C020
+C020
+C620
+C660
+6640
+6740
+6F40
+6B40
+7BC0
+3B80
+3180
+3180
+3180
+ENDCHAR
+STARTCHAR X
+ENCODING 88
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 9 13 1 0
+BITMAP
+C180
+C180
+6180
+6300
+3200
+1C00
+1C00
+1C00
+2600
+6300
+C300
+C180
+C180
+ENDCHAR
+STARTCHAR Y
+ENCODING 89
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 10 13 1 0
+BITMAP
+C0C0
+C0C0
+6180
+3100
+3300
+1A00
+0C00
+0C00
+0C00
+0C00
+0C00
+0C00
+0C00
+ENDCHAR
+STARTCHAR Z
+ENCODING 90
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 9 13 1 0
+BITMAP
+FF80
+FF80
+0180
+0300
+0600
+0C00
+1800
+3000
+6000
+C000
+C000
+FF80
+FF80
+ENDCHAR
+STARTCHAR bracketleft
+ENCODING 91
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 6 16 3 -2
+BITMAP
+FC
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+FC
+ENDCHAR
+STARTCHAR backslash
+ENCODING 92
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 9 16 1 -2
+BITMAP
+8000
+C000
+4000
+6000
+2000
+3000
+1000
+1800
+0C00
+0400
+0600
+0200
+0300
+0100
+0180
+0080
+ENDCHAR
+STARTCHAR bracketright
+ENCODING 93
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 6 16 2 -2
+BITMAP
+FC
+0C
+0C
+0C
+0C
+0C
+0C
+0C
+0C
+0C
+0C
+0C
+0C
+0C
+0C
+FC
+ENDCHAR
+STARTCHAR asciicircum
+ENCODING 94
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 9 10 1 2
+BITMAP
+0800
+1C00
+1400
+3600
+2200
+6300
+6300
+C180
+C180
+C180
+ENDCHAR
+STARTCHAR underscore
+ENCODING 95
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 11 1 0 -1
+BITMAP
+FFE0
+ENDCHAR
+STARTCHAR grave
+ENCODING 96
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 3 5 4 9
+BITMAP
+60
+C0
+E0
+E0
+E0
+ENDCHAR
+STARTCHAR a
+ENCODING 97
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 9 10 1 0
+BITMAP
+3E00
+6700
+0300
+0300
+3F00
+6300
+C300
+C300
+E700
+7980
+ENDCHAR
+STARTCHAR b
+ENCODING 98
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 9 14 1 0
+BITMAP
+C000
+C000
+C000
+C000
+DC00
+E700
+C300
+C180
+C180
+C180
+C180
+C300
+E700
+DC00
+ENDCHAR
+STARTCHAR c
+ENCODING 99
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 9 10 1 0
+BITMAP
+1F00
+7180
+6000
+C000
+C000
+C000
+C000
+6000
+7180
+1F00
+ENDCHAR
+STARTCHAR d
+ENCODING 100
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 9 14 1 0
+BITMAP
+0180
+0180
+0180
+0180
+1D80
+7380
+6180
+C180
+C180
+C180
+C180
+6180
+7380
+1D80
+ENDCHAR
+STARTCHAR e
+ENCODING 101
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 9 10 1 0
+BITMAP
+3E00
+6300
+C180
+C180
+FF80
+C000
+C000
+E000
+7180
+3F00
+ENDCHAR
+STARTCHAR f
+ENCODING 102
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 9 14 1 0
+BITMAP
+0780
+0C00
+1800
+1800
+1800
+FF80
+1800
+1800
+1800
+1800
+1800
+1800
+1800
+1800
+ENDCHAR
+STARTCHAR g
+ENCODING 103
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 9 13 1 -3
+BITMAP
+1D80
+7380
+6180
+C180
+C180
+C180
+C180
+6380
+3D80
+0180
+0180
+6300
+3E00
+ENDCHAR
+STARTCHAR h
+ENCODING 104
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 8 14 2 0
+BITMAP
+C0
+C0
+C0
+C0
+DE
+E7
+C3
+C3
+C3
+C3
+C3
+C3
+C3
+C3
+ENDCHAR
+STARTCHAR i
+ENCODING 105
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 5 14 2 0
+BITMAP
+18
+18
+00
+00
+F8
+18
+18
+18
+18
+18
+18
+18
+18
+18
+ENDCHAR
+STARTCHAR j
+ENCODING 106
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 7 17 1 -3
+BITMAP
+06
+06
+00
+00
+3E
+06
+06
+06
+06
+06
+06
+06
+06
+06
+06
+0C
+F8
+ENDCHAR
+STARTCHAR k
+ENCODING 107
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 9 14 2 0
+BITMAP
+C000
+C000
+C000
+C000
+C300
+C600
+CC00
+D800
+F000
+D800
+CC00
+C600
+C300
+C180
+ENDCHAR
+STARTCHAR l
+ENCODING 108
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 5 14 2 0
+BITMAP
+F8
+18
+18
+18
+18
+18
+18
+18
+18
+18
+18
+18
+18
+18
+ENDCHAR
+STARTCHAR m
+ENCODING 109
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 10 10 1 0
+BITMAP
+DD80
+EEC0
+CCC0
+CCC0
+CCC0
+CCC0
+CCC0
+CCC0
+CCC0
+CCC0
+ENDCHAR
+STARTCHAR n
+ENCODING 110
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 8 10 2 0
+BITMAP
+DE
+E7
+C3
+C3
+C3
+C3
+C3
+C3
+C3
+C3
+ENDCHAR
+STARTCHAR o
+ENCODING 111
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 9 10 1 0
+BITMAP
+1C00
+7700
+6300
+C180
+C180
+C180
+C180
+6300
+7700
+1C00
+ENDCHAR
+STARTCHAR p
+ENCODING 112
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 9 13 1 -3
+BITMAP
+DC00
+E700
+C300
+C180
+C180
+C180
+C180
+C300
+E700
+DC00
+C000
+C000
+C000
+ENDCHAR
+STARTCHAR q
+ENCODING 113
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 9 13 1 -3
+BITMAP
+1D80
+7380
+6180
+C180
+C180
+C180
+C180
+6180
+7380
+1D80
+0180
+0180
+0180
+ENDCHAR
+STARTCHAR r
+ENCODING 114
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 7 10 3 0
+BITMAP
+CE
+DE
+E2
+C2
+C0
+C0
+C0
+C0
+C0
+C0
+ENDCHAR
+STARTCHAR s
+ENCODING 115
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 7 10 2 0
+BITMAP
+7C
+C6
+C0
+E0
+78
+3C
+0E
+06
+C6
+7C
+ENDCHAR
+STARTCHAR t
+ENCODING 116
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 9 12 1 0
+BITMAP
+1800
+1800
+1800
+FF80
+1800
+1800
+1800
+1800
+1800
+1800
+1800
+0F80
+ENDCHAR
+STARTCHAR u
+ENCODING 117
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 8 10 1 0
+BITMAP
+C3
+C3
+C3
+C3
+C3
+C3
+C3
+C3
+E7
+7B
+ENDCHAR
+STARTCHAR v
+ENCODING 118
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 8 10 2 0
+BITMAP
+C3
+C3
+C3
+62
+66
+66
+34
+34
+18
+18
+ENDCHAR
+STARTCHAR w
+ENCODING 119
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 10 10 1 0
+BITMAP
+C0C0
+CCC0
+CCC0
+CC80
+6E80
+6E80
+7780
+3700
+3300
+3300
+ENDCHAR
+STARTCHAR x
+ENCODING 120
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 8 10 2 0
+BITMAP
+C3
+C3
+66
+34
+38
+1C
+2C
+66
+C3
+C3
+ENDCHAR
+STARTCHAR y
+ENCODING 121
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 8 13 2 -3
+BITMAP
+C3
+C3
+C3
+62
+66
+66
+34
+3C
+18
+18
+10
+30
+30
+ENDCHAR
+STARTCHAR z
+ENCODING 122
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 8 10 2 0
+BITMAP
+FF
+03
+07
+0E
+1C
+38
+70
+E0
+C0
+FF
+ENDCHAR
+STARTCHAR braceleft
+ENCODING 123
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 8 16 2 -2
+BITMAP
+1F
+30
+30
+10
+18
+08
+08
+F0
+08
+08
+18
+10
+30
+30
+30
+1F
+ENDCHAR
+STARTCHAR bar
+ENCODING 124
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 2 16 5 -2
+BITMAP
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+ENDCHAR
+STARTCHAR braceright
+ENCODING 125
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 8 16 1 -2
+BITMAP
+F8
+0C
+0C
+08
+18
+10
+10
+0F
+10
+10
+18
+08
+0C
+0C
+0C
+F8
+ENDCHAR
+STARTCHAR asciitilde
+ENCODING 126
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 9 3 1 4
+BITMAP
+7080
+9C80
+8700
+ENDCHAR
+STARTCHAR vga127
+ENCODING 127
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 7 7 2 3
+BITMAP
+10
+38
+6C
+C6
+C6
+C6
+FE
+ENDCHAR
+STARTCHAR Ccedilla
+ENCODING 128
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 9 16 1 -3
+BITMAP
+1F00
+3180
+6000
+6000
+C000
+C000
+C000
+C000
+C000
+6000
+6000
+3180
+1F00
+0C00
+0600
+1C00
+ENDCHAR
+STARTCHAR udiaeresis
+ENCODING 129
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 8 13 1 0
+BITMAP
+24
+24
+00
+C3
+C3
+C3
+C3
+C3
+C3
+C3
+C3
+E7
+7B
+ENDCHAR
+STARTCHAR eacute
+ENCODING 130
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 9 13 1 0
+BITMAP
+0E00
+1800
+0000
+3E00
+6300
+C180
+C180
+FF80
+C000
+C000
+E000
+7180
+3F00
+ENDCHAR
+STARTCHAR acircumflex
+ENCODING 131
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 9 13 1 0
+BITMAP
+0C00
+1600
+0000
+3E00
+6700
+0300
+0300
+3F00
+6300
+C300
+C300
+E700
+7980
+ENDCHAR
+STARTCHAR adiaeresis
+ENCODING 132
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 9 13 1 0
+BITMAP
+1400
+1400
+0000
+3E00
+6700
+0300
+0300
+3F00
+6300
+C300
+C300
+E700
+7980
+ENDCHAR
+STARTCHAR agrave
+ENCODING 133
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 9 13 1 0
+BITMAP
+3800
+0C00
+0000
+3E00
+6700
+0300
+0300
+3F00
+6300
+C300
+C300
+E700
+7980
+ENDCHAR
+STARTCHAR aring
+ENCODING 134
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 9 13 1 0
+BITMAP
+0C00
+1200
+0C00
+3E00
+6700
+0300
+0300
+3F00
+6300
+C300
+C300
+E700
+7980
+ENDCHAR
+STARTCHAR ccedilla
+ENCODING 135
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 9 13 1 -3
+BITMAP
+1F00
+7180
+6000
+C000
+C000
+C000
+C000
+6000
+7180
+1F00
+0C00
+0600
+1C00
+ENDCHAR
+STARTCHAR ecircumflex
+ENCODING 136
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 9 13 1 0
+BITMAP
+0C00
+1600
+0000
+3E00
+6300
+C180
+C180
+FF80
+C000
+C000
+E000
+7180
+3F00
+ENDCHAR
+STARTCHAR ediaeresis
+ENCODING 137
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 9 13 1 0
+BITMAP
+1400
+1400
+0000
+3E00
+6300
+C180
+C180
+FF80
+C000
+C000
+E000
+7180
+3F00
+ENDCHAR
+STARTCHAR egrave
+ENCODING 138
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 9 13 1 0
+BITMAP
+3800
+0C00
+0000
+3E00
+6300
+C180
+C180
+FF80
+C000
+C000
+E000
+7180
+3F00
+ENDCHAR
+STARTCHAR idiaeresis
+ENCODING 139
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 6 13 1 0
+BITMAP
+24
+24
+00
+FC
+0C
+0C
+0C
+0C
+0C
+0C
+0C
+0C
+0C
+ENDCHAR
+STARTCHAR icircumflex
+ENCODING 140
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 6 13 2 0
+BITMAP
+18
+2C
+00
+F8
+18
+18
+18
+18
+18
+18
+18
+18
+18
+ENDCHAR
+STARTCHAR igrave
+ENCODING 141
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 5 13 2 0
+BITMAP
+70
+18
+00
+F8
+18
+18
+18
+18
+18
+18
+18
+18
+18
+ENDCHAR
+STARTCHAR Adiaeresis
+ENCODING 142
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 10 16 1 0
+BITMAP
+1200
+1200
+0000
+0C00
+0C00
+1E00
+1600
+1300
+3300
+2300
+2180
+7F80
+4180
+C0C0
+C0C0
+C0C0
+ENDCHAR
+STARTCHAR Aring
+ENCODING 143
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 10 15 1 0
+BITMAP
+0C00
+1200
+0C00
+0C00
+1E00
+1600
+1300
+3300
+2300
+2180
+7F80
+4180
+C0C0
+C0C0
+C0C0
+ENDCHAR
+STARTCHAR Eacute
+ENCODING 144
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 8 16 2 0
+BITMAP
+1C
+30
+00
+FF
+C0
+C0
+C0
+C0
+C0
+FE
+C0
+C0
+C0
+C0
+C0
+FF
+ENDCHAR
+STARTCHAR ae
+ENCODING 145
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 10 10 1 0
+BITMAP
+7B80
+CCC0
+0CC0
+0CC0
+7FC0
+CC00
+CC00
+CC00
+DEC0
+6380
+ENDCHAR
+STARTCHAR AE
+ENCODING 146
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 10 13 1 0
+BITMAP
+07C0
+0E00
+0E00
+1600
+1600
+2600
+27C0
+6600
+7E00
+4600
+C600
+C600
+C7C0
+ENDCHAR
+STARTCHAR ocircumflex
+ENCODING 147
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 9 13 1 0
+BITMAP
+0C00
+1600
+0000
+1C00
+7700
+6300
+C180
+C180
+C180
+C180
+6300
+7700
+1C00
+ENDCHAR
+STARTCHAR odiaeresis
+ENCODING 148
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 9 13 1 0
+BITMAP
+1400
+1400
+0000
+1C00
+7700
+6300
+C180
+C180
+C180
+C180
+6300
+7700
+1C00
+ENDCHAR
+STARTCHAR ograve
+ENCODING 149
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 9 13 1 0
+BITMAP
+3800
+0C00
+0000
+1C00
+7700
+6300
+C180
+C180
+C180
+C180
+6300
+7700
+1C00
+ENDCHAR
+STARTCHAR ucircumflex
+ENCODING 150
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 8 13 1 0
+BITMAP
+18
+2C
+00
+C3
+C3
+C3
+C3
+C3
+C3
+C3
+C3
+E7
+7B
+ENDCHAR
+STARTCHAR ugrave
+ENCODING 151
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 8 13 1 0
+BITMAP
+38
+0C
+00
+C3
+C3
+C3
+C3
+C3
+C3
+C3
+C3
+E7
+7B
+ENDCHAR
+STARTCHAR ydiaeresis
+ENCODING 152
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 8 16 2 -3
+BITMAP
+24
+24
+00
+C3
+C3
+C3
+62
+66
+66
+34
+3C
+18
+18
+10
+30
+30
+ENDCHAR
+STARTCHAR Odiaeresis
+ENCODING 153
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 10 16 1 0
+BITMAP
+1200
+1200
+0000
+1E00
+3300
+6180
+6180
+C0C0
+C0C0
+C0C0
+C0C0
+C0C0
+6180
+6180
+3300
+1E00
+ENDCHAR
+STARTCHAR Udiaeresis
+ENCODING 154
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 9 16 1 0
+BITMAP
+2200
+2200
+0000
+C180
+C180
+C180
+C180
+C180
+C180
+C180
+C180
+C180
+C180
+6300
+7700
+1C00
+ENDCHAR
+STARTCHAR cent
+ENCODING 155
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 8 14 2 -1
+BITMAP
+08
+08
+1E
+6B
+68
+C8
+C8
+C8
+C8
+C8
+6B
+3E
+08
+08
+ENDCHAR
+STARTCHAR sterling
+ENCODING 156
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 8 13 2 0
+BITMAP
+0E
+13
+30
+30
+30
+30
+FC
+30
+30
+20
+40
+FF
+FF
+ENDCHAR
+STARTCHAR yen
+ENCODING 157
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 10 13 1 0
+BITMAP
+C0C0
+C0C0
+6180
+3100
+3300
+1A00
+0C00
+3F00
+0C00
+3F00
+0C00
+0C00
+0C00
+ENDCHAR
+STARTCHAR vga158
+ENCODING 158
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 7 11 2 2
+BITMAP
+F8
+CC
+CC
+F8
+C4
+CC
+DE
+CC
+CC
+CC
+C6
+ENDCHAR
+STARTCHAR vga159
+ENCODING 159
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 8 13 2 0
+BITMAP
+0E
+1B
+18
+18
+18
+7E
+18
+18
+18
+18
+18
+D8
+70
+ENDCHAR
+STARTCHAR aacute
+ENCODING 160
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 9 13 1 0
+BITMAP
+0E00
+1800
+0000
+3E00
+6700
+0300
+0300
+3F00
+6300
+C300
+C300
+E700
+7980
+ENDCHAR
+STARTCHAR iacute
+ENCODING 161
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 6 13 2 0
+BITMAP
+1C
+30
+00
+F8
+18
+18
+18
+18
+18
+18
+18
+18
+18
+ENDCHAR
+STARTCHAR oacute
+ENCODING 162
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 9 13 1 0
+BITMAP
+0E00
+1800
+0000
+1C00
+7700
+6300
+C180
+C180
+C180
+C180
+6300
+7700
+1C00
+ENDCHAR
+STARTCHAR uacute
+ENCODING 163
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 8 13 1 0
+BITMAP
+0E
+18
+00
+C3
+C3
+C3
+C3
+C3
+C3
+C3
+C3
+E7
+7B
+ENDCHAR
+STARTCHAR vga164
+ENCODING 164
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 7 10 2 2
+BITMAP
+76
+DC
+00
+DC
+66
+66
+66
+66
+66
+66
+ENDCHAR
+STARTCHAR vga165
+ENCODING 165
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 7 12 2 2
+BITMAP
+76
+DC
+00
+C6
+E6
+F6
+FE
+DE
+CE
+C6
+C6
+C6
+ENDCHAR
+STARTCHAR vga166
+ENCODING 166
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 6 6 3 7
+BITMAP
+78
+D8
+D8
+7C
+00
+FC
+ENDCHAR
+STARTCHAR vga167
+ENCODING 167
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 5 6 3 7
+BITMAP
+70
+D8
+D8
+70
+00
+F8
+ENDCHAR
+STARTCHAR questiondown
+ENCODING 168
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 8 13 2 -3
+BITMAP
+0C
+0C
+00
+00
+0C
+0C
+0C
+18
+60
+C0
+C0
+E3
+7E
+ENDCHAR
+STARTCHAR hook
+ENCODING 169
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 9 4 1 3
+BITMAP
+FF80
+8000
+8000
+8000
+ENDCHAR
+STARTCHAR notsign
+ENCODING 170
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 9 4 1 3
+BITMAP
+FF80
+0080
+0080
+0080
+ENDCHAR
+STARTCHAR onehalf
+ENCODING 171
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 11 13 0 0
+BITMAP
+E100
+6100
+6200
+6200
+6400
+6400
+69C0
+0A60
+0860
+10C0
+1100
+23E0
+23E0
+ENDCHAR
+STARTCHAR onequarter
+ENCODING 172
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 11 13 0 0
+BITMAP
+E100
+6100
+6200
+6200
+6400
+6400
+68C0
+11C0
+12C0
+24C0
+27E0
+40C0
+40C0
+ENDCHAR
+STARTCHAR exclamdown
+ENCODING 173
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 2 13 5 -3
+BITMAP
+C0
+C0
+00
+00
+80
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+ENDCHAR
+STARTCHAR guillemotleft
+ENCODING 174
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 9 8 1 1
+BITMAP
+1980
+3300
+6600
+CC00
+CC00
+6600
+3300
+1980
+ENDCHAR
+STARTCHAR guillemotright
+ENCODING 175
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 9 8 1 1
+BITMAP
+CC00
+6600
+3300
+1980
+1980
+3300
+6600
+CC00
+ENDCHAR
+STARTCHAR raster1
+ENCODING 176
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 11 19 0 -3
+BITMAP
+8880
+0000
+2220
+0000
+8880
+0000
+2220
+0000
+8880
+0000
+2220
+0000
+8880
+0000
+2220
+0000
+8880
+0000
+2220
+ENDCHAR
+STARTCHAR raster2
+ENCODING 177
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 11 19 0 -3
+BITMAP
+AAA0
+5540
+AAA0
+5540
+AAA0
+5540
+AAA0
+5540
+AAA0
+5540
+AAA0
+5540
+AAA0
+5540
+AAA0
+5540
+AAA0
+5540
+AAA0
+ENDCHAR
+STARTCHAR raster3
+ENCODING 178
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 11 19 0 -3
+BITMAP
+7760
+FFE0
+DDC0
+FFE0
+7760
+FFE0
+DDC0
+FFE0
+7760
+FFE0
+DDC0
+FFE0
+7760
+FFE0
+DDC0
+FFE0
+7760
+FFE0
+DDC0
+ENDCHAR
+STARTCHAR udline
+ENCODING 179
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 1 19 5 -3
+BITMAP
+80
+80
+80
+80
+80
+80
+80
+80
+80
+80
+80
+80
+80
+80
+80
+80
+80
+80
+80
+ENDCHAR
+STARTCHAR udlline
+ENCODING 180
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 6 19 0 -3
+BITMAP
+04
+04
+04
+04
+04
+04
+04
+04
+04
+04
+FC
+04
+04
+04
+04
+04
+04
+04
+04
+ENDCHAR
+STARTCHAR udLline
+ENCODING 181
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 6 19 0 -3
+BITMAP
+04
+04
+04
+04
+04
+04
+04
+04
+04
+FC
+04
+FC
+04
+04
+04
+04
+04
+04
+04
+ENDCHAR
+STARTCHAR UDlline
+ENCODING 182
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 7 19 0 -3
+BITMAP
+0A
+0A
+0A
+0A
+0A
+0A
+0A
+0A
+0A
+0A
+FA
+0A
+0A
+0A
+0A
+0A
+0A
+0A
+0A
+ENDCHAR
+STARTCHAR Dlline
+ENCODING 183
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 7 9 0 -3
+BITMAP
+FE
+0A
+0A
+0A
+0A
+0A
+0A
+0A
+0A
+ENDCHAR
+STARTCHAR dLline
+ENCODING 184
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 6 10 0 -3
+BITMAP
+FC
+04
+FC
+04
+04
+04
+04
+04
+04
+04
+ENDCHAR
+STARTCHAR UDLline
+ENCODING 185
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 7 19 0 -3
+BITMAP
+0A
+0A
+0A
+0A
+0A
+0A
+0A
+0A
+0A
+FA
+0A
+FA
+0A
+0A
+0A
+0A
+0A
+0A
+0A
+ENDCHAR
+STARTCHAR UDline
+ENCODING 186
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 3 19 4 -3
+BITMAP
+A0
+A0
+A0
+A0
+A0
+A0
+A0
+A0
+A0
+A0
+A0
+A0
+A0
+A0
+A0
+A0
+A0
+A0
+A0
+ENDCHAR
+STARTCHAR DLline
+ENCODING 187
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 7 10 0 -3
+BITMAP
+FE
+02
+FA
+0A
+0A
+0A
+0A
+0A
+0A
+0A
+ENDCHAR
+STARTCHAR ULline
+ENCODING 188
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 7 12 0 4
+BITMAP
+0A
+0A
+0A
+0A
+0A
+0A
+0A
+0A
+0A
+FA
+02
+FE
+ENDCHAR
+STARTCHAR Ulline
+ENCODING 189
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 7 11 0 5
+BITMAP
+0A
+0A
+0A
+0A
+0A
+0A
+0A
+0A
+0A
+0A
+FE
+ENDCHAR
+STARTCHAR uLline
+ENCODING 190
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 6 12 0 4
+BITMAP
+04
+04
+04
+04
+04
+04
+04
+04
+04
+FC
+04
+FC
+ENDCHAR
+STARTCHAR dlline
+ENCODING 191
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 6 9 0 -3
+BITMAP
+FC
+04
+04
+04
+04
+04
+04
+04
+04
+ENDCHAR
+STARTCHAR urline
+ENCODING 192
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 6 11 5 5
+BITMAP
+80
+80
+80
+80
+80
+80
+80
+80
+80
+80
+FC
+ENDCHAR
+STARTCHAR urlline
+ENCODING 193
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 11 11 0 5
+BITMAP
+0400
+0400
+0400
+0400
+0400
+0400
+0400
+0400
+0400
+0400
+FFE0
+ENDCHAR
+STARTCHAR rdlline
+ENCODING 194
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 11 9 0 -3
+BITMAP
+FFE0
+0400
+0400
+0400
+0400
+0400
+0400
+0400
+0400
+ENDCHAR
+STARTCHAR urdline
+ENCODING 195
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 6 19 5 -3
+BITMAP
+80
+80
+80
+80
+80
+80
+80
+80
+80
+80
+FC
+80
+80
+80
+80
+80
+80
+80
+80
+ENDCHAR
+STARTCHAR rlline
+ENCODING 196
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 11 1 0 5
+BITMAP
+FFE0
+ENDCHAR
+STARTCHAR urdlline
+ENCODING 197
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 11 19 0 -3
+BITMAP
+0400
+0400
+0400
+0400
+0400
+0400
+0400
+0400
+0400
+0400
+FFE0
+0400
+0400
+0400
+0400
+0400
+0400
+0400
+0400
+ENDCHAR
+STARTCHAR uRdline
+ENCODING 198
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 6 19 5 -3
+BITMAP
+80
+80
+80
+80
+80
+80
+80
+80
+80
+FC
+80
+FC
+80
+80
+80
+80
+80
+80
+80
+ENDCHAR
+STARTCHAR UrDline
+ENCODING 199
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 7 19 4 -3
+BITMAP
+A0
+A0
+A0
+A0
+A0
+A0
+A0
+A0
+A0
+A0
+BE
+A0
+A0
+A0
+A0
+A0
+A0
+A0
+A0
+ENDCHAR
+STARTCHAR URline
+ENCODING 200
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 7 12 4 4
+BITMAP
+A0
+A0
+A0
+A0
+A0
+A0
+A0
+A0
+A0
+BE
+80
+FE
+ENDCHAR
+STARTCHAR RDline
+ENCODING 201
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 7 10 4 -3
+BITMAP
+FE
+80
+BE
+A0
+A0
+A0
+A0
+A0
+A0
+A0
+ENDCHAR
+STARTCHAR URLline
+ENCODING 202
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 11 12 0 4
+BITMAP
+0A00
+0A00
+0A00
+0A00
+0A00
+0A00
+0A00
+0A00
+0A00
+FBE0
+0000
+FFE0
+ENDCHAR
+STARTCHAR RDLline
+ENCODING 203
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 11 10 0 -3
+BITMAP
+FFE0
+0000
+FBE0
+0A00
+0A00
+0A00
+0A00
+0A00
+0A00
+0A00
+ENDCHAR
+STARTCHAR URDline
+ENCODING 204
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 7 19 4 -3
+BITMAP
+A0
+A0
+A0
+A0
+A0
+A0
+A0
+A0
+A0
+BE
+80
+BE
+A0
+A0
+A0
+A0
+A0
+A0
+A0
+ENDCHAR
+STARTCHAR RLline
+ENCODING 205
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 11 3 0 4
+BITMAP
+FFE0
+0000
+FFE0
+ENDCHAR
+STARTCHAR URDLline
+ENCODING 206
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 11 19 0 -3
+BITMAP
+0A00
+0A00
+0A00
+0A00
+0A00
+0A00
+0A00
+0A00
+0A00
+FBE0
+0000
+FBE0
+0A00
+0A00
+0A00
+0A00
+0A00
+0A00
+0A00
+ENDCHAR
+STARTCHAR uRLline
+ENCODING 207
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 11 12 0 4
+BITMAP
+0400
+0400
+0400
+0400
+0400
+0400
+0400
+0400
+0400
+FFE0
+0000
+FFE0
+ENDCHAR
+STARTCHAR Urlline
+ENCODING 208
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 11 11 0 5
+BITMAP
+0A00
+0A00
+0A00
+0A00
+0A00
+0A00
+0A00
+0A00
+0A00
+0A00
+FFE0
+ENDCHAR
+STARTCHAR RdLline
+ENCODING 209
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 11 10 0 -3
+BITMAP
+FFE0
+0000
+FFE0
+0400
+0400
+0400
+0400
+0400
+0400
+0400
+ENDCHAR
+STARTCHAR rDlline
+ENCODING 210
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 11 9 0 -3
+BITMAP
+FFE0
+0A00
+0A00
+0A00
+0A00
+0A00
+0A00
+0A00
+0A00
+ENDCHAR
+STARTCHAR Urline
+ENCODING 211
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 7 11 4 5
+BITMAP
+A0
+A0
+A0
+A0
+A0
+A0
+A0
+A0
+A0
+A0
+FE
+ENDCHAR
+STARTCHAR uRline
+ENCODING 212
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 6 12 5 4
+BITMAP
+80
+80
+80
+80
+80
+80
+80
+80
+80
+FC
+80
+FC
+ENDCHAR
+STARTCHAR Rdline
+ENCODING 213
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 6 10 5 -3
+BITMAP
+FC
+80
+FC
+80
+80
+80
+80
+80
+80
+80
+ENDCHAR
+STARTCHAR rDline
+ENCODING 214
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 7 9 4 -3
+BITMAP
+FE
+A0
+A0
+A0
+A0
+A0
+A0
+A0
+A0
+ENDCHAR
+STARTCHAR UrDlline
+ENCODING 215
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 11 19 0 -3
+BITMAP
+0A00
+0A00
+0A00
+0A00
+0A00
+0A00
+0A00
+0A00
+0A00
+0A00
+FFE0
+0A00
+0A00
+0A00
+0A00
+0A00
+0A00
+0A00
+0A00
+ENDCHAR
+STARTCHAR uRdLline
+ENCODING 216
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 11 19 0 -3
+BITMAP
+0400
+0400
+0400
+0400
+0400
+0400
+0400
+0400
+0400
+FFE0
+0400
+FFE0
+0400
+0400
+0400
+0400
+0400
+0400
+0400
+ENDCHAR
+STARTCHAR urline
+ENCODING 217
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 6 11 0 5
+BITMAP
+04
+04
+04
+04
+04
+04
+04
+04
+04
+04
+FC
+ENDCHAR
+STARTCHAR rdline
+ENCODING 218
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 6 9 5 -3
+BITMAP
+FC
+80
+80
+80
+80
+80
+80
+80
+80
+ENDCHAR
+STARTCHAR fullblock
+ENCODING 219
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 11 19 0 -3
+BITMAP
+FFE0
+FFE0
+FFE0
+FFE0
+FFE0
+FFE0
+FFE0
+FFE0
+FFE0
+FFE0
+FFE0
+FFE0
+FFE0
+FFE0
+FFE0
+FFE0
+FFE0
+FFE0
+FFE0
+ENDCHAR
+STARTCHAR bottomblock
+ENCODING 220
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 11 10 0 -3
+BITMAP
+FFE0
+FFE0
+FFE0
+FFE0
+FFE0
+FFE0
+FFE0
+FFE0
+FFE0
+FFE0
+ENDCHAR
+STARTCHAR leftblock
+ENCODING 221
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 6 19 0 -3
+BITMAP
+FC
+FC
+FC
+FC
+FC
+FC
+FC
+FC
+FC
+FC
+FC
+FC
+FC
+FC
+FC
+FC
+FC
+FC
+FC
+ENDCHAR
+STARTCHAR rightblock
+ENCODING 222
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 5 19 6 -3
+BITMAP
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+F8
+ENDCHAR
+STARTCHAR topblock
+ENCODING 223
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 11 10 0 6
+BITMAP
+FFE0
+FFE0
+FFE0
+FFE0
+FFE0
+FFE0
+FFE0
+FFE0
+FFE0
+FFE0
+ENDCHAR
+STARTCHAR vga224
+ENCODING 224
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 7 7 2 2
+BITMAP
+76
+DC
+D8
+D8
+D8
+DC
+76
+ENDCHAR
+STARTCHAR vga225
+ENCODING 225
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 7 10 2 2
+BITMAP
+78
+CC
+CC
+CC
+D8
+CC
+C6
+C6
+C6
+CC
+ENDCHAR
+STARTCHAR vga226
+ENCODING 226
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 7 10 2 2
+BITMAP
+FE
+C6
+C6
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+ENDCHAR
+STARTCHAR vga227
+ENCODING 227
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 7 8 2 2
+BITMAP
+FE
+6C
+6C
+6C
+6C
+6C
+6C
+6C
+ENDCHAR
+STARTCHAR vga228
+ENCODING 228
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 7 9 2 2
+BITMAP
+FE
+C6
+60
+30
+18
+30
+60
+C6
+FE
+ENDCHAR
+STARTCHAR vga229
+ENCODING 229
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 7 7 2 2
+BITMAP
+7E
+D8
+D8
+D8
+D8
+D8
+70
+ENDCHAR
+STARTCHAR vga230
+ENCODING 230
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 7 9 2 1
+BITMAP
+66
+66
+66
+66
+66
+7C
+60
+60
+C0
+ENDCHAR
+STARTCHAR vga231
+ENCODING 231
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 7 8 2 2
+BITMAP
+76
+DC
+18
+18
+18
+18
+18
+18
+ENDCHAR
+STARTCHAR vga232
+ENCODING 232
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 6 9 3 2
+BITMAP
+FC
+30
+78
+CC
+CC
+CC
+78
+30
+FC
+ENDCHAR
+STARTCHAR vga233
+ENCODING 233
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 7 9 2 2
+BITMAP
+38
+6C
+C6
+C6
+FE
+C6
+C6
+6C
+38
+ENDCHAR
+STARTCHAR vga234
+ENCODING 234
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 7 10 2 2
+BITMAP
+38
+6C
+C6
+C6
+C6
+6C
+6C
+6C
+6C
+EE
+ENDCHAR
+STARTCHAR vga235
+ENCODING 235
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 6 10 3 2
+BITMAP
+3C
+60
+30
+18
+7C
+CC
+CC
+CC
+CC
+78
+ENDCHAR
+STARTCHAR vga236
+ENCODING 236
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 8 5 2 4
+BITMAP
+7E
+DB
+DB
+DB
+7E
+ENDCHAR
+STARTCHAR vga237
+ENCODING 237
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 8 9 2 2
+BITMAP
+03
+06
+7E
+DB
+DB
+F3
+7E
+60
+C0
+ENDCHAR
+STARTCHAR vga238
+ENCODING 238
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 5 10 3 2
+BITMAP
+38
+60
+C0
+C0
+F8
+C0
+C0
+C0
+60
+38
+ENDCHAR
+STARTCHAR vga239
+ENCODING 239
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 7 9 2 2
+BITMAP
+7C
+C6
+C6
+C6
+C6
+C6
+C6
+C6
+C6
+ENDCHAR
+STARTCHAR isequal
+ENCODING 240
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 9 7 1 3
+BITMAP
+FF80
+0000
+0000
+FF80
+0000
+0000
+FF80
+ENDCHAR
+STARTCHAR plusminus
+ENCODING 241
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 9 8 1 2
+BITMAP
+0800
+0800
+0800
+FF80
+0800
+0800
+0000
+FF80
+ENDCHAR
+STARTCHAR vga242
+ENCODING 242
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 6 9 3 2
+BITMAP
+60
+30
+18
+0C
+18
+30
+60
+00
+FC
+ENDCHAR
+STARTCHAR vga243
+ENCODING 243
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 6 9 3 2
+BITMAP
+18
+30
+60
+C0
+60
+30
+18
+00
+FC
+ENDCHAR
+STARTCHAR vga244
+ENCODING 244
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 5 14 5 -2
+BITMAP
+70
+D8
+D8
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+C0
+ENDCHAR
+STARTCHAR vga245
+ENCODING 245
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 5 12 2 2
+BITMAP
+18
+18
+18
+18
+18
+18
+18
+18
+D8
+D8
+D8
+70
+ENDCHAR
+STARTCHAR division
+ENCODING 246
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 9 9 1 1
+BITMAP
+0800
+0800
+0000
+0000
+FF80
+0000
+0000
+0800
+0800
+ENDCHAR
+STARTCHAR vga247
+ENCODING 247
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 7 5 2 4
+BITMAP
+76
+DC
+00
+76
+DC
+ENDCHAR
+STARTCHAR degree
+ENCODING 248
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 5 5 3 9
+BITMAP
+70
+88
+88
+88
+70
+ENDCHAR
+STARTCHAR smalldot
+ENCODING 249
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 3 3 4 5
+BITMAP
+E0
+E0
+E0
+ENDCHAR
+STARTCHAR smallerdot
+ENCODING 250
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 1 1 4 6
+BITMAP
+80
+ENDCHAR
+STARTCHAR vga251
+ENCODING 251
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 8 11 2 2
+BITMAP
+0F
+0C
+0C
+0C
+0C
+0C
+EC
+6C
+6C
+3C
+1C
+ENDCHAR
+STARTCHAR vga252
+ENCODING 252
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 6 6 2 7
+BITMAP
+D8
+6C
+6C
+6C
+6C
+6C
+ENDCHAR
+STARTCHAR twosuperior
+ENCODING 253
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 7 8 2 5
+BITMAP
+7C
+C6
+06
+1C
+70
+C0
+FE
+FE
+ENDCHAR
+STARTCHAR bullet
+ENCODING 254
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 7 7 2 3
+BITMAP
+FE
+FE
+FE
+FE
+FE
+FE
+FE
+ENDCHAR
+STARTCHAR space255
+ENCODING 255
+SWIDTH 586 0
+DWIDTH 11 0
+BBX 1 1 10 -3
+BITMAP
+00
+ENDCHAR
+ENDFONT
Added: trunk/gui/mapgen.sh
===================================================================
--- trunk/gui/mapgen.sh (rev 0)
+++ trunk/gui/mapgen.sh 2008-10-24 13:12:13 UTC (rev 4651)
@@ -0,0 +1,21 @@
+#!/bin/bash
+# author: Steph Meslin-Weber
+# license: BSD
+# fontmap generator
+INFILE=$1
+HEX=( 0 1 2 3 4 5 6 7 8 9 A B C D E F )
+
+DATA=`cat $1|grep STARTCHAR|sed -e 's/STARTCHAR //g'`
+UNITS=0
+TENS=0
+
+for LINE in ${DATA}; do
+
+ echo ${LINE}=\\u00${HEX[TENS]}${HEX[UNITS]}
+
+ let "UNITS += 1"
+ if [[ ${UNITS} -gt 15 ]]; then
+ UNITS=0;
+ let "TENS += 1"
+ fi
+done
Modified: trunk/gui/src/awt/org/jnode/awt/font/bdf/BDFFontProvider.java
===================================================================
--- trunk/gui/src/awt/org/jnode/awt/font/bdf/BDFFontProvider.java 2008-10-24 09:17:47 UTC (rev 4650)
+++ trunk/gui/src/awt/org/jnode/awt/font/bdf/BDFFontProvider.java 2008-10-24 13:12:13 UTC (rev 4651)
@@ -60,7 +60,8 @@
* All system fonts
*/
private static final String SYSTEM_FONTS[] = {
- "Vera-10.bdf", "Vera-12.bdf", "Vera-14.bdf", "VeraMono-12-8.bdf", "6x12_FixedMedium-12.bdf"
+ "Vera-10.bdf", "Vera-12.bdf", "Vera-14.bdf", "VeraMono-12-8.bdf", "6x12_FixedMedium-12.bdf",
+ "VGAMedium-19.bdf"
};
private List<BDFFontContainer> containers;
Modified: trunk/gui/src/driver/org/jnode/driver/textscreen/fb/FbTextScreenManager.java
===================================================================
--- trunk/gui/src/driver/org/jnode/driver/textscreen/fb/FbTextScreenManager.java 2008-10-24 09:17:47 UTC (rev 4650)
+++ trunk/gui/src/driver/org/jnode/driver/textscreen/fb/FbTextScreenManager.java 2008-10-24 13:12:13 UTC (rev 4651)
@@ -25,6 +25,7 @@
import java.awt.Font;
import java.awt.Graphics;
import java.awt.Rectangle;
+import java.awt.FontMetrics;
import java.awt.geom.AffineTransform;
import java.awt.image.BufferedImage;
@@ -37,19 +38,32 @@
import org.jnode.driver.video.FrameBufferConfiguration;
import org.jnode.driver.video.Surface;
import org.jnode.driver.video.UnknownConfigurationException;
+import org.jnode.awt.font.FontManager;
+import org.jnode.naming.InitialNaming;
+import javax.naming.NamingException;
final class FbTextScreenManager implements TextScreenManager, FrameBufferAPIOwner {
/**
* The font to use for rendering characters in the console :
* it must be a mono spaced font (=a font with fixed width)
*/
- private static final Font FONT = new Font("-Misc-Fixed-Medium-R-SemiCondensed--12-110-75-75-C-60-437-",
+ private static final Font FONT_SMALL = new Font("-Misc-Fixed-Medium-R-SemiCondensed--12-110-75-75-C-60-437-",
Font.PLAIN, 12);
-
+ private static final Font FONT_LARGE = new Font("-dosemu-VGA-Medium-R-Normal--19-190-75-75-C-100-IBM-",
+ Font.PLAIN, 18);
+
private final FbTextScreen systemScreen;
private final Surface surface;
private FrameBufferConfiguration conf;
-
+
+ public FontManager getFontManager() {
+ try {
+ return InitialNaming.lookup(FontManager.NAME);
+ } catch (NamingException ex) {
+ return null;
+ }
+ }
+
/**
*
* @param g
@@ -62,15 +76,24 @@
FbTextScreenManager(FrameBufferAPI api, FrameBufferConfiguration conf)
throws UnknownConfigurationException, AlreadyOpenException, DeviceException {
+ final Font font = conf.getScreenWidth() > 800 ? FONT_LARGE : FONT_SMALL;
+ final FontMetrics fm = getFontManager().getFontMetrics(font);
+ final int w = fm.getMaxAdvance();
+ final int h = fm.getHeight();
+
+ final int nbColumns = 80;
+ final int nbRows = 25;
+
// compute x and y offsets to center the console in the screen
// FIXME for now it's only an approximation
- final int consoleWidth = 567;
- final int consoleHeight = 355;
+ //final int consoleWidth = 567;
+ final int consoleWidth = w * nbColumns;
+ //final int consoleHeight = 355;
+ final int consoleHeight = h * nbRows;
final int xOffset = (conf.getScreenWidth() - consoleWidth) / 2;
final int yOffset = (conf.getScreenHeight() - consoleHeight) / 2;
- BufferedImage bufferedImage = new BufferedImage(consoleWidth, consoleHeight,
- BufferedImage.TYPE_INT_ARGB);
+ BufferedImage bufferedImage = new BufferedImage(consoleWidth, consoleHeight, BufferedImage.TYPE_INT_ARGB);
Graphics graphics = bufferedImage.getGraphics();
//TODO wait for SurfaceGraphics2D implementation + textscreen supporting something else that 80x25
@@ -85,17 +108,14 @@
int nbRows = (height - 2 * MARGIN) / fontHeight;
Unsafe.debug("getWidth: width=" + width + " font.height=" + fontHeight + " result=" + nbRows);
*/
- final int nbColumns = 80;
- final int nbRows = 25;
-
- api.requestOwnership(this);
+ api.requestOwnership(this);
surface = api.open(conf);
this.conf = conf;
// initial painting of all the screen area
clearScreen();
- systemScreen = new FbTextScreen(surface, bufferedImage, graphics, FONT, nbColumns, nbRows, xOffset, yOffset);
+ systemScreen = new FbTextScreen(surface, bufferedImage, graphics, font, nbColumns, nbRows, xOffset, yOffset);
}
private final void clearScreen() {
Modified: trunk/gui/src/driver/org/jnode/driver/textscreen/swing/SwingPcTextScreen.java
===================================================================
--- trunk/gui/src/driver/org/jnode/driver/textscreen/swing/SwingPcTextScreen.java 2008-10-24 09:17:47 UTC (rev 4650)
+++ trunk/gui/src/driver/org/jnode/driver/textscreen/swing/SwingPcTextScreen.java 2008-10-24 13:12:13 UTC (rev 4651)
@@ -7,6 +7,7 @@
import java.awt.FontMetrics;
import java.awt.Graphics;
import java.awt.KeyboardFocusManager;
+import java.awt.Toolkit;
import java.awt.event.KeyAdapter;
import java.awt.event.KeyEvent;
import java.awt.event.MouseAdapter;
@@ -81,7 +82,13 @@
int h;
{
- Font font = new Font("-Misc-Fixed-Medium-R-SemiCondensed--12-110-75-75-C-60-437-", Font.PLAIN, 12);
+ Dimension screen_size = Toolkit.getDefaultToolkit().getScreenSize();
+
+ Font font = screen_size.width > 800 ?
+ new Font("-dosemu-VGA-Medium-R-Normal--19-190-75-75-C-100-IBM-", Font.PLAIN, 18) :
+ new Font("-Misc-Fixed-Medium-R-SemiCondensed--12-110-75-75-C-60-437-", Font.PLAIN, 12);
+
+// Font font = new Font("-Misc-Fixed-Medium-R-SemiCondensed--12-110-75-75-C-60-437-", Font.PLAIN, 12);
//Font font = new Font(
//"-FontForge-Bitstream Vera Sans Mono-Book-R-Normal-SansMono--12-120-75-75-P-69-ISO10646", Font.PLAIN, 12);
//Font font = new Font("-FontForge-Bitstream Vera Sans
Modified: trunk/gui/src/font/org/jnode/font/bdf/mappings.properties
===================================================================
--- trunk/gui/src/font/org/jnode/font/bdf/mappings.properties 2008-10-24 09:17:47 UTC (rev 4650)
+++ trunk/gui/src/font/org/jnode/font/bdf/mappings.properties 2008-10-24 13:12:13 UTC (rev 4651)
@@ -129,3 +129,262 @@
lfblock=\u00DD
rtblock=\u00DE
upblock=\u00DF
+#
+#
+# Generated mapping properties
+space0=\u0000
+vga1=\u0001
+vga2=\u0002
+vga3=\u0003
+vga4=\u0004
+vga5=\u0005
+vga6=\u0006
+vga7=\u0007
+vga8=\u0008
+vga9=\u0009
+vga10=\u000A
+vga11=\u000B
+vga12=\u000C
+vga13=\u000D
+vga14=\u000E
+vga15=\u000F
+righttriangle=\u0010
+lefttriangle=\u0011
+updownarrow=\u0012
+vga19=\u0013
+paragraph=\u0014
+section=\u0015
+vga22=\u0016
+vga23=\u0017
+uparrow=\u0018
+downarrow=\u0019
+vga26=\u001A
+vga27=\u001B
+vga28=\u001C
+vga29=\u001D
+vga30=\u001E
+vga31=\u001F
+#space=\u0020
+#exclam=\u0021
+#quotedbl=\u0022
+#numbersign=\u0023
+#dollar=\u0024
+#percent=\u0025
+#ampersand=\u0026
+apostrophe=\u0027
+#parenleft=\u0028
+#parenright=\u0029
+#asterisk=\u002A
+#plus=\u002B
+#comma=\u002C
+minus=\u002D
+#period=\u002E
+#slash=\u002F
+#zero=\u0030
+#one=\u0031
+#two=\u0032
+#three=\u0033
+#four=\u0034
+#five=\u0035
+#six=\u0036
+#seven=\u0037
+#eight=\u0038
+#nine=\u0039
+#colon=\u003A
+#semicolon=\u003B
+#less=\u003C
+#equal=\u003D
+#greater=\u003E
+#question=\u003F
+#at=\u0040
+A=\u0041
+B=\u0042
+C=\u0043
+D=\u0044
+E=\u0045
+F=\u0046
+G=\u0047
+H=\u0048
+I=\u0049
+J=\u004A
+K=\u004B
+L=\u004C
+M=\u004D
+N=\u004E
+O=\u004F
+P=\u0050
+Q=\u0051
+R=\u0052
+S=\u0053
+T=\u0054
+U=\u0055
+V=\u0056
+W=\u0057
+X=\u0058
+Y=\u0059
+Z=\u005A
+#bracketleft=\u005B
+#backslash=\u005C
+#bracketright=\u005D
+#asciicircum=\u005E
+#underscore=\u005F
+#grave=\u0060
+a=\u0061
+b=\u0062
+c=\u0063
+d=\u0064
+e=\u0065
+f=\u0066
+g=\u0067
+h=\u0068
+i=\u0069
+j=\u006A
+k=\u006B
+l=\u006C
+m=\u006D
+n=\u006E
+o=\u006F
+p=\u0070
+q=\u0071
+r=\u0072
+s=\u0073
+t=\u0074
+u=\u0075
+v=\u0076
+w=\u0077
+x=\u0078
+y=\u0079
+z=\u007A
+#braceleft=\u007B
+#bar=\u007C
+#braceright=\u007D
+#asciitilde=\u007E
+vga127=\u007F
+Ccedilla=\u0080
+udiaeresis=\u0081
+eacute=\u0082
+acircumflex=\u0083
+adiaeresis=\u0084
+agrave=\u0085
+aring=\u0086
+ccedilla=\u0087
+ecircumflex=\u0088
+ediaeresis=\u0089
+egrave=\u008A
+idiaeresis=\u008B
+icircumflex=\u008C
+igrave=\u008D
+Adiaeresis=\u008E
+Aring=\u008F
+Eacute=\u0090
+ae=\u0091
+AE=\u0092
+ocircumflex=\u0093
+odiaeresis=\u0094
+ograve=\u0095
+ucircumflex=\u0096
+ugrave=\u0097
+ydiaeresis=\u0098
+Odiaeresis=\u0099
+Udiaeresis=\u009A
+cent=\u009B
+sterling=\u009C
+yen=\u009D
+vga158=\u009E
+vga159=\u009F
+aacute=\u00A0
+iacute=\u00A1
+oacute=\u00A2
+uacute=\u00A3
+vga164=\u00A4
+vga165=\u00A5
+vga166=\u00A6
+vga167=\u00A7
+questiondown=\u00A8
+hook=\u00A9
+notsign=\u00AA
+onehalf=\u00AB
+onequarter=\u00AC
+exclamdown=\u00AD
+guillemotleft=\u00AE
+guillemotright=\u00AF
+raster1=\u00B0
+raster2=\u00B1
+raster3=\u00B2
+udline=\u00B3
+udlline=\u00B4
+udLline=\u00B5
+UDlline=\u00B6
+Dlline=\u00B7
+dLline=\u00B8
+UDLline=\u00B9
+UDline=\u00BA
+DLline=\u00BB
+ULline=\u00BC
+Ulline=\u00BD
+uLline=\u00BE
+dlline=\u00BF
+#urline=\u00C0
+urlline=\u00C1
+rdlline=\u00C2
+urdline=\u00C3
+rlline=\u00C4
+urdlline=\u00C5
+uRdline=\u00C6
+UrDline=\u00C7
+URline=\u00C8
+RDline=\u00C9
+URLline=\u00CA
+RDLline=\u00CB
+URDline=\u00CC
+RLline=\u00CD
+URDLline=\u00CE
+uRLline=\u00CF
+Urlline=\u00D0
+RdLline=\u00D1
+rDlline=\u00D2
+Urline=\u00D3
+uRline=\u00D4
+Rdline=\u00D5
+rDline=\u00D6
+UrDlline=\u00D7
+uRdLline=\u00D8
+urline=\u00D9
+rdline=\u00DA
+fullblock=\u00DB
+bottomblock=\u00DC
+leftblock=\u00DD
+rightblock=\u00DE
+topblock=\u00DF
+vga224=\u00E0
+vga225=\u00E1
+vga226=\u00E2
+vga227=\u00E3
+vga228=\u00E4
+vga229=\u00E5
+vga230=\u00E6
+vga231=\u00E7
+vga232=\u00E8
+vga233=\u00E9
+vga234=\u00EA
+vga235=\u00EB
+vga236=\u00EC
+vga237=\u00ED
+vga238=\u00EE
+vga239=\u00EF
+isequal=\u00F0
+plusminus=\u00F1
+vga242=\u00F2
+vga243=\u00F3
+vga244=\u00F4
+vga245=\u00F5
+division=\u00F6
+vga247=\u00F7
+degree=\u00F8
+smalldot=\u00F9
+smallerdot=\u00FA
+vga251=\u00FB
+vga252=\u00FC
+twosuperior=\u00FD
+bullet=\u00FE
+space255=\u00FF
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ls...@us...> - 2013-02-24 17:17:13
|
Revision: 5981
http://jnode.svn.sourceforge.net/jnode/?rev=5981&view=rev
Author: lsantha
Date: 2013-02-24 17:17:05 +0000 (Sun, 24 Feb 2013)
Log Message:
-----------
Updated headers.
Modified Paths:
--------------
trunk/gui/build.xml
trunk/gui/descriptors/org.jnode.awt.command.xml
trunk/gui/descriptors/org.jnode.awt.font.bdf.xml
trunk/gui/descriptors/org.jnode.awt.font.truetype.xml
trunk/gui/descriptors/org.jnode.awt.font.xml
trunk/gui/descriptors/org.jnode.awt.swingpeers.xml
trunk/gui/descriptors/org.jnode.awt.xml
trunk/gui/descriptors/org.jnode.desktop.xml
trunk/gui/descriptors/org.jnode.driver.console.swing.xml
trunk/gui/descriptors/org.jnode.driver.input.usb.xml
trunk/gui/descriptors/org.jnode.driver.ps2.xml
trunk/gui/descriptors/org.jnode.driver.sound.command.xml
trunk/gui/descriptors/org.jnode.driver.sound.speaker.pc.xml
trunk/gui/descriptors/org.jnode.driver.sound.speaker.xml
trunk/gui/descriptors/org.jnode.driver.textscreen.fb.xml
trunk/gui/descriptors/org.jnode.driver.textscreen.swing.xml
trunk/gui/descriptors/org.jnode.driver.video.ati.mach64.xml
trunk/gui/descriptors/org.jnode.driver.video.ati.radeon.xml
trunk/gui/descriptors/org.jnode.driver.video.cirrus.xml
trunk/gui/descriptors/org.jnode.driver.video.cursor.xml
trunk/gui/descriptors/org.jnode.driver.video.nvidia.xml
trunk/gui/descriptors/org.jnode.driver.video.vesa.xml
trunk/gui/descriptors/org.jnode.driver.video.vga.xml
trunk/gui/descriptors/org.jnode.driver.video.vgahw.xml
trunk/gui/descriptors/org.jnode.driver.video.vmware.xml
trunk/gui/descriptors/org.jnode.driver.video.xml
trunk/gui/descriptors/org.jnode.font.bdf.xml
trunk/gui/descriptors/org.jnode.test.gui.xml
trunk/gui/descriptors/thinlet.xml
Modified: trunk/gui/build.xml
===================================================================
--- trunk/gui/build.xml 2013-02-24 17:13:39 UTC (rev 5980)
+++ trunk/gui/build.xml 2013-02-24 17:17:05 UTC (rev 5981)
@@ -1,3 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ $Id$
+
+ Copyright (C) 2003-2013 JNode.org
+
+ This library is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as published
+ by the Free Software Foundation; either version 2.1 of the License, or
+ (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+ License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; If not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+-->
<project name="JNode-GUI" default="all" basedir=".">
<typedef file="${basedir}/../all/lib/jnode.xml"/>
Modified: trunk/gui/descriptors/org.jnode.awt.command.xml
===================================================================
--- trunk/gui/descriptors/org.jnode.awt.command.xml 2013-02-24 17:13:39 UTC (rev 5980)
+++ trunk/gui/descriptors/org.jnode.awt.command.xml 2013-02-24 17:17:05 UTC (rev 5981)
@@ -1,4 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ $Id$
+
+ Copyright (C) 2003-2013 JNode.org
+
+ This library is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as published
+ by the Free Software Foundation; either version 2.1 of the License, or
+ (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+ License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; If not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+-->
<!DOCTYPE plugin SYSTEM "jnode.dtd">
<plugin id="org.jnode.awt.command"
Modified: trunk/gui/descriptors/org.jnode.awt.font.bdf.xml
===================================================================
--- trunk/gui/descriptors/org.jnode.awt.font.bdf.xml 2013-02-24 17:13:39 UTC (rev 5980)
+++ trunk/gui/descriptors/org.jnode.awt.font.bdf.xml 2013-02-24 17:17:05 UTC (rev 5981)
@@ -1,4 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ $Id$
+
+ Copyright (C) 2003-2013 JNode.org
+
+ This library is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as published
+ by the Free Software Foundation; either version 2.1 of the License, or
+ (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+ License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; If not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+-->
<!DOCTYPE plugin SYSTEM "jnode.dtd">
<fragment id="org.jnode.awt.font.bdf"
@@ -33,4 +52,4 @@
<permission class="java.util.PropertyPermission" name="jnode.font.renderer" actions="read"/>
</extension>
-</fragment>
\ No newline at end of file
+</fragment>
Modified: trunk/gui/descriptors/org.jnode.awt.font.truetype.xml
===================================================================
--- trunk/gui/descriptors/org.jnode.awt.font.truetype.xml 2013-02-24 17:13:39 UTC (rev 5980)
+++ trunk/gui/descriptors/org.jnode.awt.font.truetype.xml 2013-02-24 17:17:05 UTC (rev 5981)
@@ -1,4 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ $Id$
+
+ Copyright (C) 2003-2013 JNode.org
+
+ This library is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as published
+ by the Free Software Foundation; either version 2.1 of the License, or
+ (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+ License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; If not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+-->
<!DOCTYPE plugin SYSTEM "jnode.dtd">
<fragment id="org.jnode.awt.font.truetype"
@@ -28,4 +47,4 @@
<permission class="java.lang.reflect.ReflectPermission" name="suppressAccessChecks"/>
<permission class="java.util.PropertyPermission" name="jnode.font.renderer" actions="read"/>
</extension>
-</fragment>
\ No newline at end of file
+</fragment>
Modified: trunk/gui/descriptors/org.jnode.awt.font.xml
===================================================================
--- trunk/gui/descriptors/org.jnode.awt.font.xml 2013-02-24 17:13:39 UTC (rev 5980)
+++ trunk/gui/descriptors/org.jnode.awt.font.xml 2013-02-24 17:17:05 UTC (rev 5981)
@@ -1,4 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ $Id$
+
+ Copyright (C) 2003-2013 JNode.org
+
+ This library is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as published
+ by the Free Software Foundation; either version 2.1 of the License, or
+ (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+ License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; If not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+-->
<!DOCTYPE plugin SYSTEM "jnode.dtd">
<plugin id="org.jnode.awt.font"
@@ -30,4 +49,4 @@
</runtime>
<extension-point id="providers" name="JNode Font Providers"/>
-</plugin>
\ No newline at end of file
+</plugin>
Modified: trunk/gui/descriptors/org.jnode.awt.swingpeers.xml
===================================================================
--- trunk/gui/descriptors/org.jnode.awt.swingpeers.xml 2013-02-24 17:13:39 UTC (rev 5980)
+++ trunk/gui/descriptors/org.jnode.awt.swingpeers.xml 2013-02-24 17:17:05 UTC (rev 5981)
@@ -1,4 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ $Id$
+
+ Copyright (C) 2003-2013 JNode.org
+
+ This library is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as published
+ by the Free Software Foundation; either version 2.1 of the License, or
+ (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+ License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; If not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+-->
<!DOCTYPE plugin SYSTEM "jnode.dtd">
<plugin id="org.jnode.awt.swingpeers"
@@ -24,4 +43,4 @@
<permission class="java.util.PropertyPermission" name="gnu.javax.swing.DebugGraphics" actions="read"/>
</extension>
-</plugin>
\ No newline at end of file
+</plugin>
Modified: trunk/gui/descriptors/org.jnode.awt.xml
===================================================================
--- trunk/gui/descriptors/org.jnode.awt.xml 2013-02-24 17:13:39 UTC (rev 5980)
+++ trunk/gui/descriptors/org.jnode.awt.xml 2013-02-24 17:17:05 UTC (rev 5981)
@@ -1,4 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ $Id$
+
+ Copyright (C) 2003-2013 JNode.org
+
+ This library is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as published
+ by the Free Software Foundation; either version 2.1 of the License, or
+ (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+ License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; If not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+-->
<!DOCTYPE plugin SYSTEM "jnode.dtd">
<plugin id="org.jnode.awt"
@@ -32,4 +51,4 @@
<permission class="java.util.PropertyPermission" name="gnu.javax.swing.DebugGraphics" actions="read"/>
</extension>
-</plugin>
\ No newline at end of file
+</plugin>
Modified: trunk/gui/descriptors/org.jnode.desktop.xml
===================================================================
--- trunk/gui/descriptors/org.jnode.desktop.xml 2013-02-24 17:13:39 UTC (rev 5980)
+++ trunk/gui/descriptors/org.jnode.desktop.xml 2013-02-24 17:17:05 UTC (rev 5981)
@@ -1,4 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ $Id$
+
+ Copyright (C) 2003-2013 JNode.org
+
+ This library is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as published
+ by the Free Software Foundation; either version 2.1 of the License, or
+ (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+ License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; If not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+-->
<!DOCTYPE plugin SYSTEM "jnode.dtd">
<plugin id="org.jnode.desktop"
@@ -42,4 +61,4 @@
<permission class="java.awt.AWTPermission" name="setWindowAlwaysOnTop" />
</extension>
-</plugin>
\ No newline at end of file
+</plugin>
Modified: trunk/gui/descriptors/org.jnode.driver.console.swing.xml
===================================================================
--- trunk/gui/descriptors/org.jnode.driver.console.swing.xml 2013-02-24 17:13:39 UTC (rev 5980)
+++ trunk/gui/descriptors/org.jnode.driver.console.swing.xml 2013-02-24 17:17:05 UTC (rev 5981)
@@ -1,4 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ $Id$
+
+ Copyright (C) 2003-2013 JNode.org
+
+ This library is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as published
+ by the Free Software Foundation; either version 2.1 of the License, or
+ (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+ License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; If not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+-->
<!DOCTYPE plugin SYSTEM "jnode.dtd">
<plugin id="org.jnode.driver.console.swing"
@@ -28,4 +47,4 @@
<permission class="java.awt.AWTPermission" name="listenToAllAWTEvents"/>
<permission class="java.lang.RuntimePermission" name="exitVM"/>
</extension>
-</plugin>
\ No newline at end of file
+</plugin>
Modified: trunk/gui/descriptors/org.jnode.driver.input.usb.xml
===================================================================
--- trunk/gui/descriptors/org.jnode.driver.input.usb.xml 2013-02-24 17:13:39 UTC (rev 5980)
+++ trunk/gui/descriptors/org.jnode.driver.input.usb.xml 2013-02-24 17:17:05 UTC (rev 5981)
@@ -1,4 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ $Id$
+
+ Copyright (C) 2003-2013 JNode.org
+
+ This library is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as published
+ by the Free Software Foundation; either version 2.1 of the License, or
+ (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+ License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; If not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+-->
<!DOCTYPE plugin SYSTEM "jnode.dtd">
<plugin id="org.jnode.driver.input.usb"
Modified: trunk/gui/descriptors/org.jnode.driver.ps2.xml
===================================================================
--- trunk/gui/descriptors/org.jnode.driver.ps2.xml 2013-02-24 17:13:39 UTC (rev 5980)
+++ trunk/gui/descriptors/org.jnode.driver.ps2.xml 2013-02-24 17:17:05 UTC (rev 5981)
@@ -1,4 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ $Id$
+
+ Copyright (C) 2003-2013 JNode.org
+
+ This library is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as published
+ by the Free Software Foundation; either version 2.1 of the License, or
+ (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+ License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; If not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+-->
<!DOCTYPE plugin SYSTEM "jnode.dtd">
<plugin id="org.jnode.driver.ps2"
Modified: trunk/gui/descriptors/org.jnode.driver.sound.command.xml
===================================================================
--- trunk/gui/descriptors/org.jnode.driver.sound.command.xml 2013-02-24 17:13:39 UTC (rev 5980)
+++ trunk/gui/descriptors/org.jnode.driver.sound.command.xml 2013-02-24 17:17:05 UTC (rev 5981)
@@ -1,4 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ $Id$
+
+ Copyright (C) 2003-2013 JNode.org
+
+ This library is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as published
+ by the Free Software Foundation; either version 2.1 of the License, or
+ (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+ License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; If not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+-->
<!DOCTYPE plugin SYSTEM "jnode.dtd">
<plugin id="org.jnode.driver.sound.command"
Modified: trunk/gui/descriptors/org.jnode.driver.sound.speaker.pc.xml
===================================================================
--- trunk/gui/descriptors/org.jnode.driver.sound.speaker.pc.xml 2013-02-24 17:13:39 UTC (rev 5980)
+++ trunk/gui/descriptors/org.jnode.driver.sound.speaker.pc.xml 2013-02-24 17:17:05 UTC (rev 5981)
@@ -1,4 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ $Id$
+
+ Copyright (C) 2003-2013 JNode.org
+
+ This library is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as published
+ by the Free Software Foundation; either version 2.1 of the License, or
+ (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+ License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; If not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+-->
<!DOCTYPE plugin SYSTEM "jnode.dtd">
<plugin id="org.jnode.driver.sound.speaker.pc"
Modified: trunk/gui/descriptors/org.jnode.driver.sound.speaker.xml
===================================================================
--- trunk/gui/descriptors/org.jnode.driver.sound.speaker.xml 2013-02-24 17:13:39 UTC (rev 5980)
+++ trunk/gui/descriptors/org.jnode.driver.sound.speaker.xml 2013-02-24 17:17:05 UTC (rev 5981)
@@ -1,4 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ $Id$
+
+ Copyright (C) 2003-2013 JNode.org
+
+ This library is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as published
+ by the Free Software Foundation; either version 2.1 of the License, or
+ (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+ License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; If not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+-->
<!DOCTYPE plugin SYSTEM "jnode.dtd">
<plugin id="org.jnode.driver.sound.speaker"
Modified: trunk/gui/descriptors/org.jnode.driver.textscreen.fb.xml
===================================================================
--- trunk/gui/descriptors/org.jnode.driver.textscreen.fb.xml 2013-02-24 17:13:39 UTC (rev 5980)
+++ trunk/gui/descriptors/org.jnode.driver.textscreen.fb.xml 2013-02-24 17:17:05 UTC (rev 5981)
@@ -1,4 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ $Id$
+
+ Copyright (C) 2003-2013 JNode.org
+
+ This library is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as published
+ by the Free Software Foundation; either version 2.1 of the License, or
+ (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+ License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; If not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+-->
<!DOCTYPE plugin SYSTEM "jnode.dtd">
<plugin id="org.jnode.driver.textscreen.fb"
@@ -31,4 +50,4 @@
<permission class="java.security.AllPermission" />
</extension>
-</plugin>
\ No newline at end of file
+</plugin>
Modified: trunk/gui/descriptors/org.jnode.driver.textscreen.swing.xml
===================================================================
--- trunk/gui/descriptors/org.jnode.driver.textscreen.swing.xml 2013-02-24 17:13:39 UTC (rev 5980)
+++ trunk/gui/descriptors/org.jnode.driver.textscreen.swing.xml 2013-02-24 17:17:05 UTC (rev 5981)
@@ -1,4 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ $Id$
+
+ Copyright (C) 2003-2013 JNode.org
+
+ This library is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as published
+ by the Free Software Foundation; either version 2.1 of the License, or
+ (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+ License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; If not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+-->
<!DOCTYPE plugin SYSTEM "jnode.dtd">
<plugin id="org.jnode.driver.textscreen.swing"
@@ -22,4 +41,4 @@
<permission class="java.util.PropertyPermission" name="gnu.awt.dispatchthread.priority" actions="read"/>
<permission class="java.awt.AWTPermission" name="listenToAllAWTEvents"/>
</extension>
-</plugin>
\ No newline at end of file
+</plugin>
Modified: trunk/gui/descriptors/org.jnode.driver.video.ati.mach64.xml
===================================================================
--- trunk/gui/descriptors/org.jnode.driver.video.ati.mach64.xml 2013-02-24 17:13:39 UTC (rev 5980)
+++ trunk/gui/descriptors/org.jnode.driver.video.ati.mach64.xml 2013-02-24 17:17:05 UTC (rev 5981)
@@ -1,4 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ $Id$
+
+ Copyright (C) 2003-2013 JNode.org
+
+ This library is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as published
+ by the Free Software Foundation; either version 2.1 of the License, or
+ (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+ License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; If not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+-->
<!DOCTYPE plugin SYSTEM "jnode.dtd">
<plugin id="org.jnode.driver.video.ati.mach64"
@@ -28,4 +47,4 @@
<mapper id="1002:4755" name="3D RAGE II+ (GTB)" driver-class="org.jnode.driver.video.ati.mach64.Mach64Driver" class="org.jnode.driver.bus.pci.PCIDeviceToDriverMapper"/>
</extension>
-</plugin>
\ No newline at end of file
+</plugin>
Modified: trunk/gui/descriptors/org.jnode.driver.video.ati.radeon.xml
===================================================================
--- trunk/gui/descriptors/org.jnode.driver.video.ati.radeon.xml 2013-02-24 17:13:39 UTC (rev 5980)
+++ trunk/gui/descriptors/org.jnode.driver.video.ati.radeon.xml 2013-02-24 17:17:05 UTC (rev 5981)
@@ -1,4 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ $Id$
+
+ Copyright (C) 2003-2013 JNode.org
+
+ This library is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as published
+ by the Free Software Foundation; either version 2.1 of the License, or
+ (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+ License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; If not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+-->
<!DOCTYPE plugin SYSTEM "jnode.dtd">
<plugin id="org.jnode.driver.video.ati.radeon"
@@ -33,4 +52,4 @@
-->
</extension>
-</plugin>
\ No newline at end of file
+</plugin>
Modified: trunk/gui/descriptors/org.jnode.driver.video.cirrus.xml
===================================================================
--- trunk/gui/descriptors/org.jnode.driver.video.cirrus.xml 2013-02-24 17:13:39 UTC (rev 5980)
+++ trunk/gui/descriptors/org.jnode.driver.video.cirrus.xml 2013-02-24 17:17:05 UTC (rev 5981)
@@ -1,4 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ $Id$
+
+ Copyright (C) 2003-2013 JNode.org
+
+ This library is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as published
+ by the Free Software Foundation; either version 2.1 of the License, or
+ (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+ License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; If not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+-->
<!DOCTYPE plugin SYSTEM "jnode.dtd">
<plugin id="org.jnode.driver.video.cirrus"
Modified: trunk/gui/descriptors/org.jnode.driver.video.cursor.xml
===================================================================
--- trunk/gui/descriptors/org.jnode.driver.video.cursor.xml 2013-02-24 17:13:39 UTC (rev 5980)
+++ trunk/gui/descriptors/org.jnode.driver.video.cursor.xml 2013-02-24 17:17:05 UTC (rev 5981)
@@ -1,4 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ $Id$
+
+ Copyright (C) 2003-2013 JNode.org
+
+ This library is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as published
+ by the Free Software Foundation; either version 2.1 of the License, or
+ (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+ License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; If not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+-->
<!DOCTYPE plugin SYSTEM "jnode.dtd">
<plugin id="org.jnode.driver.video.cursor"
@@ -18,4 +37,4 @@
</library>
</runtime>
-</plugin>
\ No newline at end of file
+</plugin>
Modified: trunk/gui/descriptors/org.jnode.driver.video.nvidia.xml
===================================================================
--- trunk/gui/descriptors/org.jnode.driver.video.nvidia.xml 2013-02-24 17:13:39 UTC (rev 5980)
+++ trunk/gui/descriptors/org.jnode.driver.video.nvidia.xml 2013-02-24 17:17:05 UTC (rev 5981)
@@ -1,4 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ $Id$
+
+ Copyright (C) 2003-2013 JNode.org
+
+ This library is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as published
+ by the Free Software Foundation; either version 2.1 of the License, or
+ (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+ License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; If not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+-->
<!DOCTYPE plugin SYSTEM "jnode.dtd">
<plugin id="org.jnode.driver.video.nvidia"
@@ -37,4 +56,4 @@
<mapper id="10de:0286" architecture="NV28M" name="GeForce4 4200 Go" driver-class="org.jnode.driver.video.nvidia.NVidiaDriver" class="org.jnode.driver.bus.pci.PCIDeviceToDriverMapper"/>
</extension>
-</plugin>
\ No newline at end of file
+</plugin>
Modified: trunk/gui/descriptors/org.jnode.driver.video.vesa.xml
===================================================================
--- trunk/gui/descriptors/org.jnode.driver.video.vesa.xml 2013-02-24 17:13:39 UTC (rev 5980)
+++ trunk/gui/descriptors/org.jnode.driver.video.vesa.xml 2013-02-24 17:17:05 UTC (rev 5981)
@@ -1,35 +1,54 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plugin SYSTEM "jnode.dtd">
-
-<plugin id="org.jnode.driver.video.vesa"
- name="JNode Video VESA driver"
- version="@VERSION@"
- license-name="lgpl"
- provider-name="JNode.org">
-
- <requires>
- <import plugin="org.jnode.driver.bus.pci"/>
- <import plugin="org.jnode.driver.video"/>
- <import plugin="org.jnode.awt"/>
- <import plugin="org.jnode.driver.video.cursor"/>
- </requires>
-
- <runtime>
- <library name="jnode-gui.jar">
- <export name="org.jnode.driver.video.vesa.*"/>
- </library>
- </runtime>
-
- <extension point="org.jnode.driver.mappers">
- <mapper class="org.jnode.driver.video.vesa.VESADeviceToDriverMapper"/>
- </extension>
-
- <extension point="org.jnode.security.permissions">
- <permission class="org.jnode.system.resource.ResourcePermission" name="ioports"/>
- </extension>
-
- <extension point="org.jnode.shell.aliases">
- <alias name="vesa" class="org.jnode.driver.video.vesa.VESACommand"/>
- </extension>
-
-</plugin>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ $Id$
+
+ Copyright (C) 2003-2013 JNode.org
+
+ This library is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as published
+ by the Free Software Foundation; either version 2.1 of the License, or
+ (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+ License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; If not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+-->
+<!DOCTYPE plugin SYSTEM "jnode.dtd">
+
+<plugin id="org.jnode.driver.video.vesa"
+ name="JNode Video VESA driver"
+ version="@VERSION@"
+ license-name="lgpl"
+ provider-name="JNode.org">
+
+ <requires>
+ <import plugin="org.jnode.driver.bus.pci"/>
+ <import plugin="org.jnode.driver.video"/>
+ <import plugin="org.jnode.awt"/>
+ <import plugin="org.jnode.driver.video.cursor"/>
+ </requires>
+
+ <runtime>
+ <library name="jnode-gui.jar">
+ <export name="org.jnode.driver.video.vesa.*"/>
+ </library>
+ </runtime>
+
+ <extension point="org.jnode.driver.mappers">
+ <mapper class="org.jnode.driver.video.vesa.VESADeviceToDriverMapper"/>
+ </extension>
+
+ <extension point="org.jnode.security.permissions">
+ <permission class="org.jnode.system.resource.ResourcePermission" name="ioports"/>
+ </extension>
+
+ <extension point="org.jnode.shell.aliases">
+ <alias name="vesa" class="org.jnode.driver.video.vesa.VESACommand"/>
+ </extension>
+
+</plugin>
Modified: trunk/gui/descriptors/org.jnode.driver.video.vga.xml
===================================================================
--- trunk/gui/descriptors/org.jnode.driver.video.vga.xml 2013-02-24 17:13:39 UTC (rev 5980)
+++ trunk/gui/descriptors/org.jnode.driver.video.vga.xml 2013-02-24 17:17:05 UTC (rev 5981)
@@ -1,4 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ $Id$
+
+ Copyright (C) 2003-2013 JNode.org
+
+ This library is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as published
+ by the Free Software Foundation; either version 2.1 of the License, or
+ (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+ License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; If not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+-->
<!DOCTYPE plugin SYSTEM "jnode.dtd">
<plugin id="org.jnode.driver.video.vga"
@@ -33,4 +52,4 @@
<permission class="org.jnode.system.resource.ResourcePermission" name="ioports"/>
</extension>
-</plugin>
\ No newline at end of file
+</plugin>
Modified: trunk/gui/descriptors/org.jnode.driver.video.vgahw.xml
===================================================================
--- trunk/gui/descriptors/org.jnode.driver.video.vgahw.xml 2013-02-24 17:13:39 UTC (rev 5980)
+++ trunk/gui/descriptors/org.jnode.driver.video.vgahw.xml 2013-02-24 17:17:05 UTC (rev 5981)
@@ -1,4 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ $Id$
+
+ Copyright (C) 2003-2013 JNode.org
+
+ This library is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as published
+ by the Free Software Foundation; either version 2.1 of the License, or
+ (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+ License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; If not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+-->
<!DOCTYPE plugin SYSTEM "jnode.dtd">
<plugin id="org.jnode.driver.video.vgahw"
@@ -17,4 +36,4 @@
</library>
</runtime>
-</plugin>
\ No newline at end of file
+</plugin>
Modified: trunk/gui/descriptors/org.jnode.driver.video.vmware.xml
===================================================================
--- trunk/gui/descriptors/org.jnode.driver.video.vmware.xml 2013-02-24 17:13:39 UTC (rev 5980)
+++ trunk/gui/descriptors/org.jnode.driver.video.vmware.xml 2013-02-24 17:17:05 UTC (rev 5981)
@@ -1,4 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ $Id$
+
+ Copyright (C) 2003-2013 JNode.org
+
+ This library is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as published
+ by the Free Software Foundation; either version 2.1 of the License, or
+ (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+ License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; If not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+-->
<!DOCTYPE plugin SYSTEM "jnode.dtd">
<plugin id="org.jnode.driver.video.vmware"
@@ -30,4 +49,4 @@
<permission class="org.jnode.system.resource.ResourcePermission" name="ioports"/>
</extension>
-</plugin>
\ No newline at end of file
+</plugin>
Modified: trunk/gui/descriptors/org.jnode.driver.video.xml
===================================================================
--- trunk/gui/descriptors/org.jnode.driver.video.xml 2013-02-24 17:13:39 UTC (rev 5980)
+++ trunk/gui/descriptors/org.jnode.driver.video.xml 2013-02-24 17:17:05 UTC (rev 5981)
@@ -1,4 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ $Id$
+
+ Copyright (C) 2003-2013 JNode.org
+
+ This library is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as published
+ by the Free Software Foundation; either version 2.1 of the License, or
+ (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+ License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; If not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+-->
<!DOCTYPE plugin SYSTEM "jnode.dtd">
<plugin id="org.jnode.driver.video"
@@ -20,4 +39,4 @@
</library>
</runtime>
-</plugin>
\ No newline at end of file
+</plugin>
Modified: trunk/gui/descriptors/org.jnode.font.bdf.xml
===================================================================
--- trunk/gui/descriptors/org.jnode.font.bdf.xml 2013-02-24 17:13:39 UTC (rev 5980)
+++ trunk/gui/descriptors/org.jnode.font.bdf.xml 2013-02-24 17:17:05 UTC (rev 5981)
@@ -1,4 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ $Id$
+
+ Copyright (C) 2003-2013 JNode.org
+
+ This library is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as published
+ by the Free Software Foundation; either version 2.1 of the License, or
+ (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+ License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; If not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+-->
<!DOCTYPE plugin SYSTEM "jnode.dtd">
<plugin id="org.jnode.font.bdf"
@@ -13,4 +32,4 @@
<export name="org.jnode.font.bdf.*"/>
</library>
</runtime>
-</plugin>
\ No newline at end of file
+</plugin>
Modified: trunk/gui/descriptors/org.jnode.test.gui.xml
===================================================================
--- trunk/gui/descriptors/org.jnode.test.gui.xml 2013-02-24 17:13:39 UTC (rev 5980)
+++ trunk/gui/descriptors/org.jnode.test.gui.xml 2013-02-24 17:17:05 UTC (rev 5981)
@@ -1,4 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ $Id$
+
+ Copyright (C) 2003-2013 JNode.org
+
+ This library is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as published
+ by the Free Software Foundation; either version 2.1 of the License, or
+ (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+ License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; If not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+-->
<!DOCTYPE plugin SYSTEM "jnode.dtd">
<plugin id="org.jnode.test.gui"
Modified: trunk/gui/descriptors/thinlet.xml
===================================================================
--- trunk/gui/descriptors/thinlet.xml 2013-02-24 17:13:39 UTC (rev 5980)
+++ trunk/gui/descriptors/thinlet.xml 2013-02-24 17:17:05 UTC (rev 5981)
@@ -1,4 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ $Id$
+
+ Copyright (C) 2003-2013 JNode.org
+
+ This library is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as published
+ by the Free Software Foundation; either version 2.1 of the License, or
+ (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+ License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; If not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+-->
<!DOCTYPE plugin SYSTEM "jnode.dtd">
<plugin id="thinlet"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X