mass rename and rebranding from xwt to ibex - fixed to use ixt files

This change is 99% complete. org.xwt.translators remains, and will remain until upstream mips stuff is fixed

This patch also remove all unnecessary imports. This was intended to be a separate patch, but they got merged when I unrecorded this patch. Oh well...darcs learning curve.

darcs-hash:20040203104812-a9258-022844cc865dbd82d843205c4c147ac548e31b2f.gz

diff --git a/AUTHORS b/AUTHORS
index 45e1e5f..ca0f31f 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,12 +1,12 @@
 
 

-[megacz] Adam Megacz <adam@xwt.org>
+[megacz] Adam Megacz <adam@ibex.org>

    - Original Architect
    - Original Architect

-   - XWT Engine
+   - Ibex Engine

    - Most of the widget set
 
 [david] David Crawshaw <david@zentus.com>
    - Widget Czar
    - Most of the widget set
 
 [david] David Crawshaw <david@zentus.com>
    - Widget Czar

-   - Fixes to slider.xwt
+   - Fixes to slider.ibex

 
 [corey] Corey Jewett <cj@syntheticplayground.com>
    - Patch to make build.xml not depend on <bash> task
 
 [corey] Corey Jewett <cj@syntheticplayground.com>
    - Patch to make build.xml not depend on <bash> task

diff --git a/CHANGES b/CHANGES
index 83699fd..c40c796 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -186,18 +186,18 @@
 
 05-Jun megacz Main.java: now require filename to end with .xwar
 
 
 05-Jun megacz Main.java: now require filename to end with .xwar
 

-05-Jun megacz XWT.java: xwt.fileSeparator, xwt.homeDir, xwt.tempDir,
-              xwt.recursivePrintObject
+05-Jun megacz Ibex.java: ibex.fileSeparator, ibex.homeDir, ibex.tempDir,
+              ibex.recursivePrintObject

 
 05-Jun megacz AWT.java: fix for non-US keyboards
 
 
 05-Jun megacz AWT.java: fix for non-US keyboards
 

-14-Jun megacz HTML.java, XWT.java: introduced xwt.parseHTML()
+14-Jun megacz HTML.java, Ibex.java: introduced ibex.parseHTML()

 
 16-Jun megacz Resources.java: eliminated some annoying warning messages
 
 16-Jun megacz Template.java: fixed erroneous attribute checks for numbers and image/border
 
 
 16-Jun megacz Resources.java: eliminated some annoying warning messages
 
 16-Jun megacz Template.java: fixed erroneous attribute checks for numbers and image/border
 

-16-Jun megacz HTTP.java: diabled xwt-httpProxy, etc
+16-Jun megacz HTTP.java: diabled ibex-httpProxy, etc

 
 23-Jun megacz Box.java: JPEG hack, fastpath rendering bugfix,
               fixedaspect, improved >500 Pos/SizeChange loop breakout
 
 23-Jun megacz Box.java: JPEG hack, fastpath rendering bugfix,
               fixedaspect, improved >500 Pos/SizeChange loop breakout

@@ -242,10 +242,10 @@
 
 01-Jul megacz Main.java: added browser detection output
 
 
 01-Jul megacz Main.java: added browser detection output
 

-02-Jul david  bevel.xwt: hpad/vpad must be greater than thickness
+02-Jul david  bevel.ibex: hpad/vpad must be greater than thickness

 
 

-02-Jul david  colorpicker.xwt, slider.xwt, slider_base.xwt: Implemented
-              slider.xwt (limits, value display, quantization) and made
+02-Jul david  colorpicker.ibex, slider.ibex, slider_base.ibex: Implemented
+              slider.ibex (limits, value display, quantization) and made

               major improvements/fixed to colorpicker.
 
 15-Jul megacz HTTP.java: implemented isInNet(), weekdayRange(), now
               major improvements/fixed to colorpicker.
 
 15-Jul megacz HTTP.java: implemented isInNet(), weekdayRange(), now

@@ -272,8 +272,8 @@
 
 15-Jul megacz JSObject.java: added JSFunction helper
 
 
 15-Jul megacz JSObject.java: added JSFunction helper
 

-15-Jul megacz GCJ.xml, XWT.java, Template.java, Static.java,
-              Resources.java, splash.xwt, lithium.png, Main.java,
+15-Jul megacz GCJ.xml, Ibex.java, Template.java, Static.java,
+              Resources.java, splash.ibex, lithium.png, Main.java,

               Box.java: builtin.xwar, loadArchive(), prefetchImage()
 
 18-Jul megacz XMLRPC.java, MessageQueue.java: attempted to improve
               Box.java: builtin.xwar, loadArchive(), prefetchImage()
 
 18-Jul megacz XMLRPC.java, MessageQueue.java: attempted to improve

@@ -286,7 +286,7 @@
 18-Jul megacz Surface.java: improved shift modifier handling,
               prohibited windows smaller than scar.
 
 18-Jul megacz Surface.java: improved shift modifier handling,
               prohibited windows smaller than scar.
 

-18-Jul megacz XWT.java: added write-only 'proxyAuthorization' field.
+18-Jul megacz Ibex.java: added write-only 'proxyAuthorization' field.

 
 18-Jul megacz AWT.java: boosted font size by 2 points on Java12
 
 
 18-Jul megacz AWT.java: boosted font size by 2 points on Java12
 

@@ -322,7 +322,7 @@
 
 06-Aug megacz Platform.java: removed WPAD detection, HTTP.Proxy => Proxy.
 
 
 06-Aug megacz Platform.java: removed WPAD detection, HTTP.Proxy => Proxy.
 

-06-Aug megacz Static.java, Resources.java: fixed xwt.static bug.
+06-Aug megacz Static.java, Resources.java: fixed ibex.static bug.

 
 06-Aug megacz SpecialBoxProperty.java: thisbox.root now returns null
               if thisbox is a root box.
 
 06-Aug megacz SpecialBoxProperty.java: thisbox.root now returns null
               if thisbox is a root box.

@@ -345,7 +345,7 @@
 
 06-Aug megacz Box.java: use new HTTP interface, getIds() only returns children
 
 
 06-Aug megacz Box.java: use new HTTP interface, getIds() only returns children
 

-06-Aug megacz XWT.java: encodeURI, decodeURI, new HTTP stack, calling
+06-Aug megacz Ibex.java: encodeURI, decodeURI, new HTTP stack, calling

               newBox in the foreground thread is deprecated.
 
 06-Aug megacz XMLRPC.java: new HTTP stack, better verbose output
               newBox in the foreground thread is deprecated.
 
 06-Aug megacz XMLRPC.java: new HTTP stack, better verbose output

@@ -358,7 +358,7 @@
 
 09-Aug megacz Win32.java, Win32.cc: hack to avoid strange race condition in Win32 GDI
 
 
 09-Aug megacz Win32.java, Win32.cc: hack to avoid strange race condition in Win32 GDI
 

-10-Aug megacz HTML.java, html.xwt: fixed HTML widget to handle unclosed <li> tags
+10-Aug megacz HTML.java, html.ibex: fixed HTML widget to handle unclosed <li> tags

 
 10-Aug megacz TinySSL.java: fixed vulnerability to Mike Benham's attack
 
 
 10-Aug megacz TinySSL.java: fixed vulnerability to Mike Benham's attack
 

@@ -369,7 +369,7 @@
 16-Aug megacz AWT.java, Java12.java, Java14.java: fixed jdk1.4 bug
               with keypresses and frameless windows.
 
 16-Aug megacz AWT.java, Java12.java, Java14.java: fixed jdk1.4 bug
               with keypresses and frameless windows.
 

-16-Aug megacz XWT.java, SpecialBoxProperty.java: box.apply()
+16-Aug megacz Ibex.java, SpecialBoxProperty.java: box.apply()

 
 17-Aug megacz Box.java, SpecialBoxProperty.java, Surface.java: code to
               prevent engine from quitting when changing the last
 
 17-Aug megacz Box.java, SpecialBoxProperty.java, Surface.java: code to
               prevent engine from quitting when changing the last

@@ -410,7 +410,7 @@
 
 15-Sep megacz Template.java: added callback for retheme operation
 
 
 15-Sep megacz Template.java: added callback for retheme operation
 

-15-Sep megacz XWT.java: new retheme() syntax
+15-Sep megacz Ibex.java: new retheme() syntax

 
 23-Sep megacz SpecialBoxProperty.java: invisible now returns true if
               any of the box's ancestors is invisible.
 
 23-Sep megacz SpecialBoxProperty.java: invisible now returns true if
               any of the box's ancestors is invisible.

@@ -429,7 +429,7 @@
               behavior, deliver clicks to box first (not root), id is
               a readable attribute
 
               behavior, deliver clicks to box first (not root), id is
               a readable attribute
 

-03-Oct megacz XWT.java: made recursivePrintObject public so we can
+03-Oct megacz Ibex.java: made recursivePrintObject public so we can

               access it.
 
 11-Oct megacz POSIX.cc: fixed a bug that was causing phantom messages
               access it.
 
 11-Oct megacz POSIX.cc: fixed a bug that was causing phantom messages

@@ -468,7 +468,7 @@
 
 11-Feb megacz PNG.java: changed System.out.println to Log.log
 
 
 11-Feb megacz PNG.java: changed System.out.println to Log.log
 

-11-Feb megacz splash.xwt: added "press Esc to quit" message
+11-Feb megacz splash.ibex: added "press Esc to quit" message

 
 11-Feb megacz Resources.java: removed libgcj hack; 3.3 fixed the problem
 
 
 11-Feb megacz Resources.java: removed libgcj hack; 3.3 fixed the problem
 

@@ -529,7 +529,7 @@
 
 
 27-Feb =========== build 0274 ================================================
 
 
 27-Feb =========== build 0274 ================================================

-27-Feb megacz Makefile: master.dist.xwt.org
+27-Feb megacz Makefile: master.dist.ibex.org

 
 27-Feb megacz Makefile, Makefile, Makefile: none
 
 
 27-Feb megacz Makefile, Makefile, Makefile: none
 

@@ -700,7 +700,7 @@
 
 20-Apr megacz gcc.patch: fixed the patch so it applies properly
 
 
 20-Apr megacz gcc.patch: fixed the patch so it applies properly
 

-22-Apr megacz Lexer.java: added the Lexer for org.xwt.js
+22-Apr megacz Lexer.java: added the Lexer for org.ibex.js

 
 24-Apr megacz Makefile, Carbon.cc, Carbon.java: added Carbon
               skeleton code
 
 24-Apr megacz Makefile, Carbon.cc, Carbon.java: added Carbon
               skeleton code

@@ -722,7 +722,7 @@
 
 29-Apr david  Box.java: check for a moving redirect target
 
 
 29-Apr david  Box.java: check for a moving redirect target
 

-29-Apr megacz Makefile: updated xwt cvs url
+29-Apr megacz Makefile: updated ibex cvs url

 
 29-Apr david  Parser.java, TokenStream.java: HACKS for
               'and'/anonymous functions
 
 29-Apr david  Parser.java, TokenStream.java: HACKS for
               'and'/anonymous functions

@@ -743,7 +743,7 @@
 01-May david  Makefile: fix for non-linux build environments
 
 02-May megacz Lexer.java, Parser.java: parser now parses
 01-May david  Makefile: fix for non-linux build environments
 
 02-May megacz Lexer.java, Parser.java: parser now parses

-              splash.xwt
+              splash.ibex

 
 02-May megacz JS.java, Parser.java: removed all FIXMES
 
 
 02-May megacz JS.java, Parser.java: removed all FIXMES
 

@@ -770,7 +770,7 @@
 08-May ejones Makefile, Main.java, Platform.java, Carbon.cc, Carbon.java, Win32.java:
               Native Carbon Port: - Add Carbon implementation - Fix the
               Makefile to build it correctly - Fix Main and Platform to call a
 08-May ejones Makefile, Main.java, Platform.java, Carbon.cc, Carbon.java, Win32.java:
               Native Carbon Port: - Add Carbon implementation - Fix the
               Makefile to build it correctly - Fix Main and Platform to call a

-              method running on the Platform class when XWT is running. -
+              method running on the Platform class when Ibex is running. -

               Fixed Win32 to block the main thread forever in its running
               method.
 
               Fixed Win32 to block the main thread forever in its running
               method.
 

@@ -784,29 +784,29 @@
 11-May megacz Expr.java, JS.java, Lexer.java, Parser.java, package.html:
               more JS code
 
 11-May megacz Expr.java, JS.java, Lexer.java, Parser.java, package.html:
               more JS code
 

-11-May megacz edit.xwt: updated to David's latest edit widget
+11-May megacz edit.ibex: updated to David's latest edit widget

 
 

-11-May megacz scar.png: scar image now lives in org.xwt.builtin
+11-May megacz scar.png: scar image now lives in org.ibex.builtin

 
 11-May megacz Main.java: removed applet support, moved scar to
 
 11-May megacz Main.java: removed applet support, moved scar to

-              org.xwt.builtin
+              org.ibex.builtin

 
 

-11-May megacz edit_lib.xwt: added Davids xwt.standard.lib.edit
+11-May megacz edit_lib.ibex: added Davids ibex.standard.lib.edit

 
 

-11-May megacz Arguments.java, BaseFunction.java, BinaryDigitReader.java, ClassDefinitionException.java, ClassNameHelper.java, ClassOutput.java, Context.java, ContextListener.java, DToA.java, DebuggableEngineImpl.java, DefaultErrorReporter.java, Delegator.java, EcmaError.java, ErrorReporter.java, EvaluatorException.java, FlattenedObject.java, Function.java, FunctionNode.java, FunctionObject.java, IRFactory.java, IdFunction.java, IdFunctionMaster.java, IdScriptable.java, ImporterTopLevel.java, InterpretedFunction.java, InterpretedScript.java, Interpreter.java, InterpreterData.java, InterpreterFrame.java, Invoker.java, JavaMembers.java, JavaScriptException.java, Label.java, LabelTable.java, LazilyLoadedCtor.java, LineBuffer.java, ListenerArray.java, LocalVariable.java, NativeArray.java, NativeBoolean.java, NativeCall.java, NativeDate.java, NativeError.java, NativeFunction.java, NativeGlobal.java, NativeJavaArray.java, NativeJavaClass.java, NativeJavaConstructor.java, NativeJavaMethod.java, NativeJavaObject.java, NativeJavaPackage.java, NativeMath.java, NativeNumber.java, NativeObject.java, NativeScript.java, NativeString.java, NativeWith.java, Node.java, NodeTransformer.java, NotAFunctionException.java, Parser.java, PreorderNodeIterator.java, PropertyException.java, RegExpProxy.java, Script.java, ScriptRuntime.java, Scriptable.java, ScriptableObject.java, SecuritySupport.java, ShallowNodeIterator.java, SourceTextItem.java, SourceTextManager.java, Synchronizer.java, TokenStream.java, UintMap.java, Undefined.java, VariableTable.java, WrapHandler.java, WrappedException.java, Wrapper.java, DebugFrame.java, DebugReader.java, DebuggableEngine.java, DebuggableScript.java, Debugger.java, NativeRegExp.java, NativeRegExpCtor.java, RegExpImpl.java, SubString.java, Box.java, ByteStream.java, HTML.java, HTTP.java, MessageQueue.java, Platform.java, Proxy.java, Resources.java, SOAP.java, SpecialBoxProperty.java, Static.java, Surface.java, Template.java, ThreadMessage.java, Trap.java, XMLRPC.java, XWT.java, AWT.java, Java12.java, JSObject.java:
-              goodbye org.mozilla.javascript, hello org.xwt.js
+11-May megacz Arguments.java, BaseFunction.java, BinaryDigitReader.java, ClassDefinitionException.java, ClassNameHelper.java, ClassOutput.java, Context.java, ContextListener.java, DToA.java, DebuggableEngineImpl.java, DefaultErrorReporter.java, Delegator.java, EcmaError.java, ErrorReporter.java, EvaluatorException.java, FlattenedObject.java, Function.java, FunctionNode.java, FunctionObject.java, IRFactory.java, IdFunction.java, IdFunctionMaster.java, IdScriptable.java, ImporterTopLevel.java, InterpretedFunction.java, InterpretedScript.java, Interpreter.java, InterpreterData.java, InterpreterFrame.java, Invoker.java, JavaMembers.java, JavaScriptException.java, Label.java, LabelTable.java, LazilyLoadedCtor.java, LineBuffer.java, ListenerArray.java, LocalVariable.java, NativeArray.java, NativeBoolean.java, NativeCall.java, NativeDate.java, NativeError.java, NativeFunction.java, NativeGlobal.java, NativeJavaArray.java, NativeJavaClass.java, NativeJavaConstructor.java, NativeJavaMethod.java, NativeJavaObject.java, NativeJavaPackage.java, NativeMath.java, NativeNumber.java, NativeObject.java, NativeScript.java, NativeString.java, NativeWith.java, Node.java, NodeTransformer.java, NotAFunctionException.java, Parser.java, PreorderNodeIterator.java, PropertyException.java, RegExpProxy.java, Script.java, ScriptRuntime.java, Scriptable.java, ScriptableObject.java, SecuritySupport.java, ShallowNodeIterator.java, SourceTextItem.java, SourceTextManager.java, Synchronizer.java, TokenStream.java, UintMap.java, Undefined.java, VariableTable.java, WrapHandler.java, WrappedException.java, Wrapper.java, DebugFrame.java, DebugReader.java, DebuggableEngine.java, DebuggableScript.java, Debugger.java, NativeRegExp.java, NativeRegExpCtor.java, RegExpImpl.java, SubString.java, Box.java, ByteStream.java, HTML.java, HTTP.java, MessageQueue.java, Platform.java, Proxy.java, Resources.java, SOAP.java, SpecialBoxProperty.java, Static.java, Surface.java, Template.java, ThreadMessage.java, Trap.java, XMLRPC.java, Ibex.java, AWT.java, Java12.java, JSObject.java:
+              goodbye org.mozilla.javascript, hello org.ibex.js

 
 11-May megacz msjvm.jar, netscape.jar: removing
               msjvm.jar/netscape.jar; use reflection instead
 
 
 11-May megacz msjvm.jar, netscape.jar: removing
               msjvm.jar/netscape.jar; use reflection instead
 

-26-May megacz Box.java, Resources.java, SpecialBoxProperty.java, Static.java, XWT.java, JS.java, Parser.java:
-              lots of progress on org.xwt.js
+26-May megacz Box.java, Resources.java, SpecialBoxProperty.java, Static.java, Ibex.java, JS.java, Parser.java:
+              lots of progress on org.ibex.js

 
 
 26-May =========== build 0707 ================================================
 
 26-May =========== build 0708 ================================================
 
 
 26-May =========== build 0707 ================================================
 
 26-May =========== build 0708 ================================================

-02-Jun megacz XWT.java, Lexer.java, Parser.java: more js
+02-Jun megacz Ibex.java, Lexer.java, Parser.java: more js

               improvements
 
 03-Jun megacz JS.java, Lexer.java, Parser.java: nearly finished
               improvements
 
 03-Jun megacz JS.java, Lexer.java, Parser.java: nearly finished

diff --git a/COPYING b/COPYING
index 884d16f..aaa7d80 100644 (file)
--- a/COPYING
+++ b/COPYING
@@ -2,12 +2,12 @@
 The contents of this distribution are copyrighted and licensed as follows: 
 ================================================================================
 
 The contents of this distribution are copyrighted and licensed as follows: 
 ================================================================================
 

-   - src/org/xwt/TinySSL.java is Copyright 2002 Adam Megacz, and is
+   - src/org/ibex/TinySSL.java is Copyright 2002 Adam Megacz, and is

      licensed under the GNU Library General Public License; you may
      reuse it in closed source applications under certain conditions;
      see the LGPL (attached below).
 
      licensed under the GNU Library General Public License; you may
      reuse it in closed source applications under certain conditions;
      see the LGPL (attached below).
 

-   - src/org/xwt/js/Lexer.java was partially derived from the Rhino
+   - src/org/ibex/js/Lexer.java was partially derived from the Rhino

      JavaScript interpreter; hence is covered by the Netscape Public
      License.
 
      JavaScript interpreter; hence is covered by the Netscape Public
      License.
 

@@ -25,11 +25,11 @@ The contents of this distribution are copyrighted and licensed as follows:
      optimizer, written by Konstantin Knizhnik and "is freeware and is
      distributed without any restrictions on its usage"
    
      optimizer, written by Konstantin Knizhnik and "is freeware and is
      distributed without any restrictions on its usage"
    

-   - src/org/xwt/PNG.java is Copyright (c) 1997, Jason
+   - src/org/ibex/PNG.java is Copyright (c) 1997, Jason

      Marshall.  All Rights Reserved. Additional licensing terms are
      contained in that file.
 
      Marshall.  All Rights Reserved. Additional licensing terms are
      contained in that file.
 

-   - src/org/xwt/GIF.java is Copyright D. J. Hagberg, Jr. Additional
+   - src/org/ibex/GIF.java is Copyright D. J. Hagberg, Jr. Additional

      licensing terms are contained in that file.
 
    - the contents of src/org/bouncycastle is Copyright (c) 2000-2002 The
      licensing terms are contained in that file.
 
    - the contents of src/org/bouncycastle is Copyright (c) 2000-2002 The

@@ -39,13 +39,13 @@ The contents of this distribution are copyrighted and licensed as follows:
    - All other files are Copyright 2003 Adam Megacz, all rights
      reserved, all disclaimable warranties disclaimed.
    
    - All other files are Copyright 2003 Adam Megacz, all rights
      reserved, all disclaimable warranties disclaimed.
    

-     You may redistribute and/or modify the XWT engine (src/org/xwt/
+     You may redistribute and/or modify the Ibex engine (src/org/ibex/

      and all subdirectories) under the GNU General Public License
      ("GPL", included below), version 2 ONLY (not any prior or later
      versions), subject to the following two clarifications:
    
      As a clarification to the General Public License, any data files
      and all subdirectories) under the GNU General Public License
      ("GPL", included below), version 2 ONLY (not any prior or later
      versions), subject to the following two clarifications:
    
      As a clarification to the General Public License, any data files

-     (.xwt, .gif, .png) loaded into a running copy of the XWT Engine,
+     (.ibex, .gif, .png) loaded into a running copy of the Ibex Engine,

      are specifically NOT considered "derivitave works" of the engine,
      so long as they do not contain any code copied from the engine.
 
      are specifically NOT considered "derivitave works" of the engine,
      so long as they do not contain any code copied from the engine.
 

diff --git a/Makefile b/Makefile
index 2eb9259..4d030d2 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 #############################################################################
 #
 #############################################################################
 #

-# The XWT Makefile
+# The Ibex Makefile

 #
 
 target_Darwin := powerpc-apple-darwin
 #
 
 target_Darwin := powerpc-apple-darwin

@@ -17,7 +17,7 @@ dist-clean:
        find upstream -name config.cache -exec rm {} \;
        test -e upstream/mips && make -C upstream/mips clean
 
        find upstream -name config.cache -exec rm {} \;
        test -e upstream/mips && make -C upstream/mips clean
 

-JVM:        build/JVM/xwt.jar
+JVM:        build/JVM/ibex.jar

 Linux:    ; make gcj platform=Linux   link_flags="-lX11 -lXext"
 Solaris:  ; make gcj platform=Solaris link_flags="-lX11 -lXext -lpthread"
 Win32:    ; make gcj platform=Win32   link_flags="-Wl,--subsystem,windows -lcomdlg32"
 Linux:    ; make gcj platform=Linux   link_flags="-lX11 -lXext"
 Solaris:  ; make gcj platform=Solaris link_flags="-lX11 -lXext -lpthread"
 Win32:    ; make gcj platform=Win32   link_flags="-Wl,--subsystem,windows -lcomdlg32"

@@ -43,13 +43,13 @@ darwin_linker_flags += -Wl,-dylib_file,$(darwin_ogl_libdir):$(darwin_libdir)/lib
 darwin_linker_flags += -lSystem.B -lmathCommon.A -lGL -lGLU
 
 # stupid broke-ass darwin linker...
 darwin_linker_flags += -lSystem.B -lmathCommon.A -lGL -lGLU
 
 # stupid broke-ass darwin linker...

-darwin_linker_flags += build/Darwin/org/xwt/plat/OpenGL.java.o build/Darwin/org/xwt/plat/POSIX.java.o
+darwin_linker_flags += build/Darwin/org/ibex/plat/OpenGL.java.o build/Darwin/org/ibex/plat/POSIX.java.o

 
 target_bin_extension_$(platform) := $(shell echo $(platform) | tr A-Z a-z)
 target_bin_extension_Win32       := exe
 target_bin_extension_JVM         := jar
 target_bin_extension             := $(target_bin_extension_$(platform))
 
 target_bin_extension_$(platform) := $(shell echo $(platform) | tr A-Z a-z)
 target_bin_extension_Win32       := exe
 target_bin_extension_JVM         := jar
 target_bin_extension             := $(target_bin_extension_$(platform))

-target_bin                       := xwt.$(target_bin_extension)
+target_bin                       := ibex.$(target_bin_extension)

 
 jikes_flags        := -nowarn
 gcc_optimizations  := -O2
 
 jikes_flags        := -nowarn
 gcc_optimizations  := -O2

@@ -100,24 +100,24 @@ build/java/org/xwt/mips/%:
 build/class/org/xwt/translators/MIPSApps.class: build/mips/mipsapps.mips .jikes
        mkdir -p build/java/org/xwt/translators
        @echo -e "\n\033[1mtranslating        .mips -> .java:  $<\033[0m"
 build/class/org/xwt/translators/MIPSApps.class: build/mips/mipsapps.mips .jikes
        mkdir -p build/java/org/xwt/translators
        @echo -e "\n\033[1mtranslating        .mips -> .java:  $<\033[0m"

-       (echo -e 'package org.xwt.translators;\nimport org.xwt.mips.*;\n';                           \
+       (echo -e 'package org.ibex.translators;\nimport org.xwt.mips.*;\n';                           \

         java -Xint -cp upstream/mips/build org.xwt.mips.Compiler MIPSApps build/mips/mipsapps.mips) \
         | sed 's,//.*$$,,;'| tr -d '\n' > build/java/org/xwt/translators/MIPSApps.java
        @echo -e "\n\033[1mcompiling          .java -> .class: $<\033[0m"
        ./.jikes -g:none build/java/org/xwt/translators/MIPSApps.java
 
         java -Xint -cp upstream/mips/build org.xwt.mips.Compiler MIPSApps build/mips/mipsapps.mips) \
         | sed 's,//.*$$,,;'| tr -d '\n' > build/java/org/xwt/translators/MIPSApps.java
        @echo -e "\n\033[1mcompiling          .java -> .class: $<\033[0m"
        ./.jikes -g:none build/java/org/xwt/translators/MIPSApps.java
 

-build/java/org/xwt/%.java: src/org/xwt/%.java
-       make build/class/org/xwt/util/Preprocessor.class
+build/java/org/ibex/%.java: src/org/ibex/%.java
+       make build/class/org/ibex/util/Preprocessor.class

        @echo -e "\n\033[1mpreprocessing      .java -> .java:  $<\033[0m"
        @echo -e "\n\033[1mpreprocessing      .java -> .java:  $<\033[0m"

-       mkdir -p `dirname $@`; java -cp build/class org.xwt.util.Preprocessor < $< > $@
+       mkdir -p `dirname $@`; java -cp build/class org.ibex.util.Preprocessor < $< > $@

 
 build/java/%.java: src/%.java ; @echo linking $@; mkdir -p $(@D); ln -fs `echo $(@D)/ | sed 's_[^/]*//*_../_g'`/$< $@
 build/cc/%.cc:     src/%.c    ; @echo linking $@; mkdir -p $(@D); ln -fs `echo $(@D)/ | sed 's_[^/]*//*_../_g'`/$< $@
 build/res/%:       src/%      ; @echo linking $@; mkdir -p $(@D); ln -fs `echo $(@D)/ | sed 's_[^/]*//*_../_g'`/$< $@
 
 
 build/java/%.java: src/%.java ; @echo linking $@; mkdir -p $(@D); ln -fs `echo $(@D)/ | sed 's_[^/]*//*_../_g'`/$< $@
 build/cc/%.cc:     src/%.c    ; @echo linking $@; mkdir -p $(@D); ln -fs `echo $(@D)/ | sed 's_[^/]*//*_../_g'`/$< $@
 build/res/%:       src/%      ; @echo linking $@; mkdir -p $(@D); ln -fs `echo $(@D)/ | sed 's_[^/]*//*_../_g'`/$< $@
 

-build/class/org/xwt/util/Preprocessor.class: src/org/xwt/util/Preprocessor.java .jikes
+build/class/org/ibex/util/Preprocessor.class: src/org/ibex/util/Preprocessor.java .jikes

        @echo -e "\n\033[1mcompiling          .java -> .class: $<\033[0m"
        @echo -e "\n\033[1mcompiling          .java -> .class: $<\033[0m"

-       mkdir -p build/class/org/xwt/util/
+       mkdir -p build/class/org/ibex/util/

        ./.jikes $<
 
 oldcompile:; CLASSPATH=$$CLASSPATH:lib/libgcj-minimal.jar:upstream/mips/build javac -target 1.1 -d build/class `find build/java/ -name \*.java`
        ./.jikes $<
 
 oldcompile:; CLASSPATH=$$CLASSPATH:lib/libgcj-minimal.jar:upstream/mips/build javac -target 1.1 -d build/class `find build/java/ -name \*.java`

@@ -126,15 +126,16 @@ compile: .compile
        @echo -e "\n\033[1mcompiling          .java -> .class: src/**/*.java\033[0m"
        @rm -f $(java_sources:build/java/%.java=build/class/%.class)
        mkdir -p build/class
        @echo -e "\n\033[1mcompiling          .java -> .class: src/**/*.java\033[0m"
        @rm -f $(java_sources:build/java/%.java=build/class/%.class)
        mkdir -p build/class

+       echo @./.jikes $(java_sources)

        @./.jikes $(java_sources)
        touch .compile
 
        @./.jikes $(java_sources)
        touch .compile
 

-build/JVM/xwt.jar: .compile build/res/builtin.jar build/class/org/xwt/translators/MIPSApps.class
-       @echo -e "\n\033[1marchiving         .class -> .jar:   build/JVM/xwt.jar\033[0m"
+build/JVM/ibex.jar: .compile build/res/builtin.jar build/class/org/xwt/translators/MIPSApps.class
+       @echo -e "\n\033[1marchiving         .class -> .jar:   build/JVM/ibex.jar\033[0m"

        mkdir -p build/JVM
        mkdir -p build/JVM

-       echo -e "Manifest-Version: 1.0\nMain-Class: org.xwt.Main\n" > build/JVM/.manifest
-       cd build/class/org/xwt; ln -sf ../../../res/builtin.jar
-       cd build/class; $(jar) cfm ../JVM/xwt.jar ../JVM/.manifest \
+       echo -e "Manifest-Version: 1.0\nMain-Class: org.ibex.Main\n" > build/JVM/.manifest
+       cd build/class/org/ibex; ln -sf ../../../res/builtin.jar
+       cd build/class; $(jar) cfm ../JVM/ibex.jar ../JVM/.manifest \

                `find . \! -type d` \
                $(patsubst %,../../upstream/mips/build/org/xwt/mips/%*.class, Runtime Registers Syscalls Errno)
 
                `find . \! -type d` \
                $(patsubst %,../../upstream/mips/build/org/xwt/mips/%*.class, Runtime Registers Syscalls Errno)
 

@@ -153,8 +154,8 @@ build/h/%.h: build/class/%.class .compile
 ### Native Code ##############################################################################
 
 # a hack since we've disabled gcj's awt implementation
 ### Native Code ##############################################################################
 
 # a hack since we've disabled gcj's awt implementation

-build/$(platform)/org/xwt/plat/Java2.java.o: ; touch .empty.c; mkdir -p $(@D); $(gcc) -c .empty.c -o $@;
-build/$(platform)/org/xwt/plat/AWT.java.o:   ; touch .empty.c; mkdir -p $(@D); $(gcc) -c .empty.c -o $@;
+build/$(platform)/org/ibex/plat/Java2.java.o: ; touch .empty.c; mkdir -p $(@D); $(gcc) -c .empty.c -o $@;
+build/$(platform)/org/ibex/plat/AWT.java.o:   ; touch .empty.c; mkdir -p $(@D); $(gcc) -c .empty.c -o $@;

 
 build/$(platform)/org/xwt/translators/MIPSApps.java.o: build/class/org/xwt/translators/MIPSApps.class
        @echo -e "\n\033[1mcompiling         .class -> .o:     $<\033[0m"
 
 build/$(platform)/org/xwt/translators/MIPSApps.java.o: build/class/org/xwt/translators/MIPSApps.class
        @echo -e "\n\033[1mcompiling         .class -> .o:     $<\033[0m"

@@ -166,13 +167,13 @@ build/$(platform)/%.java.o: build/java/%.java
        mkdir -p `dirname $@`
        $(gcj) -c $< -o $@
 
        mkdir -p `dirname $@`
        $(gcj) -c $< -o $@
 

-build/$(platform)/org/xwt/plat/$(platform).cc.o: src/org/xwt/plat/$(platform).cc src/org/xwt/plat/*.cc .configure_jpeg-6b_$(target)
+build/$(platform)/org/ibex/plat/$(platform).cc.o: src/org/ibex/plat/$(platform).cc src/org/ibex/plat/*.cc .configure_jpeg-6b_$(target)

        @make $(java_headers)
        @echo -e "\n\033[1mcompiling            .cc -> .o:     $<\033[0m"
        mkdir -p `dirname $@`
        $(g++) -c $< -o $@
 
        @make $(java_headers)
        @echo -e "\n\033[1mcompiling            .cc -> .o:     $<\033[0m"
        mkdir -p `dirname $@`
        $(g++) -c $< -o $@
 

-nonplat_java_sources := $(filter-out build/java/org/xwt/plat/$(platform).java,$(java_sources))
+nonplat_java_sources := $(filter-out build/java/org/ibex/plat/$(platform).java,$(java_sources))

 build/$(platform)/$(platform).ar: $(nonplat_java_sources:build/java/%.java=build/$(platform)/%.java.o)
        @echo -e "\n\033[1marchiving             .o -> .a\033[0m"
        mkdir -p build/$(platform)
 build/$(platform)/$(platform).ar: $(nonplat_java_sources:build/java/%.java=build/$(platform)/%.java.o)
        @echo -e "\n\033[1marchiving             .o -> .a\033[0m"
        mkdir -p build/$(platform)

@@ -181,15 +182,15 @@ build/$(platform)/$(platform).ar: $(nonplat_java_sources:build/java/%.java=build
        upstream/install/$(target)/bin/ranlib $@
 
 upstream/jpeg-6b/build-$(target)/libjpeg.a: .install_jpeg-6b_$(target)
        upstream/install/$(target)/bin/ranlib $@
 
 upstream/jpeg-6b/build-$(target)/libjpeg.a: .install_jpeg-6b_$(target)

-build/$(platform)/$(target_bin): build/$(platform)/org/xwt/plat/$(platform).cc.o upstream/jpeg-6b/build-$(target)/libjpeg.a build/$(platform)/builtin.o build/$(platform)/$(platform).ar build/$(platform)/org/xwt/plat/$(platform).java.o
+build/$(platform)/$(target_bin): build/$(platform)/org/ibex/plat/$(platform).cc.o upstream/jpeg-6b/build-$(target)/libjpeg.a build/$(platform)/builtin.o build/$(platform)/$(platform).ar build/$(platform)/org/ibex/plat/$(platform).java.o

        @echo -e "\n\033[1mlinking               .o -> $(target_bin)\033[0m"
        mkdir -p build/$(platform)
        @echo -e "\n\033[1mlinking               .o -> $(target_bin)\033[0m"
        mkdir -p build/$(platform)

-       PATH=upstream/install/bin:$$PATH $(gcj) -v --main=org.xwt.Main -o $@ -Lupstream/install/$(target)/lib $^ $(link_flags)
+       PATH=upstream/install/bin:$$PATH $(gcj) -v --main=org.ibex.Main -o $@ -Lupstream/install/$(target)/lib $^ $(link_flags)

 
 
 ### Builtin Resources ##############################################################################
 
 
 
 ### Builtin Resources ##############################################################################
 

-builtin_src := $(shell find src/org/xwt/builtin -name '*.*' \! -name '*.xcf')
+builtin_src := $(shell find src/org/ibex/builtin -name '*.*' \! -name '*.xcf')

 build/res/fonts/vera: .download_vera-1.10
        mkdir -p build/res/fonts/vera
        cd build/res/fonts/vera; ln -s ../../../../upstream/vera-1.10/ttf-bitstream-vera-1.10/Vera.ttf
 build/res/fonts/vera: .download_vera-1.10
        mkdir -p build/res/fonts/vera
        cd build/res/fonts/vera; ln -s ../../../../upstream/vera-1.10/ttf-bitstream-vera-1.10/Vera.ttf

@@ -243,7 +244,7 @@ build/mips/mipsapps.mips: build/mips/org/xwt/translators/Freetype.c.o build/mips
 current_build         := $(shell cat next.build)
 strip_$(platform) := upstream/install/$(target)/bin/strip build/$(platform)/$(target_bin) -o 
 strip_JVM       := cp build/$(platform)/$(target_bin)
 current_build         := $(shell cat next.build)
 strip_$(platform) := upstream/install/$(target)/bin/strip build/$(platform)/$(target_bin) -o 
 strip_JVM       := cp build/$(platform)/$(target_bin)

-install-dist:;     $(strip_$(platform)) /var/www/master.dist.xwt.org/xwt-$(current_build).$(target_bin_extension).unsigned
+install-dist:;     $(strip_$(platform)) /var/www/master.dist.ibex.org/ibex-$(current_build).$(target_bin_extension).unsigned

 dist: compile
        (echo -n 0000; (echo "10k16o16i"; cat next.build | tr a-z A-Z; echo "1+f") | dc) | tail --bytes=5 > next.build-
        mv next.build- next.build
 dist: compile
        (echo -n 0000; (echo "10k16o16i"; cat next.build | tr a-z A-Z; echo "1+f") | dc) | tail --bytes=5 > next.build-
        mv next.build- next.build

diff --git a/Makefile.upstream b/Makefile.upstream
index 5f55f76..64dd9b5 100644 (file)
--- a/Makefile.upstream
+++ b/Makefile.upstream
@@ -1,6 +1,6 @@
 ############################################################################# 
 #
 ############################################################################# 
 #

-# The XWT upstream code Makefile
+# The Ibex upstream code Makefile

 #
 
 # deal with Apple's brokenness
 #
 
 # deal with Apple's brokenness

@@ -13,7 +13,7 @@ url_mingw-runtime-3.0  := http://umn.dl.sourceforge.net/sourceforge/mingw/mingw-
 url_freetype-2.1.4     := http://umn.dl.sourceforge.net/sourceforge/freetype/freetype-2.1.4.tar.gz
 url_gcc-3.3            := http://mirrors.rcn.net/pub/sourceware/gcc/releases/gcc-3.3/gcc-3.3.tar.gz 
 url_jpeg-6b            := http://www.ijg.org/files/jpegsrc.v6b.tar.gz
 url_freetype-2.1.4     := http://umn.dl.sourceforge.net/sourceforge/freetype/freetype-2.1.4.tar.gz
 url_gcc-3.3            := http://mirrors.rcn.net/pub/sourceware/gcc/releases/gcc-3.3/gcc-3.3.tar.gz 
 url_jpeg-6b            := http://www.ijg.org/files/jpegsrc.v6b.tar.gz

-url_jikes-1.18         := http://dist.xwt.org/jikes-1.18.tgz
+url_jikes-1.18         := http://dist.ibex.org/jikes-1.18.tgz

 url_libmspack-20030726 := http://www.kyz.uklinux.net/downloads/libmspack-20030726.tar.gz
 url_vera-1.10          := http://ftp.gnome.org/pub/GNOME/sources/ttf-bitstream-vera/1.10/ttf-bitstream-vera-1.10.tar.gz
 url_jode-1.1.1         := http://umn.dl.sourceforge.net/sourceforge/jode/jode-1.1.1.tar.gz
 url_libmspack-20030726 := http://www.kyz.uklinux.net/downloads/libmspack-20030726.tar.gz
 url_vera-1.10          := http://ftp.gnome.org/pub/GNOME/sources/ttf-bitstream-vera/1.10/ttf-bitstream-vera-1.10.tar.gz
 url_jode-1.1.1         := http://umn.dl.sourceforge.net/sourceforge/jode/jode-1.1.1.tar.gz

@@ -170,8 +170,8 @@ endif
 .download_mips2java:
        mkdir -p upstream/install
        curl http://www.megacz.com/tmp/mips.snapshot.tgz | tar -C upstream -xvzf -
 .download_mips2java:
        mkdir -p upstream/install
        curl http://www.megacz.com/tmp/mips.snapshot.tgz | tar -C upstream -xvzf -

-#      echo '/1 :pserver:cvs@cvs.xwt.org:2401/ A' >> ~/.cvspass
-#      cd upstream; cvs -d :pserver:cvs@cvs.xwt.org:/ co mips
+#      echo '/1 :pserver:cvs@cvs.ibex.org:2401/ A' >> ~/.cvspass
+#      cd upstream; cvs -d :pserver:cvs@cvs.ibex.org:/ co mips

        cd upstream/mips/upstream; ln -sf `cd ../..; pwd`/install
        touch $@
 
        cd upstream/mips/upstream; ln -sf `cd ../..; pwd`/install
        touch $@
 

diff --git a/README b/README
index 5d5ea78..5e6c2f9 100644 (file)
--- a/README
+++ b/README
@@ -1,10 +1,10 @@
 ==============================================================================
 ==============================================================================

-XWT README 
+Ibex README 

               
 ______________________________________________________________________________
 Documentation
 
               
 ______________________________________________________________________________
 Documentation
 

-If you're new to XWT, you should read the documentation in the order
+If you're new to Ibex, you should read the documentation in the order

 presented below:
 
 - README [this file]
 presented below:
 
 - README [this file]

@@ -12,18 +12,18 @@ presented below:
       Start here. Includes a map of all other documentation and a
       description of the directory strucure
 
       Start here. Includes a map of all other documentation and a
       description of the directory strucure
 

-- The XWT home page [http://www.xwt.org/]       
+- The Ibex home page [http://www.ibex.org/]       

           
           

-- The XWT tutorials [http://www.xwt.org/tutorials.html]
+- The Ibex tutorials [http://www.ibex.org/tutorials.html]

 
 

-      Gentle introduction to what XWT is, and how to write
-      .xwt's. Good for anybody who wants to write XWT applications.
+      Gentle introduction to what Ibex is, and how to write
+      .ibex's. Good for anybody who wants to write Ibex applications.

 
 

-- The XWT reference [http://www.xwt.org/reference.html]
+- The Ibex reference [http://www.ibex.org/reference.html]

         
         

-      Precise, technical spec of exactly how XWT works. Assumes
-      familiarity with XWT (ie, you've read the tutorial). This is the
-      authoritative source for how an XWT engine should
+      Precise, technical spec of exactly how Ibex works. Assumes
+      familiarity with Ibex (ie, you've read the tutorial). This is the
+      authoritative source for how an Ibex engine should

       behave.
 
 
       behave.
 
 

@@ -31,11 +31,11 @@ ______________________________________________________________________________
 Directory Structure
 
 /       
 Directory Structure
 
 /       

-   AUTHORS                  - people involved in developing XWT   
+   AUTHORS                  - people involved in developing Ibex   

    README                   - this file
    COPYING                  - copyright information for all files in this distro
    CHANGES                  - the changelot
    README                   - this file
    COPYING                  - copyright information for all files in this distro
    CHANGES                  - the changelot

-   TM                       - trademark information for XWT       
+   TM                       - trademark information for Ibex       

    Makefile                 - build file for gcc 3.3
    next.build               - the build id of the next build to be generated
 
    Makefile                 - build file for gcc 3.3
    next.build               - the build id of the next build to be generated
 

@@ -65,27 +65,27 @@ Directory Structure
        jump.jar             - the jump2 bytecode-to-palmos translator
        libgcj-minimal.jar   - a tiny portion of libgcj.jar; allows java->bytecode compilation without gcj
 
        jump.jar             - the jump2 bytecode-to-palmos translator
        libgcj-minimal.jar   - a tiny portion of libgcj.jar; allows java->bytecode compilation without gcj
 

-   src/                     - all java source files and xwt sources go here
+   src/                     - all java source files and ibex sources go here

        edu/stanford/ejalbr  - source code for BrowserLauncher
        gnu/regexp/          - source code for the GNU regexp library for Java
        org/
            bouncycastle/    - the BouncyCastle Crypto Library
        edu/stanford/ejalbr  - source code for BrowserLauncher
        gnu/regexp/          - source code for the GNU regexp library for Java
        org/
            bouncycastle/    - the BouncyCastle Crypto Library

-           xwt/
-               translators/ - .xwt's and .png's that are essential to bootstrapping the engine
+           ibex/
+               translators/ - .ibex's and .png's that are essential to bootstrapping the engine

                plat/        - platform-specific code
                util/        - misc utilities
                plat/        - platform-specific code
                util/        - misc utilities

-               js/          - the XWT JavaScript Interpreter
-               mips/        - the XWT MIPS interpreter/recompiler
+               js/          - the Ibex JavaScript Interpreter
+               mips/        - the Ibex MIPS interpreter/recompiler

                builtin/     - content for the core builtin resource
 
 
 ______________________________________________________________________________
 Build Requirements
 
                builtin/     - content for the core builtin resource
 
 
 ______________________________________________________________________________
 Build Requirements
 

-There are pre-built, digitally signed binaries on http://dist.xwt.org/
+There are pre-built, digitally signed binaries on http://dist.ibex.org/

 for every supported platform.  Please consider using those unless
 you're absolutely certain you need to go through the trouble of trying
 for every supported platform.  Please consider using those unless
 you're absolutely certain you need to go through the trouble of trying

-to get XWT to build.
+to get Ibex to build.

 
 Requirements:
     - jdk 1.3+
 
 Requirements:
     - jdk 1.3+

diff --git a/jode.conf b/jode.conf
index 88c5db7..6823841 100644 (file)
--- a/jode.conf
+++ b/jode.conf
@@ -5,14 +5,14 @@ strip = "unreach","lvt"
 
 #renamer = new UniqueRenamer
 
 
 #renamer = new UniqueRenamer
 

-load = new WildCard { value = "org.xwt.*" },
+load = new WildCard { value = "org.ibex.*" },

        new WildCard { value = "gnu.*" },
        new WildCard { value = "org.bouncycastle.*" },
        new WildCard { value = "edu.*" },
        new WildCard { value = "java.*" }
 
        new WildCard { value = "gnu.*" },
        new WildCard { value = "org.bouncycastle.*" },
        new WildCard { value = "edu.*" },
        new WildCard { value = "java.*" }
 

-preserve = new WildCard { value = "org.xwt.Main" },
-           new WildCard { value = "org.xwt.plat.Linux" },
+preserve = new WildCard { value = "org.ibex.Main" },
+           new WildCard { value = "org.ibex.plat.Linux" },

 new WildCard { value="java.lang" },
 new WildCard { value="gnu.gcj.protocol" },
 new WildCard { value="java.net.URLConnection" },
 new WildCard { value="java.lang" },
 new WildCard { value="gnu.gcj.protocol" },
 new WildCard { value="java.net.URLConnection" },

diff --git a/src/gnu/regexp/RE.java b/src/gnu/regexp/RE.java
index 4e0d3bf..5854d63 100644 (file)
--- a/src/gnu/regexp/RE.java
+++ b/src/gnu/regexp/RE.java
@@ -101,7 +101,7 @@ public class RE extends REToken {
   private static final String VERSION = "1.1.4-dev";
 
   // The localized strings are kept in a separate file
   private static final String VERSION = "1.1.4-dev";
 
   // The localized strings are kept in a separate file

-  // XWT LOCAL: we can't bundle property lists within the xwt executable on all platforms
+  // Ibex LOCAL: we can't bundle property lists within the ibex executable on all platforms

   // private static ResourceBundle messages = PropertyResourceBundle.getBundle("gnu/regexp/MessagesBundle", Locale.getDefault());
 
   // These are, respectively, the first and last tokens in our linked list
   // private static ResourceBundle messages = PropertyResourceBundle.getBundle("gnu/regexp/MessagesBundle", Locale.getDefault());
 
   // These are, respectively, the first and last tokens in our linked list

@@ -201,7 +201,7 @@ public class RE extends REToken {
   }
 
   // Retrieves a message from the ResourceBundle
   }
 
   // Retrieves a message from the ResourceBundle

-  // XWT LOCAL: we can't bundle property lists within the xwt executable on all platforms
+  // Ibex LOCAL: we can't bundle property lists within the ibex executable on all platforms

   //            for simplicity, just lookup the errors this way.
   static final String getLocalizedMessage(String key) {
     if(key.equals("error.prefix")) return "At position {0} in regular expression pattern:";
   //            for simplicity, just lookup the errors this way.
   static final String getLocalizedMessage(String key) {
     if(key.equals("error.prefix")) return "At position {0} in regular expression pattern:";

diff --git a/src/org/xwt/Box.java b/src/org/ibex/Box.java
similarity index 99%
rename from src/org/xwt/Box.java
rename to src/org/ibex/Box.java
index 7743120..1301639 100644 (file)
--- a/src/org/xwt/Box.java
+++ b/src/org/ibex/Box.java
@@ -1,6 +1,6 @@
 // FIXME
 // Copyright 2002 Adam Megacz, see the COPYING file for licensing [GPL]
 // FIXME
 // Copyright 2002 Adam Megacz, see the COPYING file for licensing [GPL]

-package org.xwt;
+package org.ibex;

 
 // FEATURE: reflow before allowing js to read from width/height 
 // FEATURE: fastpath for rows=1/cols=1
 
 // FEATURE: reflow before allowing js to read from width/height 
 // FEATURE: fastpath for rows=1/cols=1

@@ -11,16 +11,14 @@ package org.xwt;
 // FEATURE:    or else have a way to mark a column "same as last one"?
 // FEATURE: reintroduce surface.abort
 
 // FEATURE:    or else have a way to mark a column "same as last one"?
 // FEATURE: reintroduce surface.abort
 

-import java.io.*;
-import java.net.*;

 import java.util.*;
 import java.util.*;

-import org.xwt.js.*;
-import org.xwt.util.*;
+import org.ibex.js.*;
+import org.ibex.util.*;

 import org.xwt.translators.*;
 
 /**
  *  <p>
 import org.xwt.translators.*;
 
 /**
  *  <p>

- *  Encapsulates the data for a single XWT box as well as all layout
+ *  Encapsulates the data for a single Ibex box as well as all layout

  *  rendering logic.
  *  </p>
  *
  *  rendering logic.
  *  </p>
  *

@@ -390,7 +388,7 @@ public final class Box extends JSScope implements Scheduler.Task {
     }
     
     
     }
     
     

-    // Methods to implement org.xwt.js.JS //////////////////////////////////////
+    // Methods to implement org.ibex.js.JS //////////////////////////////////////

 
     public int globalToLocalX(int x) { return parent == null ? x : parent.globalToLocalX(x - this.x); }
     public int globalToLocalY(int y) { return parent == null ? y : parent.globalToLocalY(y - this.y); }
 
     public int globalToLocalX(int x) { return parent == null ? x : parent.globalToLocalX(x - this.x); }
     public int globalToLocalY(int y) { return parent == null ? y : parent.globalToLocalY(y - this.y); }

@@ -729,7 +727,7 @@ public final class Box extends JSScope implements Scheduler.Task {
         int globaly = 0;
 
         // WARNING: this method is called from the event-queueing thread -- it may run concurrently with
         int globaly = 0;
 
         // WARNING: this method is called from the event-queueing thread -- it may run concurrently with

-        // ANY part of XWT, and is UNSYNCHRONIZED for performance reasons.  BE CAREFUL HERE.
+        // ANY part of Ibex, and is UNSYNCHRONIZED for performance reasons.  BE CAREFUL HERE.

 
         if (!cur.test(VISIBLE)) return null;
         if (!cur.inside(x - globalx, y - globaly)) return cur.parent == null ? cur : null;
 
         if (!cur.test(VISIBLE)) return null;
         if (!cur.inside(x - globalx, y - globaly)) return cur.parent == null ? cur : null;

diff --git a/src/org/xwt/Font.java b/src/org/ibex/Font.java
similarity index 98%
rename from src/org/xwt/Font.java
rename to src/org/ibex/Font.java
index ae9a7d3..2744f0e 100644 (file)
--- a/src/org/xwt/Font.java
+++ b/src/org/ibex/Font.java
@@ -1,9 +1,7 @@
 // Copyright 2004 Adam Megacz, see the COPYING file for licensing [GPL]
 // Copyright 2004 Adam Megacz, see the COPYING file for licensing [GPL]

-package org.xwt;
+package org.ibex;

 import org.xwt.translators.*;
 import org.xwt.translators.*;

-import org.xwt.util.*;
-import org.xwt.js.*;
-import java.util.*;
+import org.ibex.util.*;

 import java.io.*;
 
 // FEATURE: this could be cleaner
 import java.io.*;
 
 // FEATURE: this could be cleaner

diff --git a/src/org/xwt/HTTP.java b/src/org/ibex/HTTP.java
similarity index 98%
rename from src/org/xwt/HTTP.java
rename to src/org/ibex/HTTP.java
index 681b928..1463897 100644 (file)
--- a/src/org/xwt/HTTP.java
+++ b/src/org/ibex/HTTP.java
@@ -1,11 +1,11 @@
 // Copyright 2004 Adam Megacz, see the COPYING file for licensing [GPL]
 // Copyright 2004 Adam Megacz, see the COPYING file for licensing [GPL]

-package org.xwt;
+package org.ibex;

 
 import java.net.*;
 import java.io.*;
 import java.util.*;
 
 import java.net.*;
 import java.io.*;
 import java.util.*;

-import org.xwt.js.*;
-import org.xwt.util.*;
+import org.ibex.js.*;
+import org.ibex.util.*;

 import org.bouncycastle.util.encoders.Base64;
 import org.bouncycastle.crypto.digests.*;
 
 import org.bouncycastle.util.encoders.Base64;
 import org.bouncycastle.crypto.digests.*;
 

@@ -117,7 +117,7 @@ public class HTTP {
                 
             } else if (reply.startsWith("2")) {
                 if (h.get("HTTP").equals("1.0") && h.get("content-length") == null)
                 
             } else if (reply.startsWith("2")) {
                 if (h.get("HTTP").equals("1.0") && h.get("content-length") == null)

-                    throw new HTTPException("XWT does not support HTTP/1.0 servers which fail to return the Content-Length header");
+                    throw new HTTPException("Ibex does not support HTTP/1.0 servers which fail to return the Content-Length header");

                 int cl = h.get("content-length") == null ? -1 : Integer.parseInt(h.get("content-length").toString());
                 InputStream ret = new HTTPInputStream(in, cl, releaseMe);
                 if ("gzip".equals(h.get("content-encoding"))) ret = new java.util.zip.GZIPInputStream(ret);
                 int cl = h.get("content-length") == null ? -1 : Integer.parseInt(h.get("content-length").toString());
                 InputStream ret = new HTTPInputStream(in, cl, releaseMe);
                 if ("gzip".equals(h.get("content-encoding"))) ret = new java.util.zip.GZIPInputStream(ret);

@@ -264,11 +264,11 @@ public class HTTP {
     }
 
     /** executes the PAC script and dispatches a call to one of the other attempt methods based on the result */
     }
 
     /** executes the PAC script and dispatches a call to one of the other attempt methods based on the result */

-    private Socket attemptPAC(org.xwt.js.JS pacFunc) {
+    private Socket attemptPAC(org.ibex.js.JS pacFunc) {

         if (Log.verbose) Log.info(this, "evaluating PAC script");
         String pac = null;
         try {
         if (Log.verbose) Log.info(this, "evaluating PAC script");
         String pac = null;
         try {

-            org.xwt.js.JSArray args = new org.xwt.js.JSArray();
+            org.ibex.js.JSArray args = new org.ibex.js.JSArray();

             Object obj = pacFunc.call(url.toString(), url.getHost(), null, null, 2);
             if (Log.verbose) Log.info(this, "  PAC script returned \"" + obj + "\"");
             pac = obj.toString();
             Object obj = pacFunc.call(url.toString(), url.getHost(), null, null, 2);
             if (Log.verbose) Log.info(this, "  PAC script returned \"" + obj + "\"");
             pac = obj.toString();

@@ -365,7 +365,7 @@ public class HTTP {
             pw.print("GET " + path + " HTTP/1.1\r\n");
         }
         
             pw.print("GET " + path + " HTTP/1.1\r\n");
         }
         

-        pw.print("User-Agent: XWT\r\n");
+        pw.print("User-Agent: Ibex\r\n");

         pw.print("Accept-encoding: gzip\r\n");
         pw.print("Host: " + (host + (port == 80 ? "" : (":" + port))) + "\r\n");
         if (proxied) pw.print("X-RequestOrigin: " + Main.originHost + "\r\n");
         pw.print("Accept-encoding: gzip\r\n");
         pw.print("Host: " + (host + (port == 80 ? "" : (":" + port))) + "\r\n");
         if (proxied) pw.print("X-RequestOrigin: " + Main.originHost + "\r\n");

@@ -748,7 +748,7 @@ public class HTTP {
                     Log.info(Platform.class, "WPAD detection failed due to:");
                     if (e instanceof JSExn) {
                         try {
                     Log.info(Platform.class, "WPAD detection failed due to:");
                     if (e instanceof JSExn) {
                         try {

-                            org.xwt.js.JSArray arr = new org.xwt.js.JSArray();
+                            org.ibex.js.JSArray arr = new org.ibex.js.JSArray();

                             arr.addElement(((JSExn)e).getObject());
                         } catch (Exception e2) {
                             Log.info(Platform.class, e);
                             arr.addElement(((JSExn)e).getObject());
                         } catch (Exception e2) {
                             Log.info(Platform.class, e);

@@ -781,7 +781,7 @@ public class HTTP {
                 Scheduler.add(new Scheduler.Task() {
                         public void perform() throws Exception {
                             Box b = new Box();
                 Scheduler.add(new Scheduler.Task() {
                         public void perform() throws Exception {
                             Box b = new Box();

-                            Template t = Template.buildTemplate(Stream.getInputStream((JS)Main.builtin.get("org/xwt/builtin/proxy_authorization.xwt")), new XWT(null));
+                            Template t = Template.buildTemplate(Stream.getInputStream((JS)Main.builtin.get("org/ibex/builtin/proxy_authorization.ibex")), new Ibex(null));

                             t.apply(b);
                             b.put("realm", realm);
                             b.put("proxyIP", proxyIP);
                             t.apply(b);
                             b.put("realm", realm);
                             b.put("proxyIP", proxyIP);

@@ -894,8 +894,8 @@ public class HTTP {
                     
                     return ((d1 <= d2 && day >= d1 && day <= d2) || (d1 > d2 && (day >= d1 || day <= d2))) ? T : F;
                     
                     
                     return ((d1 <= d2 && day >= d1 && day <= d2) || (d1 > d2 && (day >= d1 || day <= d2))) ? T : F;
                     

-                case "dateRange": throw new JSExn("XWT does not support dateRange() in PAC scripts");
-                case "timeRange": throw new JSExn("XWT does not support timeRange() in PAC scripts");
+                case "dateRange": throw new JSExn("Ibex does not support dateRange() in PAC scripts");
+                case "timeRange": throw new JSExn("Ibex does not support timeRange() in PAC scripts");

                 //#end
                 return super.callMethod(method, a0, a1, a2, rest, nargs);
             }       
                 //#end
                 return super.callMethod(method, a0, a1, a2, rest, nargs);
             }       

diff --git a/src/org/xwt/XWT.java b/src/org/ibex/Ibex.java
similarity index 90%
rename from src/org/xwt/XWT.java
rename to src/org/ibex/Ibex.java
index e5c443f..9431f1f 100644 (file)
--- a/src/org/xwt/XWT.java
+++ b/src/org/ibex/Ibex.java
@@ -1,21 +1,17 @@
 // Copyright 2004 Adam Megacz, see the COPYING file for licensing [GPL]
 // Copyright 2004 Adam Megacz, see the COPYING file for licensing [GPL]

-package org.xwt;
+package org.ibex;

 
 import java.io.*;
 
 import java.io.*;

-import java.net.*;
-import java.text.*;
-import java.util.*;
-import org.xwt.js.*;
-import org.xwt.util.*;
-import org.xwt.translators.*;
+import org.ibex.js.*;
+import org.ibex.util.*;

 import org.bouncycastle.util.encoders.Base64;
 
 import org.bouncycastle.util.encoders.Base64;
 

-/** Singleton class that provides all functionality in the xwt.* namespace */
-public final class XWT extends JS.Cloneable {
+/** Singleton class that provides all functionality in the ibex.* namespace */
+public final class Ibex extends JS.Cloneable {

 
     // FIXME remove this
     private final JS rr;
 
     // FIXME remove this
     private final JS rr;

-    public XWT(Stream rr) { this.rr = bless(rr); }
+    public Ibex(Stream rr) { this.rr = bless(rr); }

 
     public JS resolveString(String str, boolean permitAbsolute) throws JSExn {
         if (str.indexOf("://") != -1) {
 
     public JS resolveString(String str, boolean permitAbsolute) throws JSExn {
         if (str.indexOf("://") != -1) {

@@ -39,13 +35,13 @@ public final class XWT extends JS.Cloneable {
     private class Sub extends JS {
         String key;
         Sub(String key) { this.key = key; }
     private class Sub extends JS {
         String key;
         Sub(String key) { this.key = key; }

-        public void put(Object key, Object val) throws JSExn { XWT.this.put(this.key + "." + key, val); }
-        public Object get(Object key) throws JSExn { return XWT.this.get(this.key + "." + key); }
+        public void put(Object key, Object val) throws JSExn { Ibex.this.put(this.key + "." + key, val); }
+        public Object get(Object key) throws JSExn { return Ibex.this.get(this.key + "." + key); }

         public Object call(Object a0, Object a1, Object a2, Object[] rest, int nargs) throws JSExn {
         public Object call(Object a0, Object a1, Object a2, Object[] rest, int nargs) throws JSExn {

-            return XWT.this.callMethod(this.key, a0, a1, a2, rest, nargs);
+            return Ibex.this.callMethod(this.key, a0, a1, a2, rest, nargs);

         }
         public Object callMethod(Object method, Object a0, Object a1, Object a2, Object[] rest, int nargs) throws JSExn {
         }
         public Object callMethod(Object method, Object a0, Object a1, Object a2, Object[] rest, int nargs) throws JSExn {

-            return XWT.this.callMethod(this.key + "." + method, a0, a1, a2, rest, nargs);
+            return Ibex.this.callMethod(this.key + "." + method, a0, a1, a2, rest, nargs);

         }
     }
     private Cache subCache = new Cache(20);
         }
     }
     private Cache subCache = new Cache(20);

@@ -58,8 +54,8 @@ public final class XWT extends JS.Cloneable {
     public Object get(Object name) throws JSExn {
         if (name instanceof String && ((String)name).length() == 0) return rr;
         //#switch(name)
     public Object get(Object name) throws JSExn {
         if (name instanceof String && ((String)name).length() == 0) return rr;
         //#switch(name)

-        case "math": return xwtMath;
-        case "string": return xwtString;
+        case "math": return ibexMath;
+        case "string": return ibexString;

         case "date": return METHOD;
         case "box": return new Box();
         case "clone": return METHOD;
         case "date": return METHOD;
         case "box": return new Box();
         case "clone": return METHOD;

@@ -134,7 +130,7 @@ public final class XWT extends JS.Cloneable {
             HTTP.Proxy.Authorization.waitingForUser.release();
             return;
         //#end
             HTTP.Proxy.Authorization.waitingForUser.release();
             return;
         //#end

-        throw new JSExn("attempted to put unknown property: xwt."+name);
+        throw new JSExn("attempted to put unknown property: ibex."+name);

     }
 
     public Object callMethod(Object name, Object a, Object b, Object c, Object[] rest, int nargs) throws JSExn {
     }
 
     public Object callMethod(Object name, Object a, Object b, Object c, Object[] rest, int nargs) throws JSExn {

@@ -198,11 +194,11 @@ public final class XWT extends JS.Cloneable {
             }
         } catch (RuntimeException e) {
             // FIXME: maybe JSExn should take a second argument, Exception
             }
         } catch (RuntimeException e) {
             // FIXME: maybe JSExn should take a second argument, Exception

-            Log.warn(this, "xwt."+name+"() threw: " + e);
-            throw new JSExn("invalid argument for xwt object method "+name+"()");
+            Log.warn(this, "ibex."+name+"() threw: " + e);
+            throw new JSExn("invalid argument for ibex object method "+name+"()");

         }
 
         }
 

-        throw new JSExn("invalid number of arguments for xwt object method "+name+"()");
+        throw new JSExn("invalid number of arguments for ibex object method "+name+"()");

     }
 
     public Stream url2res(String url) throws JSExn {
     }
 
     public Stream url2res(String url) throws JSExn {

@@ -228,7 +224,7 @@ public final class XWT extends JS.Cloneable {
         }
     }
     
         }
     }
     

-    public static final JSMath xwtMath = new JSMath() {
+    public static final JSMath ibexMath = new JSMath() {

             private JS gs = new JSScope.Global();
             public Object get(Object key) throws JSExn {
                 //#switch(key)
             private JS gs = new JSScope.Global();
             public Object get(Object key) throws JSExn {
                 //#switch(key)

@@ -241,7 +237,7 @@ public final class XWT extends JS.Cloneable {
             }
         };
 
             }
         };
 

-    public static final JS xwtString = new JS() {
+    public static final JS ibexString = new JS() {

             private JS gs = new JSScope.Global();
             public void put(Object key, Object val) { }
             public Object get(Object key) throws JSExn {
             private JS gs = new JSScope.Global();
             public void put(Object key, Object val) { }
             public Object get(Object key) throws JSExn {

@@ -306,16 +302,16 @@ public final class XWT extends JS.Cloneable {
     }
 
     // FEATURE: move this into builtin.xwar
     }
 
     // FEATURE: move this into builtin.xwar

-    public Blessing bless(JS b) { return new XWT.Blessing((JS.Cloneable)b, this, null, null); }
+    public Blessing bless(JS b) { return new Ibex.Blessing((JS.Cloneable)b, this, null, null); }

     public static class Blessing extends JS.Clone {
     public static class Blessing extends JS.Clone {

-        private XWT xwt;
+        private Ibex ibex;

         private Template t = null;
         private Object parentkey = null;
         private Blessing parent = null;
         private Template t = null;
         private Object parentkey = null;
         private Blessing parent = null;

-        public Blessing(JS.Cloneable clonee, XWT xwt, Blessing parent, Object parentkey) {
-            super(clonee); this.xwt = xwt; this.parentkey = parentkey; this.parent = parent; }
+        public Blessing(JS.Cloneable clonee, Ibex ibex, Blessing parent, Object parentkey) {
+            super(clonee); this.ibex = ibex; this.parentkey = parentkey; this.parent = parent; }

         public Object get(Object key) throws JSExn {
         public Object get(Object key) throws JSExn {

-            return key.equals("") ? ((Object)getStatic()) : (new Blessing((JS.Cloneable)clonee.get(key), xwt, this, key));
+            return key.equals("") ? ((Object)getStatic()) : (new Blessing((JS.Cloneable)clonee.get(key), ibex, this, key));

         }
         public static Blessing getBlessing(Object o) {
             if (!(o instanceof JS)) return null;
         }
         public static Blessing getBlessing(Object o) {
             if (!(o instanceof JS)) return null;

@@ -340,7 +336,7 @@ public final class XWT extends JS.Cloneable {
         public JSScope getStatic() {
             try {
                 // FIXME background?
         public JSScope getStatic() {
             try {
                 // FIXME background?

-                if (t == null) t = Template.buildTemplate(Stream.getInputStream(parent.get(parentkey + ".xwt")), xwt);
+                if (t == null) t = Template.buildTemplate(Stream.getInputStream(parent.get(parentkey + ".ixt")), ibex);

                 return t.staticScope;
             } catch (Exception e) {
                 Log.error(this, e);
                 return t.staticScope;
             } catch (Exception e) {
                 Log.error(this, e);

diff --git a/src/org/xwt/LocalStorage.java b/src/org/ibex/LocalStorage.java
similarity index 67%
rename from src/org/xwt/LocalStorage.java
rename to src/org/ibex/LocalStorage.java
index 376ccb8..7c1d747 100644 (file)
--- a/src/org/xwt/LocalStorage.java
+++ b/src/org/ibex/LocalStorage.java
@@ -1,34 +1,31 @@
 // Copyright 2004 Adam Megacz, see the COPYING file for licensing [GPL]
 // Copyright 2004 Adam Megacz, see the COPYING file for licensing [GPL]

-package org.xwt;
+package org.ibex;

 
 import java.io.*;
 
 import java.io.*;

-import java.util.*;
-import java.util.zip.*;
-import org.xwt.js.*;
-import org.xwt.util.*;
+import org.ibex.util.*;

 import org.bouncycastle.util.encoders.Base64;
 
 import org.bouncycastle.util.encoders.Base64;
 

-/** Manages access to ~/.xwt */
+/** Manages access to ~/.ibex */

 public class LocalStorage {
 
 public class LocalStorage {
 

-    static String xwtDirName = System.getProperty("user.home") + java.io.File.separatorChar + ".xwt";
+    static String ibexDirName = System.getProperty("user.home") + java.io.File.separatorChar + ".ibex";

 
 

-    static java.io.File xwtDir = null;
+    static java.io.File ibexDir = null;

     static java.io.File cacheDir = null;
 
     static {
         try {
     static java.io.File cacheDir = null;
 
     static {
         try {

-            xwtDir = new java.io.File(xwtDirName);
-            if (!xwtDir.mkdirs()) xwtDir = null;
+            ibexDir = new java.io.File(ibexDirName);
+            if (!ibexDir.mkdirs()) ibexDir = null;

             try {
             try {

-                cacheDir = new java.io.File(xwtDirName + java.io.File.separatorChar + "cache");
+                cacheDir = new java.io.File(ibexDirName + java.io.File.separatorChar + "cache");

                 if (!cacheDir.mkdirs()) cacheDir = null;
             } catch (Exception e) {
                 Log.warn(LocalStorage.class, "unable to create cache directory " +
                 if (!cacheDir.mkdirs()) cacheDir = null;
             } catch (Exception e) {
                 Log.warn(LocalStorage.class, "unable to create cache directory " +

-                         xwtDirName + java.io.File.separatorChar + "cache");
+                         ibexDirName + java.io.File.separatorChar + "cache");

             }
         } catch (Exception e) {
             }
         } catch (Exception e) {

-            Log.warn(LocalStorage.class, "unable to create xwt directory " + xwtDirName);
+            Log.warn(LocalStorage.class, "unable to create ibex directory " + ibexDirName);

         }
     }
 
         }
     }
 

diff --git a/src/org/xwt/Main.java b/src/org/ibex/Main.java
similarity index 80%
rename from src/org/xwt/Main.java
rename to src/org/ibex/Main.java
index 49eb2b2..2c6a7d3 100644 (file)
--- a/src/org/xwt/Main.java
+++ b/src/org/ibex/Main.java
@@ -1,17 +1,12 @@
 // Copyright 2004 Adam Megacz, see the COPYING file for licensing [GPL]
 // Copyright 2004 Adam Megacz, see the COPYING file for licensing [GPL]

-package org.xwt;
+package org.ibex;

 
 import java.net.*;
 
 import java.net.*;

-import java.util.*;

 import java.io.*;
 import java.io.*;

-import java.awt.*;
-import org.xwt.js.*;
-import org.xwt.util.*;
-import org.xwt.translators.*;
-import org.xwt.plat.*;
-import org.bouncycastle.util.encoders.Base64;
+import org.ibex.js.*;
+import org.ibex.util.*;

 
 

-/** Entry point for the XWT Engine; handles splash screen, initial xwar loading, and argument processing */
+/** Entry point for the Ibex Engine; handles splash screen, initial xwar loading, and argument processing */

 public class Main {
 
     /**
 public class Main {
 
     /**

@@ -31,7 +26,7 @@ public class Main {
     public static Picture scarImage = null;
 
     public static void printUsage() {
     public static Picture scarImage = null;
 
     public static void printUsage() {

-        System.err.println("Usage: xwt [-s] [-v] [-l <port>/<url>] source-location [initial-template]");
+        System.err.println("Usage: ibex [-s] [-v] [-l <port>/<url>] source-location [initial-template]");

         System.err.println("");
         System.err.println("Options:");
         System.err.println("    -v verbose logging (required for logging on Win32)");
         System.err.println("");
         System.err.println("Options:");
         System.err.println("    -v verbose logging (required for logging on Win32)");

@@ -70,7 +65,7 @@ public class Main {
             if (originHost.indexOf('@') != -1) originHost = originHost.substring(originHost.indexOf('@') + 1);
             originAddr = InetAddress.getByName(originHost);
             rr = builtin;
             if (originHost.indexOf('@') != -1) originHost = originHost.substring(originHost.indexOf('@') + 1);
             originAddr = InetAddress.getByName(originHost);
             rr = builtin;

-            startupTemplate = "org.xwt.builtin.splash";
+            startupTemplate = "org.ibex.builtin.splash";

         } else {
             rr = new Stream.File(origin);
             if (!new File(origin).isDirectory()) rr = new Stream.Zip(rr);
         } else {
             rr = new Stream.File(origin);
             if (!new File(origin).isDirectory()) rr = new Stream.Zip(rr);

@@ -78,13 +73,13 @@ public class Main {
         }
 
         if (Log.on) Log.info(Main.class, "loading xwar");
         }
 
         if (Log.on) Log.info(Main.class, "loading xwar");

-        final XWT xwt = new XWT(rr);
-        final JS final_rr = (JS)xwt.get("");
+        final Ibex ibex = new Ibex(rr);
+        final JS final_rr = (JS)ibex.get("");

 
         scarImage =
 
         scarImage =

-            Picture.load((Stream)Main.builtin.get("org/xwt/builtin/scar.png"),
+            Picture.load((Stream)Main.builtin.get("org/ibex/builtin/scar.png"),

                          new Scheduler.Task() { public void perform() throws Exception {
                          new Scheduler.Task() { public void perform() throws Exception {

-                             xwt.resolveString(startupTemplate, false).call(new Box(), null, null, null, 1);
+                             ibex.resolveString(startupTemplate, false).call(new Box(), null, null, null, 1);

                          } });
 
         Scheduler.init();
                          } });
 
         Scheduler.init();

diff --git a/src/org/xwt/Picture.java b/src/org/ibex/Picture.java
similarity index 95%
rename from src/org/xwt/Picture.java
rename to src/org/ibex/Picture.java
index 44565d5..cdd33f0 100644 (file)
--- a/src/org/xwt/Picture.java
+++ b/src/org/ibex/Picture.java
@@ -1,8 +1,8 @@
 // Copyright 2004 Adam Megacz, see the COPYING file for licensing [GPL]
 // Copyright 2004 Adam Megacz, see the COPYING file for licensing [GPL]

-package org.xwt;
+package org.ibex;

 import java.io.*;
 import java.io.*;

-import org.xwt.js.*;
-import org.xwt.util.*;
+import org.ibex.js.*;
+import org.ibex.util.*;

 import org.xwt.translators.*;
 
 /** 
 import org.xwt.translators.*;
 
 /** 

@@ -35,7 +35,7 @@ public class Picture {
         if (ret == null) cache.put(stream, ret = Platform.createPicture(stream));
         final Picture p = ret;
         if (!ret.isLoaded && callback != null) {
         if (ret == null) cache.put(stream, ret = Platform.createPicture(stream));
         final Picture p = ret;
         if (!ret.isLoaded && callback != null) {

-            final XWT.Blessing b = XWT.Blessing.getBlessing(stream);
+            final Ibex.Blessing b = Ibex.Blessing.getBlessing(stream);

             new java.lang.Thread() { public void run() {
                 InputStream in = null;
                 try {
             new java.lang.Thread() { public void run() {
                 InputStream in = null;
                 try {

diff --git a/src/org/xwt/PixelBuffer.java b/src/org/ibex/PixelBuffer.java
similarity index 99%
rename from src/org/xwt/PixelBuffer.java
rename to src/org/ibex/PixelBuffer.java
index 2076112..1434301 100644 (file)
--- a/src/org/xwt/PixelBuffer.java
+++ b/src/org/ibex/PixelBuffer.java
@@ -1,5 +1,5 @@
 // Copyright 2004 Adam Megacz, see the COPYING file for licensing [GPL]
 // Copyright 2004 Adam Megacz, see the COPYING file for licensing [GPL]

-package org.xwt;
+package org.ibex;

 
 /**
  *  <p>
 
 /**
  *  <p>

diff --git a/src/org/xwt/Platform.java b/src/org/ibex/Platform.java
similarity index 87%
rename from src/org/xwt/Platform.java
rename to src/org/ibex/Platform.java
index 6e76b3f..15f87a6 100644 (file)
--- a/src/org/xwt/Platform.java
+++ b/src/org/ibex/Platform.java
@@ -1,12 +1,11 @@
 // Copyright 2004 Adam Megacz, see the COPYING file for licensing [GPL]
 // Copyright 2004 Adam Megacz, see the COPYING file for licensing [GPL]

-package org.xwt;
+package org.ibex;

 
 import java.lang.reflect.*;
 import java.net.*;
 import java.io.*;
 
 import java.lang.reflect.*;
 import java.net.*;
 import java.io.*;

-import java.util.*;
-import org.xwt.js.*;
-import org.xwt.util.*;
+import org.ibex.js.*;
+import org.ibex.util.*;

 
 /** 
  *  Abstracts away the small irregularities in JVM implementations.
 
 /** 
  *  Abstracts away the small irregularities in JVM implementations.

@@ -15,7 +14,7 @@ import org.xwt.util.*;
  *  JVM. Subclasses are provided for other VMs. Methods whose names
  *  start with an underscore are meant to be overridden by
  *  subclasses. If you create a subclass of Platform, you should put
  *  JVM. Subclasses are provided for other VMs. Methods whose names
  *  start with an underscore are meant to be overridden by
  *  subclasses. If you create a subclass of Platform, you should put

- *  it in the org.xwt.plat package, and add code to this file's static
+ *  it in the org.ibex.plat package, and add code to this file's static

  *  block to detect the new platform.
  */
 public abstract class Platform {
  *  block to detect the new platform.
  */
 public abstract class Platform {

@@ -27,7 +26,7 @@ public abstract class Platform {
     static boolean clipboardReadEnabled = false;       ///< true iff inside a C-v/A-v/Press3 trap handler
     static Platform platform = null;                   ///< The appropriate Platform object for this JVM
     static boolean alreadyDetectedProxy = false;       ///< true if proxy autodetection has already been run
     static boolean clipboardReadEnabled = false;       ///< true iff inside a C-v/A-v/Press3 trap handler
     static Platform platform = null;                   ///< The appropriate Platform object for this JVM
     static boolean alreadyDetectedProxy = false;       ///< true if proxy autodetection has already been run

-    static org.xwt.HTTP.Proxy cachedProxyInfo = null;  ///< the result of proxy autodetection
+    static org.ibex.HTTP.Proxy cachedProxyInfo = null;  ///< the result of proxy autodetection

     public static String build = "unknown";            ///< the current build
 
     // VM Detection Logic /////////////////////////////////////////////////////////////////////
     public static String build = "unknown";            ///< the current build
 
     // VM Detection Logic /////////////////////////////////////////////////////////////////////

@@ -59,9 +58,9 @@ public abstract class Platform {
                 criticalAbort("Unable to detect JVM");
             }
             
                 criticalAbort("Unable to detect JVM");
             }
             

-            System.err.println(" " + os_name + " ==> org.xwt.plat." + platform_class);
+            System.err.println(" " + os_name + " ==> org.ibex.plat." + platform_class);

             try {
             try {

-                if (platform_class != null) Class.forName("org.xwt.plat." + platform_class).newInstance();
+                if (platform_class != null) Class.forName("org.ibex.plat." + platform_class).newInstance();

             } catch (InstantiationException e) {
                 throw e.getCause();
             }
             } catch (InstantiationException e) {
                 throw e.getCause();
             }

@@ -70,16 +69,16 @@ public abstract class Platform {
             Log.color = term != null && term.length() != 0 && !term.equals("cygwin");
             
             try {
             Log.color = term != null && term.length() != 0 && !term.equals("cygwin");
             
             try {

-                build = (String)Class.forName("org.xwt.Build").getField("build").get(null);
-                Log.diag(Platform.class, "XWT build: " + build);
+                build = (String)Class.forName("org.ibex.Build").getField("build").get(null);
+                Log.diag(Platform.class, "Ibex build: " + build);

             } catch (ClassNotFoundException cnfe) {
             } catch (ClassNotFoundException cnfe) {

-                Log.warn(Platform.class, "XWT build: unknown");
+                Log.warn(Platform.class, "Ibex build: unknown");

             } catch (Exception e) {
                 Log.info(Platform.class, "exception while detecting build:");
                 Log.info(Platform.class, e);
             }
 
             } catch (Exception e) {
                 Log.info(Platform.class, "exception while detecting build:");
                 Log.info(Platform.class, e);
             }
 

-            Log.diag(Platform.class, "XWT VM detection:   vendor = " + vendor);
+            Log.diag(Platform.class, "Ibex VM detection:   vendor = " + vendor);

             Log.diag(Platform.class, "                   version = " + version);
             Log.diag(Platform.class, "                        os = " + os_name + " [version " + os_version + "]");
             Log.diag(Platform.class, "                  platform = " + platform.getDescriptiveName());
             Log.diag(Platform.class, "                   version = " + version);
             Log.diag(Platform.class, "                        os = " + os_name + " [version " + os_version + "]");
             Log.diag(Platform.class, "                  platform = " + platform.getDescriptiveName());

@@ -100,11 +99,11 @@ public abstract class Platform {
     protected Surface _createSurface(Box b, boolean framed) { return null; }
     protected Picture _createPicture(JS r) { return null; }
     protected PixelBuffer _createPixelBuffer(int w, int h, Surface owner) { return null; }
     protected Surface _createSurface(Box b, boolean framed) { return null; }
     protected Picture _createPicture(JS r) { return null; }
     protected PixelBuffer _createPixelBuffer(int w, int h, Surface owner) { return null; }

-    protected Font.Glyph _createGlyph(org.xwt.Font f, char c) { return new DefaultGlyph(f, c); }
+    protected Font.Glyph _createGlyph(org.ibex.Font f, char c) { return new DefaultGlyph(f, c); }

 
     public static PixelBuffer createPixelBuffer(int w, int h, Surface s) { return platform._createPixelBuffer(w, h, s); }
     public static Picture createPicture(JS r) { return platform._createPicture(r); }
 
     public static PixelBuffer createPixelBuffer(int w, int h, Surface s) { return platform._createPixelBuffer(w, h, s); }
     public static Picture createPicture(JS r) { return platform._createPicture(r); }

-    public static Font.Glyph createGlyph(org.xwt.Font f, char c) { return platform._createGlyph(f, c); }
+    public static Font.Glyph createGlyph(org.ibex.Font f, char c) { return platform._createGlyph(f, c); }

     public static Surface createSurface(Box b, boolean framed, boolean refreshable) {
         Surface ret = platform._createSurface(b, framed);
         ret.setInvisible(false);
     public static Surface createSurface(Box b, boolean framed, boolean refreshable) {
         Surface ret = platform._createSurface(b, framed);
         ret.setInvisible(false);

@@ -127,7 +126,7 @@ public abstract class Platform {
     /** invoked after initialization messages have been printed; useful for additional platform detection log messages */
     protected void postInit() { }
 
     /** invoked after initialization messages have been printed; useful for additional platform detection log messages */
     protected void postInit() { }
 

-    /** the human-readable name of the key mapped to XWT's 'alt' key */
+    /** the human-readable name of the key mapped to Ibex's 'alt' key */

     public static String altKeyName() { return platform._altKeyName(); }
     protected String _altKeyName() { return "alt"; }
 
     public static String altKeyName() { return platform._altKeyName(); }
     protected String _altKeyName() { return "alt"; }
 

@@ -155,11 +154,11 @@ public abstract class Platform {
         platform._criticalAbort(message);
     }
 
         platform._criticalAbort(message);
     }
 

-    /** if true, org.xwt.Surface will generate a Click automatically after a press and a release */
+    /** if true, org.ibex.Surface will generate a Click automatically after a press and a release */

     public static boolean needsAutoClick() { return platform._needsAutoClick(); }
     protected boolean _needsAutoClick() { return false; }
 
     public static boolean needsAutoClick() { return platform._needsAutoClick(); }
     protected boolean _needsAutoClick() { return false; }
 

-    /** if true, org.xwt.Surface will generate a DoubleClick automatically after recieving two clicks in a short period of time */
+    /** if true, org.ibex.Surface will generate a DoubleClick automatically after recieving two clicks in a short period of time */

     public static boolean needsAutoDoubleClick() { return platform._needsAutoDoubleClick(); }
     protected boolean _needsAutoDoubleClick() { return false; }
 
     public static boolean needsAutoDoubleClick() { return platform._needsAutoDoubleClick(); }
     protected boolean _needsAutoDoubleClick() { return false; }
 

@@ -169,7 +168,7 @@ public abstract class Platform {
 
     /** returns an InputStream to the builtin xwar */
     public static InputStream getBuiltinInputStream() { return platform._getBuiltinInputStream(); }
 
     /** returns an InputStream to the builtin xwar */
     public static InputStream getBuiltinInputStream() { return platform._getBuiltinInputStream(); }

-    protected InputStream _getBuiltinInputStream() {return getClass().getClassLoader().getResourceAsStream("org/xwt/builtin.jar");}
+    protected InputStream _getBuiltinInputStream() {return getClass().getClassLoader().getResourceAsStream("org/ibex/builtin.jar");}

 
     /** returns the value of the environment variable key, or null if no such key exists */
     public static String getEnv(String key) { return platform._getEnv(key); }
 
     /** returns the value of the environment variable key, or null if no such key exists */
     public static String getEnv(String key) { return platform._getEnv(key); }

@@ -206,7 +205,7 @@ public abstract class Platform {
 
     /** displays a platform-specific "open file" dialog and returns the chosen filename, or null if the user hit cancel */
     protected String _fileDialog(String suggestedFileName, boolean write) { return null; }
 
     /** displays a platform-specific "open file" dialog and returns the chosen filename, or null if the user hit cancel */
     protected String _fileDialog(String suggestedFileName, boolean write) { return null; }

-    public static String fileDialog(String suggestedFileName, boolean write) throws org.xwt.js.JSExn {
+    public static String fileDialog(String suggestedFileName, boolean write) throws org.ibex.js.JSExn {

         return platform._fileDialog(suggestedFileName, write);
     }
 
         return platform._fileDialog(suggestedFileName, write);
     }
 

@@ -225,7 +224,7 @@ public abstract class Platform {
     /** opens a new browser window */
     public static void newBrowserWindow(String url) {
         if (!(url.startsWith("https://") || url.startsWith("http://") || url.startsWith("ftp://") || url.startsWith("mailto:"))) {
     /** opens a new browser window */
     public static void newBrowserWindow(String url) {
         if (!(url.startsWith("https://") || url.startsWith("http://") || url.startsWith("ftp://") || url.startsWith("mailto:"))) {

-            Log.info(Platform.class, "xwt.newBrowserWindow() only supports http and https urls");
+            Log.info(Platform.class, "ibex.newBrowserWindow() only supports http and https urls");

             return;
         }
         // check the URL for well-formedness, as a defense against buffer overflow attacks
             return;
         }
         // check the URL for well-formedness, as a defense against buffer overflow attacks

@@ -242,15 +241,15 @@ public abstract class Platform {
     }
 
     /** detects proxy settings */
     }
 
     /** detects proxy settings */

-    protected synchronized org.xwt.HTTP.Proxy _detectProxy() { return null; }
-    public static synchronized org.xwt.HTTP.Proxy detectProxy() {
+    protected synchronized org.ibex.HTTP.Proxy _detectProxy() { return null; }
+    public static synchronized org.ibex.HTTP.Proxy detectProxy() {

 
         if (cachedProxyInfo != null) return cachedProxyInfo;
         if (alreadyDetectedProxy) return null;
         alreadyDetectedProxy = true;
 
         Log.info(Platform.class, "attempting environment-variable DNS proxy detection");
 
         if (cachedProxyInfo != null) return cachedProxyInfo;
         if (alreadyDetectedProxy) return null;
         alreadyDetectedProxy = true;
 
         Log.info(Platform.class, "attempting environment-variable DNS proxy detection");

-        cachedProxyInfo = org.xwt.HTTP.Proxy.detectProxyViaManual();
+        cachedProxyInfo = org.ibex.HTTP.Proxy.detectProxyViaManual();

         if (cachedProxyInfo != null) return cachedProxyInfo;
 
         Log.info(Platform.class, "attempting " + platform.getClass().getName() + " proxy detection");
         if (cachedProxyInfo != null) return cachedProxyInfo;
 
         Log.info(Platform.class, "attempting " + platform.getClass().getName() + " proxy detection");

@@ -267,7 +266,7 @@ public abstract class Platform {
     // FEATURE: be more efficient for many of the subclasses
     public static class DefaultGlyph extends Font.Glyph {
         private Picture p = null;
     // FEATURE: be more efficient for many of the subclasses
     public static class DefaultGlyph extends Font.Glyph {
         private Picture p = null;

-        public DefaultGlyph(org.xwt.Font f, char c) { super(f, c); }
+        public DefaultGlyph(org.ibex.Font f, char c) { super(f, c); }

         public Picture getPicture() {
             if (p == null && isLoaded) {
                 Picture p = createPicture(null);
         public Picture getPicture() {
             if (p == null && isLoaded) {
                 Picture p = createPicture(null);

diff --git a/src/org/xwt/SOAP.java b/src/org/ibex/SOAP.java
similarity index 99%
rename from src/org/xwt/SOAP.java
rename to src/org/ibex/SOAP.java
index f3ce759..0cfd1d3 100644 (file)
--- a/src/org/xwt/SOAP.java
+++ b/src/org/ibex/SOAP.java
@@ -1,11 +1,10 @@
 // Copyright 2004 Adam Megacz, see the COPYING file for licensing [GPL]
 // Copyright 2004 Adam Megacz, see the COPYING file for licensing [GPL]

-package org.xwt;
+package org.ibex;

 
 import java.io.*;
 
 import java.io.*;

-import java.net.*;

 import java.util.*;
 import java.util.*;

-import org.xwt.js.*;
-import org.xwt.util.*;
+import org.ibex.js.*;
+import org.ibex.util.*;

 import org.bouncycastle.util.encoders.Base64;
 
 /**
 import org.bouncycastle.util.encoders.Base64;
 
 /**

diff --git a/src/org/xwt/Scheduler.java b/src/org/ibex/Scheduler.java
similarity index 93%
rename from src/org/xwt/Scheduler.java
rename to src/org/ibex/Scheduler.java
index 9e939a3..4ec0aec 100644 (file)
--- a/src/org/xwt/Scheduler.java
+++ b/src/org/ibex/Scheduler.java
@@ -1,14 +1,13 @@
 // Copyright 2004 Adam Megacz, see the COPYING file for licensing [GPL]
 // Copyright 2004 Adam Megacz, see the COPYING file for licensing [GPL]

-package org.xwt;
+package org.ibex;

 
 

-import java.util.*;
-import org.xwt.js.*;
-import org.xwt.util.*;
+import org.ibex.js.*;
+import org.ibex.util.*;

 
 /** Implements cooperative multitasking */
 public class Scheduler {
 
 
 /** Implements cooperative multitasking */
 public class Scheduler {
 

-    // Public API Exposed to org.xwt /////////////////////////////////////////////////
+    // Public API Exposed to org.ibex /////////////////////////////////////////////////

 
     private static Scheduler singleton;
     public static interface Task { public abstract void perform() throws Exception; }
 
     private static Scheduler singleton;
     public static interface Task { public abstract void perform() throws Exception; }

@@ -77,7 +76,7 @@ public class Scheduler {
                 }
                 renderAll();
             } catch (JSExn e) {
                 }
                 renderAll();
             } catch (JSExn e) {

-                Log.info(Scheduler.class, "a JavaScript thread spawned with xwt.thread() threw an exception:");
+                Log.info(Scheduler.class, "a JavaScript thread spawned with ibex.thread() threw an exception:");

                 Log.info(Scheduler.class, "JS Exception: " + e.getObject() + "\n" + e.backtrace());
                 Log.info(Scheduler.class,e);
             } catch (Exception e) {
                 Log.info(Scheduler.class, "JS Exception: " + e.getObject() + "\n" + e.backtrace());
                 Log.info(Scheduler.class,e);
             } catch (Exception e) {

diff --git a/src/org/xwt/Stream.java b/src/org/ibex/Stream.java
similarity index 97%
rename from src/org/xwt/Stream.java
rename to src/org/ibex/Stream.java
index 3d847e8..d200ce0 100644 (file)
--- a/src/org/xwt/Stream.java
+++ b/src/org/ibex/Stream.java
@@ -1,13 +1,11 @@
 // Copyright 2004 Adam Megacz, see the COPYING file for licensing [GPL]
 // Copyright 2004 Adam Megacz, see the COPYING file for licensing [GPL]

-package org.xwt;
+package org.ibex;

 
 import java.io.*;
 
 import java.io.*;

-import java.util.*;

 import java.util.zip.*;
 import java.util.zip.*;

-import org.xwt.js.*;
-import org.xwt.util.*;
+import org.ibex.js.*;
+import org.ibex.util.*;

 import org.xwt.translators.MSPack;
 import org.xwt.translators.MSPack;

-import org.bouncycastle.util.encoders.Base64;

 
 /**
  *   Essentiall an InputStream "factory".  You can repeatedly ask a
 
 /**
  *   Essentiall an InputStream "factory".  You can repeatedly ask a

@@ -38,7 +36,7 @@ public abstract class Stream extends JS.Cloneable {
         HTTP(String url) { while (url.endsWith("/")) url = url.substring(0, url.length() - 1); this.url = url; }
         public Object get(Object key) throws JSExn { return new HTTP(url + "/" + (String)key); }
         public String getCacheKey(Vec path) throws NotCacheableException { return url; }
         HTTP(String url) { while (url.endsWith("/")) url = url.substring(0, url.length() - 1); this.url = url; }
         public Object get(Object key) throws JSExn { return new HTTP(url + "/" + (String)key); }
         public String getCacheKey(Vec path) throws NotCacheableException { return url; }

-        public InputStream getInputStream() throws IOException { return new org.xwt.HTTP(url).GET(); }
+        public InputStream getInputStream() throws IOException { return new org.ibex.HTTP(url).GET(); }

     }
 
     /** byte arrays */
     }
 
     /** byte arrays */

diff --git a/src/org/xwt/Surface.java b/src/org/ibex/Surface.java
similarity index 98%
rename from src/org/xwt/Surface.java
rename to src/org/ibex/Surface.java
index 70dd567..383e7a8 100644 (file)
--- a/src/org/xwt/Surface.java
+++ b/src/org/ibex/Surface.java
@@ -1,14 +1,11 @@
 // Copyright 2004 Adam Megacz, see the COPYING file for licensing [GPL]
 // Copyright 2004 Adam Megacz, see the COPYING file for licensing [GPL]

-package org.xwt;
+package org.ibex;

 
 

-import org.bouncycastle.util.encoders.Base64;
-import org.xwt.js.*;
-import org.xwt.util.*;
-import java.io.*;
-import java.util.*;
+import org.ibex.js.*;
+import org.ibex.util.*;

 
 /** 
 
 /** 

- *  A Surface, as described in the XWT Reference.
+ *  A Surface, as described in the Ibex Reference.

  *
  *  Platform subclasses should include an inner class subclass of
  *  Surface to return from the Platform._createSurface() method
  *
  *  Platform subclasses should include an inner class subclass of
  *  Surface to return from the Platform._createSurface() method

@@ -142,7 +139,7 @@ public abstract class Surface extends PixelBuffer implements Scheduler.Task {
     }
 
     /**
     }
 
     /**

-     *  Notify XWT that the mouse has moved. If the mouse leaves the
+     *  Notify Ibex that the mouse has moved. If the mouse leaves the

      *  surface, but the host windowing system does not provide its new
      *  position (for example, a Java MouseListener.mouseExited()
      *  message), the subclass should use (-1,-1).
      *  surface, but the host windowing system does not provide its new
      *  position (for example, a Java MouseListener.mouseExited()
      *  message), the subclass should use (-1,-1).

diff --git a/src/org/xwt/Template.java b/src/org/ibex/Template.java
similarity index 87%
rename from src/org/xwt/Template.java
rename to src/org/ibex/Template.java
index 2cc6242..00e580a 100644 (file)
--- a/src/org/xwt/Template.java
+++ b/src/org/ibex/Template.java
@@ -1,17 +1,14 @@
 // Copyright 2004 Adam Megacz, see the COPYING file for licensing [GPL]
 // Copyright 2004 Adam Megacz, see the COPYING file for licensing [GPL]

-package org.xwt;
+package org.ibex;

 
 import java.io.*;
 
 import java.io.*;

-import java.util.zip.*;

 import java.util.*;
 import java.util.*;

-import java.lang.*;
-import org.xwt.js.*;
-import org.xwt.translators.*;
-import org.xwt.util.*;
+import org.ibex.js.*;
+import org.ibex.util.*;

 
 /**
  *  Encapsulates a template node (the <template/> element of a
 
 /**
  *  Encapsulates a template node (the <template/> element of a

- *  .xwt file, or any child element thereof).
+ *  .ibex file, or any child element thereof).

  *
  *  Note that the Template instance corresponding to the
  *  <template/> node carries all the header information -- hence
  *
  *  Note that the Template instance corresponding to the
  *  <template/> node carries all the header information -- hence

@@ -19,7 +16,7 @@ import org.xwt.util.*;
  *  Template instances. We refer to these non-root instances as
  *  <i>anonymous templates</i>.
  *
  *  Template instances. We refer to these non-root instances as
  *  <i>anonymous templates</i>.
  *

- *  See the XWT reference for information on the order in which
+ *  See the Ibex reference for information on the order in which

  *  templates are applied, attributes are put, and scripts are run.
  */
 public class Template {
  *  templates are applied, attributes are put, and scripts are run.
  */
 public class Template {

@@ -43,14 +40,14 @@ public class Template {
     private StringBuffer content = null;   ///< during XML parsing, this holds partially-read character data; null otherwise
     private int content_start = 0;         ///< line number of the first line of <tt>content</tt>
     private int startLine = -1;            ///< the line number that this element starts on
     private StringBuffer content = null;   ///< during XML parsing, this holds partially-read character data; null otherwise
     private int content_start = 0;         ///< line number of the first line of <tt>content</tt>
     private int startLine = -1;            ///< the line number that this element starts on

-    private XWT xwt;
+    private Ibex ibex;

 
 
     // Static data/methods ///////////////////////////////////////////////////////////////////
 
     // for non-root nodes
 
 
     // Static data/methods ///////////////////////////////////////////////////////////////////
 
     // for non-root nodes

-    private Template(Template t, int startLine) { prev = t; this.xwt = t.xwt; this.startLine = startLine; }
-    private Template(XWT xwt) { this.xwt = xwt; }
+    private Template(Template t, int startLine) { prev = t; this.ibex = t.ibex; this.startLine = startLine; }
+    private Template(Ibex ibex) { this.ibex = ibex; }

     
 
     // Methods to apply templates ////////////////////////////////////////////////////////
     
 
     // Methods to apply templates ////////////////////////////////////////////////////////

@@ -82,10 +79,10 @@ public class Template {
         // FIXME this dollar stuff is all wrong
         if (id != null) parentPis.putDollar(id, b);
 
         // FIXME this dollar stuff is all wrong
         if (id != null) parentPis.putDollar(id, b);
 

-        PerInstantiationScope pis = new PerInstantiationScope(b, xwt, parentPis, staticScope);
+        PerInstantiationScope pis = new PerInstantiationScope(b, ibex, parentPis, staticScope);

         for(int i=0; i<urikeys.length; i++) {
             pis.declare(urikeys[i]);
         for(int i=0; i<urikeys.length; i++) {
             pis.declare(urikeys[i]);

-            pis.put(urikeys[i], xwt.resolveString(urivals[i], true));
+            pis.put(urikeys[i], ibex.resolveString(urivals[i], true));

         }
 
         // FIXME needs to obey the new application-ordering rules
         }
 
         // FIXME needs to obey the new application-ordering rules

@@ -112,7 +109,7 @@ public class Template {
                         if (val == null) throw new JSExn("unknown box id '"+vals[i]+"' referenced in XML attribute");
                         break;
                     case '.':
                         if (val == null) throw new JSExn("unknown box id '"+vals[i]+"' referenced in XML attribute");
                         break;
                     case '.':

-                        val = xwt.resolveString(((String)val).substring(1), false);
+                        val = ibex.resolveString(((String)val).substring(1), false);

                     // FIXME: url case
                     // FIXME: should we be resolving all of these in the XML-parsing code?
                 }
                     // FIXME: url case
                     // FIXME: should we be resolving all of these in the XML-parsing code?
                 }

@@ -126,9 +123,9 @@ public class Template {
 
     // XML Parsing /////////////////////////////////////////////////////////////////
 
 
     // XML Parsing /////////////////////////////////////////////////////////////////
 

-    public static Template buildTemplate(InputStream is, XWT xwt) {
+    public static Template buildTemplate(InputStream is, Ibex ibex) {

         try {
         try {

-            return new TemplateHelper(is, xwt).t;
+            return new TemplateHelper(is, ibex).t;

         } catch (Exception e) {
             Log.error(Template.class, e);
             return null;
         } catch (Exception e) {
             Log.error(Template.class, e);
             return null;

@@ -140,7 +137,7 @@ public class Template {
 
         private int state = STATE_INITIAL;
         private static final int STATE_INITIAL = 0;
 
         private int state = STATE_INITIAL;
         private static final int STATE_INITIAL = 0;

-        private static final int STATE_IN_XWT_NODE = 1;
+        private static final int STATE_IN_Ibex_NODE = 1;

         private static final int STATE_IN_TEMPLATE_NODE = 2; 
         private static final int STATE_IN_META_NODE = 3;
 
         private static final int STATE_IN_TEMPLATE_NODE = 2; 
         private static final int STATE_IN_META_NODE = 3;
 

@@ -149,13 +146,13 @@ public class Template {
         Vec nodeStack = new Vec();
         Template t = null;
         int meta = 0;
         Vec nodeStack = new Vec();
         Template t = null;
         int meta = 0;

-        XWT xwt;
+        Ibex ibex;

 
 

-        public TemplateHelper(InputStream is, XWT xwt) throws XML.Exn, IOException, JSExn {
-            this.xwt = xwt;
+        public TemplateHelper(InputStream is, Ibex ibex) throws XML.Exn, IOException, JSExn {
+            this.ibex = ibex;

             parse(new InputStreamReader(is));
             JS staticScript = parseScript(static_content, static_content_start);
             parse(new InputStreamReader(is));
             JS staticScript = parseScript(static_content, static_content_start);

-            t.staticScope = new PerInstantiationScope(null, xwt, null, null);
+            t.staticScope = new PerInstantiationScope(null, ibex, null, null);

             if (staticScript != null) JS.cloneWithNewParentScope(staticScript, t.staticScope).call(null, null, null, null, 0);
         }
 
             if (staticScript != null) JS.cloneWithNewParentScope(staticScript, t.staticScope).call(null, null, null, null, 0);
         }
 

@@ -174,16 +171,16 @@ public class Template {
                         throw new XML.Exn("root element was not <ibex>", XML.Exn.SCHEMA, getLine(), getCol());
                     if (c.getAttrLen() != 0)
                         throw new XML.Exn("root element must not have attributes", XML.Exn.SCHEMA, getLine(), getCol());
                         throw new XML.Exn("root element was not <ibex>", XML.Exn.SCHEMA, getLine(), getCol());
                     if (c.getAttrLen() != 0)
                         throw new XML.Exn("root element must not have attributes", XML.Exn.SCHEMA, getLine(), getCol());

-                    state = STATE_IN_XWT_NODE;
+                    state = STATE_IN_Ibex_NODE;

                     return;
                     return;

-                case STATE_IN_XWT_NODE:
+                case STATE_IN_Ibex_NODE:

                     if ("meta".equals(c.getPrefix())) { state = STATE_IN_META_NODE; meta = 0; return; }
                     state = STATE_IN_TEMPLATE_NODE;
                     if ("meta".equals(c.getPrefix())) { state = STATE_IN_META_NODE; meta = 0; return; }
                     state = STATE_IN_TEMPLATE_NODE;

-                    t = (t == null) ? new Template(xwt) : new Template(t, getLine());
+                    t = (t == null) ? new Template(ibex) : new Template(t, getLine());

                     break;
                 case STATE_IN_TEMPLATE_NODE:
                     nodeStack.addElement(t);
                     break;
                 case STATE_IN_TEMPLATE_NODE:
                     nodeStack.addElement(t);

-                    t = new Template(xwt);
+                    t = new Template(ibex);

                     break;
             }
 
                     break;
             }
 

@@ -191,7 +188,7 @@ public class Template {
                 String tagname = (c.getUri().equals("") ? "" : (c.getUri() + ".")) + c.getLocalName();
                 // GROSS hack
                 try {
                 String tagname = (c.getUri().equals("") ? "" : (c.getUri() + ".")) + c.getLocalName();
                 // GROSS hack
                 try {

-                    t.prev = (Template)t.xwt.resolveString(tagname, false).call(null, null, null, null, 9999);
+                    t.prev = (Template)t.ibex.resolveString(tagname, false).call(null, null, null, null, 9999);

                 } catch (Exception e) {
                     Log.error(Template.class, e);
                 }
                 } catch (Exception e) {
                     Log.error(Template.class, e);
                 }

@@ -268,11 +265,11 @@ public class Template {
 
         public void endElement(XML.Element c) throws XML.Exn, IOException {
             switch(state) {
 
         public void endElement(XML.Element c) throws XML.Exn, IOException {
             switch(state) {

-                case STATE_IN_META_NODE: if (meta-- < 0) state = STATE_IN_XWT_NODE; return;
-                case STATE_IN_XWT_NODE: return;
+                case STATE_IN_META_NODE: if (meta-- < 0) state = STATE_IN_Ibex_NODE; return;
+                case STATE_IN_Ibex_NODE: return;

                 case STATE_IN_TEMPLATE_NODE: {
                     if (t.content != null) { t.script = parseScript(t.content, t.content_start); t.content = null; }
                 case STATE_IN_TEMPLATE_NODE: {
                     if (t.content != null) { t.script = parseScript(t.content, t.content_start); t.content = null; }

-                    if (nodeStack.size() == 0) { state = STATE_IN_XWT_NODE; return; }
+                    if (nodeStack.size() == 0) { state = STATE_IN_Ibex_NODE; return; }

                     Template oldt = t;
                     t = (Template)nodeStack.lastElement();
                     nodeStack.setSize(nodeStack.size() - 1);
                     Template oldt = t;
                     t = (Template)nodeStack.lastElement();
                     nodeStack.setSize(nodeStack.size() - 1);

@@ -285,7 +282,7 @@ public class Template {
 
         public void characters(char[] ch, int start, int length) throws XML.Exn {
             for (int i=0; length >i; i++) if (ch[start+i] == '\t')
 
         public void characters(char[] ch, int start, int length) throws XML.Exn {
             for (int i=0; length >i; i++) if (ch[start+i] == '\t')

-                Log.error(Template.class, "tabs are not allowed in XWT files ("+getLine()+":"+getCol()+")");
+                Log.error(Template.class, "tabs are not allowed in Ibex files ("+getLine()+":"+getCol()+")");

             switch(state) {
                 case STATE_IN_TEMPLATE_NODE:
                     if (t.content == null) {
             switch(state) {
                 case STATE_IN_TEMPLATE_NODE:
                     if (t.content == null) {

@@ -294,7 +291,7 @@ public class Template {
                     }
                     t.content.append(ch, start, length);
                     return;
                     }
                     t.content.append(ch, start, length);
                     return;

-                case STATE_IN_XWT_NODE:
+                case STATE_IN_Ibex_NODE:

                     if (static_content == null) {
                         static_content_start = getLine();
                         static_content = new StringBuffer();
                     if (static_content == null) {
                         static_content_start = getLine();
                         static_content = new StringBuffer();

@@ -308,7 +305,7 @@ public class Template {
     }
 
     private static class PerInstantiationScope extends JSScope {
     }
 
     private static class PerInstantiationScope extends JSScope {

-        XWT xwt = null;
+        Ibex ibex = null;

         PerInstantiationScope parentBoxPis = null;
         JSScope myStatic = null;
         void putDollar(String key, Box target) throws JSExn {
         PerInstantiationScope parentBoxPis = null;
         JSScope myStatic = null;
         void putDollar(String key, Box target) throws JSExn {

@@ -316,16 +313,16 @@ public class Template {
             declare("$" + key);
             put("$" + key, target);
         }
             declare("$" + key);
             put("$" + key, target);
         }

-        public PerInstantiationScope(JSScope parentScope, XWT xwt, PerInstantiationScope parentBoxPis, JSScope myStatic) {
+        public PerInstantiationScope(JSScope parentScope, Ibex ibex, PerInstantiationScope parentBoxPis, JSScope myStatic) {

             super(parentScope);
             this.parentBoxPis = parentBoxPis;
             super(parentScope);
             this.parentBoxPis = parentBoxPis;

-            this.xwt = xwt;
+            this.ibex = ibex;

             this.myStatic = myStatic;
         }
         public Object get(Object key) throws JSExn {
             if (super.has(key)) return super.get(key);
             this.myStatic = myStatic;
         }
         public Object get(Object key) throws JSExn {
             if (super.has(key)) return super.get(key);

-            if (key.equals("xwt")) return xwt;
-            if (key.equals("")) return xwt.get("");
+            if (key.equals("ibex")) return ibex;
+            if (key.equals("")) return ibex.get("");

             if (key.equals("static")) return myStatic;
             return super.get(key);
         }
             if (key.equals("static")) return myStatic;
             return super.get(key);
         }

diff --git a/src/org/xwt/VectorGraphics.java b/src/org/ibex/VectorGraphics.java
similarity index 99%
rename from src/org/xwt/VectorGraphics.java
rename to src/org/ibex/VectorGraphics.java
index 988c18a..a634b67 100644 (file)
--- a/src/org/xwt/VectorGraphics.java
+++ b/src/org/ibex/VectorGraphics.java
@@ -1,7 +1,6 @@
 // FIXME
 // Copyright 2002 Adam Megacz, see the COPYING file for licensing [GPL]
 // FIXME
 // Copyright 2002 Adam Megacz, see the COPYING file for licensing [GPL]

-package org.xwt;
-import org.xwt.util.*;
+package org.ibex;

 import java.util.*;
 
 // FIXME: offer a "subpixel" mode where we pass floats to the Platform and don't do any snapping
 import java.util.*;
 
 // FIXME: offer a "subpixel" mode where we pass floats to the Platform and don't do any snapping

@@ -29,7 +28,7 @@ import java.util.*;
         - transform each corner of the trapezoid and then interpolate
 */
 
         - transform each corner of the trapezoid and then interpolate
 */
 

-/** XWT's fully conformant Static SVG Viewer; see SVG spec, section G.7 */
+/** Ibex's fully conformant Static SVG Viewer; see SVG spec, section G.7 */

 public final class VectorGraphics {
 
     // Private Constants ///////////////////////////////////////////////////////////////////
 public final class VectorGraphics {
 
     // Private Constants ///////////////////////////////////////////////////////////////////

diff --git a/src/org/xwt/XMLRPC.java b/src/org/ibex/XMLRPC.java
similarity index 98%
rename from src/org/xwt/XMLRPC.java
rename to src/org/ibex/XMLRPC.java
index f78936a..6c1699c 100644 (file)
--- a/src/org/xwt/XMLRPC.java
+++ b/src/org/ibex/XMLRPC.java
@@ -1,16 +1,15 @@
 // Copyright 2004 Adam Megacz, see the COPYING file for licensing [GPL]
 // Copyright 2004 Adam Megacz, see the COPYING file for licensing [GPL]

-package org.xwt;
+package org.ibex;

 
 import java.io.*;
 
 import java.io.*;

-import java.net.*;

 import java.util.*;
 import java.util.*;

-import org.xwt.js.*;
-import org.xwt.util.*;
+import org.ibex.js.*;
+import org.ibex.util.*;

 import org.bouncycastle.util.encoders.Base64;
 
 /**
  *  An XML-RPC client implemented as a JavaScript Host Object. See the
 import org.bouncycastle.util.encoders.Base64;
 
 /**
  *  An XML-RPC client implemented as a JavaScript Host Object. See the

- *  XWT spec for information on its behavior.
+ *  Ibex spec for information on its behavior.

  *
  *  NOTE: this client is EXTREMELY lenient in the responses it will
  *  accept; there are many, many invalid responses that it will
  *
  *  NOTE: this client is EXTREMELY lenient in the responses it will
  *  accept; there are many, many invalid responses that it will

@@ -120,7 +119,7 @@ class XMLRPC extends JS {
                     objects.setElementAt(nd, objects.size() - 1);
                     
                 } catch (Exception e) {
                     objects.setElementAt(nd, objects.size() - 1);
                     
                 } catch (Exception e) {

-                    throw new RuntimeException("xwt.net.rpc.xml.recieve.malformedDateTag" +
+                    throw new RuntimeException("ibex.net.rpc.xml.recieve.malformedDateTag" +

                                     "the server sent a <dateTime.iso8601> tag which was malformed: " + s);
                 }
             case "member":
                                     "the server sent a <dateTime.iso8601> tag which was malformed: " + s);
                 }
             case "member":

diff --git a/src/org/xwt/builtin/bevel.xwt b/src/org/ibex/builtin/bevel.ibex
similarity index 66%
rename from src/org/xwt/builtin/bevel.xwt
rename to src/org/ibex/builtin/bevel.ibex
index 240697f..370f44f 100644 (file)
--- a/src/org/xwt/builtin/bevel.xwt
+++ b/src/org/ibex/builtin/bevel.ibex
@@ -1,5 +1,5 @@
 <!-- Copyright 2002 Adam Megacz, see the COPYING file for licensing [LGPL] -->
 <!-- Copyright 2002 Adam Megacz, see the COPYING file for licensing [LGPL] -->

-<xwt>
+<ibex>

 
     <redirect target="self"/>
     <template thickness="2" depth="up" hpad="2" vpad="2">
 
     <redirect target="self"/>
     <template thickness="2" depth="up" hpad="2" vpad="2">

@@ -15,12 +15,12 @@
             if (thickness > hpad) hpad = thickness;
             if (thickness > vpad) vpad = thickness;
 
             if (thickness > hpad) hpad = thickness;
             if (thickness > vpad) vpad = thickness;
 

-            if (depth == "up") border = "org.xwt.builtin.bevel_2_up";
-            else if (depth == "down") border = "org.xwt.builtin.bevel_2_down";
-            else if (depth == "flat") border = "org.xwt.builtin.bevel_2_flat";
+            if (depth == "up") border = "org.ibex.builtin.bevel_2_up";
+            else if (depth == "down") border = "org.ibex.builtin.bevel_2_down";
+            else if (depth == "flat") border = "org.ibex.builtin.bevel_2_flat";

             else border = null;
         }
 
     </template>
 
             else border = null;
         }
 
     </template>
 

-</xwt>
+</ibex>

diff --git a/src/org/xwt/builtin/bevel_2_down.png b/src/org/ibex/builtin/bevel_2_down.png
similarity index 100%
rename from src/org/xwt/builtin/bevel_2_down.png
rename to src/org/ibex/builtin/bevel_2_down.png

diff --git a/src/org/xwt/builtin/bevel_2_flat.png b/src/org/ibex/builtin/bevel_2_flat.png
similarity index 100%
rename from src/org/xwt/builtin/bevel_2_flat.png
rename to src/org/ibex/builtin/bevel_2_flat.png

diff --git a/src/org/xwt/builtin/bevel_2_up.png b/src/org/ibex/builtin/bevel_2_up.png
similarity index 100%
rename from src/org/xwt/builtin/bevel_2_up.png
rename to src/org/ibex/builtin/bevel_2_up.png

diff --git a/src/org/xwt/builtin/button.xwt b/src/org/ibex/builtin/button.ibex
similarity index 82%
rename from src/org/xwt/builtin/button.xwt
rename to src/org/ibex/builtin/button.ibex
index 6d19c17..45bad31 100644 (file)
--- a/src/org/xwt/builtin/button.xwt
+++ b/src/org/ibex/builtin/button.ibex
@@ -1,8 +1,8 @@
 <!-- Copyright 2002 Adam Megacz, see the COPYING file for licensing [LGPL] -->
 <!-- Copyright 2002 Adam Megacz, see the COPYING file for licensing [LGPL] -->

-<xwt>
+<ibex>

 
     <redirect target="self"/>
 
     <redirect target="self"/>

-    <preapply name="org.xwt.builtin.bevel"/>
+    <preapply name="org.ibex.builtin.bevel"/>

     <template hot="false">
 
         var owned = false;
     <template hot="false">
 
         var owned = false;

@@ -16,11 +16,11 @@
             owned = true;
             press = true;
 
             owned = true;
             press = true;
 

-            xwt.thread = function() {
-                xwt.sleep(holdfrequency);
+            ibex.thread = function() {
+                ibex.sleep(holdfrequency);

                 while (owned) {
                 while (owned) {

-                    if (xwt.button == 1 and mouseinside) hold = true;
-                    xwt.sleep(holdfrequency);
+                    if (ibex.button == 1 and mouseinside) hold = true;
+                    ibex.sleep(holdfrequency);

                 }
             }
             root._Release1 = function() {
                 }
             }
             root._Release1 = function() {

@@ -50,4 +50,4 @@
 
     </template>
 
 
     </template>
 

-</xwt>    
\ No newline at end of file
+</ibex>    

diff --git a/src/org/xwt/builtin/edit.xwt b/src/org/ibex/builtin/edit.ibex
similarity index 90%
rename from src/org/xwt/builtin/edit.xwt
rename to src/org/ibex/builtin/edit.ibex
index 707129a..b767f42 100644 (file)
--- a/src/org/xwt/builtin/edit.xwt
+++ b/src/org/ibex/builtin/edit.ibex
@@ -1,5 +1,5 @@
 <!-- Copyright 2002 NeuronForge Pty Ltd, see COPYING file for licensing [LGPL] -->
 <!-- Copyright 2002 NeuronForge Pty Ltd, see COPYING file for licensing [LGPL] -->

-<xwt>
+<ibex>

     A single-line or multi-line edit widget. Only handles text with one font and one color, and is capable of line or word wrapping.
 
     TRAPS:
     A single-line or multi-line edit widget. Only handles text with one font and one color, and is capable of line or word wrapping.
 
     TRAPS:

@@ -64,7 +64,7 @@
     - keep length value up to date so limit checking works.
     - insert key
 
     - keep length value up to date so limit checking works.
     - insert key
 

-    <preapply name="org.xwt.builtin.edit_lib"/>
+    <preapply name="org.ibex.builtin.edit_lib"/>

 
     <template multiline="false" disabled="false" editable="true" wrap="none" font="sansserif"
               selectcolor="blue" selecttextcolor="#FFFFFF" color="#FFFFFF" orient="vertical">
 
     <template multiline="false" disabled="false" editable="true" wrap="none" font="sansserif"
               selectcolor="blue" selecttextcolor="#FFFFFF" color="#FFFFFF" orient="vertical">

@@ -96,18 +96,18 @@
             var key = k.substring(k.lastIndexOf('-')+1).toLowerCase();
 
             if (key.length == 1) {
             var key = k.substring(k.lastIndexOf('-')+1).toLowerCase();
 
             if (key.length == 1) {

-                if (xwt.control) {
+                if (ibex.control) {

                     if (key == 'a') {
                         selectText(0, 0, content.numchildren -1, content[content.numchildren -1].fulltext.length);
                         arguments.cascade(null);
                     } else if (key == 'x') {
                     if (key == 'a') {
                         selectText(0, 0, content.numchildren -1, content[content.numchildren -1].fulltext.length);
                         arguments.cascade(null);
                     } else if (key == 'x') {

-                        xwt.clipboard = selection; deleteSelection();
+                        ibex.clipboard = selection; deleteSelection();

                         arguments.cascade(null);
                     } else if (key == 'c') {
                         arguments.cascade(null);
                     } else if (key == 'c') {

-                        xwt.clipboard = selection;
+                        ibex.clipboard = selection;

                         arguments.cascade(null);
                     } else if (key == 'v') {
                         arguments.cascade(null);
                     } else if (key == 'v') {

-                        deleteSelection(); insertText(curs.cl, curs.cx, xwt.clipboard);
+                        deleteSelection(); insertText(curs.cl, curs.cx, ibex.clipboard);

                         textChangd = true;
                         arguments.cascade(null);
                     } else {
                         textChangd = true;
                         arguments.cascade(null);
                     } else {

@@ -119,7 +119,7 @@
             } else if (key == "left") {
                 var cl, cx;
 
             } else if (key == "left") {
                 var cl, cx;
 

-                if (xwt.control) {
+                if (ibex.control) {

                     // Skip word algorithm. Ugly to look at.
                     cl = curs.cl; cx = curs.cx;
 
                     // Skip word algorithm. Ugly to look at.
                     cl = curs.cl; cx = curs.cx;
 

@@ -141,14 +141,14 @@
                     else               { cl = curs.cl; cx = curs.cx -1; }
                 }
 
                     else               { cl = curs.cl; cx = curs.cx -1; }
                 }
 

-                if (xwt.shift) { updateSelectionCx(cl, cx); }
+                if (ibex.shift) { updateSelectionCx(cl, cx); }

                 else           { clearSelection(); moveCursor(cl, cx); }
                 arguments.cascade(null);
 
             } else if (key == "right") {
                 var cl, cx;
 
                 else           { clearSelection(); moveCursor(cl, cx); }
                 arguments.cascade(null);
 
             } else if (key == "right") {
                 var cl, cx;
 

-                if (xwt.control) {
+                if (ibex.control) {

                     // Skip word algorithm. Ugly to look at.
                     cl = curs.cl; cx = curs.cx;
 
                     // Skip word algorithm. Ugly to look at.
                     cl = curs.cl; cx = curs.cx;
 

@@ -170,51 +170,51 @@
                     else               { cl = curs.cl; cx = curs.cx +1; }
                 }
 
                     else               { cl = curs.cl; cx = curs.cx +1; }
                 }
 

-                if (xwt.shift) { updateSelectionCx(cl, cx); }
+                if (ibex.shift) { updateSelectionCx(cl, cx); }

                 else           { clearSelection(); moveCursor(cl, cx); }
                 arguments.cascade(null);
 
             } else if (key == "down") {
                 var cl, cy;
                 else           { clearSelection(); moveCursor(cl, cx); }
                 arguments.cascade(null);
 
             } else if (key == "down") {
                 var cl, cy;

-                if (xwt.control) { cl = content.numchildren -1; cy = content[cl].numchildren -1; }
+                if (ibex.control) { cl = content.numchildren -1; cy = content[cl].numchildren -1; }

                 else  { if (curs.cy == content[curs.cl].numchildren -1) { cl = curs.cl +1; cy = 0; } else { cl = curs.cl; cy = curs.cy + 1; } }
 
                 else  { if (curs.cy == content[curs.cl].numchildren -1) { cl = curs.cl +1; cy = 0; } else { cl = curs.cl; cy = curs.cy + 1; } }
 

-                if (xwt.shift) { updateSelection(cl, cy, curs.px); }
+                if (ibex.shift) { updateSelection(cl, cy, curs.px); }

                 else           { var px = curs.px; clearSelection(); moveCursorToCy(cl, cy, px); }
                 arguments.cascade(null);
 
             } else if (key == "up") {
                 var cl, cy;
                 else           { var px = curs.px; clearSelection(); moveCursorToCy(cl, cy, px); }
                 arguments.cascade(null);
 
             } else if (key == "up") {
                 var cl, cy;

-                if (xwt.control) { cl = 0; cy = content[0].numchildren -1; }
+                if (ibex.control) { cl = 0; cy = content[0].numchildren -1; }

                 else  {
                     if (curs.cy == 0) { if (curs.cl == 0) { cl=0; cy=0; } else { cl = curs.cl -1; cy = content[cl].numchildren -1; } }
                     else { cl = curs.cl; cy = curs.cy -1; }
                 }
 
                 else  {
                     if (curs.cy == 0) { if (curs.cl == 0) { cl=0; cy=0; } else { cl = curs.cl -1; cy = content[cl].numchildren -1; } }
                     else { cl = curs.cl; cy = curs.cy -1; }
                 }
 

-                if (xwt.shift) { updateSelection(cl, cy, curs.px); }
+                if (ibex.shift) { updateSelection(cl, cy, curs.px); }

                 else           { var px = curs.px; clearSelection(); moveCursorToCy(cl, cy, px); }
                 arguments.cascade(null);
 
             } else if (key == "home") {
                 var cy;
                 else           { var px = curs.px; clearSelection(); moveCursorToCy(cl, cy, px); }
                 arguments.cascade(null);
 
             } else if (key == "home") {
                 var cy;

-                if (xwt.control) { cy = 0; }
+                if (ibex.control) { cy = 0; }

                 else             { cy = curs.cy; }
 
                 else             { cy = curs.cy; }
 

-                if (xwt.shift) { updateSelection(curs.cl, cy, 0); }
+                if (ibex.shift) { updateSelection(curs.cl, cy, 0); }

                 else           { var cl = curs.cl; clearSelection(); moveCursorToCy(cl, cy, 0); }
                 arguments.cascade(null);
 
             } else if (key == "end") {
                 var cy;
                 else           { var cl = curs.cl; clearSelection(); moveCursorToCy(cl, cy, 0); }
                 arguments.cascade(null);
 
             } else if (key == "end") {
                 var cy;

-                if (xwt.control) { cy = content[curs.cl].numchildren -1; }
+                if (ibex.control) { cy = content[curs.cl].numchildren -1; }

                 else             { cy = curs.cy; }
 
                 else             { cy = curs.cy; }
 

-                if (xwt.shift) { updateSelection(curs.cl, cy, content[curs.cl][cy].text.length); }
+                if (ibex.shift) { updateSelection(curs.cl, cy, content[curs.cl][cy].text.length); }

                 else           { var cl = curs.cl; clearSelection(); moveCursorToCy(cl, cy, content[cl][cy].text.length); }
                 arguments.cascade(null);
 
             } else if (key == "insert") {
                 else           { var cl = curs.cl; clearSelection(); moveCursorToCy(cl, cy, content[cl][cy].text.length); }
                 arguments.cascade(null);
 
             } else if (key == "insert") {

-                xwt.println("NOT YET IMPLEMENTED: insert key"); // TODO
+                ibex.println("NOT YET IMPLEMENTED: insert key"); // TODO

                 arguments.cascade(null);
             }
         }
                 arguments.cascade(null);
             }
         }

@@ -231,4 +231,4 @@
             _blink = function(v) { invisible = (focused and !disabled) ? v : true; }
         </box>
     </template>
             _blink = function(v) { invisible = (focused and !disabled) ? v : true; }
         </box>
     </template>

-</xwt>
+</ibex>

diff --git a/src/org/xwt/builtin/edit_lib.xwt b/src/org/ibex/builtin/edit_lib.ibex
similarity index 92%
rename from src/org/xwt/builtin/edit_lib.xwt
rename to src/org/ibex/builtin/edit_lib.ibex
index abcc8eb..c842594 100644 (file)
--- a/src/org/xwt/builtin/edit_lib.xwt
+++ b/src/org/ibex/builtin/edit_lib.ibex
@@ -1,11 +1,11 @@
 <!-- Copyright 2002 NeuronForge Pty Ltd, see COPYING file for licensing [LGPL] -->
 <!-- Copyright 2002 NeuronForge Pty Ltd, see COPYING file for licensing [LGPL] -->

-<xwt>
+<ibex>

     <static>
         var cursors = [];
         var worddivider = [' ', '-'];
 
     <static>
         var cursors = [];
         var worddivider = [' ', '-'];
 

-        xwt.thread = function() {
-            while (true) { xwt.sleep(1000); for (var i=0; cursors.length > i; i++) { cursors[i].blink = !cursors[i].blink; } }
+        ibex.thread = function() {
+            while (true) { ibex.sleep(1000); for (var i=0; cursors.length > i; i++) { cursors[i].blink = !cursors[i].blink; } }

         }
 
         // Returns the number of characters the pixel position pos is into text t. end is the pixel with of t.
         }
 
         // Returns the number of characters the pixel position pos is into text t. end is the pixel with of t.

@@ -19,20 +19,20 @@
             if (pxpos >= pxlen) return t.length;
 
             // Inital guess based on average character width.
             if (pxpos >= pxlen) return t.length;
 
             // Inital guess based on average character width.

-            var guessch = xwt.math.min(t.length, xwt.math.floor(pxpos / (pxlen / t.length)));
-            var guesspx = xwt.textwidth(tfont, t.substring(0, guessch));
+            var guessch = ibex.math.min(t.length, ibex.math.floor(pxpos / (pxlen / t.length)));
+            var guesspx = ibex.textwidth(tfont, t.substring(0, guessch));

 
             if (guesspx > pxpos) {
                 while (guesspx > pxpos) {
                     // Textwidth of individual character must account for font kerning.
 
             if (guesspx > pxpos) {
                 while (guesspx > pxpos) {
                     // Textwidth of individual character must account for font kerning.

-                    guesspx -= xwt.textwidth(tfont, t.substring(guessch -1, guessch +1)) - xwt.textwidth(tfont, t.charAt(guessch));
+                    guesspx -= ibex.textwidth(tfont, t.substring(guessch -1, guessch +1)) - ibex.textwidth(tfont, t.charAt(guessch));

                     guessch--;
                 }
             } else if (pxpos > guesspx) {
                 while (pxpos > guesspx) {
                     guessch++;
                     if (guessch >= t.length) break;
                     guessch--;
                 }
             } else if (pxpos > guesspx) {
                 while (pxpos > guesspx) {
                     guessch++;
                     if (guessch >= t.length) break;

-                    guesspx += xwt.textwidth(tfont, t.substring(guessch -1, guessch+1)) - xwt.textwidth(tfont, t.charAt(guessch));
+                    guesspx += ibex.textwidth(tfont, t.substring(guessch -1, guessch+1)) - ibex.textwidth(tfont, t.charAt(guessch));

                 }
                 guessch--;  // Round down.
             }
                 }
                 guessch--;  // Round down.
             }

@@ -60,7 +60,7 @@
         _wrap = function(v) {
             // Used on _SizeChange if wrap needs to know.
             var resize = function() {
         _wrap = function(v) {
             // Used on _SizeChange if wrap needs to know.
             var resize = function() {

-                xwt.thread = function() {
+                ibex.thread = function() {

                     // TODO: Only run this change if the width is different.
                     for (var i = 0; content.numchildren > i; i++) { content[i].fulltext = content[i].fulltext; }
                 };
                     // TODO: Only run this change if the width is different.
                     for (var i = 0; content.numchildren > i; i++) { content[i].fulltext = content[i].fulltext; }
                 };

@@ -69,14 +69,14 @@
             if (multiline and v == "line") {
                 content.vshrink = true;
                 content.hshrink = false;
             if (multiline and v == "line") {
                 content.vshrink = true;
                 content.hshrink = false;

-                content.maxwidth = xwt.maxdim; // Must reset maxwidth after shrink = true.
+                content.maxwidth = ibex.maxdim; // Must reset maxwidth after shrink = true.

                 ref_fulltext = fulltext_linewrap;
                 _SizeChange = resize;
 
             } else if (multiline and v == "word") {
                 content.vshrink = true;
                 content.hshrink = false;
                 ref_fulltext = fulltext_linewrap;
                 _SizeChange = resize;
 
             } else if (multiline and v == "word") {
                 content.vshrink = true;
                 content.hshrink = false;

-                content.maxwidth = xwt.maxdim;
+                content.maxwidth = ibex.maxdim;

                 ref_fulltext = fulltext_wordwrap;
                 _SizeChange = resize;
 
                 ref_fulltext = fulltext_wordwrap;
                 _SizeChange = resize;
 

@@ -97,7 +97,7 @@
         _selecttextcolor = function(v) { sel1.textcolor = sel2.textcolor = v; }
 
         _font = function(f) {
         _selecttextcolor = function(v) { sel1.textcolor = sel2.textcolor = v; }
 
         _font = function(f) {

-            lineheight = xwt.textheight(f);
+            lineheight = ibex.textheight(f);

             if (lineheight > 0) { minheight = content.minheight = linecount * lineheight; }
             for (var i=0; content.numchildren > i; i++) { content[i].font = f; }
             sel1.font = sel2.font = curs.font = f;
             if (lineheight > 0) { minheight = content.minheight = linecount * lineheight; }
             for (var i=0; content.numchildren > i; i++) { content[i].font = f; }
             sel1.font = sel2.font = curs.font = f;

@@ -166,7 +166,7 @@
 
             // Limit checking.
             if (limit > 0 and length + t.length > limit) {
 
             // Limit checking.
             if (limit > 0 and length + t.length > limit) {

-                xwt.println("WARNING: Limit applied on inserted text.");
+                ibex.println("WARNING: Limit applied on inserted text.");

                 t = t.substring(0, limit - length);
             }
 
                 t = t.substring(0, limit - length);
             }
 

@@ -196,7 +196,7 @@
 
                     moveCursor(cl + newT.length - 1, newT[newT.length -1].length);
                 } else {
 
                     moveCursor(cl + newT.length - 1, newT[newT.length -1].length);
                 } else {

-                    xwt.println("WARNING: Single line edit, ignoring all text after the carrige return.");
+                    ibex.println("WARNING: Single line edit, ignoring all text after the carrige return.");

                     content[0].fulltext = content[0].fulltext.substring(0, cx) + newT[0] + content[0].fulltext.substring(cx);
 
                     moveCursor(0, cx + newT[0].length);
                     content[0].fulltext = content[0].fulltext.substring(0, cx) + newT[0] + content[0].fulltext.substring(cx);
 
                     moveCursor(0, cx + newT[0].length);

@@ -344,12 +344,12 @@
             if (sel1.cl == cl1) {
                 for (var i=sel1.cy+1; cy1 >= i; i++) { content[cl1][i].selected = false; }
             } else if (cl1 > sel1.cl) {
             if (sel1.cl == cl1) {
                 for (var i=sel1.cy+1; cy1 >= i; i++) { content[cl1][i].selected = false; }
             } else if (cl1 > sel1.cl) {

-                for (var i=xwt.math.max(0, sel1.cl); cl1 >= i; i++) { content[i].selected = false; }
+                for (var i=ibex.math.max(0, sel1.cl); cl1 >= i; i++) { content[i].selected = false; }

             }
             if (sel2.cl == cl2) { 
                 for (var i=sel2.cy-1; i >= cy2; i--) { content[cl2][i].selected = false; }
             } else if (sel2.cl > cl2) {
             }
             if (sel2.cl == cl2) { 
                 for (var i=sel2.cy-1; i >= cy2; i--) { content[cl2][i].selected = false; }
             } else if (sel2.cl > cl2) {

-                for (var i=xwt.math.max(0, sel2.cl); i >= cl2; i--) { content[i].selected = false; }
+                for (var i=ibex.math.max(0, sel2.cl); i >= cl2; i--) { content[i].selected = false; }

             }
 
             // Store point data.
             }
 
             // Store point data.

@@ -358,7 +358,7 @@
 
             // Place first select box.
             sel1.y = content[cl1].y + content[cl1][cy1].y;
 
             // Place first select box.
             sel1.y = content[cl1].y + content[cl1][cy1].y;

-            sel1.x = xwt.textwidth(font, content[cl1][cy1].text.substring(0, px1));
+            sel1.x = ibex.textwidth(font, content[cl1][cy1].text.substring(0, px1));

 
             if (cl1 == cl2 and cy1 == cy2) {
                 // Only the first select box is required.
 
             if (cl1 == cl2 and cy1 == cy2) {
                 // Only the first select box is required.

@@ -405,7 +405,7 @@
             // Move the cursor.
             curs.cl = cl; curs.cx = cx; curs.cy = cy; curs.px = px;
             curs.y = content.y + content[cl].y + (lineheight * cy);
             // Move the cursor.
             curs.cl = cl; curs.cx = cx; curs.cy = cy; curs.px = px;
             curs.y = content.y + content[cl].y + (lineheight * cy);

-            curs.x = content.x + xwt.textwidth(font, content[cl][cy].text.substring(0, px)) -1;
+            curs.x = content.x + ibex.textwidth(font, content[cl][cy].text.substring(0, px)) -1;

             curs.blink = false;
 
             // Speed Hack: As the cursor has values that match the names used by the focusarea variable, we
             curs.blink = false;
 
             // Speed Hack: As the cursor has values that match the names used by the focusarea variable, we

@@ -417,7 +417,7 @@
 
         // Returns a box ready to be a full line, armed with the current fulltext trap.
         var newLine = function() {
 
         // Returns a box ready to be a full line, armed with the current fulltext trap.
         var newLine = function() {

-            var b = xwt.newBox();
+            var b = ibex.newBox();

 
             b.color     = color;
             b.align     = "topleft";
 
             b.color     = color;
             b.align     = "topleft";

@@ -437,7 +437,7 @@
 
         // Returns a box ready to be a soft line; one of the components of a line.
         var newSoftline = function() {
 
         // Returns a box ready to be a soft line; one of the components of a line.
         var newSoftline = function() {

-            var b = xwt.newBox();
+            var b = ibex.newBox();

 
             b._selected = function(s) {
                 arguments.trapee.color     = s ? selectcolor : color;
 
             b._selected = function(s) {
                 arguments.trapee.color     = s ? selectcolor : color;

@@ -487,7 +487,7 @@
                 if (i == arguments.trapee.numchildren) { arguments.trapee[i] = newSoftline(); }
 
                 // TODO: Switch to getpos
                 if (i == arguments.trapee.numchildren) { arguments.trapee[i] = newSoftline(); }
 
                 // TODO: Switch to getpos

-                var nl = static.getpos(t, cw, xwt.textwidth(font, t), font);
+                var nl = static.getpos(t, cw, ibex.textwidth(font, t), font);

                 arguments.trapee[i].text = t.substring(0, nl);
                 t = t.substring(nl);
             }
                 arguments.trapee[i].text = t.substring(0, nl);
                 t = t.substring(nl);
             }

@@ -507,7 +507,7 @@
             for (; t.length > 0; i++) {
                 if (i == arguments.trapee.numchildren) { arguments.trapee[i] = newSoftline(); }
 
             for (; t.length > 0; i++) {
                 if (i == arguments.trapee.numchildren) { arguments.trapee[i] = newSoftline(); }
 

-                var nl = static.getpos(t, cw, xwt.textwidth(font, t), font);
+                var nl = static.getpos(t, cw, ibex.textwidth(font, t), font);

 
                 var rl = nl;
                 if (t.length > nl) {
 
                 var rl = nl;
                 if (t.length > nl) {

@@ -538,7 +538,7 @@
 
             root._Move = function() {
                 // Update Selection.
 
             root._Move = function() {
                 // Update Selection.

-                var linediff = xwt.math.floor((content.mousey - (content[sel.cl].y + content[sel.cl][sel.cy].y)) / lineheight);
+                var linediff = ibex.math.floor((content.mousey - (content[sel.cl].y + content[sel.cl][sel.cy].y)) / lineheight);

 
                 var cl = sel.cl;
                 var cy = sel.cy;
 
                 var cl = sel.cl;
                 var cy = sel.cy;

@@ -572,7 +572,7 @@
             // Set selection root position.
             clearSelection();
             sel.cl = content.indexof(refline);
             // Set selection root position.
             clearSelection();
             sel.cl = content.indexof(refline);

-            sel.cy = xwt.math.floor(refline.mousey / lineheight);
+            sel.cy = ibex.math.floor(refline.mousey / lineheight);

 
             if (sel.cy >= refline.numchildren) sel.cy = refline.numchildren -1;
             else if (0 > sel.cy)               sel.cy = 0;
 
             if (sel.cy >= refline.numchildren) sel.cy = refline.numchildren -1;
             else if (0 > sel.cy)               sel.cy = 0;

@@ -611,7 +611,7 @@
             content[curs.cl +1] = newLine();
             content[curs.cl +1].fulltext = content[curs.cl].fulltext.substring(curs.cx);
             content[curs.cl].fulltext = content[curs.cl].fulltext.substring(0, curs.cx);
             content[curs.cl +1] = newLine();
             content[curs.cl +1].fulltext = content[curs.cl].fulltext.substring(curs.cx);
             content[curs.cl].fulltext = content[curs.cl].fulltext.substring(0, curs.cx);

-            xwt.thread = function() { moveCursor(curs.cl +1, 0); }
+            ibex.thread = function() { moveCursor(curs.cl +1, 0); }

         }
 
         key_back_space = function() {
         }
 
         key_back_space = function() {

@@ -652,7 +652,7 @@
                 } else {
                     content[curs.cl].fulltext = content[curs.cl].fulltext.substring(0, curs.cx)
                         + k + content[curs.cl].fulltext.substring(curs.cx);
                 } else {
                     content[curs.cl].fulltext = content[curs.cl].fulltext.substring(0, curs.cx)
                         + k + content[curs.cl].fulltext.substring(curs.cx);

-                    xwt.thread = function() { moveCursor(curs.cl, curs.cx+1); }
+                    ibex.thread = function() { moveCursor(curs.cl, curs.cx+1); }

                     textChanged = true;
                 }
 
                     textChanged = true;
                 }
 

@@ -677,4 +677,4 @@
         }
 
     </template>
         }
 
     </template>

-</xwt>
+</ibex>

diff --git a/src/org/xwt/builtin/key.png b/src/org/ibex/builtin/key.png
similarity index 100%
rename from src/org/xwt/builtin/key.png
rename to src/org/ibex/builtin/key.png

diff --git a/src/org/xwt/builtin/lithium.png b/src/org/ibex/builtin/lithium.png
similarity index 100%
rename from src/org/xwt/builtin/lithium.png
rename to src/org/ibex/builtin/lithium.png

diff --git a/src/org/xwt/builtin/password12.xwf b/src/org/ibex/builtin/password12.xwf
similarity index 100%
rename from src/org/xwt/builtin/password12.xwf
rename to src/org/ibex/builtin/password12.xwf

diff --git a/src/org/xwt/builtin/progress.png b/src/org/ibex/builtin/progress.png
similarity index 100%
rename from src/org/xwt/builtin/progress.png
rename to src/org/ibex/builtin/progress.png

diff --git a/src/org/xwt/builtin/proxy_authorization.xwt b/src/org/ibex/builtin/proxy_authorization.ibex
similarity index 91%
rename from src/org/xwt/builtin/proxy_authorization.xwt
rename to src/org/ibex/builtin/proxy_authorization.ibex
index 207f829..0272cf5 100644 (file)
--- a/src/org/xwt/builtin/proxy_authorization.xwt
+++ b/src/org/ibex/builtin/proxy_authorization.ibex
@@ -1,6 +1,6 @@
-<xwt>
+<ibex>

 
 

-    <import name="org.xwt.builtin.*"/>
+    <import name="org.ibex.builtin.*"/>

     <template thisbox="frame" minwidth="397" maxwidth="397" minheight="243" maxheight="243"
               vpad="20" hpad="10" titlebar="Enter Network Password">
 
     <template thisbox="frame" minwidth="397" maxwidth="397" minheight="243" maxheight="243"
               vpad="20" hpad="10" titlebar="Enter Network Password">
 

@@ -16,12 +16,12 @@
         $cancel._click = function() { thisbox = null; }
 
         $user._focused = function(f) {
         $cancel._click = function() { thisbox = null; }
 
         $user._focused = function(f) {

-            xwt.println("user.focused = " + f);
+            ibex.println("user.focused = " + f);

             if (f) $password.focused = false;
         }
 
         $password._focused = function(f) {
             if (f) $password.focused = false;
         }
 
         $password._focused = function(f) {

-            xwt.println("password.focused = " + f);
+            ibex.println("password.focused = " + f);

             if (f) $user.focused = false;
         }
 
             if (f) $user.focused = false;
         }
 

@@ -30,7 +30,7 @@
         $user._SizeChange = function() { $password.height = $user.height; }
 
         $ok._click = function() {
         $user._SizeChange = function() { $password.height = $user.height; }
 
         $ok._click = function() {

-            xwt.proxyAuthorization = $user.text + ":" + $password.text;
+            ibex.proxyAuthorization = $user.text + ":" + $password.text;

             thisbox = null;
         }
 
             thisbox = null;
         }
 

@@ -65,7 +65,7 @@
             <box>
                 <box width="75" font="dialog8" text="Password" vshrink="true"/>
                 <box border="bevel_2_down" hpad="2" vpad="2">
             <box>
                 <box width="75" font="dialog8" text="Password" vshrink="true"/>
                 <box border="bevel_2_down" hpad="2" vpad="2">

-                    <edit color="white" id="password" font="org.xwt.builtin.password12" focused="false"/>
+                    <edit color="white" id="password" font="org.ibex.builtin.password12" focused="false"/>

                 </box>
             </box>
             <box height="30"/>
                 </box>
             </box>
             <box height="30"/>

@@ -84,4 +84,4 @@
 
     </template>
 
 
     </template>
 

-</xwt>
\ No newline at end of file
+</ibex>

diff --git a/src/org/xwt/builtin/scar.png b/src/org/ibex/builtin/scar.png
similarity index 100%
rename from src/org/xwt/builtin/scar.png
rename to src/org/ibex/builtin/scar.png

diff --git a/src/org/xwt/js/ByteCodes.java b/src/org/ibex/js/ByteCodes.java
similarity index 99%
rename from src/org/xwt/js/ByteCodes.java
rename to src/org/ibex/js/ByteCodes.java
index 7ba54b4..e8170f1 100644 (file)
--- a/src/org/xwt/js/ByteCodes.java
+++ b/src/org/ibex/js/ByteCodes.java
@@ -1,5 +1,5 @@
 // Copyright 2004 Adam Megacz, see the COPYING file for licensing [GPL]
 // Copyright 2004 Adam Megacz, see the COPYING file for licensing [GPL]

-package org.xwt.js;
+package org.ibex.js;

 
 /**
  *  Constants for the various JavaScript ByteCode operations.
 
 /**
  *  Constants for the various JavaScript ByteCode operations.

diff --git a/src/org/xwt/js/Interpreter.java b/src/org/ibex/js/Interpreter.java
similarity index 99%
rename from src/org/xwt/js/Interpreter.java
rename to src/org/ibex/js/Interpreter.java
index b5becd0..1b679ca 100644 (file)
--- a/src/org/xwt/js/Interpreter.java
+++ b/src/org/ibex/js/Interpreter.java
@@ -1,9 +1,8 @@
 // Copyright 2004 Adam Megacz, see the COPYING file for licensing [GPL]
 // Copyright 2004 Adam Megacz, see the COPYING file for licensing [GPL]

-package org.xwt.js;
+package org.ibex.js;

 
 

-import org.xwt.util.*;
+import org.ibex.util.*;

 import java.util.*;
 import java.util.*;

-import java.io.*;

 
 /** Encapsulates a single JS interpreter (ie call stack) */
 class Interpreter implements ByteCodes, Tokens {
 
 /** Encapsulates a single JS interpreter (ie call stack) */
 class Interpreter implements ByteCodes, Tokens {

@@ -94,7 +93,7 @@ class Interpreter implements ByteCodes, Tokens {
             case DUP: stack.push(stack.peek()); break;
             case NEWSCOPE: scope = new JSScope(scope); break;
             case OLDSCOPE: scope = scope.getParentScope(); break;
             case DUP: stack.push(stack.peek()); break;
             case NEWSCOPE: scope = new JSScope(scope); break;
             case OLDSCOPE: scope = scope.getParentScope(); break;

-            case ASSERT: if (!JS.toBoolean(stack.pop())) throw je("xwt.assertion.failed" /*FEATURE: line number*/); break;
+            case ASSERT: if (!JS.toBoolean(stack.pop())) throw je("ibex.assertion.failed" /*FEATURE: line number*/); break;

             case BITNOT: stack.push(JS.N(~JS.toLong(stack.pop()))); break;
             case BANG: stack.push(JS.B(!JS.toBoolean(stack.pop()))); break;
             case NEWFUNCTION: stack.push(((JSFunction)arg)._cloneWithNewParentScope(scope)); break;
             case BITNOT: stack.push(JS.N(~JS.toLong(stack.pop()))); break;
             case BANG: stack.push(JS.B(!JS.toBoolean(stack.pop()))); break;
             case NEWFUNCTION: stack.push(((JSFunction)arg)._cloneWithNewParentScope(scope)); break;

diff --git a/src/org/xwt/js/JS.java b/src/org/ibex/js/JS.java
similarity index 98%
rename from src/org/xwt/js/JS.java
rename to src/org/ibex/js/JS.java
index e0451c9..d73b37b 100644 (file)
--- a/src/org/xwt/js/JS.java
+++ b/src/org/ibex/js/JS.java
@@ -1,13 +1,13 @@
 // Copyright 2004 Adam Megacz, see the COPYING file for licensing [GPL] 
 // Copyright 2004 Adam Megacz, see the COPYING file for licensing [GPL] 

-package org.xwt.js; 
+package org.ibex.js; 

 
 

-import org.xwt.util.*; 
-import org.xwt.*; 
+import org.ibex.util.*; 
+import org.ibex.*; 

 import java.io.*;
 import java.util.*;
 
 /** The minimum set of functionality required for objects which are manipulated by JavaScript */
 import java.io.*;
 import java.util.*;
 
 /** The minimum set of functionality required for objects which are manipulated by JavaScript */

-public class JS extends org.xwt.util.BalancedTree { 
+public class JS extends org.ibex.util.BalancedTree { 

 
     public static final Object METHOD = new Object();
     public final JS unclone() { return _unclone(); }
 
     public static final Object METHOD = new Object();
     public final JS unclone() { return _unclone(); }

diff --git a/src/org/xwt/js/JSArray.java b/src/org/ibex/js/JSArray.java
similarity index 99%
rename from src/org/xwt/js/JSArray.java
rename to src/org/ibex/js/JSArray.java
index ca2919d..f29b79a 100644 (file)
--- a/src/org/xwt/js/JSArray.java
+++ b/src/org/ibex/js/JSArray.java
@@ -1,7 +1,7 @@
 // Copyright 2004 Adam Megacz, see the COPYING file for licensing [GPL] 
 // Copyright 2004 Adam Megacz, see the COPYING file for licensing [GPL] 

-package org.xwt.js; 
+package org.ibex.js; 

 
 

-import org.xwt.util.*; 
+import org.ibex.util.*; 

 import java.util.*;
 
 /** A JavaScript JSArray */
 import java.util.*;
 
 /** A JavaScript JSArray */

diff --git a/src/org/xwt/js/JSDate.java b/src/org/ibex/js/JSDate.java
similarity index 99%
rename from src/org/xwt/js/JSDate.java
rename to src/org/ibex/js/JSDate.java
index fc3fcd0..694122c 100644 (file)
--- a/src/org/xwt/js/JSDate.java
+++ b/src/org/ibex/js/JSDate.java
@@ -34,13 +34,9 @@
  * file under either the NPL or the GPL.
  */
 
  * file under either the NPL or the GPL.
  */
 

-package org.xwt.js;
+package org.ibex.js;

 
 

-import java.util.TimeZone;
-import java.util.Locale;
-import java.text.NumberFormat;

 import java.text.DateFormat;
 import java.text.DateFormat;

-import java.text.SimpleDateFormat;

 
 /**
  * This class implements the Date native object.
 
 /**
  * This class implements the Date native object.

diff --git a/src/org/xwt/js/JSExn.java b/src/org/ibex/js/JSExn.java
similarity index 91%
rename from src/org/xwt/js/JSExn.java
rename to src/org/ibex/js/JSExn.java
index df1022e..8d1a758 100644 (file)
--- a/src/org/xwt/js/JSExn.java
+++ b/src/org/ibex/js/JSExn.java
@@ -1,10 +1,7 @@
 // Copyright 2004 Adam Megacz, see the COPYING file for licensing [GPL] 
 // Copyright 2004 Adam Megacz, see the COPYING file for licensing [GPL] 

-package org.xwt.js; 
+package org.ibex.js; 

 
 

-import org.xwt.util.*; 
-import org.xwt.*; 
-import java.io.*;
-import java.util.*;
+import org.ibex.util.*; 

 
 /** An exception which can be thrown and caught by JavaScript code */
 public class JSExn extends Exception { 
 
 /** An exception which can be thrown and caught by JavaScript code */
 public class JSExn extends Exception { 

diff --git a/src/org/xwt/js/JSFunction.java b/src/org/ibex/js/JSFunction.java
similarity index 97%
rename from src/org/xwt/js/JSFunction.java
rename to src/org/ibex/js/JSFunction.java
index 2f75ff2..6c0e89a 100644 (file)
--- a/src/org/xwt/js/JSFunction.java
+++ b/src/org/ibex/js/JSFunction.java
@@ -1,12 +1,10 @@
 // Copyright 2004 Adam Megacz, see the COPYING file for licensing [GPL]
 // Copyright 2004 Adam Megacz, see the COPYING file for licensing [GPL]

-package org.xwt.js;
+package org.ibex.js;

 
 

-import org.xwt.util.*;
-import java.util.*;

 import java.io.*;
 
 /** A JavaScript function, compiled into bytecode */
 import java.io.*;
 
 /** A JavaScript function, compiled into bytecode */

-class JSFunction extends JS implements ByteCodes, Tokens, org.xwt.Scheduler.Task {
+class JSFunction extends JS implements ByteCodes, Tokens, org.ibex.Scheduler.Task {

 
 
     // Fields and Accessors ///////////////////////////////////////////////
 
 
     // Fields and Accessors ///////////////////////////////////////////////

diff --git a/src/org/xwt/js/JSMath.java b/src/org/ibex/js/JSMath.java
similarity index 97%
rename from src/org/xwt/js/JSMath.java
rename to src/org/ibex/js/JSMath.java
index 75cb48a..5eed9b5 100644 (file)
--- a/src/org/xwt/js/JSMath.java
+++ b/src/org/ibex/js/JSMath.java
@@ -1,9 +1,6 @@
 // Copyright 2004 Adam Megacz, see the COPYING file for licensing [GPL ]
 
 // Copyright 2004 Adam Megacz, see the COPYING file for licensing [GPL ]
 

-package org.xwt.js; 
-import org.xwt.util.*; 
-import java.io.*;
-import java.util.*;
+package org.ibex.js; 

 
 /** The JavaScript Math object */
 public class JSMath extends JS {
 
 /** The JavaScript Math object */
 public class JSMath extends JS {

diff --git a/src/org/xwt/js/JSRegexp.java b/src/org/ibex/js/JSRegexp.java
similarity index 99%
rename from src/org/xwt/js/JSRegexp.java
rename to src/org/ibex/js/JSRegexp.java
index 4bc4ad8..da22d2e 100644 (file)
--- a/src/org/xwt/js/JSRegexp.java
+++ b/src/org/ibex/js/JSRegexp.java
@@ -1,5 +1,5 @@
 // Copyright 2004 Adam Megacz, see the COPYING file for licensing [GPL]
 // Copyright 2004 Adam Megacz, see the COPYING file for licensing [GPL]

-package org.xwt.js;
+package org.ibex.js;

 
 import gnu.regexp.*;
 
 
 import gnu.regexp.*;
 

diff --git a/src/org/xwt/js/JSScope.java b/src/org/ibex/js/JSScope.java
similarity index 98%
rename from src/org/xwt/js/JSScope.java
rename to src/org/ibex/js/JSScope.java
index a504d8d..675ddc7 100644 (file)
--- a/src/org/xwt/js/JSScope.java
+++ b/src/org/ibex/js/JSScope.java
@@ -1,9 +1,5 @@
 // Copyright 2004 Adam Megacz, see the COPYING file for licensing [GPL] 
 // Copyright 2004 Adam Megacz, see the COPYING file for licensing [GPL] 

-package org.xwt.js; 
-
-import org.xwt.util.*; 
-import java.io.*;
-import java.util.*;
+package org.ibex.js; 

 
 // FIXME: should allow parentScope to be a JS, not a JSScope
 /** Implementation of a JavaScript Scope */
 
 // FIXME: should allow parentScope to be a JS, not a JSScope
 /** Implementation of a JavaScript Scope */

diff --git a/src/org/xwt/js/Lexer.java b/src/org/ibex/js/Lexer.java
similarity index 99%
rename from src/org/xwt/js/Lexer.java
rename to src/org/ibex/js/Lexer.java
index 0bf311f..6e77eb7 100644 (file)
--- a/src/org/xwt/js/Lexer.java
+++ b/src/org/ibex/js/Lexer.java
@@ -17,7 +17,7 @@
  * Contributor(s): Roger Lawrence, Mike McCabe
  */
 
  * Contributor(s): Roger Lawrence, Mike McCabe
  */
 

-package org.xwt.js;
+package org.ibex.js;

 import java.io.*;
 
 /** Lexes a stream of characters into a stream of Tokens */
 import java.io.*;
 
 /** Lexes a stream of characters into a stream of Tokens */

@@ -147,7 +147,7 @@ class Lexer implements Tokens {
         in.unread();
         String str = in.getString();
         int result = getKeyword(str);
         in.unread();
         String str = in.getString();
         int result = getKeyword(str);

-        if (result == RESERVED) throw new LexerException("The reserved word \"" + str + "\" is not permitted in XWT scripts");
+        if (result == RESERVED) throw new LexerException("The reserved word \"" + str + "\" is not permitted in Ibex scripts");

         if (result != -1) return result;
         this.string = str.intern();
         return NAME;
         if (result != -1) return result;
         this.string = str.intern();
         return NAME;

diff --git a/src/org/xwt/js/Parser.java b/src/org/ibex/js/Parser.java
similarity index 99%
rename from src/org/xwt/js/Parser.java
rename to src/org/ibex/js/Parser.java
index 1914cc7..f36eda4 100644 (file)
--- a/src/org/xwt/js/Parser.java
+++ b/src/org/ibex/js/Parser.java
@@ -1,7 +1,7 @@
 // Copyright 2004 Adam Megacz, see the COPYING file for licensing [GPL]
 // Copyright 2004 Adam Megacz, see the COPYING file for licensing [GPL]

-package org.xwt.js;
+package org.ibex.js;

 
 

-import org.xwt.util.*;
+import org.ibex.util.*;

 import java.io.*;
 
 /**
 import java.io.*;
 
 /**

@@ -741,7 +741,7 @@ class Parser extends Lexer implements ByteCodes {
                     exceptionVar = string;
                     int[] writebacks = new int[] { -1, -1, -1 };
                     if (peekToken() != RP) {
                     exceptionVar = string;
                     int[] writebacks = new int[] { -1, -1, -1 };
                     if (peekToken() != RP) {

-                        // extended XWT catch block: catch(e faultCode "foo.bar.baz")
+                        // extended Ibex catch block: catch(e faultCode "foo.bar.baz")

                         consume(NAME);
                         String propName = string;
                         b.add(parserLine, DUP);
                         consume(NAME);
                         String propName = string;
                         b.add(parserLine, DUP);

diff --git a/src/org/xwt/js/Tokens.java b/src/org/ibex/js/Tokens.java
similarity index 99%
rename from src/org/xwt/js/Tokens.java
rename to src/org/ibex/js/Tokens.java
index 28e57af..8970e14 100644 (file)
--- a/src/org/xwt/js/Tokens.java
+++ b/src/org/ibex/js/Tokens.java
@@ -1,5 +1,5 @@
 // Copyright 2004 Adam Megacz, see the COPYING file for licensing [GPL]
 // Copyright 2004 Adam Megacz, see the COPYING file for licensing [GPL]

-package org.xwt.js;
+package org.ibex.js;

 
 /** this class contains a <tt>public static final int</tt> for each valid token */
 interface Tokens {
 
 /** this class contains a <tt>public static final int</tt> for each valid token */
 interface Tokens {

diff --git a/src/org/xwt/js/Trap.java b/src/org/ibex/js/Trap.java
similarity index 96%
rename from src/org/xwt/js/Trap.java
rename to src/org/ibex/js/Trap.java
index 041e012..4b2f92a 100644 (file)
--- a/src/org/xwt/js/Trap.java
+++ b/src/org/ibex/js/Trap.java
@@ -1,9 +1,5 @@
 // Copyright 2004 Adam Megacz, see the COPYING file for licensing [GPL]
 // Copyright 2004 Adam Megacz, see the COPYING file for licensing [GPL]

-package org.xwt.js;
-
-import java.util.*;
-import org.xwt.util.*;
-import java.io.*;
+package org.ibex.js;

 
 /**
  *  This class encapsulates a single trap placed on a given node. The
 
 /**
  *  This class encapsulates a single trap placed on a given node. The

diff --git a/src/org/ibex/js/package.html b/src/org/ibex/js/package.html
new file mode 100644 (file)
index 0000000..bdfc2e5
--- /dev/null
+++ b/src/org/ibex/js/package.html
@@ -0,0 +1,7 @@
+<body>
+
+<p>
+The Ibex JavaScript Engine.
+</p>
+
+</body>

diff --git a/src/org/xwt/package.html b/src/org/ibex/package.html
similarity index 97%
rename from src/org/xwt/package.html
rename to src/org/ibex/package.html
index 61ca04e..7e1167c 100644 (file)
--- a/src/org/xwt/package.html
+++ b/src/org/ibex/package.html
@@ -2,7 +2,7 @@
 <body>
 
 <p>
 <body>
 
 <p>

-The core XWT engine classes.
+The core Ibex engine classes.

 </p>
 
 <h3>Interfacing with other code</h3>
 </p>
 
 <h3>Interfacing with other code</h3>

@@ -38,4 +38,4 @@ manipulate instances of Box from within the AWT thread.  @see
 MessageQueue ThreadMessage
 </p>
 
 MessageQueue ThreadMessage
 </p>
 

-</body>
\ No newline at end of file
+</body>

diff --git a/src/org/xwt/plat/AWT.java b/src/org/ibex/plat/AWT.java
similarity index 97%
rename from src/org/xwt/plat/AWT.java
rename to src/org/ibex/plat/AWT.java
index 7c775bb..c247a97 100644 (file)
--- a/src/org/xwt/plat/AWT.java
+++ b/src/org/ibex/plat/AWT.java
@@ -1,12 +1,10 @@
 // Copyright 2004 Adam Megacz, see the COPYING file for licensing [GPL]
 // Copyright 2004 Adam Megacz, see the COPYING file for licensing [GPL]

-package org.xwt.plat;
+package org.ibex.plat;

 
 

-import org.xwt.*;
-import org.xwt.util.*;
-import java.net.*;
+import org.ibex.*;
+import org.ibex.util.*;

 import java.io.*;
 import java.io.*;

-import org.xwt.js.*;
-import java.util.*;
+import org.ibex.js.*;

 import java.awt.*;
 import java.awt.datatransfer.*;
 import java.awt.image.*;
 import java.awt.*;
 import java.awt.datatransfer.*;
 import java.awt.image.*;

@@ -29,9 +27,9 @@ public class AWT extends JVM {
 
     protected void _criticalAbort(String message) {
         if (Log.on) Log.info(this, message);
 
     protected void _criticalAbort(String message) {
         if (Log.on) Log.info(this, message);

-        final Dialog d = new Dialog(new Frame(), "XWT Cannot Continue");
+        final Dialog d = new Dialog(new Frame(), "Ibex Cannot Continue");

         d.setLayout(new BorderLayout());
         d.setLayout(new BorderLayout());

-        TextArea ta = new TextArea("XWT cannot continue because:\n\n" + message, 10, 80);
+        TextArea ta = new TextArea("Ibex cannot continue because:\n\n" + message, 10, 80);

         ta.setEditable(false);
         d.add(ta, "Center");
         Button b = new Button("OK");
         ta.setEditable(false);
         d.add(ta, "Center");
         Button b = new Button("OK");

@@ -115,8 +113,8 @@ public class AWT extends JVM {
 
     // Inner Classes /////////////////////////////////////////////////////////////////////////////////////
 
 
     // Inner Classes /////////////////////////////////////////////////////////////////////////////////////
 

-    protected org.xwt.Font.Glyph _createGlyph(org.xwt.Font f, char c) { return new AWTGlyph(f, c); }
-    protected static class AWTGlyph extends org.xwt.Font.Glyph {
+    protected org.ibex.Font.Glyph _createGlyph(org.ibex.Font f, char c) { return new AWTGlyph(f, c); }
+    protected static class AWTGlyph extends org.ibex.Font.Glyph {

         private Image i = null;
         private static ColorModel cmodel = new DirectColorModel(32, 0x00FF0000, 0x0000FF00, 0x000000FF, 0xFF000000);
 
         private Image i = null;
         private static ColorModel cmodel = new DirectColorModel(32, 0x00FF0000, 0x0000FF00, 0x000000FF, 0xFF000000);
 

@@ -130,7 +128,7 @@ public class AWT extends JVM {
         };
         */
 
         };
         */
 

-        public AWTGlyph(org.xwt.Font f, char c) { super(f, c); }
+        public AWTGlyph(org.ibex.Font f, char c) { super(f, c); }

         Image getImage() {
             if (i == null && isLoaded) {
 
         Image getImage() {
             if (i == null && isLoaded) {
 

@@ -215,7 +213,7 @@ public class AWT extends JVM {
         }
 
         /** implemented with java.awt 1.1's setXORMode() */
         }
 
         /** implemented with java.awt 1.1's setXORMode() */

-        public void drawGlyph(org.xwt.Font.Glyph source, int dx, int dy, int cx1, int cy1, int cx2, int cy2, int rgb) {
+        public void drawGlyph(org.ibex.Font.Glyph source, int dx, int dy, int cx1, int cy1, int cx2, int cy2, int rgb) {

 
             // XOR the target region
             g.setXORMode(new Color((rgb & 0x00ff0000) >> 16, (rgb & 0x0000ff00) >> 8, rgb & 0x000000ff));
 
             // XOR the target region
             g.setXORMode(new Color((rgb & 0x00ff0000) >> 16, (rgb & 0x0000ff00) >> 8, rgb & 0x000000ff));

diff --git a/src/org/xwt/plat/Darwin.cc b/src/org/ibex/plat/Darwin.cc
similarity index 96%
rename from src/org/xwt/plat/Darwin.cc
rename to src/org/ibex/plat/Darwin.cc
index fc05588..7adf0ee 100644 (file)
--- a/src/org/xwt/plat/Darwin.cc
+++ b/src/org/ibex/plat/Darwin.cc
@@ -16,24 +16,24 @@
 #include <java/lang/Object.h>
 #include <java/lang/Error.h>
 
 #include <java/lang/Object.h>
 #include <java/lang/Error.h>
 

-#include <org/xwt/plat/Darwin.h>
-#include <org/xwt/plat/Darwin$CarbonSurface.h>
-#include <org/xwt/plat/Darwin$GLCarbonSurface.h>
-#include <org/xwt/plat/Darwin$GLCarbonPixelBuffer.h>
-#include <org/xwt/plat/Darwin$CarbonMessage.h>
-#include <org/xwt/plat/Darwin$CarbonOpenGL.h>
-#include <org/xwt/plat/Darwin$FileDialogHelper.h>
-#include <org/xwt/plat/GCJ$Retainer.h>
-#include <org/xwt/HTTP$Proxy.h>
-#include <org/xwt/util/Semaphore.h>
+#include <org/ibex/plat/Darwin.h>
+#include <org/ibex/plat/Darwin$CarbonSurface.h>
+#include <org/ibex/plat/Darwin$GLCarbonSurface.h>
+#include <org/ibex/plat/Darwin$GLCarbonPixelBuffer.h>
+#include <org/ibex/plat/Darwin$CarbonMessage.h>
+#include <org/ibex/plat/Darwin$CarbonOpenGL.h>
+#include <org/ibex/plat/Darwin$FileDialogHelper.h>
+#include <org/ibex/plat/GCJ$Retainer.h>
+#include <org/ibex/HTTP$Proxy.h>
+#include <org/ibex/util/Semaphore.h>

 
 #include <stdlib.h>
 #include <pthread.h>
 
 #include "DarwinCarbonHeaders.h"
 
 
 #include <stdlib.h>
 #include <pthread.h>
 
 #include "DarwinCarbonHeaders.h"
 

-#define XWT_CARBON_NO_BUNDLE_HACK
-#ifdef XWT_CARBON_NO_BUNDLE_HACK
+#define Ibex_CARBON_NO_BUNDLE_HACK
+#ifdef Ibex_CARBON_NO_BUNDLE_HACK

 extern "C" {
     OSErr CPSEnableForegroundOperation(ProcessSerialNumber *psn);
     OSErr CPSSetFrontProcess(ProcessSerialNumber *psn);
 extern "C" {
     OSErr CPSEnableForegroundOperation(ProcessSerialNumber *psn);
     OSErr CPSSetFrontProcess(ProcessSerialNumber *psn);

@@ -161,12 +161,12 @@ declare_weak(NewWindowPaintUPP);
 #define InstallEventHandler WC(InstallEventHandler)
 #define __CFStringMakeConstantString WC(__CFStringMakeConstantString)
 
 #define InstallEventHandler WC(InstallEventHandler)
 #define __CFStringMakeConstantString WC(__CFStringMakeConstantString)
 

-using namespace org::xwt::plat;
+using namespace org::ibex::plat;

 using gnu::gcj::RawData;
 using gnu::gcj::RawData;

-using org::xwt::util::Semaphore;
+using org::ibex::util::Semaphore;

 using java::lang::Object;
 
 using java::lang::Object;
 

-namespace org { namespace xwt { namespace plat {
+namespace org { namespace ibex { namespace plat {

 
 
 #pragma mark ----- Blit Locks ------
 
 
 #pragma mark ----- Blit Locks ------

@@ -256,9 +256,9 @@ class SmartCFString {
 };
 
 // CHECKME: Is just making up your own four char codes really correct?
 };
 
 // CHECKME: Is just making up your own four char codes really correct?

-const static UInt32 kEventClassCarbonMessage = 'xwta';
-const static UInt32 kEventCarbonMessage = 'xwtb';
-const static UInt32 kEventParamCarbonMessage = 'xwtc';
+const static UInt32 kEventClassCarbonMessage = 'ibexa';
+const static UInt32 kEventCarbonMessage = 'ibexb';
+const static UInt32 kEventParamCarbonMessage = 'ibexc';

 
 static OSStatus carbonMessageEventHandler(EventHandlerCallRef handler, EventRef e, void *userData);
 static EventHandlerUPP carbonMessageEventHandlerUPP;
 
 static OSStatus carbonMessageEventHandler(EventHandlerCallRef handler, EventRef e, void *userData);
 static EventHandlerUPP carbonMessageEventHandlerUPP;

@@ -505,7 +505,7 @@ static OSStatus windowEventHandler(EventHandlerCallRef handler, EventRef e, void
                 case kEventRawKeyModifiersChanged: {
                     const static struct {
                         UInt32 mask;
                 case kEventRawKeyModifiersChanged: {
                     const static struct {
                         UInt32 mask;

-                        jstring xwtKey;
+                        jstring ibexKey;

                     } modifiersTable[] = {
                         { shiftKey,  JvNewStringLatin1("shift")     },
                         { alphaLock, JvNewStringLatin1("caps_lock") },
                     } modifiersTable[] = {
                         { shiftKey,  JvNewStringLatin1("shift")     },
                         { alphaLock, JvNewStringLatin1("caps_lock") },

@@ -526,9 +526,9 @@ static OSStatus windowEventHandler(EventHandlerCallRef handler, EventRef e, void
                         UInt32 mask = modifiersTable[i].mask;
                         if(!(changedModifiers & mask)) continue;
                         if(newModifiers & mask)
                         UInt32 mask = modifiersTable[i].mask;
                         if(!(changedModifiers & mask)) continue;
                         if(newModifiers & mask)

-                            surface->KeyPressed(modifiersTable[i].xwtKey);
+                            surface->KeyPressed(modifiersTable[i].ibexKey);

                         else
                         else

-                            surface->KeyReleased(modifiersTable[i].xwtKey);
+                            surface->KeyReleased(modifiersTable[i].ibexKey);

                     }
                     return noErr;
                 }
                     }
                     return noErr;
                 }

@@ -558,27 +558,27 @@ static OSStatus windowEventHandler(EventHandlerCallRef handler, EventRef e, void
                 case kEventMouseUp: {
                     EventMouseButton button;
                     UInt32 clickCount;
                 case kEventMouseUp: {
                     EventMouseButton button;
                     UInt32 clickCount;

-                    jint xwtButton;
+                    jint ibexButton;

                     r = WC(GetEventParameter)(e,kEventParamMouseButton,typeMouseButton,NULL,sizeof(button),NULL,&button);
                     checkStatus(r,"GetEventParameter");
                     r = WC(GetEventParameter)(e,kEventParamClickCount,typeUInt32,NULL,sizeof(clickCount),NULL,&clickCount);
                     checkStatus(r,"GetEventParameter");
                     
                     switch(button) {
                     r = WC(GetEventParameter)(e,kEventParamMouseButton,typeMouseButton,NULL,sizeof(button),NULL,&button);
                     checkStatus(r,"GetEventParameter");
                     r = WC(GetEventParameter)(e,kEventParamClickCount,typeUInt32,NULL,sizeof(clickCount),NULL,&clickCount);
                     checkStatus(r,"GetEventParameter");
                     
                     switch(button) {

-                        case kEventMouseButtonPrimary:   xwtButton = 1; break;
-                        case kEventMouseButtonSecondary: xwtButton = 2; break;
-                        case kEventMouseButtonTertiary:  xwtButton = 3; break;
+                        case kEventMouseButtonPrimary:   ibexButton = 1; break;
+                        case kEventMouseButtonSecondary: ibexButton = 2; break;
+                        case kEventMouseButtonTertiary:  ibexButton = 3; break;

                         default: return noErr;
                     }
                     if(eKind == kEventMouseDown) {
                         default: return noErr;
                     }
                     if(eKind == kEventMouseDown) {

-                        surface->Press(xwtButton);
+                        surface->Press(ibexButton);

                     } else {
                     } else {

-                        surface->Release(xwtButton);
+                        surface->Release(ibexButton);

                         while(clickCount > 1) {
                         while(clickCount > 1) {

-                            surface->DoubleClick(xwtButton);
+                            surface->DoubleClick(ibexButton);

                             clickCount-=2;
                         }
                             clickCount-=2;
                         }

-                        if(clickCount) surface->Click(xwtButton);
+                        if(clickCount) surface->Click(ibexButton);

                     }
                     return noErr;
                 }
                     }
                     return noErr;
                 }

@@ -591,7 +591,7 @@ static OSStatus windowEventHandler(EventHandlerCallRef handler, EventRef e, void
                     r = WC(GetEventParameter)(e,kEventParamMouseWheelDelta,typeSInt32,NULL,sizeof(delta),NULL,&delta);
                     checkStatus(r,"GetEventParameter");
                     fprintf(stderr,"kEventMouseWheelMoved: delta: %d",delta);
                     r = WC(GetEventParameter)(e,kEventParamMouseWheelDelta,typeSInt32,NULL,sizeof(delta),NULL,&delta);
                     checkStatus(r,"GetEventParameter");
                     fprintf(stderr,"kEventMouseWheelMoved: delta: %d",delta);

-                    // surface->MouseWheelMoved(...) IMPROVMENT: mouse wheel support in xwt
+                    // surface->MouseWheelMoved(...) IMPROVMENT: mouse wheel support in ibex

                     return noErr;
                 }
             }
                     return noErr;
                 }
             }

@@ -739,7 +739,7 @@ void Darwin$CarbonSurface::natDispose() {
     WC(DisposeWindow)(window);
 }
 
     WC(DisposeWindow)(window);
 }
 

-void Darwin$CarbonSurface::natSetIcon(org::xwt::Picture *_p) {
+void Darwin$CarbonSurface::natSetIcon(org::ibex::Picture *_p) {

 }
 
 void Darwin$CarbonSurface::natSetLocation() {
 }
 
 void Darwin$CarbonSurface::natSetLocation() {

@@ -826,7 +826,7 @@ void fileDialogEventHandler(NavEventCallbackMessage callBackSelector, NavCBRecPt
 void Darwin::natFileDialog(Darwin$FileDialogHelper *helper,jstring suggestion_, jboolean write) {
     NavDialogRef dlg;
     SmartCFString suggestion = suggestion_;
 void Darwin::natFileDialog(Darwin$FileDialogHelper *helper,jstring suggestion_, jboolean write) {
     NavDialogRef dlg;
     SmartCFString suggestion = suggestion_;

-    CFStringRef message = CFSTR("By selecting a file in this dialog you are giving this XWT application permission to access that file.");
+    CFStringRef message = CFSTR("By selecting a file in this dialog you are giving this Ibex application permission to access that file.");

     OSStatus r;
     WindowRef window = WC(FrontWindow)();
     NavDialogCreationOptions options;
     OSStatus r;
     WindowRef window = WC(FrontWindow)();
     NavDialogCreationOptions options;

@@ -835,7 +835,7 @@ void Darwin::natFileDialog(Darwin$FileDialogHelper *helper,jstring suggestion_,
     options.optionFlags =
         (options.optionFlags|kNavAllFilesInPopup|kNavSelectAllReadableItem|kNavDontUseCustomFrame|kNavDontConfirmReplacement)
         &~(kNavAllowStationery|kNavAllowMultipleFiles);
     options.optionFlags =
         (options.optionFlags|kNavAllFilesInPopup|kNavSelectAllReadableItem|kNavDontUseCustomFrame|kNavDontConfirmReplacement)
         &~(kNavAllowStationery|kNavAllowMultipleFiles);

-    options.clientName = CFSTR("XWT");
+    options.clientName = CFSTR("Ibex");

     if(write)
         options.saveFileName  = suggestion;
     options.message = message;
     if(write)
         options.saveFileName  = suggestion;
     options.message = message;

@@ -889,7 +889,7 @@ void Darwin::natSetClipBoard(jstring js) {
 }
 
 HTTP$Proxy *Darwin::natDetectProxy() {
 }
 
 HTTP$Proxy *Darwin::natDetectProxy() {

-    using org::xwt::HTTP$Proxy;
+    using org::ibex::HTTP$Proxy;

     HTTP$Proxy *p=0;
     CFStringRef string;
     CFNumberRef number;
     HTTP$Proxy *p=0;
     CFStringRef string;
     CFNumberRef number;

@@ -947,7 +947,7 @@ doproto(SOCKS,socks)
     */    
             
 /*
     */    
             
 /*

-    using org::xwt::Proxy;
+    using org::ibex::Proxy;

     AutoARP pool;
     Proxy *p=0;
     NSString *host;
     AutoARP pool;
     Proxy *p=0;
     NSString *host;

@@ -1025,11 +1025,11 @@ void Darwin::natInit() {
     fileDialogEventHandlerUPP = WC(NewNavEventUPP)(fileDialogEventHandler);
     paintProcUPP = WC(NewWindowPaintUPP)(paintProc);
 
     fileDialogEventHandlerUPP = WC(NewNavEventUPP)(fileDialogEventHandler);
     paintProcUPP = WC(NewWindowPaintUPP)(paintProc);
 

-    #ifdef XWT_CARBON_NO_BUNDLE_HACK
+    #ifdef Ibex_CARBON_NO_BUNDLE_HACK

     {        
         ProcessSerialNumber currentProcess = { 0, kCurrentProcess };
         
     {        
         ProcessSerialNumber currentProcess = { 0, kCurrentProcess };
         

-        ::fprintf(stderr,"Doing XWT_CARBON_NO_BUNDLE_HACK\n");
+        ::fprintf(stderr,"Doing Ibex_CARBON_NO_BUNDLE_HACK\n");

         r = WC(GetCurrentProcess)(&currentProcess);
         checkStatus(r,"GetCurrentProcess");
         r = WC(CPSEnableForegroundOperation)( &currentProcess );
         r = WC(GetCurrentProcess)(&currentProcess);
         checkStatus(r,"GetCurrentProcess");
         r = WC(CPSEnableForegroundOperation)( &currentProcess );

@@ -1278,7 +1278,7 @@ void Darwin$GLCarbonSurface::natDispose() {
     Darwin$CarbonSurface::natDispose();
 }
 
     Darwin$CarbonSurface::natDispose();
 }
 

-} } } // end namepsace org::xwt::plat
+} } } // end namepsace org::ibex::plat

 
 
 
 
 
 

diff --git a/src/org/xwt/plat/Darwin.java b/src/org/ibex/plat/Darwin.java
similarity index 98%
rename from src/org/xwt/plat/Darwin.java
rename to src/org/ibex/plat/Darwin.java
index 0da083f..34cad44 100644 (file)
--- a/src/org/xwt/plat/Darwin.java
+++ b/src/org/ibex/plat/Darwin.java
@@ -1,13 +1,12 @@
 // Copyright 2004 Adam Megacz, see the COPYING file for licensing [LGPL]
 // Authors: Brian Alliet and Evan Jones
 
 // Copyright 2004 Adam Megacz, see the COPYING file for licensing [LGPL]
 // Authors: Brian Alliet and Evan Jones
 

-package org.xwt.plat;
+package org.ibex.plat;

 
 import gnu.gcj.RawData;
 
 import gnu.gcj.RawData;

-import org.xwt.util.*;
-import org.xwt.js.*;
-import org.xwt.*;
-import java.util.*;
+import org.ibex.util.*;
+import org.ibex.js.*;
+import org.ibex.*;

 
 public class Darwin extends POSIX {
     private static final Class openGLClass = OpenGL.class;
 
 public class Darwin extends POSIX {
     private static final Class openGLClass = OpenGL.class;

@@ -94,7 +93,7 @@ public class Darwin extends POSIX {
     
     protected Scheduler _getScheduler() { return new DarwinScheduler(); }
     protected native void runApplicationEventLoop();
     
     protected Scheduler _getScheduler() { return new DarwinScheduler(); }
     protected native void runApplicationEventLoop();

-    private class DarwinScheduler extends org.xwt.Scheduler {
+    private class DarwinScheduler extends org.ibex.Scheduler {

         public void run() {
             new Thread() { public void run() { defaultRun(); } }.start();
             runApplicationEventLoop();
         public void run() {
             new Thread() { public void run() { defaultRun(); } }.start();
             runApplicationEventLoop();

@@ -331,7 +330,7 @@ public class Darwin extends POSIX {
         else
             return /*new QZCarbonPicture(data,w,h);*/ null;
     }
         else
             return /*new QZCarbonPicture(data,w,h);*/ null;
     }

-    protected org.xwt.Font.Glyph  _createGlyph(org.xwt.Font f, char c) {
+    protected org.ibex.Font.Glyph  _createGlyph(org.ibex.Font f, char c) {

         if(openGL != null)
             return openGL._createGlyph(f, c);
         else
         if(openGL != null)
             return openGL._createGlyph(f, c);
         else

diff --git a/src/org/xwt/plat/DarwinCarbonHeaders.h b/src/org/ibex/plat/DarwinCarbonHeaders.h
similarity index 100%
rename from src/org/xwt/plat/DarwinCarbonHeaders.h
rename to src/org/ibex/plat/DarwinCarbonHeaders.h

diff --git a/src/org/xwt/plat/GCJ.cc b/src/org/ibex/plat/GCJ.cc
similarity index 92%
rename from src/org/xwt/plat/GCJ.cc
rename to src/org/ibex/plat/GCJ.cc
index 5c355d3..ca5aa9b 100644 (file)
--- a/src/org/xwt/plat/GCJ.cc
+++ b/src/org/ibex/plat/GCJ.cc
@@ -14,27 +14,27 @@ extern "C" {
 #include <setjmp.h>
 #include "jpeglib.h"
 }
 #include <setjmp.h>
 #include "jpeglib.h"
 }

-#include <org/xwt/Platform.h>
-#include <org/xwt/Picture.h>
-#include <org/xwt/plat/GCJ.h>
+#include <org/ibex/Platform.h>
+#include <org/ibex/Picture.h>
+#include <org/ibex/plat/GCJ.h>

 #include <java/io/InputStream.h>
 #include <java/io/ByteArrayInputStream.h>
 #include <java/lang/RuntimeException.h>
 #include <java/io/InputStream.h>
 #include <java/io/ByteArrayInputStream.h>
 #include <java/lang/RuntimeException.h>

-#include <org/xwt/plat/GCJ.h>
-#include <org/xwt/util/Log.h>
+#include <org/ibex/plat/GCJ.h>
+#include <org/ibex/util/Log.h>

 
 #ifdef TRUE
 #undef TRUE
 #endif
 #define TRUE 1
 
 #ifdef TRUE
 #undef TRUE
 #endif
 #define TRUE 1

-using org::xwt::util::Log;
+using org::ibex::util::Log;

 
 // builtin.xwar /////////////////////////////////////////////////////////
 
 extern unsigned char builtin_bytes[];
 extern int builtin_length;
 
 
 // builtin.xwar /////////////////////////////////////////////////////////
 
 extern unsigned char builtin_bytes[];
 extern int builtin_length;
 

-java::io::InputStream* org::xwt::plat::GCJ::_getBuiltinInputStream() {
+java::io::InputStream* org::ibex::plat::GCJ::_getBuiltinInputStream() {

     jbyteArray ret = JvNewByteArray(builtin_length);
     memcpy(elements(ret), builtin_bytes, builtin_length);
     return new java::io::ByteArrayInputStream(ret);
     jbyteArray ret = JvNewByteArray(builtin_length);
     memcpy(elements(ret), builtin_bytes, builtin_length);
     return new java::io::ByteArrayInputStream(ret);

@@ -99,7 +99,7 @@ void skip_input_data (j_decompress_ptr cinfo, long num_bytes) {
     src->pub.bytes_in_buffer -= num_bytes;
 }
 
     src->pub.bytes_in_buffer -= num_bytes;
 }
 

-void org::xwt::plat::GCJ::_decodeJPEG(java::io::InputStream* is, org::xwt::Picture* p) {
+void org::ibex::plat::GCJ::_decodeJPEG(java::io::InputStream* is, org::ibex::Picture* p) {

     struct jpeg_decompress_struct cinfo;
     my_error_mgr_t jerr;
     my_source_mgr_t src;
     struct jpeg_decompress_struct cinfo;
     my_error_mgr_t jerr;
     my_source_mgr_t src;

diff --git a/src/org/xwt/plat/GCJ.java b/src/org/ibex/plat/GCJ.java
similarity index 97%
rename from src/org/xwt/plat/GCJ.java
rename to src/org/ibex/plat/GCJ.java
index dc0da01..55fdb09 100644 (file)
--- a/src/org/xwt/plat/GCJ.java
+++ b/src/org/ibex/plat/GCJ.java
@@ -1,8 +1,8 @@
 // Copyright 2004 Adam Megacz, see the COPYING file for licensing [GPL]
 // Copyright 2004 Adam Megacz, see the COPYING file for licensing [GPL]

-package org.xwt.plat;
+package org.ibex.plat;

 
 

-import org.xwt.*;
-import org.xwt.util.*;
+import org.ibex.*;
+import org.ibex.util.*;

 import java.io.*;
 
 /** common superclass for all platforms that use GCJ to compile a native binary */
 import java.io.*;
 
 /** common superclass for all platforms that use GCJ to compile a native binary */

diff --git a/src/org/xwt/plat/JVM.java b/src/org/ibex/plat/JVM.java
similarity index 81%
rename from src/org/xwt/plat/JVM.java
rename to src/org/ibex/plat/JVM.java
index e496a63..54f6e21 100644 (file)
--- a/src/org/xwt/plat/JVM.java
+++ b/src/org/ibex/plat/JVM.java
@@ -1,7 +1,7 @@
 // Copyright 2004 Adam Megacz, see the COPYING file for licensing [GPL]
 // Copyright 2004 Adam Megacz, see the COPYING file for licensing [GPL]

-package org.xwt.plat;
+package org.ibex.plat;

 
 

-import org.xwt.*;
+import org.ibex.*;

 
 /** common superclass for all platforms that run in a "real" JVM */
 public abstract class JVM extends Platform {
 
 /** common superclass for all platforms that run in a "real" JVM */
 public abstract class JVM extends Platform {

diff --git a/src/org/xwt/plat/Java2.java b/src/org/ibex/plat/Java2.java
similarity index 96%
rename from src/org/xwt/plat/Java2.java
rename to src/org/ibex/plat/Java2.java
index bfe57ed..00088d4 100644 (file)
--- a/src/org/xwt/plat/Java2.java
+++ b/src/org/ibex/plat/Java2.java
@@ -1,15 +1,13 @@
 // Copyright 2004 Adam Megacz, see the COPYING file for licensing [GPL]
 // Copyright 2004 Adam Megacz, see the COPYING file for licensing [GPL]

-package org.xwt.plat;
+package org.ibex.plat;

 
 import java.awt.*;
 import java.awt.event.*;
 import java.awt.image.*;
 
 import java.awt.*;
 import java.awt.event.*;
 import java.awt.image.*;

-import java.awt.datatransfer.*;

 import java.net.*;
 import java.net.*;

-import java.io.*;

 import java.util.*;
 import java.util.*;

-import org.xwt.util.*;
-import org.xwt.*;
+import org.ibex.util.*;
+import org.ibex.*;

 import java.lang.reflect.*;
 
 
 import java.lang.reflect.*;
 
 

@@ -43,11 +41,11 @@ public class Java2 extends AWT {
     }
 
     /** this is done with reflection in case a new version of the plugin comes out that doesn't let us pull the sun.plugin.* trick */
     }
 
     /** this is done with reflection in case a new version of the plugin comes out that doesn't let us pull the sun.plugin.* trick */

-    protected synchronized org.xwt.HTTP.Proxy _detectProxy() {
-        return (org.xwt.HTTP.Proxy)java.security.AccessController.doPrivileged(new java.security.PrivilegedAction() {
+    protected synchronized org.ibex.HTTP.Proxy _detectProxy() {
+        return (org.ibex.HTTP.Proxy)java.security.AccessController.doPrivileged(new java.security.PrivilegedAction() {

                 public Object run() {
                     try {
                 public Object run() {
                     try {

-                        org.xwt.HTTP.Proxy pi = new org.xwt.HTTP.Proxy();
+                        org.ibex.HTTP.Proxy pi = new org.ibex.HTTP.Proxy();

                         
                         Class PluginProxyHandler = Class.forName("sun.plugin.protocol.PluginProxyHandler");
                         Method getDefaultProxyHandler = PluginProxyHandler.getMethod("getDefaultProxyHandler", new Class[] { });
                         
                         Class PluginProxyHandler = Class.forName("sun.plugin.protocol.PluginProxyHandler");
                         Method getDefaultProxyHandler = PluginProxyHandler.getMethod("getDefaultProxyHandler", new Class[] { });

@@ -55,7 +53,7 @@ public class Java2 extends AWT {
                         
                         Class ProxyHandler = Class.forName("sun.plugin.protocol.ProxyHandler");
                         Method getProxyInfo = ProxyHandler.getMethod("getProxyInfo", new Class[] { URL.class });
                         
                         Class ProxyHandler = Class.forName("sun.plugin.protocol.ProxyHandler");
                         Method getProxyInfo = ProxyHandler.getMethod("getProxyInfo", new Class[] { URL.class });

-                        Object proxyInfo = getProxyInfo.invoke(proxyHandler, new Object[] { new URL("http://www.xwt.org") });
+                        Object proxyInfo = getProxyInfo.invoke(proxyHandler, new Object[] { new URL("http://www.ibex.org") });

                         
                         Class ProxyInfo = Class.forName("sun.plugin.protocol.ProxyInfo");
                         
                         
                         Class ProxyInfo = Class.forName("sun.plugin.protocol.ProxyInfo");
                         

diff --git a/src/org/xwt/plat/Linux.cc b/src/org/ibex/plat/Linux.cc
similarity index 88%
rename from src/org/xwt/plat/Linux.cc
rename to src/org/ibex/plat/Linux.cc
index b3a19e6..9a9e324 100644 (file)
--- a/src/org/xwt/plat/Linux.cc
+++ b/src/org/ibex/plat/Linux.cc
@@ -1,13 +1,13 @@
 #include <stdint.h>
 #include "X11.cc"
 
 #include <stdint.h>
 #include "X11.cc"
 

-#include <org/xwt/plat/Linux.h>
+#include <org/ibex/plat/Linux.h>

 
 // we love libgcj!
 extern const char **_Jv_argv;
 extern int _Jv_argc;
 
 
 // we love libgcj!
 extern const char **_Jv_argv;
 extern int _Jv_argc;
 

-void org::xwt::plat::Linux::fixEnvironment() {
+void org::ibex::plat::Linux::fixEnvironment() {

     // see http://lists.debian.org/debian-glibc/2003/debian-glibc-200311/msg00647.html
     const char* ld_assume_kernel = getenv("LD_ASSUME_KERNEL");
     if (ld_assume_kernel == NULL || strcmp("2.4.1", ld_assume_kernel)) {
     // see http://lists.debian.org/debian-glibc/2003/debian-glibc-200311/msg00647.html
     const char* ld_assume_kernel = getenv("LD_ASSUME_KERNEL");
     if (ld_assume_kernel == NULL || strcmp("2.4.1", ld_assume_kernel)) {

diff --git a/src/org/xwt/plat/Linux.java b/src/org/ibex/plat/Linux.java
similarity index 85%
rename from src/org/xwt/plat/Linux.java
rename to src/org/ibex/plat/Linux.java
index d7c8be8..a802d07 100644 (file)
--- a/src/org/xwt/plat/Linux.java
+++ b/src/org/ibex/plat/Linux.java
@@ -1,7 +1,5 @@
 // Copyright 2004 Adam Megacz, see the COPYING file for licensing [GPL]
 // Copyright 2004 Adam Megacz, see the COPYING file for licensing [GPL]

-package org.xwt.plat;
-
-import org.xwt.*;
+package org.ibex.plat;

 
 /** Linux with an X11 display */
 public class Linux extends X11 {
 
 /** Linux with an X11 display */
 public class Linux extends X11 {

diff --git a/src/org/xwt/plat/OpenGL.cc b/src/org/ibex/plat/OpenGL.cc
similarity index 96%
rename from src/org/xwt/plat/OpenGL.cc
rename to src/org/ibex/plat/OpenGL.cc
index 3c8cf6a..1f79649 100644 (file)
--- a/src/org/xwt/plat/OpenGL.cc
+++ b/src/org/ibex/plat/OpenGL.cc
@@ -3,12 +3,12 @@
 
 // IMPROVMENT: use alpha testing? might be faster
 
 
 // IMPROVMENT: use alpha testing? might be faster
 

-#include <org/xwt/plat/OpenGL.h>
-#include <org/xwt/plat/OpenGL$GLPixelBuffer.h>
-#include <org/xwt/plat/OpenGL$GLPicture.h>
-#include <org/xwt/plat/OpenGL$RectGLPicture.h>
-#include <org/xwt/plat/OpenGL$SquareGLPicture.h>
-#include <org/xwt/plat/OpenGL$MosaicGLPicture.h>
+#include <org/ibex/plat/OpenGL.h>
+#include <org/ibex/plat/OpenGL$GLPixelBuffer.h>
+#include <org/ibex/plat/OpenGL$GLPicture.h>
+#include <org/ibex/plat/OpenGL$RectGLPicture.h>
+#include <org/ibex/plat/OpenGL$SquareGLPicture.h>
+#include <org/ibex/plat/OpenGL$MosaicGLPicture.h>

 
 #include <java/lang/Error.h>
 
 
 #include <java/lang/Error.h>
 

@@ -28,7 +28,7 @@
 #define min(a,b) ((a)<(b)?(a):(b)) 
 #define max(a,b) ((a)>(b)?(a):(b)) 
 
 #define min(a,b) ((a)<(b)?(a):(b)) 
 #define max(a,b) ((a)>(b)?(a):(b)) 
 

-namespace org { namespace xwt { namespace plat {
+namespace org { namespace ibex { namespace plat {

 
 #define checkGLError() checkGLError2(__FILE__,__LINE__)
 static void checkGLError2(const char *file,int line) {
 
 #define checkGLError() checkGLError2(__FILE__,__LINE__)
 static void checkGLError2(const char *file,int line) {

@@ -302,4 +302,4 @@ void OpenGL$SquareGLPicture::draw(jint dx, jint dy, jint cx1, jint cy1, jint cx2
     checkGLError();
 }
 
     checkGLError();
 }
 

-} } } // end org::xwt::plat
+} } } // end org::ibex::plat

diff --git a/src/org/xwt/plat/OpenGL.java b/src/org/ibex/plat/OpenGL.java
similarity index 95%
rename from src/org/xwt/plat/OpenGL.java
rename to src/org/ibex/plat/OpenGL.java
index c18d09c..51ef708 100644 (file)
--- a/src/org/xwt/plat/OpenGL.java
+++ b/src/org/ibex/plat/OpenGL.java
@@ -1,10 +1,10 @@
 // Copyright 2004 Adam Megacz, see the COPYING file for licensing [LGPL]
 // Author: Brian Alliet
 
 // Copyright 2004 Adam Megacz, see the COPYING file for licensing [LGPL]
 // Author: Brian Alliet
 

-package org.xwt.plat;
-import org.xwt.*;
-import org.xwt.js.*;
-import org.xwt.util.*;
+package org.ibex.plat;
+import org.ibex.*;
+import org.ibex.js.*;
+import org.ibex.util.*;

 
 abstract class OpenGL {
     static final boolean pretendToBeACrappyVideoCard = false;
 
 abstract class OpenGL {
     static final boolean pretendToBeACrappyVideoCard = false;

@@ -81,8 +81,8 @@ abstract class OpenGL {
             //System.out.println("drawString(): " + text);
         }
 
             //System.out.println("drawString(): " + text);
         }
 

-        public void drawGlyph(org.xwt.Font.Glyph source, int dx, int dy, int cx1, int cy1, int cx2, int cy2, int rgb) {
-            drawPicture_(((org.xwt.Platform.DefaultGlyph)source).getPicture(), dx, dy, cx1, cy1, cx2, cy2, rgb);
+        public void drawGlyph(org.ibex.Font.Glyph source, int dx, int dy, int cx1, int cy1, int cx2, int cy2, int rgb) {
+            drawPicture_(((org.ibex.Platform.DefaultGlyph)source).getPicture(), dx, dy, cx1, cy1, cx2, cy2, rgb);

         }
         public void drawPicture(Picture source, int dx, int dy, int cx1, int cy1, int cx2, int cy2) {
             drawPicture_(source, dx, dy, cx1, cy1, cx2, cy2, 0xffffffff);
         }
         public void drawPicture(Picture source, int dx, int dy, int cx1, int cy1, int cx2, int cy2) {
             drawPicture_(source, dx, dy, cx1, cy1, cx2, cy2, 0xffffffff);

@@ -127,7 +127,7 @@ abstract class OpenGL {
         GLPicture realPicture = null;
     }
 
         GLPicture realPicture = null;
     }
 

-    public Font.Glyph _createGlyph(org.xwt.Font f, char c) { return new org.xwt.Platform.DefaultGlyph(f, c); }
+    public Font.Glyph _createGlyph(org.ibex.Font f, char c) { return new org.ibex.Platform.DefaultGlyph(f, c); }

     
     private native void natDeleteTexture(int tex);
     public void deleteTexture(final int tex) {
     
     private native void natDeleteTexture(int tex);
     public void deleteTexture(final int tex) {

diff --git a/src/org/xwt/plat/POSIX.cc b/src/org/ibex/plat/POSIX.cc
similarity index 78%
rename from src/org/xwt/plat/POSIX.cc
rename to src/org/ibex/plat/POSIX.cc
index 209c37a..869e275 100644 (file)
--- a/src/org/xwt/plat/POSIX.cc
+++ b/src/org/ibex/plat/POSIX.cc
@@ -14,20 +14,20 @@
 
 // FIXME: we don't need all these
 #include <java/lang/String.h>
 
 // FIXME: we don't need all these
 #include <java/lang/String.h>

-#include <org/xwt/Surface.h>
-#include <org/xwt/Picture.h>
-#include <org/xwt/js/JS.h>
-#include <org/xwt/Box.h>
-#include <org/xwt/util/Semaphore.h>
-#include <org/xwt/Platform.h>
+#include <org/ibex/Surface.h>
+#include <org/ibex/Picture.h>
+#include <org/ibex/js/JS.h>
+#include <org/ibex/Box.h>
+#include <org/ibex/util/Semaphore.h>
+#include <org/ibex/Platform.h>

 #include <java/lang/Long.h>
 #include <java/util/Hashtable.h>
 #include <java/lang/Long.h>
 #include <java/util/Hashtable.h>

-#include <org/xwt/util/Log.h>
-#include <org/xwt/plat/POSIX.h>
+#include <org/ibex/util/Log.h>
+#include <org/ibex/plat/POSIX.h>

 #include <java/lang/System.h>
 #include <java/io/PrintStream.h>
 
 #include <java/lang/System.h>
 #include <java/io/PrintStream.h>
 

-jstring org::xwt::plat::POSIX::_getEnv(jstring key) {
+jstring org::ibex::plat::POSIX::_getEnv(jstring key) {

     int len = JvGetStringUTFLength(key);
     char buf[len + 1];
     JvGetStringUTFRegion(key, 0, len, buf);
     int len = JvGetStringUTFLength(key);
     char buf[len + 1];
     JvGetStringUTFRegion(key, 0, len, buf);

@@ -36,7 +36,7 @@ jstring org::xwt::plat::POSIX::_getEnv(jstring key) {
     return envstr == NULL ? NULL : JvNewStringLatin1(envstr);
 }
 
     return envstr == NULL ? NULL : JvNewStringLatin1(envstr);
 }
 

-void org::xwt::plat::POSIX::spawnChildProcess(JArray<jstring>* cmd) {
+void org::ibex::plat::POSIX::spawnChildProcess(JArray<jstring>* cmd) {

     jstring* cmdstrings = elements(cmd);
     char* cmd2[cmd->length + 1];
     cmd2[cmd->length] = NULL;
     jstring* cmdstrings = elements(cmd);
     char* cmd2[cmd->length + 1];
     cmd2[cmd->length] = NULL;

diff --git a/src/org/xwt/plat/POSIX.java b/src/org/ibex/plat/POSIX.java
similarity index 91%
rename from src/org/xwt/plat/POSIX.java
rename to src/org/ibex/plat/POSIX.java
index d69bf76..e8c3ff1 100644 (file)
--- a/src/org/xwt/plat/POSIX.java
+++ b/src/org/ibex/plat/POSIX.java
@@ -1,13 +1,8 @@
 // Copyright 2004 Adam Megacz, see the COPYING file for licensing [LGPL]
 // Copyright 2004 Adam Megacz, see the COPYING file for licensing [LGPL]

-package org.xwt.plat;
+package org.ibex.plat;

 
 import gnu.gcj.RawData;
 
 import gnu.gcj.RawData;

-import java.net.*;
-import java.lang.reflect.*;
-import java.io.*;

 import java.util.*;
 import java.util.*;

-import org.xwt.util.*;
-import org.xwt.*;

 
 /** Platform implementation for POSIX compliant operating systems */
 public class POSIX extends GCJ {
 
 /** Platform implementation for POSIX compliant operating systems */
 public class POSIX extends GCJ {

diff --git a/src/org/xwt/plat/PalmOS.java b/src/org/ibex/plat/PalmOS.java
similarity index 90%
rename from src/org/xwt/plat/PalmOS.java
rename to src/org/ibex/plat/PalmOS.java
index e1da913..85e67da 100644 (file)
--- a/src/org/xwt/plat/PalmOS.java
+++ b/src/org/ibex/plat/PalmOS.java
@@ -1,6 +1,6 @@
 // Copyright 2004 Adam Megacz, see the COPYING file for licensing [GPL]
 // Copyright 2004 Adam Megacz, see the COPYING file for licensing [GPL]

-package org.xwt.plat;
-import org.xwt.*;
+package org.ibex.plat;
+import org.ibex.*;

 import java.io.*;
 
 /** Platform class for PalmOS devices */
 import java.io.*;
 
 /** Platform class for PalmOS devices */

diff --git a/src/org/xwt/plat/Solaris.cc b/src/org/ibex/plat/Solaris.cc
similarity index 100%
rename from src/org/xwt/plat/Solaris.cc
rename to src/org/ibex/plat/Solaris.cc

diff --git a/src/org/xwt/plat/Solaris.java b/src/org/ibex/plat/Solaris.java
similarity index 77%
rename from src/org/xwt/plat/Solaris.java
rename to src/org/ibex/plat/Solaris.java
index c79d8fc..bf35d05 100644 (file)
--- a/src/org/xwt/plat/Solaris.java
+++ b/src/org/ibex/plat/Solaris.java
@@ -1,7 +1,5 @@
 // Copyright 2004 Adam Megacz, see the COPYING file for licensing [GPL]
 // Copyright 2004 Adam Megacz, see the COPYING file for licensing [GPL]

-package org.xwt.plat;
-
-import org.xwt.*;
+package org.ibex.plat;

 
 /** Solaris with an X11 display */
 public class Solaris extends X11 {
 
 /** Solaris with an X11 display */
 public class Solaris extends X11 {

diff --git a/src/org/xwt/plat/Win32.cc b/src/org/ibex/plat/Win32.cc
similarity index 82%
rename from src/org/xwt/plat/Win32.cc
rename to src/org/ibex/plat/Win32.cc
index 1b3ccea..fda911b 100644 (file)
--- a/src/org/xwt/plat/Win32.cc
+++ b/src/org/ibex/plat/Win32.cc
@@ -5,8 +5,8 @@
 #define INT32 WIN32_INT32
 
 // this has to precede the others so we don't get collisions on min/max
 #define INT32 WIN32_INT32
 
 // this has to precede the others so we don't get collisions on min/max

-#include <org/xwt/js/JS.h>
-#include <org/xwt/Box.h>
+#include <org/ibex/js/JS.h>
+#include <org/ibex/Box.h>

 
 #include <stdint.h>
 #include <stdlib.h>
 
 #include <stdint.h>
 #include <stdlib.h>

@@ -23,17 +23,17 @@
 
 #include <java/lang/Integer.h>
 #include <java/util/Hashtable.h>
 
 #include <java/lang/Integer.h>
 #include <java/util/Hashtable.h>

-#include <org/xwt/Box.h>
-#include <org/xwt/Surface.h>
-#include <org/xwt/PixelBuffer.h>
-#include <org/xwt/Picture.h>
-#include <org/xwt/Platform.h>
-#include <org/xwt/plat/Win32.h>
-#include <org/xwt/plat/Win32$Win32Surface.h>
-#include <org/xwt/plat/Win32$Win32PixelBuffer.h>
-#include <org/xwt/plat/Win32$Win32Picture.h>
-#include <org/xwt/util/Log.h>
-#include <org/xwt/util/Semaphore.h>
+#include <org/ibex/Box.h>
+#include <org/ibex/Surface.h>
+#include <org/ibex/PixelBuffer.h>
+#include <org/ibex/Picture.h>
+#include <org/ibex/Platform.h>
+#include <org/ibex/plat/Win32.h>
+#include <org/ibex/plat/Win32$Win32Surface.h>
+#include <org/ibex/plat/Win32$Win32PixelBuffer.h>
+#include <org/ibex/plat/Win32$Win32Picture.h>
+#include <org/ibex/util/Log.h>
+#include <org/ibex/util/Semaphore.h>

 
 // for debugging
 #include <java/lang/System.h>
 
 // for debugging
 #include <java/lang/System.h>

@@ -50,8 +50,8 @@
 // Callbacks ////////////////////////////////////////////////////////////////////
 
 LRESULT CALLBACK WndProc(HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM lParam) {
 // Callbacks ////////////////////////////////////////////////////////////////////
 
 LRESULT CALLBACK WndProc(HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM lParam) {

-    org::xwt::plat::Win32$Win32Surface* surface =
-        (org::xwt::plat::Win32$Win32Surface*)org::xwt::plat::Win32::hwndToWin32SurfaceMap->get(new java::lang::Integer((jint)hwnd));
+    org::ibex::plat::Win32$Win32Surface* surface =
+        (org::ibex::plat::Win32$Win32Surface*)org::ibex::plat::Win32::hwndToWin32SurfaceMap->get(new java::lang::Integer((jint)hwnd));

 
     if (surface != NULL) {
         return (LRESULT)surface->WndProc((jint)hwnd, (jint)iMsg, (jint)wParam, (jint)lParam);
 
     if (surface != NULL) {
         return (LRESULT)surface->WndProc((jint)hwnd, (jint)iMsg, (jint)wParam, (jint)lParam);

@@ -67,7 +67,7 @@ LRESULT CALLBACK WndProc(HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM lParam) {
 
 static int window_class_counter = 0;
 
 
 static int window_class_counter = 0;
 

-jstring org::xwt::plat::Win32::getTempPath() {
+jstring org::ibex::plat::Win32::getTempPath() {

     char buf[1024];
     DWORD ret = GetTempPath(1024, buf);
     if (ret == 0) criticalAbort(JvNewStringLatin1("GetTempPath() failed"));
     char buf[1024];
     DWORD ret = GetTempPath(1024, buf);
     if (ret == 0) criticalAbort(JvNewStringLatin1("GetTempPath() failed"));

@@ -146,30 +146,30 @@ static unsigned char hand_cursor_and[32 * 4] = {
   0xFF, 0xFF, 0xFF, 0xFF
 };
 
   0xFF, 0xFF, 0xFF, 0xFF
 };
 

-void org::xwt::plat::Win32::natPreInit() {
-    if (org::xwt::util::Log::verbose) {
+void org::ibex::plat::Win32::natPreInit() {
+    if (org::ibex::util::Log::verbose) {

         AllocConsole();
         freopen("CONOUT$", "w+t", stderr);
     }
 }
 
         AllocConsole();
         freopen("CONOUT$", "w+t", stderr);
     }
 }
 

-void org::xwt::plat::Win32::natInit() {
+void org::ibex::plat::Win32::natInit() {

 
     // grab desktop dc/handle
     desktop_handle = (jint)GetDesktopWindow();
     desktop_dc = (jint)GetDC((HWND)desktop_handle);
 
     // create cursors
 
     // grab desktop dc/handle
     desktop_handle = (jint)GetDesktopWindow();
     desktop_dc = (jint)GetDC((HWND)desktop_handle);
 
     // create cursors

-    org::xwt::plat::Win32::wait_cursor = (jint)LoadCursor(NULL, IDC_WAIT);
-    org::xwt::plat::Win32::default_cursor = (jint)LoadCursor(NULL, IDC_ARROW);
-    org::xwt::plat::Win32::crosshair_cursor = (jint)LoadCursor(NULL, IDC_CROSS);
-    org::xwt::plat::Win32::text_cursor = (jint)LoadCursor(NULL, IDC_IBEAM);
-    org::xwt::plat::Win32::move_cursor = (jint)LoadCursor(NULL, IDC_SIZEALL);
-    org::xwt::plat::Win32::sizenesw_cursor = (jint)LoadCursor(NULL, IDC_SIZENESW);
-    org::xwt::plat::Win32::sizens_cursor = (jint)LoadCursor(NULL, IDC_SIZENS);
-    org::xwt::plat::Win32::sizenwse_cursor = (jint)LoadCursor(NULL, IDC_SIZENWSE);
-    org::xwt::plat::Win32::sizewe_cursor = (jint)LoadCursor(NULL, IDC_SIZEWE);
-    org::xwt::plat::Win32::hand_cursor = (jint)CreateCursor(GetModuleHandle(NULL), 14, 1, 32, 32, hand_cursor_and, hand_cursor_xor);
+    org::ibex::plat::Win32::wait_cursor = (jint)LoadCursor(NULL, IDC_WAIT);
+    org::ibex::plat::Win32::default_cursor = (jint)LoadCursor(NULL, IDC_ARROW);
+    org::ibex::plat::Win32::crosshair_cursor = (jint)LoadCursor(NULL, IDC_CROSS);
+    org::ibex::plat::Win32::text_cursor = (jint)LoadCursor(NULL, IDC_IBEAM);
+    org::ibex::plat::Win32::move_cursor = (jint)LoadCursor(NULL, IDC_SIZEALL);
+    org::ibex::plat::Win32::sizenesw_cursor = (jint)LoadCursor(NULL, IDC_SIZENESW);
+    org::ibex::plat::Win32::sizens_cursor = (jint)LoadCursor(NULL, IDC_SIZENS);
+    org::ibex::plat::Win32::sizenwse_cursor = (jint)LoadCursor(NULL, IDC_SIZENWSE);
+    org::ibex::plat::Win32::sizewe_cursor = (jint)LoadCursor(NULL, IDC_SIZEWE);
+    org::ibex::plat::Win32::hand_cursor = (jint)CreateCursor(GetModuleHandle(NULL), 14, 1, 32, 32, hand_cursor_and, hand_cursor_xor);

 
     messagePumpThread = (jint)GetCurrentThreadId();
     messagePumpStarted->release();
 
     messagePumpThread = (jint)GetCurrentThreadId();
     messagePumpStarted->release();

@@ -178,12 +178,12 @@ void org::xwt::plat::Win32::natInit() {
     while(GetMessage(&msg, (HWND)NULL, 0, 0) > 0) {
 
         if (msg.message == WM_USER_CREATEWINDOW) {
     while(GetMessage(&msg, (HWND)NULL, 0, 0) > 0) {
 
         if (msg.message == WM_USER_CREATEWINDOW) {

-            org::xwt::plat::Win32$Win32Surface *surface = (org::xwt::plat::Win32$Win32Surface*)msg.lParam;
+            org::ibex::plat::Win32$Win32Surface *surface = (org::ibex::plat::Win32$Win32Surface*)msg.lParam;

 
             // we must create a unique window class name for each
             // window so that minimization icons can be set independantly
             char buf[255];
 
             // we must create a unique window class name for each
             // window so that minimization icons can be set independantly
             char buf[255];

-            sprintf(buf, "XWT_WINDOW_CLASS_%i", window_class_counter++);
+            sprintf(buf, "Ibex_WINDOW_CLASS_%i", window_class_counter++);

 
             WNDCLASSEX wc;
             wc.style = CS_DBLCLKS | CS_HREDRAW | CS_VREDRAW;
 
             WNDCLASSEX wc;
             wc.style = CS_DBLCLKS | CS_HREDRAW | CS_VREDRAW;

@@ -227,7 +227,7 @@ void org::xwt::plat::Win32::natInit() {
 
 // Platform Methods ///////////////////////////////////////////////////////////////////
 
 
 // Platform Methods ///////////////////////////////////////////////////////////////////
 

-jstring org::xwt::plat::Win32::_getEnv(jstring key) {
+jstring org::ibex::plat::Win32::_getEnv(jstring key) {

     int len = JvGetStringUTFLength(key);
     char buf[len + 1];
     JvGetStringUTFRegion(key, 0, len, buf);
     int len = JvGetStringUTFLength(key);
     char buf[len + 1];
     JvGetStringUTFRegion(key, 0, len, buf);

@@ -238,7 +238,7 @@ jstring org::xwt::plat::Win32::_getEnv(jstring key) {
     return NULL;
 }
 
     return NULL;
 }
 

-jstring org::xwt::plat::Win32::_fileDialog(jstring suggestedFileName, jboolean write) {
+jstring org::ibex::plat::Win32::_fileDialog(jstring suggestedFileName, jboolean write) {

 
     char buf[1024];
     OPENFILENAME ofn;
 
     char buf[1024];
     OPENFILENAME ofn;

@@ -260,7 +260,7 @@ jstring org::xwt::plat::Win32::_fileDialog(jstring suggestedFileName, jboolean w
     return ret == 0 ? NULL : JvNewStringLatin1(buf);
 }
 
     return ret == 0 ? NULL : JvNewStringLatin1(buf);
 }
 

-void org::xwt::plat::Win32::__detectProxy(JArray<jstring>* container) {
+void org::ibex::plat::Win32::__detectProxy(JArray<jstring>* container) {

 
     HKEY hkey;
     char buf[1024];
 
     HKEY hkey;
     char buf[1024];

@@ -295,7 +295,7 @@ void org::xwt::plat::Win32::__detectProxy(JArray<jstring>* container) {
     elements(container)[1] = JvNewStringLatin1(buf);
 }
 
     elements(container)[1] = JvNewStringLatin1(buf);
 }
 

-jstring org::xwt::plat::Win32::_getClipBoard() {
+jstring org::ibex::plat::Win32::_getClipBoard() {

     OpenClipboard((HWND)desktop_handle);
     HGLOBAL hmem = GetClipboardData(CF_TEXT);
     if (hmem == NULL) return NULL;
     OpenClipboard((HWND)desktop_handle);
     HGLOBAL hmem = GetClipboardData(CF_TEXT);
     if (hmem == NULL) return NULL;

@@ -307,7 +307,7 @@ jstring org::xwt::plat::Win32::_getClipBoard() {
     return ret;
 }
 
     return ret;
 }
 

-void org::xwt::plat::Win32::_setClipBoard(jstring s) {
+void org::ibex::plat::Win32::_setClipBoard(jstring s) {

     OpenClipboard((HWND)desktop_handle);
     HGLOBAL hmem = GlobalAlloc(GMEM_MOVEABLE | GMEM_DDESHARE, JvGetStringUTFLength(s) + 1);
     if (hmem == NULL) return;
     OpenClipboard((HWND)desktop_handle);
     HGLOBAL hmem = GlobalAlloc(GMEM_MOVEABLE | GMEM_DDESHARE, JvGetStringUTFLength(s) + 1);
     if (hmem == NULL) return;

@@ -320,27 +320,27 @@ void org::xwt::plat::Win32::_setClipBoard(jstring s) {
     CloseClipboard();
 }
 
     CloseClipboard();
 }
 

-void org::xwt::plat::Win32::_criticalAbort(jstring message) {
+void org::ibex::plat::Win32::_criticalAbort(jstring message) {

     char buf[JvGetStringUTFLength(message) + 1];
     buf[JvGetStringUTFLength(message)] = '\0';
     JvGetStringUTFRegion(message, 0, JvGetStringUTFLength(message), buf);
     char buf[JvGetStringUTFLength(message) + 1];
     buf[JvGetStringUTFLength(message)] = '\0';
     JvGetStringUTFRegion(message, 0, JvGetStringUTFLength(message), buf);

-    MessageBox (NULL, buf, "XWT Cannot Continue", MB_OK | MB_ICONSTOP | MB_TASKMODAL | MB_SETFOREGROUND);
+    MessageBox (NULL, buf, "Ibex Cannot Continue", MB_OK | MB_ICONSTOP | MB_TASKMODAL | MB_SETFOREGROUND);

     java::lang::System::exit(-1);
 }
 
     java::lang::System::exit(-1);
 }
 

-jint org::xwt::plat::Win32::_getScreenWidth() {
+jint org::ibex::plat::Win32::_getScreenWidth() {

     RECT rect;
     SystemParametersInfo(SPI_GETWORKAREA, 0, &rect, 0);
     return rect.right - rect.left;
 }
 
     RECT rect;
     SystemParametersInfo(SPI_GETWORKAREA, 0, &rect, 0);
     return rect.right - rect.left;
 }
 

-jint org::xwt::plat::Win32::_getScreenHeight() {
+jint org::ibex::plat::Win32::_getScreenHeight() {

     RECT rect;
     SystemParametersInfo(SPI_GETWORKAREA, 0, &rect, 0);
     return rect.bottom - rect.top;
 }
 
     RECT rect;
     SystemParametersInfo(SPI_GETWORKAREA, 0, &rect, 0);
     return rect.bottom - rect.top;
 }
 

-jboolean org::xwt::plat::Win32::_newBrowserWindow_(jstring url) {
+jboolean org::ibex::plat::Win32::_newBrowserWindow_(jstring url) {

 
     int len = min(2048, JvGetStringUTFLength(url));
     char buf[len + 1];
 
     int len = min(2048, JvGetStringUTFLength(url));
     char buf[len + 1];

@@ -372,11 +372,11 @@ static jint scratch_h = 0;
 #define max(a,b) ((a)>(b)?(a):(b))
 #define min(a,b) ((a)<(b)?(a):(b))
 
 #define max(a,b) ((a)>(b)?(a):(b))
 #define min(a,b) ((a)<(b)?(a):(b))
 

-void org::xwt::plat::Win32$Win32PixelBuffer::drawPicture(org::xwt::Picture* source0,
+void org::ibex::plat::Win32$Win32PixelBuffer::drawPicture(org::ibex::Picture* source0,

                                                          jint dx, jint dy,
                                                          jint cx1, jint cy1, jint cx2, jint cy2,
                                                          jint rgb, jboolean alphaOnly) {
                                                          jint dx, jint dy,
                                                          jint cx1, jint cy1, jint cx2, jint cy2,
                                                          jint rgb, jboolean alphaOnly) {

-    org::xwt::plat::Win32$Win32Picture* source = (org::xwt::plat::Win32$Win32Picture*)source0;
+    org::ibex::plat::Win32$Win32Picture* source = (org::ibex::plat::Win32$Win32Picture*)source0;

 
     cx1 = max(dx, cx1);
     cy1 = max(dy, cy1);
 
     cx1 = max(dx, cx1);
     cy1 = max(dy, cy1);

@@ -403,7 +403,7 @@ void org::xwt::plat::Win32$Win32PixelBuffer::drawPicture(org::xwt::Picture* sour
 
             // create section DIB
             scratch = CreateDIBSection(NULL, &bitmapinfo, DIB_RGB_COLORS, (void**)&scratch_bits, NULL, 0);
 
             // create section DIB
             scratch = CreateDIBSection(NULL, &bitmapinfo, DIB_RGB_COLORS, (void**)&scratch_bits, NULL, 0);

-            scratch_dc = CreateCompatibleDC((HDC)org::xwt::plat::Win32::desktop_dc);
+            scratch_dc = CreateCompatibleDC((HDC)org::ibex::plat::Win32::desktop_dc);

             SelectObject(scratch_dc, scratch);
         }
 
             SelectObject(scratch_dc, scratch);
         }
 

@@ -443,7 +443,7 @@ void org::xwt::plat::Win32$Win32PixelBuffer::drawPicture(org::xwt::Picture* sour
 
 }
 
 
 }
 

-void org::xwt::plat::Win32$Win32PixelBuffer::fillRect(jint x, jint y, jint x2, jint y2, jint color) {
+void org::ibex::plat::Win32$Win32PixelBuffer::fillRect(jint x, jint y, jint x2, jint y2, jint color) {

     jint w = x2 - x;
     jint h = y2 - y;
 
     jint w = x2 - x;
     jint h = y2 - y;
 

@@ -455,20 +455,20 @@ void org::xwt::plat::Win32$Win32PixelBuffer::fillRect(jint x, jint y, jint x2, j
     DeleteObject(brush);
 }
 
     DeleteObject(brush);
 }
 

-void org::xwt::plat::Win32$Win32Surface::blit(org::xwt::PixelBuffer* s, jint sx, jint sy, jint dx, jint dy, jint dx2, jint dy2) {
+void org::ibex::plat::Win32$Win32Surface::blit(org::ibex::PixelBuffer* s, jint sx, jint sy, jint dx, jint dy, jint dx2, jint dy2) {

     // we create the DC lazily to get around some strange race condition in WinXP
     if (hdc == 0) hdc = (jint)GetDC((HWND)hwnd);
     // we create the DC lazily to get around some strange race condition in WinXP
     if (hdc == 0) hdc = (jint)GetDC((HWND)hwnd);

-    BitBlt((HDC)hdc, dx, dy, dx2 - dx, dy2 - dy, (HDC)(((org::xwt::plat::Win32$Win32PixelBuffer*)s)->hdc), sx, sy, SRCCOPY);
+    BitBlt((HDC)hdc, dx, dy, dx2 - dx, dy2 - dy, (HDC)(((org::ibex::plat::Win32$Win32PixelBuffer*)s)->hdc), sx, sy, SRCCOPY);

 }
 
 }
 

-void org::xwt::plat::Win32$Win32PixelBuffer::natInit() {
-    hbitmap = (jint)CreateCompatibleBitmap((HDC)org::xwt::plat::Win32::desktop_dc, w, h);
-    hdc = (jint)CreateCompatibleDC((HDC)org::xwt::plat::Win32::desktop_dc);
+void org::ibex::plat::Win32$Win32PixelBuffer::natInit() {
+    hbitmap = (jint)CreateCompatibleBitmap((HDC)org::ibex::plat::Win32::desktop_dc, w, h);
+    hdc = (jint)CreateCompatibleDC((HDC)org::ibex::plat::Win32::desktop_dc);

     SetBkMode((HDC)hdc, TRANSPARENT);
     SelectObject((HDC)hdc, (HBITMAP)hbitmap);
 }
 
     SetBkMode((HDC)hdc, TRANSPARENT);
     SelectObject((HDC)hdc, (HBITMAP)hbitmap);
 }
 

-void org::xwt::plat::Win32$Win32PixelBuffer::finalize() {
+void org::ibex::plat::Win32$Win32PixelBuffer::finalize() {

     DeleteObject((void*)hdc);
     DeleteObject((void*)hbitmap);
 }
     DeleteObject((void*)hdc);
     DeleteObject((void*)hbitmap);
 }

@@ -477,7 +477,7 @@ void org::xwt::plat::Win32$Win32PixelBuffer::finalize() {
 
 // Win32Picture /////////////////////////////////////////////////////////////////////////
 
 
 // Win32Picture /////////////////////////////////////////////////////////////////////////
 

-void org::xwt::plat::Win32$Win32Picture::natInit() {
+void org::ibex::plat::Win32$Win32Picture::natInit() {

 
     BITMAPINFO bitmapinfo;
     memset(&bitmapinfo, 0, sizeof(BITMAPINFO));
 
     BITMAPINFO bitmapinfo;
     memset(&bitmapinfo, 0, sizeof(BITMAPINFO));

@@ -488,8 +488,8 @@ void org::xwt::plat::Win32$Win32Picture::natInit() {
     bitmapinfo.bmiHeader.biBitCount = 32;
     bitmapinfo.bmiHeader.biCompression = BI_RGB;
 
     bitmapinfo.bmiHeader.biBitCount = 32;
     bitmapinfo.bmiHeader.biCompression = BI_RGB;
 

-    hbitmap = (jint)CreateCompatibleBitmap((HDC)org::xwt::plat::Win32::desktop_dc, width, height);
-    hdc = (jint)CreateCompatibleDC((HDC)org::xwt::plat::Win32::desktop_dc);
+    hbitmap = (jint)CreateCompatibleBitmap((HDC)org::ibex::plat::Win32::desktop_dc, width, height);
+    hdc = (jint)CreateCompatibleDC((HDC)org::ibex::plat::Win32::desktop_dc);

     SelectObject((HDC)hdc, (HBITMAP)hbitmap);
     uint32_t* dat = (uint32_t*)elements(data);
     for(int i=0; i<data->length; i++) if ((dat[i] & 0xFF000000) == 0x00000000) dat[i] = 0x00000000;
     SelectObject((HDC)hdc, (HBITMAP)hbitmap);
     uint32_t* dat = (uint32_t*)elements(data);
     for(int i=0; i<data->length; i++) if ((dat[i] & 0xFF000000) == 0x00000000) dat[i] = 0x00000000;

@@ -518,7 +518,7 @@ void org::xwt::plat::Win32$Win32Picture::natInit() {
     }
 
     //    hmask = (jint)CreateBitmap(w, h, 1, 1, NULL);
     }
 
     //    hmask = (jint)CreateBitmap(w, h, 1, 1, NULL);

-    hmask = (jint)CreateCompatibleBitmap((HDC)org::xwt::plat::Win32::desktop_dc, width, height);
+    hmask = (jint)CreateCompatibleBitmap((HDC)org::ibex::plat::Win32::desktop_dc, width, height);

     maskdc = (jint)CreateCompatibleDC(NULL);
     SelectObject((HDC)maskdc, (HBITMAP)hmask);
     StretchDIBits((HDC)maskdc, 0, 0, width, height, 0, 0, width, height, copy, &bitmapinfo, DIB_RGB_COLORS, SRCCOPY);
     maskdc = (jint)CreateCompatibleDC(NULL);
     SelectObject((HDC)maskdc, (HBITMAP)hmask);
     StretchDIBits((HDC)maskdc, 0, 0, width, height, 0, 0, width, height, copy, &bitmapinfo, DIB_RGB_COLORS, SRCCOPY);

@@ -529,10 +529,10 @@ void org::xwt::plat::Win32$Win32Picture::natInit() {
 
 // Win32Surface /////////////////////////////////////////////////////////////////////////////
 
 
 // Win32Surface /////////////////////////////////////////////////////////////////////////////
 

-void org::xwt::plat::Win32$Win32Surface::natInit(jboolean framed) {
+void org::ibex::plat::Win32$Win32Surface::natInit(jboolean framed) {

 
     // Ask the message-handling thread to create a window for us
 
     // Ask the message-handling thread to create a window for us

-    PostThreadMessage((DWORD)org::xwt::plat::Win32::messagePumpThread, WM_USER + 2, (WPARAM)framed, (LPARAM)this);
+    PostThreadMessage((DWORD)org::ibex::plat::Win32::messagePumpThread, WM_USER + 2, (WPARAM)framed, (LPARAM)this);

     hwndCreated->block();
 
     // turn on incremental GC now that we have a user-visible interface
     hwndCreated->block();
 
     // turn on incremental GC now that we have a user-visible interface

@@ -542,16 +542,16 @@ void org::xwt::plat::Win32$Win32Surface::natInit(jboolean framed) {
     ShowWindow ((HWND)hwnd, SW_SHOWDEFAULT);
 }
 
     ShowWindow ((HWND)hwnd, SW_SHOWDEFAULT);
 }
 

-void org::xwt::plat::Win32$Win32Surface::finalize() { /* DeleteObject((void*)hwnd); */ }
-void org::xwt::plat::Win32$Win32Surface::toFront() { BringWindowToTop((HWND)hwnd); }
-void org::xwt::plat::Win32$Win32Surface::toBack() { SetWindowPos((HWND)hwnd, HWND_BOTTOM, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE); }
-void org::xwt::plat::Win32$Win32Surface::_dispose() { PostMessage((HWND)hwnd, WM_USER_DISPOSE, 0, 0); }
-void org::xwt::plat::Win32$Win32Surface::setInvisible(jboolean h) { ShowWindow((HWND)hwnd, h ? SW_HIDE : SW_SHOWNORMAL); }
-void org::xwt::plat::Win32$Win32Surface::_setMinimized(jboolean m) { ShowWindow((HWND)hwnd, m ? SW_SHOWMINIMIZED : SW_SHOWNORMAL); }
-void org::xwt::plat::Win32$Win32Surface::_setMaximized(jboolean m) { ShowWindow((HWND)hwnd, m ? SW_SHOWMAXIMIZED : SW_SHOWNORMAL); }
-void org::xwt::plat::Win32$Win32Surface::postCursorChange() { PostMessage((HWND)hwnd, WM_USER_SETCURSOR, 0, 0); }
+void org::ibex::plat::Win32$Win32Surface::finalize() { /* DeleteObject((void*)hwnd); */ }
+void org::ibex::plat::Win32$Win32Surface::toFront() { BringWindowToTop((HWND)hwnd); }
+void org::ibex::plat::Win32$Win32Surface::toBack() { SetWindowPos((HWND)hwnd, HWND_BOTTOM, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE); }
+void org::ibex::plat::Win32$Win32Surface::_dispose() { PostMessage((HWND)hwnd, WM_USER_DISPOSE, 0, 0); }
+void org::ibex::plat::Win32$Win32Surface::setInvisible(jboolean h) { ShowWindow((HWND)hwnd, h ? SW_HIDE : SW_SHOWNORMAL); }
+void org::ibex::plat::Win32$Win32Surface::_setMinimized(jboolean m) { ShowWindow((HWND)hwnd, m ? SW_SHOWMINIMIZED : SW_SHOWNORMAL); }
+void org::ibex::plat::Win32$Win32Surface::_setMaximized(jboolean m) { ShowWindow((HWND)hwnd, m ? SW_SHOWMAXIMIZED : SW_SHOWNORMAL); }
+void org::ibex::plat::Win32$Win32Surface::postCursorChange() { PostMessage((HWND)hwnd, WM_USER_SETCURSOR, 0, 0); }

 
 

-void org::xwt::plat::Win32$Win32Surface::setLocation() {
+void org::ibex::plat::Win32$Win32Surface::setLocation() {

     POINT point;
     RECT rect;
     point.x = 0;
     POINT point;
     RECT rect;
     point.x = 0;

@@ -561,7 +561,7 @@ void org::xwt::plat::Win32$Win32Surface::setLocation() {
     SetWindowPos((HWND)hwnd, NULL, root->x - (point.x - rect.left), root->y - (point.y - rect.top), 0, 0, SWP_NOZORDER | SWP_NOSIZE);
 }
 
     SetWindowPos((HWND)hwnd, NULL, root->x - (point.x - rect.left), root->y - (point.y - rect.top), 0, 0, SWP_NOZORDER | SWP_NOSIZE);
 }
 

-void org::xwt::plat::Win32$Win32Surface::_setSize(jint w, jint h) {
+void org::ibex::plat::Win32$Win32Surface::_setSize(jint w, jint h) {

     RECT client_rect, window_rect;
     GetClientRect((HWND)hwnd, &client_rect);
     GetWindowRect((HWND)hwnd, &window_rect);
     RECT client_rect, window_rect;
     GetClientRect((HWND)hwnd, &client_rect);
     GetWindowRect((HWND)hwnd, &window_rect);

@@ -570,7 +570,7 @@ void org::xwt::plat::Win32$Win32Surface::_setSize(jint w, jint h) {
     SetWindowPos((HWND)hwnd, NULL, 0, 0, width, height, SWP_NOZORDER | SWP_NOMOVE);
 }
 
     SetWindowPos((HWND)hwnd, NULL, 0, 0, width, height, SWP_NOZORDER | SWP_NOMOVE);
 }
 

-void org::xwt::plat::Win32$Win32Surface::setTitleBarText(java::lang::String* title) {
+void org::ibex::plat::Win32$Win32Surface::setTitleBarText(java::lang::String* title) {

     int len = min(1024, JvGetStringUTFLength(title));
     char buf[len + 1];
     buf[len] = '\0';
     int len = min(1024, JvGetStringUTFLength(title));
     char buf[len + 1];
     buf[len] = '\0';

@@ -578,9 +578,9 @@ void org::xwt::plat::Win32$Win32Surface::setTitleBarText(java::lang::String* tit
     SetWindowText((HWND)hwnd, buf);
 }
 
     SetWindowText((HWND)hwnd, buf);
 }
 

-void org::xwt::plat::Win32$Win32Surface::setIcon(org::xwt::Picture* p0) {
+void org::ibex::plat::Win32$Win32Surface::setIcon(org::ibex::Picture* p0) {

 
 

-    org::xwt::plat::Win32$Win32Picture* p = (org::xwt::plat::Win32$Win32Picture*)p0;
+    org::ibex::plat::Win32$Win32Picture* p = (org::ibex::plat::Win32$Win32Picture*)p0;

     int icon_width = GetSystemMetrics(SM_CXSMICON);
     int icon_height = GetSystemMetrics(SM_CYSMICON);
 
     int icon_width = GetSystemMetrics(SM_CXSMICON);
     int icon_height = GetSystemMetrics(SM_CYSMICON);
 

@@ -616,7 +616,7 @@ void org::xwt::plat::Win32$Win32Surface::setIcon(org::xwt::Picture* p0) {
 }
 
 static jstring keyToString(WPARAM wParam);
 }
 
 static jstring keyToString(WPARAM wParam);

-jint org::xwt::plat::Win32$Win32Surface::WndProc(jint _hwnd, jint _iMsg, jint _wParam, jint _lParam) {
+jint org::ibex::plat::Win32$Win32Surface::WndProc(jint _hwnd, jint _iMsg, jint _wParam, jint _lParam) {

 
     UINT iMsg = (UINT)_iMsg;
     WPARAM wParam = (WPARAM)_wParam;
 
     UINT iMsg = (UINT)_iMsg;
     WPARAM wParam = (WPARAM)_wParam;

@@ -746,15 +746,15 @@ jint org::xwt::plat::Win32$Win32Surface::WndProc(jint _hwnd, jint _iMsg, jint _w
         mmi->ptMinTrackSize.x = ((uint32_t)root->minwidth) + addwidth;
         mmi->ptMinTrackSize.y = ((uint32_t)root->minheight) + addheight;
         resizable = !((root->minwidth == root->maxwidth) && (root->minheight == root->maxheight));
         mmi->ptMinTrackSize.x = ((uint32_t)root->minwidth) + addwidth;
         mmi->ptMinTrackSize.y = ((uint32_t)root->minheight) + addheight;
         resizable = !((root->minwidth == root->maxwidth) && (root->minheight == root->maxheight));

-        mmi->ptMaxTrackSize.x = resizable ? org::xwt::plat::Win32::getScreenWidth() : mmi->ptMinTrackSize.x;
-        mmi->ptMaxTrackSize.y = resizable ? org::xwt::plat::Win32::getScreenHeight() : mmi->ptMinTrackSize.y;
+        mmi->ptMaxTrackSize.x = resizable ? org::ibex::plat::Win32::getScreenWidth() : mmi->ptMinTrackSize.x;
+        mmi->ptMaxTrackSize.y = resizable ? org::ibex::plat::Win32::getScreenHeight() : mmi->ptMinTrackSize.y;

         return 0;
         
     case WM_PAINT: 
         PAINTSTRUCT ps;
         return 0;
         
     case WM_PAINT: 
         PAINTSTRUCT ps;

-        BeginPaint((HWND)org::xwt::plat::Win32$Win32Surface::hwnd, &ps);
+        BeginPaint((HWND)org::ibex::plat::Win32$Win32Surface::hwnd, &ps);

         Dirty(ps.rcPaint.left, ps.rcPaint.top, ps.rcPaint.right - ps.rcPaint.left, ps.rcPaint.bottom - ps.rcPaint.top);
         Dirty(ps.rcPaint.left, ps.rcPaint.top, ps.rcPaint.right - ps.rcPaint.left, ps.rcPaint.bottom - ps.rcPaint.top);

-        EndPaint((HWND)org::xwt::plat::Win32$Win32Surface::hwnd, &ps);
+        EndPaint((HWND)org::ibex::plat::Win32$Win32Surface::hwnd, &ps);

         return 0;
 
     default: break;
         return 0;
 
     default: break;

diff --git a/src/org/xwt/plat/Win32.inf b/src/org/ibex/plat/Win32.inf
similarity index 72%
rename from src/org/xwt/plat/Win32.inf
rename to src/org/ibex/plat/Win32.inf
index 55f1fec..4855948 100644 (file)
--- a/src/org/xwt/plat/Win32.inf
+++ b/src/org/ibex/plat/Win32.inf
@@ -1,18 +1,18 @@
-;; This file will be copied to bin-Win32/xwt.inf and then packed up
+;; This file will be copied to bin-Win32/ibex.inf and then packed up

 ;; into the .cab file for distribution
 
 [version]
     signature="$CHICAGO$"
     AdvancedINF=2.0
  [Add.Code]
 ;; into the .cab file for distribution
 
 [version]
     signature="$CHICAGO$"
     AdvancedINF=2.0
  [Add.Code]

-    xwt.dll=xwt.dll
-    xwt.exe=xwt.exe
- [xwt.dll]
+    ibex.dll=ibex.dll
+    ibex.exe=ibex.exe
+ [ibex.dll]

     file-win32-x86=thiscab
     clsid={C60D6D23-3A7D-11d6-82F9-005056CA9250}
     FileVersion=7,0,0,0
     RegisterServer=yes
     file-win32-x86=thiscab
     clsid={C60D6D23-3A7D-11d6-82F9-005056CA9250}
     FileVersion=7,0,0,0
     RegisterServer=yes

- [xwt.exe]
+ [ibex.exe]

     file-win32-x86=thiscab
     clsid={FFFFFFFF-FFFF-FFFF-FFFF-FFFFFFFFFFFE}
     FileVersion=7,0,0,0
     file-win32-x86=thiscab
     clsid={FFFFFFFF-FFFF-FFFF-FFFF-FFFFFFFFFFFE}
     FileVersion=7,0,0,0

diff --git a/src/org/xwt/plat/Win32.java b/src/org/ibex/plat/Win32.java
similarity index 98%
rename from src/org/xwt/plat/Win32.java
rename to src/org/ibex/plat/Win32.java
index a17323b..592baf9 100644 (file)
--- a/src/org/xwt/plat/Win32.java
+++ b/src/org/ibex/plat/Win32.java
@@ -1,11 +1,10 @@
 // Copyright 2004 Adam Megacz, see the COPYING file for licensing [LGPL]
 // Copyright 2004 Adam Megacz, see the COPYING file for licensing [LGPL]

-package org.xwt.plat;
+package org.ibex.plat;

 
 

-import org.xwt.*;
-import org.xwt.util.*;
+import org.ibex.*;
+import org.ibex.util.*;

 import java.util.*;
 import java.util.*;

-import org.xwt.js.*;
-import java.io.*;
+import org.ibex.js.*;

 
 /** Platform specific code for GCJ-compiled Win32 binaries */
 public class Win32 extends GCJ {
 
 /** Platform specific code for GCJ-compiled Win32 binaries */
 public class Win32 extends GCJ {

@@ -258,7 +257,7 @@ public class Win32 extends GCJ {
             ((Win32Picture)source).init();
             drawPicture(source, dx, dy, cx1, cy1, cx2, cy2, 0, false);
         }
             ((Win32Picture)source).init();
             drawPicture(source, dx, dy, cx1, cy1, cx2, cy2, 0, false);
         }

-        public void drawGlyph(org.xwt.Font.Glyph source, int dx, int dy, int cx1, int cy1, int cx2, int cy2, int rgb) {
+        public void drawGlyph(org.ibex.Font.Glyph source, int dx, int dy, int cx1, int cy1, int cx2, int cy2, int rgb) {

             Win32Picture p = ((Win32Picture)((Platform.DefaultGlyph)source).getPicture());
             p.init();
             drawPicture(p, dx, dy, cx1, cy1, cx2, cy2, rgb, true);
             Win32Picture p = ((Win32Picture)((Platform.DefaultGlyph)source).getPicture());
             p.init();
             drawPicture(p, dx, dy, cx1, cy1, cx2, cy2, rgb, true);

diff --git a/src/org/xwt/plat/X11.cc b/src/org/ibex/plat/X11.cc
similarity index 93%
rename from src/org/xwt/plat/X11.cc
rename to src/org/ibex/plat/X11.cc
index 2bdb083..81e61fb 100644 (file)
--- a/src/org/xwt/plat/X11.cc
+++ b/src/org/ibex/plat/X11.cc
@@ -13,18 +13,18 @@
 #include <X11/Xmu/StdCmap.h>
 
 #include <java/lang/String.h>
 #include <X11/Xmu/StdCmap.h>
 
 #include <java/lang/String.h>

-#include <org/xwt/Surface.h>
-#include <org/xwt/Picture.h>
-#include <org/xwt/Box.h>
-#include <org/xwt/plat/X11.h>
-#include <org/xwt/plat/X11$X11Surface.h>
-#include <org/xwt/plat/X11$X11Picture.h>
-#include <org/xwt/plat/X11$X11PixelBuffer.h>
-#include <org/xwt/util/Semaphore.h>
-#include <org/xwt/Platform.h>
+#include <org/ibex/Surface.h>
+#include <org/ibex/Picture.h>
+#include <org/ibex/Box.h>
+#include <org/ibex/plat/X11.h>
+#include <org/ibex/plat/X11$X11Surface.h>
+#include <org/ibex/plat/X11$X11Picture.h>
+#include <org/ibex/plat/X11$X11PixelBuffer.h>
+#include <org/ibex/util/Semaphore.h>
+#include <org/ibex/Platform.h>

 #include <java/lang/Long.h>
 #include <java/util/Hashtable.h>
 #include <java/lang/Long.h>
 #include <java/util/Hashtable.h>

-#include <org/xwt/util/Log.h>
+#include <org/ibex/util/Log.h>

 
 #include <java/lang/System.h>
 #include <java/io/PrintStream.h>
 
 #include <java/lang/System.h>
 #include <java/io/PrintStream.h>

@@ -66,9 +66,9 @@ static void ensureShmSize(int size) {
     }
 }
 
     }
 }
 

-void org::xwt::plat::X11$X11PixelBuffer::fastDrawPicture(org::xwt::Picture* s,
+void org::ibex::plat::X11$X11PixelBuffer::fastDrawPicture(org::ibex::Picture* s,

                                                          jint dx, jint dy, jint cx1, jint cy1, jint cx2, jint cy2) {
                                                          jint dx, jint dy, jint cx1, jint cy1, jint cx2, jint cy2) {

-    org::xwt::plat::X11$X11Picture* source = (org::xwt::plat::X11$X11Picture*)s;
+    org::ibex::plat::X11$X11Picture* source = (org::ibex::plat::X11$X11Picture*)s;

 
     if (source->doublebuf->stipple != NULL) {
         XSetClipMask(display, (*((GC*)clipped_gc)), *((Pixmap*)source->doublebuf->stipple));
 
     if (source->doublebuf->stipple != NULL) {
         XSetClipMask(display, (*((GC*)clipped_gc)), *((Pixmap*)source->doublebuf->stipple));

@@ -82,11 +82,11 @@ void org::xwt::plat::X11$X11PixelBuffer::fastDrawPicture(org::xwt::Picture* s,
               cx1 - dx, cy1 - dy, cx2 - cx1, cy2 - cy1, cx1, cy1);
 }
 
               cx1 - dx, cy1 - dy, cx2 - cx1, cy2 - cy1, cx1, cy1);
 }
 

-void org::xwt::plat::X11$X11PixelBuffer::slowDrawPicture(org::xwt::Picture* s,
+void org::ibex::plat::X11$X11PixelBuffer::slowDrawPicture(org::ibex::Picture* s,

                                                          jint dx, jint dy, jint cx1, jint cy1, jint cx2, jint cy2,
                                                          jint rgb, jboolean alphaOnly) {
 
                                                          jint dx, jint dy, jint cx1, jint cy1, jint cx2, jint cy2,
                                                          jint rgb, jboolean alphaOnly) {
 

-    org::xwt::plat::X11$X11Picture* source = (org::xwt::plat::X11$X11Picture*)s;
+    org::ibex::plat::X11$X11Picture* source = (org::ibex::plat::X11$X11Picture*)s;

     XImage* xi; 
 
     // FASTEST: shared pixmap; twiddle bits in video ram directly
     XImage* xi; 
 
     // FASTEST: shared pixmap; twiddle bits in video ram directly

@@ -138,7 +138,7 @@ void org::xwt::plat::X11$X11PixelBuffer::slowDrawPicture(org::xwt::Picture* s,
                            (((int)*(current_pixel + 1)) << 8) |
                            (((int)*(current_pixel + 2))); break;
                 case 32: targetpixel = *((int*)current_pixel); break;
                            (((int)*(current_pixel + 1)) << 8) |
                            (((int)*(current_pixel + 2))); break;
                 case 32: targetpixel = *((int*)current_pixel); break;

-                default: org::xwt::Platform::criticalAbort(JvNewStringLatin1("ERROR: bpp not a multiple of 8!"));
+                default: org::ibex::Platform::criticalAbort(JvNewStringLatin1("ERROR: bpp not a multiple of 8!"));

                 }
                 targetpixel -= colormap_info->base_pixel;
 
                 }
                 targetpixel -= colormap_info->base_pixel;
 

@@ -173,7 +173,7 @@ void org::xwt::plat::X11$X11PixelBuffer::slowDrawPicture(org::xwt::Picture* s,
                 break;
             }
             case 32: *((uint32_t*)current_pixel) = destpixel; break;
                 break;
             }
             case 32: *((uint32_t*)current_pixel) = destpixel; break;

-            default: org::xwt::Platform::criticalAbort(JvNewStringLatin1("ERROR: bpp not a multiple of 8!"));
+            default: org::ibex::Platform::criticalAbort(JvNewStringLatin1("ERROR: bpp not a multiple of 8!"));

             }
         }
     }
             }
         }
     }

@@ -191,7 +191,7 @@ void org::xwt::plat::X11$X11PixelBuffer::slowDrawPicture(org::xwt::Picture* s,
     }
 }
 
     }
 }
 

-void org::xwt::plat::X11$X11PixelBuffer::finalize() {
+void org::ibex::plat::X11$X11PixelBuffer::finalize() {

     if (shared_pixmap) {
         XShmSegmentInfo *sinfo = (XShmSegmentInfo*)shm_segment;
         XShmDetach(display, sinfo);
     if (shared_pixmap) {
         XShmSegmentInfo *sinfo = (XShmSegmentInfo*)shm_segment;
         XShmDetach(display, sinfo);

@@ -209,7 +209,7 @@ void org::xwt::plat::X11$X11PixelBuffer::finalize() {
     XFreeGC(display, *((GC*)clipped_gc));
 }
 
     XFreeGC(display, *((GC*)clipped_gc));
 }
 

-void org::xwt::plat::X11$X11PixelBuffer::natInit() {
+void org::ibex::plat::X11$X11PixelBuffer::natInit() {

     
     if (width == 0 || height == 0) return;
     shared_pixmap &= shm_supported & shm_pixmaps_supported; // refuse to use shared pixmaps if we don't have shm
     
     if (width == 0 || height == 0) return;
     shared_pixmap &= shm_supported & shm_pixmaps_supported; // refuse to use shared pixmaps if we don't have shm

@@ -242,7 +242,7 @@ void org::xwt::plat::X11$X11PixelBuffer::natInit() {
     XChangeGC(display, (*((GC*)clipped_gc)), GCGraphicsExposures, &vm);
 }    
 
     XChangeGC(display, (*((GC*)clipped_gc)), GCGraphicsExposures, &vm);
 }    
 

-void org::xwt::plat::X11$X11PixelBuffer::createStipple(org::xwt::plat::X11$X11Picture* xpi) {
+void org::ibex::plat::X11$X11PixelBuffer::createStipple(org::ibex::plat::X11$X11Picture* xpi) {

 
     stipple = (gnu::gcj::RawData*)malloc(sizeof(Pixmap));
     (*((Pixmap*)stipple)) = XCreatePixmap(display, RootWindow(display, screen_num), width, height, 1);
 
     stipple = (gnu::gcj::RawData*)malloc(sizeof(Pixmap));
     (*((Pixmap*)stipple)) = XCreatePixmap(display, RootWindow(display, screen_num), width, height, 1);

@@ -275,13 +275,13 @@ void org::xwt::plat::X11$X11PixelBuffer::createStipple(org::xwt::plat::X11$X11Pi
     XPutImage(display, (*((Pixmap*)stipple)), stipple_gc, &xi, 0, 0, 0, 0, width, height);
 }
 
     XPutImage(display, (*((Pixmap*)stipple)), stipple_gc, &xi, 0, 0, 0, 0, width, height);
 }
 

-void org::xwt::plat::X11$X11Surface::blit(org::xwt::PixelBuffer* db, jint sx, jint sy, jint dx, jint dy, jint dx2, jint dy2) {
-    org::xwt::plat::X11$X11PixelBuffer *xdb = (org::xwt::plat::X11$X11PixelBuffer*)db;
+void org::ibex::plat::X11$X11Surface::blit(org::ibex::PixelBuffer* db, jint sx, jint sy, jint dx, jint dy, jint dx2, jint dy2) {
+    org::ibex::plat::X11$X11PixelBuffer *xdb = (org::ibex::plat::X11$X11PixelBuffer*)db;

     XCopyArea(display, *((Pixmap*)xdb->pm), *((Window*)window), *((GC*)gc), sx, sy, dx2 - dx, dy2 - dy, dx, dy);
     XFlush(display);
 }
 
     XCopyArea(display, *((Pixmap*)xdb->pm), *((Window*)window), *((GC*)gc), sx, sy, dx2 - dx, dy2 - dy, dx, dy);
     XFlush(display);
 }
 

-void org::xwt::plat::X11$X11PixelBuffer::fillRect (jint x, jint y, jint x2, jint y2, jint argb) {
+void org::ibex::plat::X11$X11PixelBuffer::fillRect (jint x, jint y, jint x2, jint y2, jint argb) {

     
     jint w = x2 - x;
     jint h = y2 - y;
     
     jint w = x2 - x;
     jint h = y2 - y;

@@ -304,9 +304,9 @@ void org::xwt::plat::X11$X11PixelBuffer::fillRect (jint x, jint y, jint x2, jint
 
 // X11Surface //////////////////////////////////////////////////////////////////////
 
 
 // X11Surface //////////////////////////////////////////////////////////////////////
 

-void org::xwt::plat::X11$X11Surface::setIcon(org::xwt::Picture* pic) {
-    org::xwt::plat::X11$X11Picture* p = ((org::xwt::plat::X11$X11Picture*)pic);
-    org::xwt::plat::X11$X11PixelBuffer* old_dbuf = p->doublebuf;
+void org::ibex::plat::X11$X11Surface::setIcon(org::ibex::Picture* pic) {
+    org::ibex::plat::X11$X11Picture* p = ((org::ibex::plat::X11$X11Picture*)pic);
+    org::ibex::plat::X11$X11PixelBuffer* old_dbuf = p->doublebuf;

     p->buildPixelBuffer(1);
     XWMHints xwmh;
     memset(&xwmh, 0, sizeof(XWMHints));
     p->buildPixelBuffer(1);
     XWMHints xwmh;
     memset(&xwmh, 0, sizeof(XWMHints));

@@ -317,7 +317,7 @@ void org::xwt::plat::X11$X11Surface::setIcon(org::xwt::Picture* pic) {
     p->doublebuf = old_dbuf;
 }
 
     p->doublebuf = old_dbuf;
 }
 

-void org::xwt::plat::X11$X11Surface::setTitleBarText(java::lang::String* s) {
+void org::ibex::plat::X11$X11Surface::setTitleBarText(java::lang::String* s) {

     int len = min(JvGetStringUTFLength(s), 1024);
     char buf[len + 1];
     JvGetStringUTFRegion(s, 0, len, buf);
     int len = min(JvGetStringUTFLength(s), 1024);
     char buf[len + 1];
     JvGetStringUTFRegion(s, 0, len, buf);

@@ -332,7 +332,7 @@ void org::xwt::plat::X11$X11Surface::setTitleBarText(java::lang::String* s) {
     XSetTextProperty(display, (*((Window*)window)), &tp, XA_WM_ICON_NAME);
 }
 
     XSetTextProperty(display, (*((Window*)window)), &tp, XA_WM_ICON_NAME);
 }
 

-void org::xwt::plat::X11$X11Surface::setLimits(jint minw, jint minh, jint maxw, jint maxh) {
+void org::ibex::plat::X11$X11Surface::setLimits(jint minw, jint minh, jint maxw, jint maxh) {

     XSizeHints hints;
     hints.min_width = minw;
     hints.min_height = minh;
     XSizeHints hints;
     hints.min_width = minw;
     hints.min_height = minh;

@@ -342,35 +342,35 @@ void org::xwt::plat::X11$X11Surface::setLimits(jint minw, jint minh, jint maxw,
     XSetWMNormalHints(display, (*((Window*)window)), &hints);
 }
 
     XSetWMNormalHints(display, (*((Window*)window)), &hints);
 }
 

-void org::xwt::plat::X11$X11Surface::_setSize (jint width, jint height) {
+void org::ibex::plat::X11$X11Surface::_setSize (jint width, jint height) {

     if (width <= 0 || height <= 0) return;
     XResizeWindow(display, (*((Window*)window)), width, height);
     XFlush(display);
 }
 
     if (width <= 0 || height <= 0) return;
     XResizeWindow(display, (*((Window*)window)), width, height);
     XFlush(display);
 }
 

-void org::xwt::plat::X11$X11Surface::setLocation () { XMoveWindow(display, (*((Window*)window)), root->x, root->y); }
-void org::xwt::plat::X11$X11Surface::toFront() { XRaiseWindow(display, (*((Window*)window))); }
-void org::xwt::plat::X11$X11Surface::toBack() { XLowerWindow(display, (*((Window*)window))); }
+void org::ibex::plat::X11$X11Surface::setLocation () { XMoveWindow(display, (*((Window*)window)), root->x, root->y); }
+void org::ibex::plat::X11$X11Surface::toFront() { XRaiseWindow(display, (*((Window*)window))); }
+void org::ibex::plat::X11$X11Surface::toBack() { XLowerWindow(display, (*((Window*)window))); }

 
 

-void org::xwt::plat::X11$X11Surface::_dispose() {
+void org::ibex::plat::X11$X11Surface::_dispose() {

     // without this we get phantom messages after the window is gone
     // without this we get phantom messages after the window is gone

-    org::xwt::plat::X11::windowToSurfaceMap->remove(new java::lang::Long(*((Window*)window)));
+    org::ibex::plat::X11::windowToSurfaceMap->remove(new java::lang::Long(*((Window*)window)));

     XDestroyWindow(display, (*((Window*)window)));
 }
 
     XDestroyWindow(display, (*((Window*)window)));
 }
 

-void org::xwt::plat::X11$X11Surface::setInvisible(jboolean i) {
+void org::ibex::plat::X11$X11Surface::setInvisible(jboolean i) {

     if (i) XUnmapWindow(display, (*((Window*)window)));
     else XMapRaised(display, (*((Window*)window)));
     XFlush(display);
 }
 
     if (i) XUnmapWindow(display, (*((Window*)window)));
     else XMapRaised(display, (*((Window*)window)));
     XFlush(display);
 }
 

-void org::xwt::plat::X11$X11Surface::_setMinimized(jboolean b) {
+void org::ibex::plat::X11$X11Surface::_setMinimized(jboolean b) {

     if (b) XIconifyWindow(display, (*((Window*)window)), screen_num);
     else XMapRaised(display, (*((Window*)window)));
     XFlush(display);
 }
 
     if (b) XIconifyWindow(display, (*((Window*)window)), screen_num);
     else XMapRaised(display, (*((Window*)window)));
     XFlush(display);
 }
 

-void org::xwt::plat::X11$X11Surface::natInit() {
+void org::ibex::plat::X11$X11Surface::natInit() {

     XSetWindowAttributes xswa;
     window = (gnu::gcj::RawData*)malloc(sizeof(Window));
     xswa.bit_gravity = NorthWestGravity;
     XSetWindowAttributes xswa;
     window = (gnu::gcj::RawData*)malloc(sizeof(Window));
     xswa.bit_gravity = NorthWestGravity;

@@ -396,7 +396,7 @@ void org::xwt::plat::X11$X11Surface::natInit() {
     }
     
     XTextProperty tp;
     }
     
     XTextProperty tp;

-    tp.value = (unsigned char*)"XWT";
+    tp.value = (unsigned char*)"Ibex";

     tp.nitems = 3;
     tp.encoding = XA_STRING;
     tp.format = 8;
     tp.nitems = 3;
     tp.encoding = XA_STRING;
     tp.format = 8;

@@ -406,7 +406,7 @@ void org::xwt::plat::X11$X11Surface::natInit() {
     XSetWMProtocols(display, (*((Window*)window)), &proto, 1);
     
     XSelectInput(display, (*((Window*)window)), StructureNotifyMask);
     XSetWMProtocols(display, (*((Window*)window)), &proto, 1);
     
     XSelectInput(display, (*((Window*)window)), StructureNotifyMask);

-    org::xwt::plat::X11::windowToSurfaceMap->put(new java::lang::Long(*((Window*)window)), this);
+    org::ibex::plat::X11::windowToSurfaceMap->put(new java::lang::Long(*((Window*)window)), this);

 
     XEvent e;
     XMapRaised(display, (*((Window*)window)));
 
     XEvent e;
     XMapRaised(display, (*((Window*)window)));

@@ -425,7 +425,7 @@ void org::xwt::plat::X11$X11Surface::natInit() {
 }
 
 
 }
 
 

-void org::xwt::plat::X11$X11Surface::dispatchEvent(gnu::gcj::RawData* ev) {
+void org::ibex::plat::X11$X11Surface::dispatchEvent(gnu::gcj::RawData* ev) {

 
     XEvent* e = (XEvent*)ev;
     if (e->type == Expose) {
 
     XEvent* e = (XEvent*)ev;
     if (e->type == Expose) {

@@ -561,7 +561,7 @@ static Cursor crosshair_cursor, east_cursor, hand_cursor, move_cursor, north_cur
     northeast_cursor, northwest_cursor, south_cursor, southeast_cursor,
     southwest_cursor, text_cursor, west_cursor, wait_cursor, default_cursor;
 
     northeast_cursor, northwest_cursor, south_cursor, southeast_cursor,
     southwest_cursor, text_cursor, west_cursor, wait_cursor, default_cursor;
 

-void org::xwt::plat::X11$X11Surface::syncCursor() {
+void org::ibex::plat::X11$X11Surface::syncCursor() {

     
     Cursor curs;
     if (cursor->equals(crosshair)) curs = crosshair_cursor;
     
     Cursor curs;
     if (cursor->equals(crosshair)) curs = crosshair_cursor;

@@ -586,13 +586,13 @@ void org::xwt::plat::X11$X11Surface::syncCursor() {
 
 // X11 ///////////////////////////////////////////////////////////////////
 
 
 // X11 ///////////////////////////////////////////////////////////////////
 

-jint org::xwt::plat::X11::_getScreenWidth() { return WidthOfScreen(DefaultScreenOfDisplay(display)); }
-jint org::xwt::plat::X11::_getScreenHeight() { return HeightOfScreen(DefaultScreenOfDisplay(display)); }
+jint org::ibex::plat::X11::_getScreenWidth() { return WidthOfScreen(DefaultScreenOfDisplay(display)); }
+jint org::ibex::plat::X11::_getScreenHeight() { return HeightOfScreen(DefaultScreenOfDisplay(display)); }

 
 static void dispatchSelectionEvent(XEvent* e) {
     if (e->type == SelectionNotify) {
         XSelectionEvent* xsn = (XSelectionEvent*)(e);
 
 static void dispatchSelectionEvent(XEvent* e) {
     if (e->type == SelectionNotify) {
         XSelectionEvent* xsn = (XSelectionEvent*)(e);

-        if (xsn->property == None) org::xwt::plat::X11::clipboard = JvNewStringLatin1("", 0);
+        if (xsn->property == None) org::ibex::plat::X11::clipboard = JvNewStringLatin1("", 0);

         else {
             Atom returntype;
             int returnformat;
         else {
             Atom returntype;
             int returnformat;

@@ -602,10 +602,10 @@ static void dispatchSelectionEvent(XEvent* e) {
             XGetWindowProperty(display, xsn->requestor, xsn->property, 0, 4096,
                                True, AnyPropertyType, &returntype, &returnformat,
                                &numitems, &bytes_after, &ret);
             XGetWindowProperty(display, xsn->requestor, xsn->property, 0, 4096,
                                True, AnyPropertyType, &returntype, &returnformat,
                                &numitems, &bytes_after, &ret);

-            org::xwt::plat::X11::clipboard =
+            org::ibex::plat::X11::clipboard =

                 (returntype == None ? JvNewStringLatin1("", 0) : JvNewStringLatin1((char*)ret, strlen((char*)ret)));
         }
                 (returntype == None ? JvNewStringLatin1("", 0) : JvNewStringLatin1((char*)ret, strlen((char*)ret)));
         }

-        org::xwt::plat::X11::waiting_for_selection_event->release();
+        org::ibex::plat::X11::waiting_for_selection_event->release();

         
     } else if (e->type == SelectionRequest) {
         XSelectionRequestEvent* xsr = (XSelectionRequestEvent*)(e);
         
     } else if (e->type == SelectionRequest) {
         XSelectionRequestEvent* xsr = (XSelectionRequestEvent*)(e);

@@ -620,9 +620,9 @@ static void dispatchSelectionEvent(XEvent* e) {
         xsn.property = xsr->property;
         xsn.time = xsr->time;
         
         xsn.property = xsr->property;
         xsn.time = xsr->time;
         

-        int len = min(1024, JvGetStringUTFLength(org::xwt::plat::X11::clipboard));
+        int len = min(1024, JvGetStringUTFLength(org::ibex::plat::X11::clipboard));

         char buf[len + 1];
         char buf[len + 1];

-        JvGetStringUTFRegion(org::xwt::plat::X11::clipboard, 0, len, buf);
+        JvGetStringUTFRegion(org::ibex::plat::X11::clipboard, 0, len, buf);

         buf[len] = '\0';
         
         XChangeProperty(display, xsr->requestor, xsr->property, xsr->target, 8, PropModeReplace, (unsigned char*)buf, len + 1);
         buf[len] = '\0';
         
         XChangeProperty(display, xsr->requestor, xsr->property, xsr->target, 8, PropModeReplace, (unsigned char*)buf, len + 1);

@@ -630,28 +630,28 @@ static void dispatchSelectionEvent(XEvent* e) {
     }        
 }
 
     }        
 }
 

-void org::xwt::plat::X11::eventThread() {
+void org::ibex::plat::X11::eventThread() {

     XEvent e;
     while(true) {
         XNextEvent(display, &e);
         if (e.type == SelectionNotify || e.type == SelectionRequest) {
             dispatchSelectionEvent(&e);
         } else {
     XEvent e;
     while(true) {
         XNextEvent(display, &e);
         if (e.type == SelectionNotify || e.type == SelectionRequest) {
             dispatchSelectionEvent(&e);
         } else {

-            org::xwt::plat::X11$X11Surface* surface =
-                (org::xwt::plat::X11$X11Surface*)windowToSurfaceMap->get(new java::lang::Long(((XAnyEvent*)&e)->window));
+            org::ibex::plat::X11$X11Surface* surface =
+                (org::ibex::plat::X11$X11Surface*)windowToSurfaceMap->get(new java::lang::Long(((XAnyEvent*)&e)->window));

             if (surface != NULL) surface->dispatchEvent((gnu::gcj::RawData*)&e);
         }
     }
 }
 
             if (surface != NULL) surface->dispatchEvent((gnu::gcj::RawData*)&e);
         }
     }
 }
 

-jstring org::xwt::plat::X11::_getClipBoard() {
+jstring org::ibex::plat::X11::_getClipBoard() {

     XConvertSelection(display, XA_PRIMARY, XA_STRING, XInternAtom(display, "VT_SELECTION", False), selectionWindow, CurrentTime);
     XFlush(display);
     XConvertSelection(display, XA_PRIMARY, XA_STRING, XInternAtom(display, "VT_SELECTION", False), selectionWindow, CurrentTime);
     XFlush(display);

-    org::xwt::plat::X11::waiting_for_selection_event->block();
+    org::ibex::plat::X11::waiting_for_selection_event->block();

     return clipboard;
 }
 
     return clipboard;
 }
 

-void org::xwt::plat::X11::_setClipBoard(jstring s) {
+void org::ibex::plat::X11::_setClipBoard(jstring s) {

     clipboard = s;
     int len = JvGetStringUTFLength(clipboard);
     char buf[len + 1];
     clipboard = s;
     int len = JvGetStringUTFLength(clipboard);
     char buf[len + 1];

@@ -667,17 +667,17 @@ int errorHandler(Display* d, XErrorEvent* e) {
     shm_supported = 0;
 }
 
     shm_supported = 0;
 }
 

-void org::xwt::plat::X11::natInit() {
+void org::ibex::plat::X11::natInit() {

 
     if (!XInitThreads())
 
     if (!XInitThreads())

-        org::xwt::Platform::criticalAbort(JvNewStringLatin1("Your X11 libraries do not support multithreaded programs"));
+        org::ibex::Platform::criticalAbort(JvNewStringLatin1("Your X11 libraries do not support multithreaded programs"));

 
     char* DISPLAY = getenv("DISPLAY");
     if (DISPLAY == NULL || strlen(DISPLAY) == 0) DISPLAY = ":0.0";
     display = XOpenDisplay(DISPLAY);
 
     if (display == 0)
 
     char* DISPLAY = getenv("DISPLAY");
     if (DISPLAY == NULL || strlen(DISPLAY) == 0) DISPLAY = ":0.0";
     display = XOpenDisplay(DISPLAY);
 
     if (display == 0)

-        org::xwt::Platform::criticalAbort(JvNewStringLatin1("Unable to connect to X11 display server"));
+        org::ibex::Platform::criticalAbort(JvNewStringLatin1("Unable to connect to X11 display server"));

 
     screen_num = XDefaultScreen(display);
     colorDepth = (jint)(DefaultDepth(((Display*)display), 0));
 
     screen_num = XDefaultScreen(display);
     colorDepth = (jint)(DefaultDepth(((Display*)display), 0));

@@ -731,36 +731,36 @@ void org::xwt::plat::X11::natInit() {
     visual = DefaultVisual(display, screen_num);
     char buf[255];
     sprintf(buf, "X11 DISPLAY: %s", XDisplayString(display));
     visual = DefaultVisual(display, screen_num);
     char buf[255];
     sprintf(buf, "X11 DISPLAY: %s", XDisplayString(display));

-    org::xwt::util::Log::info(this->getClass(), JvNewStringLatin1(buf));
+    org::ibex::util::Log::info(this->getClass(), JvNewStringLatin1(buf));

     sprintf(buf, "X11 SHM:     %s", shm_supported ? "enabled" : "disabled");
     sprintf(buf, "X11 SHM:     %s", shm_supported ? "enabled" : "disabled");

-    org::xwt::util::Log::info(this->getClass(), JvNewStringLatin1(buf));
+    org::ibex::util::Log::info(this->getClass(), JvNewStringLatin1(buf));

     sprintf(buf, "X11 Visual:  %x %x %x bits: %i visualid: %i depth: %i",
             visual->red_mask, visual->green_mask, visual->blue_mask, visual->bits_per_rgb, visual->visualid, colorDepth);
     sprintf(buf, "X11 Visual:  %x %x %x bits: %i visualid: %i depth: %i",
             visual->red_mask, visual->green_mask, visual->blue_mask, visual->bits_per_rgb, visual->visualid, colorDepth);

-    org::xwt::util::Log::info(this->getClass(), JvNewStringLatin1(buf));
+    org::ibex::util::Log::info(this->getClass(), JvNewStringLatin1(buf));

 
     // FIXME: don't know why (True, False) is the best solution...
     if(XmuLookupStandardColormap(display, screen_num, visual->visualid, colorDepth, XA_RGB_BEST_MAP, True, False) == 0)
 
     // FIXME: don't know why (True, False) is the best solution...
     if(XmuLookupStandardColormap(display, screen_num, visual->visualid, colorDepth, XA_RGB_BEST_MAP, True, False) == 0)

-        org::xwt::Platform::criticalAbort(JvNewStringLatin1("ERROR: XmuLookupStandardColormap failed"));
+        org::ibex::Platform::criticalAbort(JvNewStringLatin1("ERROR: XmuLookupStandardColormap failed"));

     
     XStandardColormap* best_map_info = NULL;
     int count;
     if (XGetRGBColormaps(display, RootWindow(display, screen_num), &best_map_info, &count, XA_RGB_BEST_MAP) == 0)
     
     XStandardColormap* best_map_info = NULL;
     int count;
     if (XGetRGBColormaps(display, RootWindow(display, screen_num), &best_map_info, &count, XA_RGB_BEST_MAP) == 0)

-        org::xwt::Platform::criticalAbort(JvNewStringLatin1("ERROR: couldn't allocate a standard colormap"));
+        org::ibex::Platform::criticalAbort(JvNewStringLatin1("ERROR: couldn't allocate a standard colormap"));

     if (!best_map_info->colormap)
     if (!best_map_info->colormap)

-        org::xwt::Platform::criticalAbort(JvNewStringLatin1("ERROR: XmuLookupStandardColomap succeded, but no colormap was found on the root window"));
+        org::ibex::Platform::criticalAbort(JvNewStringLatin1("ERROR: XmuLookupStandardColomap succeded, but no colormap was found on the root window"));

     if (best_map_info->red_max == 0)
     if (best_map_info->red_max == 0)

-        org::xwt::Platform::criticalAbort(JvNewStringLatin1("ERROR: standard colormap exists, but was improperly allocated"));
+        org::ibex::Platform::criticalAbort(JvNewStringLatin1("ERROR: standard colormap exists, but was improperly allocated"));

     s_colormap = best_map_info->colormap;
     colormap_info = best_map_info;
 
     sprintf(buf, "            red_max / red_mult: %x %x", colormap_info->red_max, colormap_info->red_mult);
     s_colormap = best_map_info->colormap;
     colormap_info = best_map_info;
 
     sprintf(buf, "            red_max / red_mult: %x %x", colormap_info->red_max, colormap_info->red_mult);

-    org::xwt::util::Log::info(this->getClass(), JvNewStringLatin1(buf));
+    org::ibex::util::Log::info(this->getClass(), JvNewStringLatin1(buf));

     sprintf(buf, "            green_max / green_mult: %x %x", colormap_info->green_max, colormap_info->green_mult);
     sprintf(buf, "            green_max / green_mult: %x %x", colormap_info->green_max, colormap_info->green_mult);

-    org::xwt::util::Log::info(this->getClass(), JvNewStringLatin1(buf));
+    org::ibex::util::Log::info(this->getClass(), JvNewStringLatin1(buf));

     sprintf(buf, "            blue_max / blue_mult: %x %x", colormap_info->blue_max, colormap_info->blue_mult);
     sprintf(buf, "            blue_max / blue_mult: %x %x", colormap_info->blue_max, colormap_info->blue_mult);

-    org::xwt::util::Log::info(this->getClass(), JvNewStringLatin1(buf));
+    org::ibex::util::Log::info(this->getClass(), JvNewStringLatin1(buf));

     sprintf(buf, "            base_pixel: %x", colormap_info->base_pixel);
     sprintf(buf, "            base_pixel: %x", colormap_info->base_pixel);

-    org::xwt::util::Log::info(this->getClass(), JvNewStringLatin1(buf));
+    org::ibex::util::Log::info(this->getClass(), JvNewStringLatin1(buf));

 }
 
 
 }
 
 

diff --git a/src/org/xwt/plat/X11.java b/src/org/ibex/plat/X11.java
similarity index 98%
rename from src/org/xwt/plat/X11.java
rename to src/org/ibex/plat/X11.java
index d84aa85..e821ad5 100644 (file)
--- a/src/org/xwt/plat/X11.java
+++ b/src/org/ibex/plat/X11.java
@@ -1,14 +1,11 @@
 // Copyright 2004 Adam Megacz, see the COPYING file for licensing [LGPL]
 // Copyright 2004 Adam Megacz, see the COPYING file for licensing [LGPL]

-package org.xwt.plat;
+package org.ibex.plat;

 
 import gnu.gcj.RawData;
 
 import gnu.gcj.RawData;

-import java.net.*;
-import java.lang.reflect.*;
-import java.io.*;

 import java.util.*;
 import java.util.*;

-import org.xwt.js.*;
-import org.xwt.util.*;
-import org.xwt.*;
+import org.ibex.js.*;
+import org.ibex.util.*;
+import org.ibex.*;

 
 /** Platform implementation for POSIX compliant operating systems with an X11 Server */
 public class X11 extends POSIX {
 
 /** Platform implementation for POSIX compliant operating systems with an X11 Server */
 public class X11 extends POSIX {

diff --git a/src/org/xwt/plat/package.html b/src/org/ibex/plat/package.html
similarity index 74%
rename from src/org/xwt/plat/package.html
rename to src/org/ibex/plat/package.html
index 272a116..a539002 100644 (file)
--- a/src/org/xwt/plat/package.html
+++ b/src/org/ibex/plat/package.html
@@ -1,24 +1,24 @@
 <body>
 
 <p>
 <body>
 
 <p>

-Each platform which XWT is ported to should have a subclass of {@link
-org.xwt.Platform} in this package as well as an ant buildfile.
+Each platform which Ibex is ported to should have a subclass of {@link
+org.ibex.Platform} in this package as well as an ant buildfile.

 </p>
 
 <p>
 </p>
 
 <p>

-The subclass of {@link org.xwt.Platform} should be named
+The subclass of {@link org.ibex.Platform} should be named

 <i>plat</i>.java, where <i>plat</i> is the descriptive name for the
 platform. The ant buildfile should be named <i>plat</i>.xml, and
 should contain three targets:
 </p>
 
 <i>plat</i>.java, where <i>plat</i> is the descriptive name for the
 platform. The ant buildfile should be named <i>plat</i>.xml, and
 should contain three targets:
 </p>
 

-<ul><li> <b><tt>build</tt></b>: compiles all code required for the XWT
+<ul><li> <b><tt>build</tt></b>: compiles all code required for the Ibex

          Engine and creates an executable in
          Engine and creates an executable in

-         <tt>xwt/www/html/dist/</tt>. If applicable, all debugging
+         <tt>ibex/www/html/dist/</tt>. If applicable, all debugging

          symbols should be left in this executable.
 
     <li> <b><tt>run</tt></b>: runs the executable, loading the
          symbols should be left in this executable.
 
     <li> <b><tt>run</tt></b>: runs the executable, loading the

-         <tt>org.xwt.demo.main</tt> widget demo. This is useful for
+         <tt>org.ibex.demo.main</tt> widget demo. This is useful for

          testing.
 
     <li> <b><tt>dist</tt></b>: prepares any files required to
          testing.
 
     <li> <b><tt>dist</tt></b>: prepares any files required to

diff --git a/src/org/xwt/util/AccessibleCharArrayWriter.java b/src/org/ibex/util/AccessibleCharArrayWriter.java
similarity index 89%
rename from src/org/xwt/util/AccessibleCharArrayWriter.java
rename to src/org/ibex/util/AccessibleCharArrayWriter.java
index 211dfd1..62e436a 100644 (file)
--- a/src/org/xwt/util/AccessibleCharArrayWriter.java
+++ b/src/org/ibex/util/AccessibleCharArrayWriter.java
@@ -1,4 +1,4 @@
-package org.xwt.util;
+package org.ibex.util;

 
 import java.io.*;
 
 
 import java.io.*;
 

diff --git a/src/org/xwt/util/BalancedTree.java b/src/org/ibex/util/BalancedTree.java
similarity index 99%
rename from src/org/xwt/util/BalancedTree.java
rename to src/org/ibex/util/BalancedTree.java
index 5e15b3e..615db24 100644 (file)
--- a/src/org/xwt/util/BalancedTree.java
+++ b/src/org/ibex/util/BalancedTree.java
@@ -1,11 +1,11 @@
-// Copyright (C) 2003 Adam Megacz <adam@xwt.org> all rights reserved.
+// Copyright (C) 2003 Adam Megacz <adam@ibex.org> all rights reserved.

 //
 // You may modify, copy, and redistribute this code under the terms of
 // the GNU Library Public License version 2.1, with the exception of
 // the portion of clause 6a after the semicolon (aka the "obnoxious
 // relink clause")
 
 //
 // You may modify, copy, and redistribute this code under the terms of
 // the GNU Library Public License version 2.1, with the exception of
 // the portion of clause 6a after the semicolon (aka the "obnoxious
 // relink clause")
 

-package org.xwt.util;
+package org.ibex.util;

 
 // FEATURE: private void intersection() { }
 // FEATURE: private void union() { }
 
 // FEATURE: private void intersection() { }
 // FEATURE: private void union() { }

diff --git a/src/org/xwt/util/CAB.java b/src/org/ibex/util/CAB.java
similarity index 99%
rename from src/org/xwt/util/CAB.java
rename to src/org/ibex/util/CAB.java
index a74b47f..96e0947 100644 (file)
--- a/src/org/xwt/util/CAB.java
+++ b/src/org/ibex/util/CAB.java
@@ -1,16 +1,15 @@
-// Copyright (C) 2003 Adam Megacz <adam@xwt.org> all rights reserved.
+// Copyright (C) 2003 Adam Megacz <adam@ibex.org> all rights reserved.

 //
 // You may modify, copy, and redistribute this code under the terms of
 // the GNU Library Public License version 2.1, with the exception of
 // the portion of clause 6a after the semicolon (aka the "obnoxious
 // relink clause")
 
 //
 // You may modify, copy, and redistribute this code under the terms of
 // the GNU Library Public License version 2.1, with the exception of
 // the portion of clause 6a after the semicolon (aka the "obnoxious
 // relink clause")
 

-package org.xwt.util;
+package org.ibex.util;

 
 import java.io.*;
 import java.util.*;
 import java.util.zip.*;
 
 import java.io.*;
 import java.util.*;
 import java.util.zip.*;

-import java.math.*;

 
 /** Reads a CAB file structure */
 public class CAB {
 
 /** Reads a CAB file structure */
 public class CAB {

diff --git a/src/org/xwt/util/Cache.java b/src/org/ibex/util/Cache.java
similarity index 95%
rename from src/org/xwt/util/Cache.java
rename to src/org/ibex/util/Cache.java
index 1822363..47f4faf 100644 (file)
--- a/src/org/xwt/util/Cache.java
+++ b/src/org/ibex/util/Cache.java
@@ -1,13 +1,11 @@
-// Copyright (C) 2003 Adam Megacz <adam@xwt.org> all rights reserved.
+// Copyright (C) 2003 Adam Megacz <adam@ibex.org> all rights reserved.

 //
 // You may modify, copy, and redistribute this code under the terms of
 // the GNU Library Public License version 2.1, with the exception of
 // the portion of clause 6a after the semicolon (aka the "obnoxious
 // relink clause")
 
 //
 // You may modify, copy, and redistribute this code under the terms of
 // the GNU Library Public License version 2.1, with the exception of
 // the portion of clause 6a after the semicolon (aka the "obnoxious
 // relink clause")
 

-package org.xwt.util;
-
-import java.util.*;
+package org.ibex.util;

 
 // FIXME needs to be a weak hash
 
 
 // FIXME needs to be a weak hash
 

diff --git a/src/org/xwt/util/CachedInputStream.java b/src/org/ibex/util/CachedInputStream.java
similarity index 97%
rename from src/org/xwt/util/CachedInputStream.java
rename to src/org/ibex/util/CachedInputStream.java
index 4e38954..a712f84 100644 (file)
--- a/src/org/xwt/util/CachedInputStream.java
+++ b/src/org/ibex/util/CachedInputStream.java
@@ -1,11 +1,11 @@
-// Copyright (C) 2003 Adam Megacz <adam@xwt.org> all rights reserved.
+// Copyright (C) 2003 Adam Megacz <adam@ibex.org> all rights reserved.

 //
 // You may modify, copy, and redistribute this code under the terms of
 // the GNU Library Public License version 2.1, with the exception of
 // the portion of clause 6a after the semicolon (aka the "obnoxious
 // relink clause")
 
 //
 // You may modify, copy, and redistribute this code under the terms of
 // the GNU Library Public License version 2.1, with the exception of
 // the portion of clause 6a after the semicolon (aka the "obnoxious
 // relink clause")
 

-package org.xwt.util;
+package org.ibex.util;

 import java.io.*;
 
 // FEATURE: don't use a byte[] if we have a diskCache file
 import java.io.*;
 
 // FEATURE: don't use a byte[] if we have a diskCache file

diff --git a/src/org/xwt/util/Callback.java b/src/org/ibex/util/Callback.java
similarity index 78%
rename from src/org/xwt/util/Callback.java
rename to src/org/ibex/util/Callback.java
index 1ff5400..471df9b 100644 (file)
--- a/src/org/xwt/util/Callback.java
+++ b/src/org/ibex/util/Callback.java
@@ -1,11 +1,11 @@
-// Copyright (C) 2003 Adam Megacz <adam@xwt.org> all rights reserved.
+// Copyright (C) 2003 Adam Megacz <adam@ibex.org> all rights reserved.

 //
 // You may modify, copy, and redistribute this code under the terms of
 // the GNU Library Public License version 2.1, with the exception of
 // the portion of clause 6a after the semicolon (aka the "obnoxious
 // relink clause")
 
 //
 // You may modify, copy, and redistribute this code under the terms of
 // the GNU Library Public License version 2.1, with the exception of
 // the portion of clause 6a after the semicolon (aka the "obnoxious
 // relink clause")
 

-package org.xwt.util;
+package org.ibex.util;

 
 /** a simple interface for callbacks*/
 public interface Callback {
 
 /** a simple interface for callbacks*/
 public interface Callback {

diff --git a/src/org/xwt/util/DirtyList.java b/src/org/ibex/util/DirtyList.java
similarity index 98%
rename from src/org/xwt/util/DirtyList.java
rename to src/org/ibex/util/DirtyList.java
index 8c8820b..932a99f 100644 (file)
--- a/src/org/xwt/util/DirtyList.java
+++ b/src/org/ibex/util/DirtyList.java
@@ -1,13 +1,11 @@
-// Copyright (C) 2003 Adam Megacz <adam@xwt.org> all rights reserved.
+// Copyright (C) 2003 Adam Megacz <adam@ibex.org> all rights reserved.

 //
 // You may modify, copy, and redistribute this code under the terms of
 // the GNU Library Public License version 2.1, with the exception of
 // the portion of clause 6a after the semicolon (aka the "obnoxious
 // relink clause")
 
 //
 // You may modify, copy, and redistribute this code under the terms of
 // the GNU Library Public License version 2.1, with the exception of
 // the portion of clause 6a after the semicolon (aka the "obnoxious
 // relink clause")
 

-package org.xwt.util;
-
-import java.util.*;
+package org.ibex.util;

 
 /** 
  *  A general-purpose data structure for holding a list of rectangular
 
 /** 
  *  A general-purpose data structure for holding a list of rectangular

diff --git a/src/org/xwt/util/Grammar.java b/src/org/ibex/util/Grammar.java
similarity index 98%
rename from src/org/xwt/util/Grammar.java
rename to src/org/ibex/util/Grammar.java
index 6ad2580..a690e62 100644 (file)
--- a/src/org/xwt/util/Grammar.java
+++ b/src/org/ibex/util/Grammar.java
@@ -1,8 +1,6 @@
-package org.xwt.util;
+package org.ibex.util;

 
 

-import java.util.*;
-import java.io.*;
-import org.xwt.js.*;
+import org.ibex.js.*;

 
 public abstract class Grammar extends JS {
 
 
 public abstract class Grammar extends JS {
 

diff --git a/src/org/xwt/util/Hash.java b/src/org/ibex/util/Hash.java
similarity index 98%
rename from src/org/xwt/util/Hash.java
rename to src/org/ibex/util/Hash.java
index 09ed008..40cf117 100644 (file)
--- a/src/org/xwt/util/Hash.java
+++ b/src/org/ibex/util/Hash.java
@@ -1,11 +1,11 @@
-// Copyright (C) 2003 Adam Megacz <adam@xwt.org> all rights reserved.
+// Copyright (C) 2003 Adam Megacz <adam@ibex.org> all rights reserved.

 //
 // You may modify, copy, and redistribute this code under the terms of
 // the GNU Library Public License version 2.1, with the exception of
 // the portion of clause 6a after the semicolon (aka the "obnoxious
 // relink clause")
 
 //
 // You may modify, copy, and redistribute this code under the terms of
 // the GNU Library Public License version 2.1, with the exception of
 // the portion of clause 6a after the semicolon (aka the "obnoxious
 // relink clause")
 

-package org.xwt.util;
+package org.ibex.util;

 
 import java.util.*;
 
 
 import java.util.*;
 

diff --git a/src/org/xwt/util/InputStreamToByteArray.java b/src/org/ibex/util/InputStreamToByteArray.java
similarity index 92%
rename from src/org/xwt/util/InputStreamToByteArray.java
rename to src/org/ibex/util/InputStreamToByteArray.java
index 7737e0f..7e19644 100644 (file)
--- a/src/org/xwt/util/InputStreamToByteArray.java
+++ b/src/org/ibex/util/InputStreamToByteArray.java
@@ -1,11 +1,11 @@
-// Copyright (C) 2003 Adam Megacz <adam@xwt.org> all rights reserved.
+// Copyright (C) 2003 Adam Megacz <adam@ibex.org> all rights reserved.

 //
 // You may modify, copy, and redistribute this code under the terms of
 // the GNU Library Public License version 2.1, with the exception of
 // the portion of clause 6a after the semicolon (aka the "obnoxious
 // relink clause")
 
 //
 // You may modify, copy, and redistribute this code under the terms of
 // the GNU Library Public License version 2.1, with the exception of
 // the portion of clause 6a after the semicolon (aka the "obnoxious
 // relink clause")
 

-package org.xwt.util;
+package org.ibex.util;

 import java.io.*;
 
 public class InputStreamToByteArray {
 import java.io.*;
 
 public class InputStreamToByteArray {

diff --git a/src/org/xwt/util/KnownLength.java b/src/org/ibex/util/KnownLength.java
similarity index 88%
rename from src/org/xwt/util/KnownLength.java
rename to src/org/ibex/util/KnownLength.java
index 836dbab..06118bb 100644 (file)
--- a/src/org/xwt/util/KnownLength.java
+++ b/src/org/ibex/util/KnownLength.java
@@ -1,11 +1,11 @@
-// Copyright (C) 2003 Adam Megacz <adam@xwt.org> all rights reserved.
+// Copyright (C) 2003 Adam Megacz <adam@ibex.org> all rights reserved.

 //
 // You may modify, copy, and redistribute this code under the terms of
 // the GNU Library Public License version 2.1, with the exception of
 // the portion of clause 6a after the semicolon (aka the "obnoxious
 // relink clause")
 
 //
 // You may modify, copy, and redistribute this code under the terms of
 // the GNU Library Public License version 2.1, with the exception of
 // the portion of clause 6a after the semicolon (aka the "obnoxious
 // relink clause")
 

-package org.xwt.util;
+package org.ibex.util;

 import java.io.*;
 
 /** a generic interface for things that "know" their length */
 import java.io.*;
 
 /** a generic interface for things that "know" their length */

diff --git a/src/org/xwt/util/Log.java b/src/org/ibex/util/Log.java
similarity index 98%
rename from src/org/xwt/util/Log.java
rename to src/org/ibex/util/Log.java
index ad266a0..04fc7c1 100644 (file)
--- a/src/org/xwt/util/Log.java
+++ b/src/org/ibex/util/Log.java
@@ -1,12 +1,12 @@
-// Copyright (C) 2003 Adam Megacz <adam@xwt.org> all rights reserved.
+// Copyright (C) 2003 Adam Megacz <adam@ibex.org> all rights reserved.

 //
 // You may modify, copy, and redistribute this code under the terms of
 // the GNU Library Public License version 2.1, with the exception of
 // the portion of clause 6a after the semicolon (aka the "obnoxious
 // relink clause")
 
 //
 // You may modify, copy, and redistribute this code under the terms of
 // the GNU Library Public License version 2.1, with the exception of
 // the portion of clause 6a after the semicolon (aka the "obnoxious
 // relink clause")
 

-package org.xwt.util;
-import org.xwt.js.*;
+package org.ibex.util;
+import org.ibex.js.*;

 import java.io.*;
 import java.util.*;
 
 import java.io.*;
 import java.util.*;
 

diff --git a/src/org/xwt/util/PackBytesIntoString.java b/src/org/ibex/util/PackBytesIntoString.java
similarity index 92%
rename from src/org/xwt/util/PackBytesIntoString.java
rename to src/org/ibex/util/PackBytesIntoString.java
index 6c9b1ad..1e07e86 100644 (file)
--- a/src/org/xwt/util/PackBytesIntoString.java
+++ b/src/org/ibex/util/PackBytesIntoString.java
@@ -1,13 +1,11 @@
-// Copyright (C) 2003 Adam Megacz <adam@xwt.org> all rights reserved.
+// Copyright (C) 2003 Adam Megacz <adam@ibex.org> all rights reserved.

 //
 // You may modify, copy, and redistribute this code under the terms of
 // the GNU Library Public License version 2.1, with the exception of
 // the portion of clause 6a after the semicolon (aka the "obnoxious
 // relink clause")
 
 //
 // You may modify, copy, and redistribute this code under the terms of
 // the GNU Library Public License version 2.1, with the exception of
 // the portion of clause 6a after the semicolon (aka the "obnoxious
 // relink clause")
 

-package org.xwt.util;
-import java.io.*;
-import java.util.*;
+package org.ibex.util;

 
 /** packs 8-bit bytes into a String of 7-bit chars (to avoid the UTF-8 non-ASCII penalty) */
 public class PackBytesIntoString {
 
 /** packs 8-bit bytes into a String of 7-bit chars (to avoid the UTF-8 non-ASCII penalty) */
 public class PackBytesIntoString {

diff --git a/src/org/xwt/util/Preprocessor.java b/src/org/ibex/util/Preprocessor.java
similarity index 99%
rename from src/org/xwt/util/Preprocessor.java
rename to src/org/ibex/util/Preprocessor.java
index 00ae93e..0b6e1ef 100644 (file)
--- a/src/org/xwt/util/Preprocessor.java
+++ b/src/org/ibex/util/Preprocessor.java
@@ -1,11 +1,11 @@
-// Copyright (C) 2003 Adam Megacz <adam@xwt.org> all rights reserved.
+// Copyright (C) 2003 Adam Megacz <adam@ibex.org> all rights reserved.

 //
 // You may modify, copy, and redistribute this code under the terms of
 // the GNU Library Public License version 2.1, with the exception of
 // the portion of clause 6a after the semicolon (aka the "obnoxious
 // relink clause")
 
 //
 // You may modify, copy, and redistribute this code under the terms of
 // the GNU Library Public License version 2.1, with the exception of
 // the portion of clause 6a after the semicolon (aka the "obnoxious
 // relink clause")
 

-package org.xwt.util;
+package org.ibex.util;

 
 import java.util.*;
 import java.io.*;
 
 import java.util.*;
 import java.io.*;

diff --git a/src/org/xwt/util/Queue.java b/src/org/ibex/util/Queue.java
similarity index 96%
rename from src/org/xwt/util/Queue.java
rename to src/org/ibex/util/Queue.java
index 8da10d4..91b9b29 100644 (file)
--- a/src/org/xwt/util/Queue.java
+++ b/src/org/ibex/util/Queue.java
@@ -1,11 +1,11 @@
-// Copyright (C) 2003 Adam Megacz <adam@xwt.org> all rights reserved.
+// Copyright (C) 2003 Adam Megacz <adam@ibex.org> all rights reserved.

 //
 // You may modify, copy, and redistribute this code under the terms of
 // the GNU Library Public License version 2.1, with the exception of
 // the portion of clause 6a after the semicolon (aka the "obnoxious
 // relink clause")
 
 //
 // You may modify, copy, and redistribute this code under the terms of
 // the GNU Library Public License version 2.1, with the exception of
 // the portion of clause 6a after the semicolon (aka the "obnoxious
 // relink clause")
 

-package org.xwt.util;
+package org.ibex.util;

 
 /** A simple synchronized queue, implemented as an array */
 public class Queue {
 
 /** A simple synchronized queue, implemented as an array */
 public class Queue {

diff --git a/src/org/xwt/util/SSL.java b/src/org/ibex/util/SSL.java
similarity index 99%
rename from src/org/xwt/util/SSL.java
rename to src/org/ibex/util/SSL.java
index 84fc575..dff780a 100644 (file)
--- a/src/org/xwt/util/SSL.java
+++ b/src/org/ibex/util/SSL.java
@@ -1,11 +1,11 @@
-// Copyright (C) 2003 Adam Megacz <adam@xwt.org> all rights reserved.
+// Copyright (C) 2003 Adam Megacz <adam@ibex.org> all rights reserved.

 //
 // You may modify, copy, and redistribute this code under the terms of
 // the GNU Library Public License version 2.1, with the exception of
 // the portion of clause 6a after the semicolon (aka the "obnoxious
 // relink clause")
 
 //
 // You may modify, copy, and redistribute this code under the terms of
 // the GNU Library Public License version 2.1, with the exception of
 // the portion of clause 6a after the semicolon (aka the "obnoxious
 // relink clause")
 

-package org.xwt.util;
+package org.ibex.util;

 
 import org.bouncycastle.crypto.AsymmetricBlockCipher;
 import org.bouncycastle.crypto.Digest;
 
 import org.bouncycastle.crypto.AsymmetricBlockCipher;
 import org.bouncycastle.crypto.Digest;

@@ -34,7 +34,7 @@ import org.bouncycastle.asn1.x509.X509Name;
 import org.bouncycastle.asn1.x509.X509Extensions;
 import org.bouncycastle.asn1.x509.X509Extension;
 import org.bouncycastle.asn1.x509.BasicConstraints;
 import org.bouncycastle.asn1.x509.X509Extensions;
 import org.bouncycastle.asn1.x509.X509Extension;
 import org.bouncycastle.asn1.x509.BasicConstraints;

-import org.xwt.util.Log;
+import org.ibex.util.Log;

 import java.net.*;
 import java.io.*;
 import java.util.*;
 import java.net.*;
 import java.io.*;
 import java.util.*;

@@ -87,7 +87,7 @@ import java.text.*;
    1.03 10-Aug-02  Fixed a vulnerability outlined at
                    http://online.securityfocus.com/archive/1/286290
 
    1.03 10-Aug-02  Fixed a vulnerability outlined at
                    http://online.securityfocus.com/archive/1/286290
 

-   1.04 12-Dec-03  Renamed to org.xwt.SSL, fixed race condition
+   1.04 12-Dec-03  Renamed to org.ibex.SSL, fixed race condition

 
 */
 
 
 */
 

diff --git a/src/org/xwt/util/Semaphore.java b/src/org/ibex/util/Semaphore.java
similarity index 90%
rename from src/org/xwt/util/Semaphore.java
rename to src/org/ibex/util/Semaphore.java
index 673919d..79dc268 100644 (file)
--- a/src/org/xwt/util/Semaphore.java
+++ b/src/org/ibex/util/Semaphore.java
@@ -1,11 +1,11 @@
-// Copyright (C) 2003 Adam Megacz <adam@xwt.org> all rights reserved.
+// Copyright (C) 2003 Adam Megacz <adam@ibex.org> all rights reserved.

 //
 // You may modify, copy, and redistribute this code under the terms of
 // the GNU Library Public License version 2.1, with the exception of
 // the portion of clause 6a after the semicolon (aka the "obnoxious
 // relink clause")
 
 //
 // You may modify, copy, and redistribute this code under the terms of
 // the GNU Library Public License version 2.1, with the exception of
 // the portion of clause 6a after the semicolon (aka the "obnoxious
 // relink clause")
 

-package org.xwt.util;
+package org.ibex.util;

 
 /** Simple implementation of a blocking, counting semaphore. */
 public class Semaphore {
 
 /** Simple implementation of a blocking, counting semaphore. */
 public class Semaphore {

diff --git a/src/org/xwt/util/Vec.java b/src/org/ibex/util/Vec.java
similarity index 97%
rename from src/org/xwt/util/Vec.java
rename to src/org/ibex/util/Vec.java
index b20e352..e120be5 100644 (file)
--- a/src/org/xwt/util/Vec.java
+++ b/src/org/ibex/util/Vec.java
@@ -1,13 +1,12 @@
-// Copyright (C) 2003 Adam Megacz <adam@xwt.org> all rights reserved.
+// Copyright (C) 2003 Adam Megacz <adam@ibex.org> all rights reserved.

 //
 // You may modify, copy, and redistribute this code under the terms of
 // the GNU Library Public License version 2.1, with the exception of
 // the portion of clause 6a after the semicolon (aka the "obnoxious
 // relink clause")
 
 //
 // You may modify, copy, and redistribute this code under the terms of
 // the GNU Library Public License version 2.1, with the exception of
 // the portion of clause 6a after the semicolon (aka the "obnoxious
 // relink clause")
 

-package org.xwt.util;
+package org.ibex.util;

 
 

-import java.util.*;

 import java.io.*;
 
 /** 
 import java.io.*;
 
 /** 

diff --git a/src/org/xwt/util/XML.java b/src/org/ibex/util/XML.java
similarity index 99%
rename from src/org/xwt/util/XML.java
rename to src/org/ibex/util/XML.java
index e3d0b14..db55a66 100644 (file)
--- a/src/org/xwt/util/XML.java
+++ b/src/org/ibex/util/XML.java
@@ -1,11 +1,11 @@
-// Copyright (C) 2003 Adam Megacz <adam@xwt.org> all rights reserved.
+// Copyright (C) 2003 Adam Megacz <adam@ibex.org> all rights reserved.

 //
 // You may modify, copy, and redistribute this code under the terms of
 // the GNU Library Public License version 2.1, with the exception of
 // the portion of clause 6a after the semicolon (aka the "obnoxious
 // relink clause")
 
 //
 // You may modify, copy, and redistribute this code under the terms of
 // the GNU Library Public License version 2.1, with the exception of
 // the portion of clause 6a after the semicolon (aka the "obnoxious
 // relink clause")
 

-package org.xwt.util;
+package org.ibex.util;

 
 import java.io.Reader;
 import java.io.IOException;
 
 import java.io.Reader;
 import java.io.IOException;

diff --git a/src/org/xwt/util/package.html b/src/org/ibex/util/package.html
similarity index 85%
rename from src/org/xwt/util/package.html
rename to src/org/ibex/util/package.html
index 5662f17..a66d097 100644 (file)
--- a/src/org/xwt/util/package.html
+++ b/src/org/ibex/util/package.html
@@ -1,3 +1,3 @@
 <body>
 An assortment of useful utility classes.
 <body>
 An assortment of useful utility classes.

-</body>
\ No newline at end of file
+</body>

diff --git a/src/org/xwt/builtin/splash.xwt b/src/org/xwt/builtin/splash.xwt
deleted file mode 100644 (file)
index b0fc151..0000000
--- a/src/org/xwt/builtin/splash.xwt
+++ /dev/null
@@ -1,79 +0,0 @@
-<xwt>
-
-    <template orient="vertical" color="white">
-
-        KeyPressed += function(k) { if (k == "escape") thisbox = null; }
-
-        var settext = function(t) {
-            $text.text = t;
-            $text1.text = t;
-            $text2.text = t;
-            $text3.text = t;
-            $text4.text = t;
-        }
-
-        var progress = function(n, d) {
-            var t = "downloaded " + xwt.math.ceil(100 * n/d) + "%";
-            xwt.log.println("downloaded " + t);
-            $innerbar.width = $bar.width * n / d + 1;
-            settext(t);
-       } 
-
-        xwt.thread = function() {
-            $text.font = xwt.font.sansserif;
-            $text.fontsize = 14;
-            $text1.font = xwt.font.sansserif;
-            $text1.fontsize = 14;
-            $text2.font = xwt.font.sansserif;
-            $text2.fontsize = 14;
-            $text3.font = xwt.font.sansserif;
-            $text3.fontsize = 14;
-            $text4.font = xwt.font.sansserif;
-            $text4.fontsize = 14;
-            settext("downloading...");
-            fill = .org.xwt.builtin["splash.png"];
-            xwt.ui.window = thisbox;
-            thisbox.width=394;
-            thisbox.height=276;
-            x = (xwt.ui.screen.width - width) / 2;
-            y = (xwt.ui.screen.height - height) / 2;
-            var origin = xwt.origin;
-            if (origin.substring(0, 21) == "http://launch.xwt.org") {
-                origin = origin.substring(22);
-                origin = "http://" + origin.substring(origin.indexOf('/') + 1);
-            }
-            xwt.log.println("origin is " + origin);
-            var new_rr = xwt.res.unzip(xwt.res.watch(xwt.res.url(origin), progress));
-            var new_xwt = xwt.clone(new_rr);
-
-            xwt.thread = function() {
-                for(var i=0; 100>i; i++) {
-                progress(i, 100);
-                xwt.thread.yield();
-            }
-            new_xwt.apply(xwt.box, new_xwt["main.xwt"]);
-            thisbox = null;
-        }
-xwt.log.println("leaving");
-        }
-
-        <box height="236" align="bottomleft" packed="false" x="20" y="0">
-            <box vshrink="true">
-                <box packed="false" textcolor="black" x="2" y="2" id="text1"/>
-                <box packed="false" textcolor="black" x="0" y="2" id="text2"/>
-                <box packed="false" textcolor="black" x="2" y="0" id="text3"/>
-                <box packed="false" textcolor="black" x="0" y="0" id="text4"/>
-                <box cols="2">
-                    <box height="1" colspan="2"/>
-                    <box width="1"/>
-                    <box textcolor="white" id="text"/>
-                </box>
-            </box>
-        </box>
-        <box packed="false" id="bar" x="20" y="236" width="354" height="20" align="left">
-            <box id="innerbar" fill="blue" width="10" height="20"/>
-        </box>
-
-    </template>
-
-</xwt>
\ No newline at end of file

diff --git a/src/org/xwt/js/package.html b/src/org/xwt/js/package.html
deleted file mode 100644 (file)
index 118bc6d..0000000
--- a/src/org/xwt/js/package.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<body>
-
-<p>
-The XWT JavaScript Engine.
-</p>
-
-</body>
\ No newline at end of file

diff --git a/src/org/xwt/translators/Freetype.java b/src/org/xwt/translators/Freetype.java
index c8406db..a7020e9 100644 (file)
--- a/src/org/xwt/translators/Freetype.java
+++ b/src/org/xwt/translators/Freetype.java
@@ -1,10 +1,7 @@
 package org.xwt.translators;
 package org.xwt.translators;

-import org.xwt.*;
-import org.xwt.util.*;
+import org.ibex.*;
+import org.ibex.util.*;

 import java.io.*;
 import java.io.*;

-import java.util.zip.*;
-import java.util.*;
-import org.bouncycastle.util.encoders.Base64;

 
 import org.xwt.mips.Runtime;
 
 
 import org.xwt.mips.Runtime;
 

diff --git a/src/org/xwt/translators/GIF.java b/src/org/xwt/translators/GIF.java
index aa3f46a..572c124 100644 (file)
--- a/src/org/xwt/translators/GIF.java
+++ b/src/org/xwt/translators/GIF.java
@@ -43,12 +43,11 @@
  */
 package org.xwt.translators;
 
  */
 package org.xwt.translators;
 

-import org.xwt.*;
-import org.xwt.util.*;
+import org.ibex.*;
+import org.ibex.util.*;

 import java.io.BufferedInputStream;
 import java.io.InputStream;
 import java.io.IOException;
 import java.io.BufferedInputStream;
 import java.io.InputStream;
 import java.io.IOException;

-import java.io.PrintWriter;

 
 /** Converts an InputStream carrying a GIF image into an ARGB int[] */
 public class GIF {
 
 /** Converts an InputStream carrying a GIF image into an ARGB int[] */
 public class GIF {

diff --git a/src/org/xwt/translators/HTML.java b/src/org/xwt/translators/HTML.java
index a3bf8aa..4b40a34 100644 (file)
--- a/src/org/xwt/translators/HTML.java
+++ b/src/org/xwt/translators/HTML.java
@@ -1,11 +1,8 @@
 // Copyright 2004 Adam Megacz, see the COPYING file for licensing [GPL]
 package org.xwt.translators;
 
 // Copyright 2004 Adam Megacz, see the COPYING file for licensing [GPL]
 package org.xwt.translators;
 

-import java.util.*;
-import java.net.*;

 import java.io.*;
 import java.io.*;

-import org.xwt.js.*;
-import org.xwt.util.*;
+import org.ibex.js.*;

 
 /* 
  * While entities are limited to a subset of Unicode characters ,
 
 /* 
  * While entities are limited to a subset of Unicode characters ,

@@ -25,7 +22,7 @@ import org.xwt.util.*;
 
 /**
  *   This class parses an InputStream containing HTML and returns it
 
 /**
  *   This class parses an InputStream containing HTML and returns it

- *   as an XWT DOM tree. Each HTML Element is returned as a struct,
+ *   as an Ibex DOM tree. Each HTML Element is returned as a struct,

  *   with the following members:
  *
  *   Since HTML may have multiple top level elements (unlike XML),
  *   with the following members:
  *
  *   Since HTML may have multiple top level elements (unlike XML),

diff --git a/src/org/xwt/translators/MSPack.java b/src/org/xwt/translators/MSPack.java
index a815801..68cf6e4 100644 (file)
--- a/src/org/xwt/translators/MSPack.java
+++ b/src/org/xwt/translators/MSPack.java
@@ -1,8 +1,6 @@
 package org.xwt.translators;
 
 package org.xwt.translators;
 

-import org.xwt.Main;
-import org.xwt.util.*;
-import org.xwt.mips.*;
+import org.ibex.util.*;

 import java.io.*;
 
 import org.xwt.mips.Runtime;
 import java.io.*;
 
 import org.xwt.mips.Runtime;

diff --git a/src/org/xwt/translators/PNG.java b/src/org/xwt/translators/PNG.java
index 33440ea..5653a03 100644 (file)
--- a/src/org/xwt/translators/PNG.java
+++ b/src/org/xwt/translators/PNG.java
@@ -13,11 +13,9 @@
 
 package org.xwt.translators;
 
 
 package org.xwt.translators;
 

-import org.xwt.*;
-import org.xwt.util.*;
+import org.ibex.*;
+import org.ibex.util.*;

 import java.io.*;
 import java.io.*;

-import java.util.Hashtable;
-import java.util.Vector;

 import java.util.Enumeration;
 import java.util.zip.*;
 
 import java.util.Enumeration;
 import java.util.zip.*;
 

diff --git a/src/org/xwt/translators/SVG.java b/src/org/xwt/translators/SVG.java
index 9f0bf7c..3e2e780 100644 (file)
--- a/src/org/xwt/translators/SVG.java
+++ b/src/org/xwt/translators/SVG.java
@@ -29,7 +29,7 @@ public class SVG {
             String align = st.nextToken();
             if ("defer".equals(align)) align = st.nextToken();
             if (!align.equals("none")) {
             String align = st.nextToken();
             if ("defer".equals(align)) align = st.nextToken();
             if (!align.equals("none")) {

-                // FIXME, need to beef up XWT's align property
+                // FIXME, need to beef up Ibex's align property

                 align = "";
                 if (align.startsWith("yMin")) align = "top";
                 else if (align.startsWith("yMax")) align = "bottom";
                 align = "";
                 if (align.startsWith("yMin")) align = "top";
                 else if (align.startsWith("yMax")) align = "bottom";

@@ -253,7 +253,7 @@ public class SVG {
             public void render(DoubleBuffer buf, int x, int y, int fillcolor, int strokecolor, float scaleFactor) {
                 // FEATURE: make b double-buffered for increased performance
                 if (b == null) {
             public void render(DoubleBuffer buf, int x, int y, int fillcolor, int strokecolor, float scaleFactor) {
                 // FEATURE: make b double-buffered for increased performance
                 if (b == null) {

-                    b = new Box(t, new org.xwt.util.Vec(), new org.xwt.util.Vec(), null, 0, 0);
+                    b = new Box(t, new org.ibex.util.Vec(), new org.ibex.util.Vec(), null, 0, 0);

                     b.put("absolute", Boolean.TRUE);
                     b.prerender();
                     t = null;
                     b.put("absolute", Boolean.TRUE);
                     b.prerender();
                     t = null;