diff --git a/linux_scripts/README b/archive/linux_scripts/README similarity index 100% rename from linux_scripts/README rename to archive/linux_scripts/README diff --git a/linux_scripts/builddeb b/archive/linux_scripts/builddeb similarity index 100% rename from linux_scripts/builddeb rename to archive/linux_scripts/builddeb diff --git a/linux_scripts/dostable b/archive/linux_scripts/dostable similarity index 100% rename from linux_scripts/dostable rename to archive/linux_scripts/dostable diff --git a/linux_scripts/dosvn b/archive/linux_scripts/dosvn similarity index 100% rename from linux_scripts/dosvn rename to archive/linux_scripts/dosvn diff --git a/linux_scripts/idebuild b/archive/linux_scripts/idebuild similarity index 100% rename from linux_scripts/idebuild rename to archive/linux_scripts/idebuild diff --git a/linux_scripts/uppdeb b/archive/linux_scripts/uppdeb similarity index 100% rename from linux_scripts/uppdeb rename to archive/linux_scripts/uppdeb diff --git a/linux_scripts/uppstable2deb b/archive/linux_scripts/uppstable2deb similarity index 100% rename from linux_scripts/uppstable2deb rename to archive/linux_scripts/uppstable2deb diff --git a/linux_scripts/uppsvn2deb b/archive/linux_scripts/uppsvn2deb similarity index 100% rename from linux_scripts/uppsvn2deb rename to archive/linux_scripts/uppsvn2deb diff --git a/olddraw/CtrlCore/Copying b/archive/olddraw/CtrlCore/Copying similarity index 100% rename from olddraw/CtrlCore/Copying rename to archive/olddraw/CtrlCore/Copying diff --git a/olddraw/CtrlCore/Ctrl.cpp b/archive/olddraw/CtrlCore/Ctrl.cpp similarity index 100% rename from olddraw/CtrlCore/Ctrl.cpp rename to archive/olddraw/CtrlCore/Ctrl.cpp diff --git a/olddraw/CtrlCore/Ctrl.iml b/archive/olddraw/CtrlCore/Ctrl.iml similarity index 100% rename from olddraw/CtrlCore/Ctrl.iml rename to archive/olddraw/CtrlCore/Ctrl.iml diff --git a/olddraw/CtrlCore/CtrlChild.cpp b/archive/olddraw/CtrlCore/CtrlChild.cpp similarity index 100% rename from olddraw/CtrlCore/CtrlChild.cpp rename to archive/olddraw/CtrlCore/CtrlChild.cpp diff --git a/olddraw/CtrlCore/CtrlClip.cpp b/archive/olddraw/CtrlCore/CtrlClip.cpp similarity index 100% rename from olddraw/CtrlCore/CtrlClip.cpp rename to archive/olddraw/CtrlCore/CtrlClip.cpp diff --git a/olddraw/CtrlCore/CtrlCore.h b/archive/olddraw/CtrlCore/CtrlCore.h similarity index 100% rename from olddraw/CtrlCore/CtrlCore.h rename to archive/olddraw/CtrlCore/CtrlCore.h diff --git a/olddraw/CtrlCore/CtrlCore.icpp b/archive/olddraw/CtrlCore/CtrlCore.icpp similarity index 100% rename from olddraw/CtrlCore/CtrlCore.icpp rename to archive/olddraw/CtrlCore/CtrlCore.icpp diff --git a/olddraw/CtrlCore/CtrlCore.t b/archive/olddraw/CtrlCore/CtrlCore.t similarity index 100% rename from olddraw/CtrlCore/CtrlCore.t rename to archive/olddraw/CtrlCore/CtrlCore.t diff --git a/olddraw/CtrlCore/CtrlCore.upp b/archive/olddraw/CtrlCore/CtrlCore.upp similarity index 100% rename from olddraw/CtrlCore/CtrlCore.upp rename to archive/olddraw/CtrlCore/CtrlCore.upp diff --git a/olddraw/CtrlCore/CtrlDraw.cpp b/archive/olddraw/CtrlCore/CtrlDraw.cpp similarity index 100% rename from olddraw/CtrlCore/CtrlDraw.cpp rename to archive/olddraw/CtrlCore/CtrlDraw.cpp diff --git a/olddraw/CtrlCore/CtrlKbd.cpp b/archive/olddraw/CtrlCore/CtrlKbd.cpp similarity index 100% rename from olddraw/CtrlCore/CtrlKbd.cpp rename to archive/olddraw/CtrlCore/CtrlKbd.cpp diff --git a/olddraw/CtrlCore/CtrlMouse.cpp b/archive/olddraw/CtrlCore/CtrlMouse.cpp similarity index 100% rename from olddraw/CtrlCore/CtrlMouse.cpp rename to archive/olddraw/CtrlCore/CtrlMouse.cpp diff --git a/olddraw/CtrlCore/CtrlPos.cpp b/archive/olddraw/CtrlCore/CtrlPos.cpp similarity index 100% rename from olddraw/CtrlCore/CtrlPos.cpp rename to archive/olddraw/CtrlCore/CtrlPos.cpp diff --git a/olddraw/CtrlCore/CtrlTimer.cpp b/archive/olddraw/CtrlCore/CtrlTimer.cpp similarity index 100% rename from olddraw/CtrlCore/CtrlTimer.cpp rename to archive/olddraw/CtrlCore/CtrlTimer.cpp diff --git a/olddraw/CtrlCore/DHCtrl.cpp b/archive/olddraw/CtrlCore/DHCtrl.cpp similarity index 100% rename from olddraw/CtrlCore/DHCtrl.cpp rename to archive/olddraw/CtrlCore/DHCtrl.cpp diff --git a/olddraw/CtrlCore/Frame.cpp b/archive/olddraw/CtrlCore/Frame.cpp similarity index 100% rename from olddraw/CtrlCore/Frame.cpp rename to archive/olddraw/CtrlCore/Frame.cpp diff --git a/olddraw/CtrlCore/LocalLoop.cpp b/archive/olddraw/CtrlCore/LocalLoop.cpp similarity index 100% rename from olddraw/CtrlCore/LocalLoop.cpp rename to archive/olddraw/CtrlCore/LocalLoop.cpp diff --git a/olddraw/CtrlCore/MKeys.h b/archive/olddraw/CtrlCore/MKeys.h similarity index 100% rename from olddraw/CtrlCore/MKeys.h rename to archive/olddraw/CtrlCore/MKeys.h diff --git a/olddraw/CtrlCore/MultiMon.dli b/archive/olddraw/CtrlCore/MultiMon.dli similarity index 100% rename from olddraw/CtrlCore/MultiMon.dli rename to archive/olddraw/CtrlCore/MultiMon.dli diff --git a/olddraw/CtrlCore/TopWin32.cpp b/archive/olddraw/CtrlCore/TopWin32.cpp similarity index 100% rename from olddraw/CtrlCore/TopWin32.cpp rename to archive/olddraw/CtrlCore/TopWin32.cpp diff --git a/olddraw/CtrlCore/TopWinX11.cpp b/archive/olddraw/CtrlCore/TopWinX11.cpp similarity index 100% rename from olddraw/CtrlCore/TopWinX11.cpp rename to archive/olddraw/CtrlCore/TopWinX11.cpp diff --git a/olddraw/CtrlCore/TopWindow.cpp b/archive/olddraw/CtrlCore/TopWindow.cpp similarity index 100% rename from olddraw/CtrlCore/TopWindow.cpp rename to archive/olddraw/CtrlCore/TopWindow.cpp diff --git a/olddraw/CtrlCore/TopWindow.h b/archive/olddraw/CtrlCore/TopWindow.h similarity index 100% rename from olddraw/CtrlCore/TopWindow.h rename to archive/olddraw/CtrlCore/TopWindow.h diff --git a/olddraw/CtrlCore/Win32Clip.cpp b/archive/olddraw/CtrlCore/Win32Clip.cpp similarity index 100% rename from olddraw/CtrlCore/Win32Clip.cpp rename to archive/olddraw/CtrlCore/Win32Clip.cpp diff --git a/olddraw/CtrlCore/Win32DnD.cpp b/archive/olddraw/CtrlCore/Win32DnD.cpp similarity index 100% rename from olddraw/CtrlCore/Win32DnD.cpp rename to archive/olddraw/CtrlCore/Win32DnD.cpp diff --git a/olddraw/CtrlCore/Win32Keys.i b/archive/olddraw/CtrlCore/Win32Keys.i similarity index 100% rename from olddraw/CtrlCore/Win32Keys.i rename to archive/olddraw/CtrlCore/Win32Keys.i diff --git a/olddraw/CtrlCore/Win32Msg.i b/archive/olddraw/CtrlCore/Win32Msg.i similarity index 100% rename from olddraw/CtrlCore/Win32Msg.i rename to archive/olddraw/CtrlCore/Win32Msg.i diff --git a/olddraw/CtrlCore/Win32Proc.cpp b/archive/olddraw/CtrlCore/Win32Proc.cpp similarity index 100% rename from olddraw/CtrlCore/Win32Proc.cpp rename to archive/olddraw/CtrlCore/Win32Proc.cpp diff --git a/olddraw/CtrlCore/Win32Wnd.cpp b/archive/olddraw/CtrlCore/Win32Wnd.cpp similarity index 100% rename from olddraw/CtrlCore/Win32Wnd.cpp rename to archive/olddraw/CtrlCore/Win32Wnd.cpp diff --git a/olddraw/CtrlCore/X11App.cpp b/archive/olddraw/CtrlCore/X11App.cpp similarity index 100% rename from olddraw/CtrlCore/X11App.cpp rename to archive/olddraw/CtrlCore/X11App.cpp diff --git a/olddraw/CtrlCore/X11Clip.cpp b/archive/olddraw/CtrlCore/X11Clip.cpp similarity index 100% rename from olddraw/CtrlCore/X11Clip.cpp rename to archive/olddraw/CtrlCore/X11Clip.cpp diff --git a/olddraw/CtrlCore/X11DHCtrl.cpp b/archive/olddraw/CtrlCore/X11DHCtrl.cpp similarity index 100% rename from olddraw/CtrlCore/X11DHCtrl.cpp rename to archive/olddraw/CtrlCore/X11DHCtrl.cpp diff --git a/olddraw/CtrlCore/X11DnD.cpp b/archive/olddraw/CtrlCore/X11DnD.cpp similarity index 100% rename from olddraw/CtrlCore/X11DnD.cpp rename to archive/olddraw/CtrlCore/X11DnD.cpp diff --git a/olddraw/CtrlCore/X11Event.i b/archive/olddraw/CtrlCore/X11Event.i similarity index 100% rename from olddraw/CtrlCore/X11Event.i rename to archive/olddraw/CtrlCore/X11Event.i diff --git a/olddraw/CtrlCore/X11ImgClip.cpp b/archive/olddraw/CtrlCore/X11ImgClip.cpp similarity index 100% rename from olddraw/CtrlCore/X11ImgClip.cpp rename to archive/olddraw/CtrlCore/X11ImgClip.cpp diff --git a/olddraw/CtrlCore/X11Keys.i b/archive/olddraw/CtrlCore/X11Keys.i similarity index 100% rename from olddraw/CtrlCore/X11Keys.i rename to archive/olddraw/CtrlCore/X11Keys.i diff --git a/olddraw/CtrlCore/X11Proc.cpp b/archive/olddraw/CtrlCore/X11Proc.cpp similarity index 100% rename from olddraw/CtrlCore/X11Proc.cpp rename to archive/olddraw/CtrlCore/X11Proc.cpp diff --git a/olddraw/CtrlCore/X11Wnd.cpp b/archive/olddraw/CtrlCore/X11Wnd.cpp similarity index 100% rename from olddraw/CtrlCore/X11Wnd.cpp rename to archive/olddraw/CtrlCore/X11Wnd.cpp diff --git a/olddraw/CtrlCore/init b/archive/olddraw/CtrlCore/init similarity index 100% rename from olddraw/CtrlCore/init rename to archive/olddraw/CtrlCore/init diff --git a/olddraw/CtrlCore/lay.h b/archive/olddraw/CtrlCore/lay.h similarity index 100% rename from olddraw/CtrlCore/lay.h rename to archive/olddraw/CtrlCore/lay.h diff --git a/olddraw/CtrlCore/llay.h b/archive/olddraw/CtrlCore/llay.h similarity index 100% rename from olddraw/CtrlCore/llay.h rename to archive/olddraw/CtrlCore/llay.h diff --git a/olddraw/CtrlCore/prj.aux b/archive/olddraw/CtrlCore/prj.aux similarity index 100% rename from olddraw/CtrlCore/prj.aux rename to archive/olddraw/CtrlCore/prj.aux diff --git a/olddraw/CtrlCore/src.tpp/Ctrl$en-us.tpp b/archive/olddraw/CtrlCore/src.tpp/Ctrl$en-us.tpp similarity index 100% rename from olddraw/CtrlCore/src.tpp/Ctrl$en-us.tpp rename to archive/olddraw/CtrlCore/src.tpp/Ctrl$en-us.tpp diff --git a/olddraw/CtrlCore/src.tpp/Frame$en-us.tpp b/archive/olddraw/CtrlCore/src.tpp/Frame$en-us.tpp similarity index 100% rename from olddraw/CtrlCore/src.tpp/Frame$en-us.tpp rename to archive/olddraw/CtrlCore/src.tpp/Frame$en-us.tpp diff --git a/olddraw/CtrlCore/src.tpp/Layout$en-us.tpp b/archive/olddraw/CtrlCore/src.tpp/Layout$en-us.tpp similarity index 100% rename from olddraw/CtrlCore/src.tpp/Layout$en-us.tpp rename to archive/olddraw/CtrlCore/src.tpp/Layout$en-us.tpp diff --git a/olddraw/CtrlCore/src.tpp/RectTracker$en-us.tpp b/archive/olddraw/CtrlCore/src.tpp/RectTracker$en-us.tpp similarity index 100% rename from olddraw/CtrlCore/src.tpp/RectTracker$en-us.tpp rename to archive/olddraw/CtrlCore/src.tpp/RectTracker$en-us.tpp diff --git a/olddraw/CtrlCore/src.tpp/TopWindow$en-us.tpp b/archive/olddraw/CtrlCore/src.tpp/TopWindow$en-us.tpp similarity index 100% rename from olddraw/CtrlCore/src.tpp/TopWindow$en-us.tpp rename to archive/olddraw/CtrlCore/src.tpp/TopWindow$en-us.tpp diff --git a/olddraw/CtrlCore/srcdoc.tpp/AboutFrames$en-us.tpp b/archive/olddraw/CtrlCore/srcdoc.tpp/AboutFrames$en-us.tpp similarity index 100% rename from olddraw/CtrlCore/srcdoc.tpp/AboutFrames$en-us.tpp rename to archive/olddraw/CtrlCore/srcdoc.tpp/AboutFrames$en-us.tpp diff --git a/olddraw/CtrlCore/srcdoc.tpp/LogPos$en-us.tpp b/archive/olddraw/CtrlCore/srcdoc.tpp/LogPos$en-us.tpp similarity index 100% rename from olddraw/CtrlCore/srcdoc.tpp/LogPos$en-us.tpp rename to archive/olddraw/CtrlCore/srcdoc.tpp/LogPos$en-us.tpp diff --git a/olddraw/CtrlCore/srcdoc.tpp/TimerAndModalTrap$en-us.tpp b/archive/olddraw/CtrlCore/srcdoc.tpp/TimerAndModalTrap$en-us.tpp similarity index 100% rename from olddraw/CtrlCore/srcdoc.tpp/TimerAndModalTrap$en-us.tpp rename to archive/olddraw/CtrlCore/srcdoc.tpp/TimerAndModalTrap$en-us.tpp diff --git a/olddraw/Draw/Cham.cpp b/archive/olddraw/Draw/Cham.cpp similarity index 100% rename from olddraw/Draw/Cham.cpp rename to archive/olddraw/Draw/Cham.cpp diff --git a/olddraw/Draw/Cham.h b/archive/olddraw/Draw/Cham.h similarity index 100% rename from olddraw/Draw/Cham.h rename to archive/olddraw/Draw/Cham.h diff --git a/olddraw/Draw/ComposeText.cpp b/archive/olddraw/Draw/ComposeText.cpp similarity index 100% rename from olddraw/Draw/ComposeText.cpp rename to archive/olddraw/Draw/ComposeText.cpp diff --git a/olddraw/Draw/Copying b/archive/olddraw/Draw/Copying similarity index 100% rename from olddraw/Draw/Copying rename to archive/olddraw/Draw/Copying diff --git a/olddraw/Draw/Debug.cpp b/archive/olddraw/Draw/Debug.cpp similarity index 100% rename from olddraw/Draw/Debug.cpp rename to archive/olddraw/Draw/Debug.cpp diff --git a/olddraw/Draw/Debug.h b/archive/olddraw/Draw/Debug.h similarity index 100% rename from olddraw/Draw/Debug.h rename to archive/olddraw/Draw/Debug.h diff --git a/olddraw/Draw/Display.cpp b/archive/olddraw/Draw/Display.cpp similarity index 100% rename from olddraw/Draw/Display.cpp rename to archive/olddraw/Draw/Display.cpp diff --git a/olddraw/Draw/Display.h b/archive/olddraw/Draw/Display.h similarity index 100% rename from olddraw/Draw/Display.h rename to archive/olddraw/Draw/Display.h diff --git a/olddraw/Draw/Draw.cpp b/archive/olddraw/Draw/Draw.cpp similarity index 100% rename from olddraw/Draw/Draw.cpp rename to archive/olddraw/Draw/Draw.cpp diff --git a/olddraw/Draw/Draw.h b/archive/olddraw/Draw/Draw.h similarity index 100% rename from olddraw/Draw/Draw.h rename to archive/olddraw/Draw/Draw.h diff --git a/olddraw/Draw/Draw.upp b/archive/olddraw/Draw/Draw.upp similarity index 100% rename from olddraw/Draw/Draw.upp rename to archive/olddraw/Draw/Draw.upp diff --git a/olddraw/Draw/DrawData.cpp b/archive/olddraw/Draw/DrawData.cpp similarity index 100% rename from olddraw/Draw/DrawData.cpp rename to archive/olddraw/Draw/DrawData.cpp diff --git a/olddraw/Draw/DrawImg.iml b/archive/olddraw/Draw/DrawImg.iml similarity index 100% rename from olddraw/Draw/DrawImg.iml rename to archive/olddraw/Draw/DrawImg.iml diff --git a/olddraw/Draw/DrawOpWin32.cpp b/archive/olddraw/Draw/DrawOpWin32.cpp similarity index 100% rename from olddraw/Draw/DrawOpWin32.cpp rename to archive/olddraw/Draw/DrawOpWin32.cpp diff --git a/olddraw/Draw/DrawOpX11.cpp b/archive/olddraw/Draw/DrawOpX11.cpp similarity index 100% rename from olddraw/Draw/DrawOpX11.cpp rename to archive/olddraw/Draw/DrawOpX11.cpp diff --git a/olddraw/Draw/DrawRasterData.cpp b/archive/olddraw/Draw/DrawRasterData.cpp similarity index 100% rename from olddraw/Draw/DrawRasterData.cpp rename to archive/olddraw/Draw/DrawRasterData.cpp diff --git a/olddraw/Draw/DrawText.cpp b/archive/olddraw/Draw/DrawText.cpp similarity index 100% rename from olddraw/Draw/DrawText.cpp rename to archive/olddraw/Draw/DrawText.cpp diff --git a/olddraw/Draw/DrawTextUtil.cpp b/archive/olddraw/Draw/DrawTextUtil.cpp similarity index 100% rename from olddraw/Draw/DrawTextUtil.cpp rename to archive/olddraw/Draw/DrawTextUtil.cpp diff --git a/olddraw/Draw/DrawTextWin32.cpp b/archive/olddraw/Draw/DrawTextWin32.cpp similarity index 100% rename from olddraw/Draw/DrawTextWin32.cpp rename to archive/olddraw/Draw/DrawTextWin32.cpp diff --git a/olddraw/Draw/DrawTextXft.cpp b/archive/olddraw/Draw/DrawTextXft.cpp similarity index 100% rename from olddraw/Draw/DrawTextXft.cpp rename to archive/olddraw/Draw/DrawTextXft.cpp diff --git a/olddraw/Draw/DrawUtil.cpp b/archive/olddraw/Draw/DrawUtil.cpp similarity index 100% rename from olddraw/Draw/DrawUtil.cpp rename to archive/olddraw/Draw/DrawUtil.cpp diff --git a/olddraw/Draw/DrawWin32.cpp b/archive/olddraw/Draw/DrawWin32.cpp similarity index 100% rename from olddraw/Draw/DrawWin32.cpp rename to archive/olddraw/Draw/DrawWin32.cpp diff --git a/olddraw/Draw/DrawWin32.h b/archive/olddraw/Draw/DrawWin32.h similarity index 100% rename from olddraw/Draw/DrawWin32.h rename to archive/olddraw/Draw/DrawWin32.h diff --git a/olddraw/Draw/DrawX11.cpp b/archive/olddraw/Draw/DrawX11.cpp similarity index 100% rename from olddraw/Draw/DrawX11.cpp rename to archive/olddraw/Draw/DrawX11.cpp diff --git a/olddraw/Draw/Drawing.cpp b/archive/olddraw/Draw/Drawing.cpp similarity index 100% rename from olddraw/Draw/Drawing.cpp rename to archive/olddraw/Draw/Drawing.cpp diff --git a/olddraw/Draw/Image.cpp b/archive/olddraw/Draw/Image.cpp similarity index 100% rename from olddraw/Draw/Image.cpp rename to archive/olddraw/Draw/Image.cpp diff --git a/olddraw/Draw/Image.h b/archive/olddraw/Draw/Image.h similarity index 100% rename from olddraw/Draw/Image.h rename to archive/olddraw/Draw/Image.h diff --git a/olddraw/Draw/ImageBlit.cpp b/archive/olddraw/Draw/ImageBlit.cpp similarity index 100% rename from olddraw/Draw/ImageBlit.cpp rename to archive/olddraw/Draw/ImageBlit.cpp diff --git a/olddraw/Draw/ImageChOp.cpp b/archive/olddraw/Draw/ImageChOp.cpp similarity index 100% rename from olddraw/Draw/ImageChOp.cpp rename to archive/olddraw/Draw/ImageChOp.cpp diff --git a/olddraw/Draw/ImageDraw.h b/archive/olddraw/Draw/ImageDraw.h similarity index 100% rename from olddraw/Draw/ImageDraw.h rename to archive/olddraw/Draw/ImageDraw.h diff --git a/olddraw/Draw/ImageOp.cpp b/archive/olddraw/Draw/ImageOp.cpp similarity index 100% rename from olddraw/Draw/ImageOp.cpp rename to archive/olddraw/Draw/ImageOp.cpp diff --git a/olddraw/Draw/ImageOp.h b/archive/olddraw/Draw/ImageOp.h similarity index 100% rename from olddraw/Draw/ImageOp.h rename to archive/olddraw/Draw/ImageOp.h diff --git a/olddraw/Draw/ImageScale.cpp b/archive/olddraw/Draw/ImageScale.cpp similarity index 100% rename from olddraw/Draw/ImageScale.cpp rename to archive/olddraw/Draw/ImageScale.cpp diff --git a/olddraw/Draw/ImageWin32.cpp b/archive/olddraw/Draw/ImageWin32.cpp similarity index 100% rename from olddraw/Draw/ImageWin32.cpp rename to archive/olddraw/Draw/ImageWin32.cpp diff --git a/olddraw/Draw/ImageX11.cpp b/archive/olddraw/Draw/ImageX11.cpp similarity index 100% rename from olddraw/Draw/ImageX11.cpp rename to archive/olddraw/Draw/ImageX11.cpp diff --git a/olddraw/Draw/MakeCache.cpp b/archive/olddraw/Draw/MakeCache.cpp similarity index 100% rename from olddraw/Draw/MakeCache.cpp rename to archive/olddraw/Draw/MakeCache.cpp diff --git a/olddraw/Draw/MetaFile.cpp b/archive/olddraw/Draw/MetaFile.cpp similarity index 100% rename from olddraw/Draw/MetaFile.cpp rename to archive/olddraw/Draw/MetaFile.cpp diff --git a/olddraw/Draw/Mt.cpp b/archive/olddraw/Draw/Mt.cpp similarity index 100% rename from olddraw/Draw/Mt.cpp rename to archive/olddraw/Draw/Mt.cpp diff --git a/olddraw/Draw/Palette.cpp b/archive/olddraw/Draw/Palette.cpp similarity index 100% rename from olddraw/Draw/Palette.cpp rename to archive/olddraw/Draw/Palette.cpp diff --git a/olddraw/Draw/Raster.cpp b/archive/olddraw/Draw/Raster.cpp similarity index 100% rename from olddraw/Draw/Raster.cpp rename to archive/olddraw/Draw/Raster.cpp diff --git a/olddraw/Draw/Raster.h b/archive/olddraw/Draw/Raster.h similarity index 100% rename from olddraw/Draw/Raster.h rename to archive/olddraw/Draw/Raster.h diff --git a/olddraw/Draw/RasterEncoder.cpp b/archive/olddraw/Draw/RasterEncoder.cpp similarity index 100% rename from olddraw/Draw/RasterEncoder.cpp rename to archive/olddraw/Draw/RasterEncoder.cpp diff --git a/olddraw/Draw/RasterFormat.cpp b/archive/olddraw/Draw/RasterFormat.cpp similarity index 100% rename from olddraw/Draw/RasterFormat.cpp rename to archive/olddraw/Draw/RasterFormat.cpp diff --git a/olddraw/Draw/RasterWrite.cpp b/archive/olddraw/Draw/RasterWrite.cpp similarity index 100% rename from olddraw/Draw/RasterWrite.cpp rename to archive/olddraw/Draw/RasterWrite.cpp diff --git a/olddraw/Draw/SSettings.cpp b/archive/olddraw/Draw/SSettings.cpp similarity index 100% rename from olddraw/Draw/SSettings.cpp rename to archive/olddraw/Draw/SSettings.cpp diff --git a/olddraw/Draw/gdk.dli b/archive/olddraw/Draw/gdk.dli similarity index 100% rename from olddraw/Draw/gdk.dli rename to archive/olddraw/Draw/gdk.dli diff --git a/olddraw/Draw/gnome.dli b/archive/olddraw/Draw/gnome.dli similarity index 100% rename from olddraw/Draw/gnome.dli rename to archive/olddraw/Draw/gnome.dli diff --git a/olddraw/Draw/gobj.dli b/archive/olddraw/Draw/gobj.dli similarity index 100% rename from olddraw/Draw/gobj.dli rename to archive/olddraw/Draw/gobj.dli diff --git a/olddraw/Draw/gpixbuf.dli b/archive/olddraw/Draw/gpixbuf.dli similarity index 100% rename from olddraw/Draw/gpixbuf.dli rename to archive/olddraw/Draw/gpixbuf.dli diff --git a/olddraw/Draw/gtk.dli b/archive/olddraw/Draw/gtk.dli similarity index 100% rename from olddraw/Draw/gtk.dli rename to archive/olddraw/Draw/gtk.dli diff --git a/olddraw/Draw/iml.h b/archive/olddraw/Draw/iml.h similarity index 100% rename from olddraw/Draw/iml.h rename to archive/olddraw/Draw/iml.h diff --git a/olddraw/Draw/iml_header.h b/archive/olddraw/Draw/iml_header.h similarity index 100% rename from olddraw/Draw/iml_header.h rename to archive/olddraw/Draw/iml_header.h diff --git a/olddraw/Draw/iml_source.h b/archive/olddraw/Draw/iml_source.h similarity index 100% rename from olddraw/Draw/iml_source.h rename to archive/olddraw/Draw/iml_source.h diff --git a/olddraw/Draw/init b/archive/olddraw/Draw/init similarity index 100% rename from olddraw/Draw/init rename to archive/olddraw/Draw/init diff --git a/olddraw/Draw/src.tpp/Display$en-us.tpp b/archive/olddraw/Draw/src.tpp/Display$en-us.tpp similarity index 100% rename from olddraw/Draw/src.tpp/Display$en-us.tpp rename to archive/olddraw/Draw/src.tpp/Display$en-us.tpp diff --git a/olddraw/Draw/src.tpp/Draw$en-us.tpp b/archive/olddraw/Draw/src.tpp/Draw$en-us.tpp similarity index 100% rename from olddraw/Draw/src.tpp/Draw$en-us.tpp rename to archive/olddraw/Draw/src.tpp/Draw$en-us.tpp diff --git a/olddraw/Draw/src.tpp/Font$en-us.tpp b/archive/olddraw/Draw/src.tpp/Font$en-us.tpp similarity index 100% rename from olddraw/Draw/src.tpp/Font$en-us.tpp rename to archive/olddraw/Draw/src.tpp/Font$en-us.tpp diff --git a/olddraw/Draw/src.tpp/FontInfo$en-us.tpp b/archive/olddraw/Draw/src.tpp/FontInfo$en-us.tpp similarity index 100% rename from olddraw/Draw/src.tpp/FontInfo$en-us.tpp rename to archive/olddraw/Draw/src.tpp/FontInfo$en-us.tpp diff --git a/olddraw/Draw/src.tpp/Image$en-us.tpp b/archive/olddraw/Draw/src.tpp/Image$en-us.tpp similarity index 100% rename from olddraw/Draw/src.tpp/Image$en-us.tpp rename to archive/olddraw/Draw/src.tpp/Image$en-us.tpp diff --git a/olddraw/Draw/src.tpp/Iml$en-us.tpp b/archive/olddraw/Draw/src.tpp/Iml$en-us.tpp similarity index 100% rename from olddraw/Draw/src.tpp/Iml$en-us.tpp rename to archive/olddraw/Draw/src.tpp/Iml$en-us.tpp diff --git a/olddraw/Draw/srcdoc.tpp/DrawOutput$en-us.tpp b/archive/olddraw/Draw/srcdoc.tpp/DrawOutput$en-us.tpp similarity index 100% rename from olddraw/Draw/srcdoc.tpp/DrawOutput$en-us.tpp rename to archive/olddraw/Draw/srcdoc.tpp/DrawOutput$en-us.tpp diff --git a/olddraw/Draw/srcdoc.tpp/DrawTutorial$en-us.tpp b/archive/olddraw/Draw/srcdoc.tpp/DrawTutorial$en-us.tpp similarity index 100% rename from olddraw/Draw/srcdoc.tpp/DrawTutorial$en-us.tpp rename to archive/olddraw/Draw/srcdoc.tpp/DrawTutorial$en-us.tpp diff --git a/olddraw/Draw/srcdoc.tpp/ImgTutorial$en-us.tpp b/archive/olddraw/Draw/srcdoc.tpp/ImgTutorial$en-us.tpp similarity index 100% rename from olddraw/Draw/srcdoc.tpp/ImgTutorial$en-us.tpp rename to archive/olddraw/Draw/srcdoc.tpp/ImgTutorial$en-us.tpp diff --git a/olddraw/Painter/Approximate.cpp b/archive/olddraw/Painter/Approximate.cpp similarity index 100% rename from olddraw/Painter/Approximate.cpp rename to archive/olddraw/Painter/Approximate.cpp diff --git a/olddraw/Painter/BufferPainter.h b/archive/olddraw/Painter/BufferPainter.h similarity index 100% rename from olddraw/Painter/BufferPainter.h rename to archive/olddraw/Painter/BufferPainter.h diff --git a/olddraw/Painter/Context.cpp b/archive/olddraw/Painter/Context.cpp similarity index 100% rename from olddraw/Painter/Context.cpp rename to archive/olddraw/Painter/Context.cpp diff --git a/olddraw/Painter/Copying b/archive/olddraw/Painter/Copying similarity index 100% rename from olddraw/Painter/Copying rename to archive/olddraw/Painter/Copying diff --git a/olddraw/Painter/Dasher.cpp b/archive/olddraw/Painter/Dasher.cpp similarity index 100% rename from olddraw/Painter/Dasher.cpp rename to archive/olddraw/Painter/Dasher.cpp diff --git a/olddraw/Painter/DrawOp.cpp b/archive/olddraw/Painter/DrawOp.cpp similarity index 100% rename from olddraw/Painter/DrawOp.cpp rename to archive/olddraw/Painter/DrawOp.cpp diff --git a/olddraw/Painter/Fillers.cpp b/archive/olddraw/Painter/Fillers.cpp similarity index 100% rename from olddraw/Painter/Fillers.cpp rename to archive/olddraw/Painter/Fillers.cpp diff --git a/olddraw/Painter/Fillers.h b/archive/olddraw/Painter/Fillers.h similarity index 100% rename from olddraw/Painter/Fillers.h rename to archive/olddraw/Painter/Fillers.h diff --git a/olddraw/Painter/FontWin32.cpp b/archive/olddraw/Painter/FontWin32.cpp similarity index 100% rename from olddraw/Painter/FontWin32.cpp rename to archive/olddraw/Painter/FontWin32.cpp diff --git a/olddraw/Painter/FontX11.cpp b/archive/olddraw/Painter/FontX11.cpp similarity index 100% rename from olddraw/Painter/FontX11.cpp rename to archive/olddraw/Painter/FontX11.cpp diff --git a/olddraw/Painter/Gradient.cpp b/archive/olddraw/Painter/Gradient.cpp similarity index 100% rename from olddraw/Painter/Gradient.cpp rename to archive/olddraw/Painter/Gradient.cpp diff --git a/olddraw/Painter/Image.cpp b/archive/olddraw/Painter/Image.cpp similarity index 100% rename from olddraw/Painter/Image.cpp rename to archive/olddraw/Painter/Image.cpp diff --git a/olddraw/Painter/Interpolator.cpp b/archive/olddraw/Painter/Interpolator.cpp similarity index 100% rename from olddraw/Painter/Interpolator.cpp rename to archive/olddraw/Painter/Interpolator.cpp diff --git a/olddraw/Painter/Mask.cpp b/archive/olddraw/Painter/Mask.cpp similarity index 100% rename from olddraw/Painter/Mask.cpp rename to archive/olddraw/Painter/Mask.cpp diff --git a/olddraw/Painter/OnPath.cpp b/archive/olddraw/Painter/OnPath.cpp similarity index 100% rename from olddraw/Painter/OnPath.cpp rename to archive/olddraw/Painter/OnPath.cpp diff --git a/olddraw/Painter/PaintPainting.icpp b/archive/olddraw/Painter/PaintPainting.icpp similarity index 100% rename from olddraw/Painter/PaintPainting.icpp rename to archive/olddraw/Painter/PaintPainting.icpp diff --git a/olddraw/Painter/Painter.cpp b/archive/olddraw/Painter/Painter.cpp similarity index 100% rename from olddraw/Painter/Painter.cpp rename to archive/olddraw/Painter/Painter.cpp diff --git a/olddraw/Painter/Painter.h b/archive/olddraw/Painter/Painter.h similarity index 100% rename from olddraw/Painter/Painter.h rename to archive/olddraw/Painter/Painter.h diff --git a/olddraw/Painter/Painter.hpp b/archive/olddraw/Painter/Painter.hpp similarity index 100% rename from olddraw/Painter/Painter.hpp rename to archive/olddraw/Painter/Painter.hpp diff --git a/olddraw/Painter/Painter.upp b/archive/olddraw/Painter/Painter.upp similarity index 100% rename from olddraw/Painter/Painter.upp rename to archive/olddraw/Painter/Painter.upp diff --git a/olddraw/Painter/PainterPath.cpp b/archive/olddraw/Painter/PainterPath.cpp similarity index 100% rename from olddraw/Painter/PainterPath.cpp rename to archive/olddraw/Painter/PainterPath.cpp diff --git a/olddraw/Painter/Painting.cpp b/archive/olddraw/Painter/Painting.cpp similarity index 100% rename from olddraw/Painter/Painting.cpp rename to archive/olddraw/Painter/Painting.cpp diff --git a/olddraw/Painter/Painting.h b/archive/olddraw/Painter/Painting.h similarity index 100% rename from olddraw/Painter/Painting.h rename to archive/olddraw/Painter/Painting.h diff --git a/olddraw/Painter/Path.cpp b/archive/olddraw/Painter/Path.cpp similarity index 100% rename from olddraw/Painter/Path.cpp rename to archive/olddraw/Painter/Path.cpp diff --git a/olddraw/Painter/RadialGradient.cpp b/archive/olddraw/Painter/RadialGradient.cpp similarity index 100% rename from olddraw/Painter/RadialGradient.cpp rename to archive/olddraw/Painter/RadialGradient.cpp diff --git a/olddraw/Painter/Rasterizer.cpp b/archive/olddraw/Painter/Rasterizer.cpp similarity index 100% rename from olddraw/Painter/Rasterizer.cpp rename to archive/olddraw/Painter/Rasterizer.cpp diff --git a/olddraw/Painter/Rasterizer3.h b/archive/olddraw/Painter/Rasterizer3.h similarity index 100% rename from olddraw/Painter/Rasterizer3.h rename to archive/olddraw/Painter/Rasterizer3.h diff --git a/olddraw/Painter/RasterizerClip.cpp b/archive/olddraw/Painter/RasterizerClip.cpp similarity index 100% rename from olddraw/Painter/RasterizerClip.cpp rename to archive/olddraw/Painter/RasterizerClip.cpp diff --git a/olddraw/Painter/Render.cpp b/archive/olddraw/Painter/Render.cpp similarity index 100% rename from olddraw/Painter/Render.cpp rename to archive/olddraw/Painter/Render.cpp diff --git a/olddraw/Painter/RenderChar.cpp b/archive/olddraw/Painter/RenderChar.cpp similarity index 100% rename from olddraw/Painter/RenderChar.cpp rename to archive/olddraw/Painter/RenderChar.cpp diff --git a/olddraw/Painter/Stroker.cpp b/archive/olddraw/Painter/Stroker.cpp similarity index 100% rename from olddraw/Painter/Stroker.cpp rename to archive/olddraw/Painter/Stroker.cpp diff --git a/olddraw/Painter/SvgArc.cpp b/archive/olddraw/Painter/SvgArc.cpp similarity index 100% rename from olddraw/Painter/SvgArc.cpp rename to archive/olddraw/Painter/SvgArc.cpp diff --git a/olddraw/Painter/Transformer.cpp b/archive/olddraw/Painter/Transformer.cpp similarity index 100% rename from olddraw/Painter/Transformer.cpp rename to archive/olddraw/Painter/Transformer.cpp diff --git a/olddraw/Painter/Xform2D.cpp b/archive/olddraw/Painter/Xform2D.cpp similarity index 100% rename from olddraw/Painter/Xform2D.cpp rename to archive/olddraw/Painter/Xform2D.cpp diff --git a/olddraw/Painter/init b/archive/olddraw/Painter/init similarity index 100% rename from olddraw/Painter/init rename to archive/olddraw/Painter/init diff --git a/olddraw/Painter/srcimp.tpp/SubpixelFiller$en-us.tpp b/archive/olddraw/Painter/srcimp.tpp/SubpixelFiller$en-us.tpp similarity index 100% rename from olddraw/Painter/srcimp.tpp/SubpixelFiller$en-us.tpp rename to archive/olddraw/Painter/srcimp.tpp/SubpixelFiller$en-us.tpp diff --git a/olddraw/PdfDraw/Copying b/archive/olddraw/PdfDraw/Copying similarity index 100% rename from olddraw/PdfDraw/Copying rename to archive/olddraw/PdfDraw/Copying diff --git a/olddraw/PdfDraw/PdfDraw.cpp b/archive/olddraw/PdfDraw/PdfDraw.cpp similarity index 100% rename from olddraw/PdfDraw/PdfDraw.cpp rename to archive/olddraw/PdfDraw/PdfDraw.cpp diff --git a/olddraw/PdfDraw/PdfDraw.h b/archive/olddraw/PdfDraw/PdfDraw.h similarity index 100% rename from olddraw/PdfDraw/PdfDraw.h rename to archive/olddraw/PdfDraw/PdfDraw.h diff --git a/olddraw/PdfDraw/PdfDraw.upp b/archive/olddraw/PdfDraw/PdfDraw.upp similarity index 100% rename from olddraw/PdfDraw/PdfDraw.upp rename to archive/olddraw/PdfDraw/PdfDraw.upp diff --git a/olddraw/PdfDraw/PdfReport.icpp b/archive/olddraw/PdfDraw/PdfReport.icpp similarity index 100% rename from olddraw/PdfDraw/PdfReport.icpp rename to archive/olddraw/PdfDraw/PdfReport.icpp diff --git a/olddraw/PdfDraw/TTFReader.cpp b/archive/olddraw/PdfDraw/TTFReader.cpp similarity index 100% rename from olddraw/PdfDraw/TTFReader.cpp rename to archive/olddraw/PdfDraw/TTFReader.cpp diff --git a/olddraw/PdfDraw/TTFStream.cpp b/archive/olddraw/PdfDraw/TTFStream.cpp similarity index 100% rename from olddraw/PdfDraw/TTFStream.cpp rename to archive/olddraw/PdfDraw/TTFStream.cpp diff --git a/olddraw/PdfDraw/TTFStruct.cpp b/archive/olddraw/PdfDraw/TTFStruct.cpp similarity index 100% rename from olddraw/PdfDraw/TTFStruct.cpp rename to archive/olddraw/PdfDraw/TTFStruct.cpp diff --git a/olddraw/PdfDraw/TTFSubset.cpp b/archive/olddraw/PdfDraw/TTFSubset.cpp similarity index 100% rename from olddraw/PdfDraw/TTFSubset.cpp rename to archive/olddraw/PdfDraw/TTFSubset.cpp diff --git a/olddraw/PdfDraw/init b/archive/olddraw/PdfDraw/init similarity index 100% rename from olddraw/PdfDraw/init rename to archive/olddraw/PdfDraw/init diff --git a/olddraw/PdfDraw/ttf.h b/archive/olddraw/PdfDraw/ttf.h similarity index 100% rename from olddraw/PdfDraw/ttf.h rename to archive/olddraw/PdfDraw/ttf.h diff --git a/uppdev/FontMetrics/main.cpp b/uppdev/FontMetrics/main.cpp index de032d2ab..691e4f070 100644 --- a/uppdev/FontMetrics/main.cpp +++ b/uppdev/FontMetrics/main.cpp @@ -2,62 +2,45 @@ using namespace Upp; -struct CharMetrics { - int16 width; - int16 lspc; - int16 rspc; +const char *font[] = { + "sans-serif", + "Arial", + "Arial Unicode MS", + "MS UI Gothic", + "MS Mincho", + "Arial", + "AlArabiya" + "FreeSerif", + "Kochi Mincho", + "Kochi Gothic", + "Sazanami Mincho", + "Sazanami Gothic", + "Gulim", + "SimSun", + "PMingLiU", + "Symbol", }; -struct FontMetrics { - int refcount; - Font font; - int angle; - int device; - #ifdef PLATFORM_WIN32 - HFONT hfont; - #endif - #ifdef PLATFORM_XFT - XftFont *xftfont; - XftFont *xftfont0; - #endif - int ascent; - int descent; - int external; - int internal; - int height; - int lineheight; - int overhang; - Size offset; - int avewidth; - int maxwidth; - int firstchar; - int charcount; - int default_char; - - CharMetrics *base[64]; - - Mutex xmutex; - Vector kinfo; - VectorMap xx; - - bool fixedpitch; - bool scaleable; - int spacebefore; - int spaceafter; - #ifdef PLATFORM_X11 - int underline_position; - int underline_thickness; - double sina; - double cosa; - bool twobyte; - String filename; - #endif -}; - -FontMetrics GetFontMetrics(Font fnt); -CharMetrics GetCharMetrics(Font fnt, int chr); - GUI_APP_MAIN { + LOG("struct..."); + for(int i = 0; i < __countof(font); i++) { + Font fnt; + fnt.FaceName(font[i]); + dword l = 0; + for(int ch = 32; ch < 4096; ch++) { + if(GetGlyphInfo(fnt, ch).IsNormal()) { + l |= (0x80000000 >> (ch / 128)); + ch = (ch + 127) & ~127; + } + } + dword h = 0; + for(int ch = 32; ch < 65536; ch++) { + if(GetGlyphInfo(fnt, ch).IsNormal()) { + h |= (0x80000000 >> (ch / 2048)); + ch = (ch + 2047) & ~2047; + } + } + LOG(AsCString(font[i]) << ", 0x" << FormatIntHex(l) << ", 0x" << FormatIntHex(h) << ','); + } } - diff --git a/uppdev/Fonts/main.cpp b/uppdev/Fonts/main.cpp index 97d72857a..0b06a0d45 100644 --- a/uppdev/Fonts/main.cpp +++ b/uppdev/Fonts/main.cpp @@ -4,13 +4,7 @@ using namespace Upp; GUI_APP_MAIN { - ArrayCtrl a; - a.AddColumn("Font"); - a.AddColumn("View"); - for(int i = 0; i < Font::GetFaceCount(); i++) - a.Add(Font::GetFaceName(i), AttrText("Just a test!").SetFont(Font(i, 20))); - a.SetLineCy(24); - TopWindow app; - app.Add(a.SizePos()); - app.Run(); + DDUMP(GetGlyphInfo(Font().FaceName("Courier New"), 35798).IsNormal()); + DDUMP(GetGlyphInfo(Font().FaceName("Verdana"), 35798).IsNormal()); + DDUMP(GetGlyphInfo(Font().FaceName("Symbol"), 35798).IsNormal()); } diff --git a/upptst/Mirrors/main.cpp b/upptst/Mirrors/main.cpp index 124810bca..81fb65e6f 100644 --- a/upptst/Mirrors/main.cpp +++ b/upptst/Mirrors/main.cpp @@ -11,6 +11,7 @@ GUI_APP_MAIN String letters = "sSzZEeDNB12345679kKrRLCc"; Report r; Size page = r.GetPageSize(); +#if 0 // r.DrawText(0, 0, letters, fnt); for(int y = 0; y + isz.cy < page.cy; y += 3 * isz.cy / 2) for(int x = 0; x < page.cx; x += 3 * isz.cx / 2) { @@ -37,20 +38,39 @@ GUI_APP_MAIN r.DrawText(x, y, String(ch, 1) + String(cl, 1), fnt); } r.NewPage(); - for(int i = 0; i < 18; i++) { - int a, b; - do { - a = Random(200) + 1; - b = Random(200) + 1; +#endif + for(int i = 0; i < 26; i++) { + for(int j = 0; j < 3; j++) { + int a, b, c; + do { + a = Random(50) + 1; + b = Random(50) - 25; + c = Random(50) - 25; + } + while(a + b + c < 1 || a + b + c > 50); + int q = Random(4); + String s; + if(q == 0) + s = "__"; + else + s = AsString(a); + s << (b > 0 ? " + " : " - "); + if(q == 1) + s << "__"; + else + s << AsString(abs(b)); + s << (c > 0 ? " + " : " - "); + if(q == 2) + s << "__"; + else + s << AsString(abs(c)); + s << " = "; + if(q == 3) + s << "__"; + else + s << a + b + c; + r.DrawText(10 + 1200 * j, 10 + 2 * isz.cy / 2 * i, s, Arial(120)); } - while(a + b < 90 || a + b > 400); - r.DrawText(10, 10 + 3 * isz.cy / 2 * i, Format("%d + %d =", a, b), fnt); - do { - a = Random(100) + 1; - b = Random(100) + 1; - } - while(a - b < 1); - r.DrawText(2000, 10 + 3 * isz.cy / 2 * i, Format("%d - %d =", a, b), fnt); } Perform(r); }