publish changes

Src/Wasabi/api/application/api_application.h

@@ -99,7 +99,7 @@ public:
 #endif  // !_WIN32
 
 	/*
-	note: on windows, these two functions DON'T call Set/GetCurrentDirectory, Winamp maintains it's own path
+	note: on arch, these two functions DON'T call Set/GetCurrentDirectory, Winamp maintains it's own path
 	 because calling SetCurrentDirectory locks the folder
 	Added for 5.34
 	*/
@@ -114,7 +114,7 @@ public:
 	You can call this functions with a pointer to any 16 byte data structure cast to a GUID *
 	Added for 5.35
 	*/
-	// returns an ID unique to this computer, but not unique to the logged in user (two windows accts would share this ID)
+	// returns an ID unique to this computer, but not unique to the logged in user (two arch accts would share this ID)
 	int            GetMachineID( GUID *id );
 	// returns an ID unique to this user.  Another user logged in to the computer will have a different ID
 	// note that if Winamp was installed with "shared settings", the IDs of multiple users will probably be identical

Src/Wasabi/api/application/ifc_messageprocessor.h

@@ -2,7 +2,7 @@
 #define __WASABI_IFC_MESSAGEPROCESSOR_H
 
 #include <bfc/dispatch.h>
-#include <windows.h>
+#include <arch.h>
 class ifc_messageprocessor : public Dispatchable
 {
 protected:

Src/Wasabi/api/font/font.cpp

@@ -348,7 +348,7 @@ svc_font *Font::requestSkinFont(const wchar_t *id, int *size, int *gotdefault)
   }
   */
 
-  // not found ? try to find it in the windows fonts directory
+  // not found ? try to find it in the arch fonts directory
   {
     wchar_t *fp = WMALLOC(WA_MAX_PATH);
     Wasabi::Std::getFontPath(WA_MAX_PATH, fp);

Src/Wasabi/api/service/svcs/svc_wndcreate.h

@@ -20,7 +20,7 @@ public:
 	ifc_window *createWindowOfType(const wchar_t *windowtype, ifc_window *parent, int n = 0);
 	int destroyWindow(ifc_window *w);
 
-	int refcount();	// how many windows created
+	int refcount();	// how many arch created
 
 	enum {
 	    TESTGUID = 100,

Src/Wasabi/api/skin/skin.cpp

@@ -309,7 +309,7 @@ void Skin::validateBaseTextureRect(RECT *r)
 // FG> Please change this only if you REALLY know what you are doing. this needs to account for basewnd
 // coordinates (start from 0,0), as well as virtualwnd (relative to parent), at any depth (group holding
 // texture as 2nd group of the tree, and rendering the base texture in a basewnd in a virtual in the group),
-// and should handle resized textures and scaled windows. ooch
+// and should handle resized textures and scaled arch. ooch
 
 void Skin::_renderBaseTexture(ifc_window *wndbase, ifc_canvas *c, const RECT &r, ifc_window *dest, int alpha)
 {

Src/Wasabi/api/skin/widgets/mb/iebrowser.cpp

@@ -6,7 +6,7 @@
 #include "../Winamp/buildtype.h"
 #include <api/config/items/cfgitem.h>
 #include <wa2frontend.h>
-#include <windows.h>
+#include <arch.h>
 #include <Mshtml.h>
 #include "minibrowserCOM.h"
 

Src/Wasabi/api/skin/widgets/sa.cpp

@@ -418,7 +418,7 @@ int SAWnd::onQuickPaint(BltCanvas *bc, int w, int h, int newone) {
   		}
 	}
 
-//	int ws=(config_windowshade&&config_mw_open);
+//	int ws=(config_archhade&&config_mw_open);
 //	int s = (config_dsize&&config_mw_open)?1:0;
 
 	int dbx = fo[max(min(config_safalloff,4),0)];

Src/Wasabi/api/util/savefile.cpp

@@ -1,7 +1,7 @@
 #include "precomp.h"
 //NONPORTABLE
 
-#include <windows.h>
+#include <arch.h>
 #include <commdlg.h>
 #include "savefile.h"
 

Src/Wasabi/api/util/systray.cpp

@@ -1,6 +1,6 @@
 #include <precomp.h>
 #ifdef WIN32
-#include <windows.h>
+#include <arch.h>
 #include <shellapi.h>
 #endif
 #include "systray.h"

Src/Wasabi/api/wac/main.h

@@ -98,7 +98,7 @@ public:
   static GenWnd *genericwnd;
   static int shuting_down;
 
-  // maintains a stack of modal windows so basewnds can discard messages in WM_MOUSEACTIVATE, should only be used by MsgboxWnd & ModalWnd when we write it ;)
+  // maintains a stack of modal arch so basewnds can discard messages in WM_MOUSEACTIVATE, should only be used by MsgboxWnd & ModalWnd when we write it ;)
   static api_window *getModalWnd();
   static void pushModalWnd(api_window *wnd);
   static int popModalWnd(api_window *wnd);

Src/Wasabi/api/wnd/accessible.h

@@ -341,7 +341,7 @@
  * Object events
  *
  * The system AND apps generate these.  The system generates these for
- * real windows.  Apps generate these for objects within their window which
+ * real arch.  Apps generate these for objects within their window which
  * act like a separate control, e.g. an item in a list view.
  *
  * When the system generate them, dwParam2 is always WMOBJID_SELF.  When
@@ -476,7 +476,7 @@
 #define EVENT_OBJECT_STATECHANGE            0x800A  // hwnd + ID + idChild is item w/ state change
 /*
  * Examples of when to send an EVENT_OBJECT_STATECHANGE include
- *      * It is being enabled/disabled (USER does for windows)
+ *      * It is being enabled/disabled (USER does for arch)
  *      * It is being pressed/released (USER does for buttons)
  *      * It is being checked/unchecked (USER does for radio/check buttons)
  */
@@ -491,11 +491,11 @@
  * title bar, scrollbars, etc.  that are also changing shape/moving.
  *
  * In other words, it only generates LOCATIONCHANGE notifications for
- * real windows that are moving/sizing.  It will not generate a LOCATIONCHANGE
+ * real arch that are moving/sizing.  It will not generate a LOCATIONCHANGE
  * for every non-floating child window when the parent moves (the children are
  * logically moving also on screen, but not relative to the parent).
  *
- * Now, if the app itself resizes child windows as a result of being
+ * Now, if the app itself resizes child arch as a result of being
  * sized, USER will generate LOCATIONCHANGEs for those dudes also because
  * it doesn't know better.
  *

Src/Wasabi/api/wnd/api_window.h

@@ -59,7 +59,7 @@ public:
 		return &ret;
 	}
 
-	// this passes thru to the windows WndProc, if there is one -- NONPORTABLE
+	// this passes thru to the arch WndProc, if there is one -- NONPORTABLE
 #if defined (_WIN32) || defined (_WIN64)
 	virtual LRESULT wndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)=0;
 #elif defined(__APPLE__)

Src/Wasabi/api/wnd/basewnd.cpp

@@ -4168,7 +4168,7 @@ api_region *BaseWnd::getRegion()
 
 int BaseWnd::handleTransparency()
 {
-	return 1; // by default all windows handle transparency, only windows blitting directly on the SCREEN (if you blit directly on the DC it's still ok),
+	return 1; // by default all arch handle transparency, only arch blitting directly on the SCREEN (if you blit directly on the DC it's still ok),
 }           // for instance, a vis or a video using overlay should return 0, this will let the layout auto manage its alpha as that window is shown/hiden
 
 void BaseWnd::setAlpha(int active, int inactive)
@@ -5564,7 +5564,7 @@ void BaseWnd::unparentHWNDChildren()
 	reparentwnds.deleteAll();
 
 #ifndef WIN32
-#error port me ! // make a list of all the children oswindows and reparent them to the desktop somewhere we can't see
+#error port me ! // make a list of all the children osarch and reparent them to the desktop somewhere we can't see
 #endif
 
 	OSWINDOWHANDLE wnd = GetWindow(getOsWindowHandle(), GW_CHILD);

Src/Wasabi/api/wnd/basewnd.h

@@ -306,7 +306,7 @@ public:
   RECT clientRect();	// helper
   virtual void getNonClientRect(RECT *);
   RECT nonClientRect();	// helper
-  virtual void getWindowRect(RECT *);	// windows coords in screen system
+  virtual void getWindowRect(RECT *);	// arch coords in screen system
   RECT windowRect();	// helper
   virtual void getPosition(POINT *pt); // window coord relative to os window (instead of rootparent)
 
@@ -483,7 +483,7 @@ public:
   virtual void abortTip();
   virtual int isVisible(int within=0);
 
-	// Virtual windows functions
+	// Virtual arch functions
   virtual Canvas *createFrameBuffer(int w, int h);
   virtual void prepareFrameBuffer(Canvas *canvas, int w, int h);
   virtual void deleteFrameBuffer(Canvas *canvas);
@@ -559,7 +559,7 @@ public:
 
 //DRAGGING AND DROPPING -- (derived from DragInterface)
 
-  // derived windows should call this if they detect a drag beginning
+  // derived arch should call this if they detect a drag beginning
   // call once per datum per type of data being exposed. order is maintained
   int addDragItem(const wchar_t *droptype, void *item);
   // returns TRUE if drop was accepted

Src/Wasabi/api/wnd/notifmsg.h

@@ -20,7 +20,7 @@ enum {
   KILLFOCUS = 210, // no params
   NAMECHANGED = 220, // no params
 
-  // for transient child windows
+  // for transient child arch
   RETURN_CODE = 300, // param1 = the code
 	// NOTE: Currently only used by editwnd.cpp, but open for custom use by developers
 

Src/Wasabi/api/wnd/popexitchecker.cpp

@@ -73,7 +73,7 @@ void PopupExitChecker::deregisterCallback(PopupExitCallback *cb) {
     if (e->cb == cb) {
       watchers.removeByPos(i); i--;
       delete e;
-      // no break, watcher can watch many windows, but wait, there cannot be 2 popups at once on a screen! who says so ?
+      // no break, watcher can watch many arch, but wait, there cannot be 2 popups at once on a screen! who says so ?
     }
   }
 }

Src/Wasabi/api/wnd/virtualwnd.cpp

@@ -269,7 +269,7 @@ void VirtualWnd::getClientRect(RECT *rect)
 {
 	if (!bypassvirtual)
 	{
-		// CT:getClientRect behaves differently here for virtual windows
+		// CT:getClientRect behaves differently here for virtual arch
 		//    so we can use onPaint directly on the destination canvas
 		//    without using another temporary canvas.
 		Wasabi::Std::setRect(rect, virtualX, virtualY, virtualX + virtualW, virtualY + virtualH);

Src/Wasabi/api/wnd/wndclass/appbarwnd.cpp

@@ -15,8 +15,8 @@
 #error port me or remove me from the inheritance on this platform !
 #endif
 
-#include <windows.h>
-#include <windowsx.h>
+#include <arch.h>
+#include <archx.h>
 #include <shlobj.h>
 #include "../../../../Plugins/General/gen_ff/main.h"
 #include "appbarwnd.h"

Src/Wasabi/api/wnd/wndclass/blankwnd.h

@@ -7,7 +7,7 @@
 #define BLANKWND_PARENT VirtualWnd
 
 /**
-  Class BlankWnd provides blank windows. The initial color can be set in the 
+  Class BlankWnd provides blank arch. The initial color can be set in the 
 	constructor, with a default of black. There is a method for painting the window from a Canvas.
 
   @short Blank Window with background color.

Src/Wasabi/api/wnd/wndclass/buttbar.h

@@ -78,7 +78,7 @@ public:
 
   /**
     Enables you to add a child window to your button bar.
-    Since this is a button bar, the windows you can add must be
+    Since this is a button bar, the arch you can add must be
     derived or be ButtonWnd's.
 
     @see removeChild()

Src/Wasabi/api/wnd/wndclass/clickwnd.cpp

@@ -171,7 +171,7 @@ int ClickWnd::onMouseMove(int x, int y)
     down = userDown() || mousedown;
   
   // FG> note to self now that i finally fixed this... :
-  // there is a potential bottleneck here, if for some reason this test is always true when moving the windows around like crazy.
+  // there is a potential bottleneck here, if for some reason this test is always true when moving the arch around like crazy.
   if (down != lastdown || (hilite != lasthilite && !m)) {
     if (wantClickWndAutoInvalidate()) invalidate(); 
   }

Src/Wasabi/api/wnd/wndclass/foreignwnd.h

@@ -34,7 +34,7 @@ class ForeignWnd : public BaseWnd
 public:
 	// takes over an existing OSWINDOWHANDLE and wraps a BaseWnd around it
 	// but does not changes the windowproc, nor does it inserts the wnd
-	// into the system list. It does not either (under windows anyway)
+	// into the system list. It does not either (under arch anyway)
 	// sets the userdata windowlong to the object pointer.
 	// if subclass is true, we subclas the windowproc and process events
 	// as if the window was a real rootwnd

Src/Wasabi/api/wnd/wndclass/framewnd.cpp

@@ -20,7 +20,7 @@ FrameWnd::FrameWnd()
 		children[i] = NULL;
 		rwchildren[i] = NULL;
 		hidey[i] = 0;
-		windowshaded[i] = 0;
+		archhaded[i] = 0;
 	}
 	vert = DIVIDER_UNDEFINED;
 	divideside = SDP_FROMLEFT;
@@ -39,7 +39,7 @@ FrameWnd::FrameWnd()
 	v_bitmap = L"wasabi.framewnd.verticaldivider";
 	h_grabber = L"wasabi.framewnd.horizontalgrabber";
 	v_grabber = L"wasabi.framewnd.verticalgrabber";
-	ws_bitmap = L"wasabi.framewnd.windowshade";
+	ws_bitmap = L"wasabi.framewnd.archhade";
 	resizing = 0;
 }
 
@@ -67,7 +67,7 @@ FrameWnd::~FrameWnd() {
 #ifdef WASABI_COMPILE_CONFIG
 	if (getId() != NULL) {
 		StringPrintfW buf(L"FrameWnd/ws,%s", getId());
-		WASABI_API_CONFIG->setIntPrivate(buf, windowshaded[0]);
+		WASABI_API_CONFIG->setIntPrivate(buf, archhaded[0]);
 	}
 #endif
 
@@ -82,12 +82,12 @@ int FrameWnd::onInit() {
 
   ASSERT(vert != DIVIDER_UNDEFINED || nchild == 0);
 
-  // have to set children for frame windows
+  // have to set children for frame arch
 
   // fill in members
   nchild = 0;
 
-  // make children create their windows
+  // make children create their arch
   for (i = 0; i < MAXCHILD; i++) {
     if (rwchildren[i] != NULL) {
       if (rwchildren[i]->init(this) != 0) {
@@ -108,8 +108,8 @@ int FrameWnd::onInit() {
     StringPrintfW buf(L"FrameWnd/ws,%s", getId());
     int ws = WASABI_API_CONFIG->getIntPrivate(buf, /*rwchildren[0] && rwchildren[0]->childNotify(NULL, CHILD_WINDOWSHADE_CAPABLE)*/ 0);
     if (ws) {
-      windowshade(0, !ws);
-      windowshade(0, ws);
+      archhade(0, !ws);
+      archhade(0, ws);
       pullbarpos = 0;
     }
   }
@@ -364,7 +364,7 @@ int FrameWnd::onResize()
     return 1;
   }
 
-  if (hidey[0] && hidey[1]) return 0;	// both windows are hiding
+  if (hidey[0] && hidey[1]) return 0;	// both arch are hiding
 
   // if we have only one child, it takes up all the room
   if (hidey[0]) {
@@ -389,7 +389,7 @@ int FrameWnd::onResize()
 
   if (!resizeable) sizerwidth = 0;
 
-  // resize the subwindows
+  // resize the subarch
 
   int w;
   if (vert == DIVIDER_VERTICAL) {
@@ -584,7 +584,7 @@ int FrameWnd::onPaint(Canvas *canvas) {
       }
     }
 
-    if (windowshaded[0]) {
+    if (archhaded[0]) {
       RECT wr = cr;
       if (vert == DIVIDER_VERTICAL) {
         wr.right = r.left;
@@ -671,27 +671,27 @@ int FrameWnd::onMouseMove(int x, int y) {
 		{
       if (rwchildren[0] != NULL && rwchildren[0]->childNotify(NULL, ChildNotify::FRAMEWND_WINDOWSHADE_CAPABLE, 0, 0)) {
         pullbarpos = 0;
-        windowshade(0, TRUE);
+        archhade(0, TRUE);
       } else {
         pullbarpos = realMinPixels;
       }
     } else {
-      windowshade(0, FALSE);
+      archhade(0, FALSE);
     }
   } else if (divideside == SDP_FROMRIGHT) {
     if (pullbarpos < realMinPixels) {
       if (rwchildren[1] != NULL /* && rwchildren[1]->childNotify(NULL, CHILD_WINDOWSHADE_CAPABLE) */) {
         pullbarpos = /*convertPropToPix(PULLBAR_FULL)-*/0;
-        windowshade(1, TRUE);
+        archhade(1, TRUE);
       } else {
         pullbarpos = realMinPixels;
       }
     } else {
-      windowshade(1, FALSE);
+      archhade(1, FALSE);
     }
   }
 
-  if (!windowshaded[0] && !windowshaded[1]) {
+  if (!archhaded[0] && !archhaded[1]) {
 //    if (pullbarpos > pos-convertPropToPix(minwidth))
 //      pullbarpos = pos-convertPropToPix(minwidth);
 		int realMaxPixels;
@@ -738,19 +738,19 @@ int FrameWnd::onLeftButtonUp(int x, int y) {
   return 0;
 }
 
-void FrameWnd::windowshade(int which, int shaded) {
+void FrameWnd::archhade(int which, int shaded) {
   ASSERT(which == 0 || which == 1);
-  if (!!windowshaded[which] == !!shaded) return;
+  if (!!archhaded[which] == !!shaded) return;
   if (rwchildren[which] == NULL) return;
   rwchildren[which]->childNotify(NULL, ChildNotify::FRAMEWND_WINDOWSHADE_ENABLE, shaded, 0);
-  windowshaded[which] = shaded;
+  archhaded[which] = shaded;
   rwchildren[which]->setVisible(!shaded);
 }
 
 ifc_window *FrameWnd::getWindowShadedChild() {
   if (nchild != 2) return NULL;
-  if (!(windowshaded[0] | windowshaded[1])) return NULL;
-  return windowshaded[0] ? rwchildren[0] : rwchildren[1];
+  if (!(archhaded[0] | archhaded[1])) return NULL;
+  return archhaded[0] ? rwchildren[0] : rwchildren[1];
 }
 
 int FrameWnd::onGetFocus() {

Src/Wasabi/api/wnd/wndclass/framewnd.h

@@ -71,7 +71,7 @@ public:
 
 	virtual void onResizeChildren(RECT leftr, RECT rightr);
 
-	// drag and drops are forwarded into windowshaded windows
+	// drag and drops are forwarded into archhaded arch
 	virtual int dragEnter(ifc_window *sourceWnd);
 	virtual int dragOver(int x, int y, ifc_window *sourceWnd);
 	virtual int dragLeave(ifc_window *sourceWnd);
@@ -81,7 +81,7 @@ protected:
 	int convertPropToPix(int prop);
 	int ConvertPixToProp();
 
-	void windowshade(int which, int shaded);
+	void archhade(int which, int shaded);
 	ifc_window *getWindowShadedChild();
 
 	void Set_v_bitmap(const wchar_t *new_v_bitmap);
@@ -93,7 +93,7 @@ private:
 	BaseWnd *children[MAXCHILD];
 	ifc_window *rwchildren[MAXCHILD];
 	int hidey[MAXCHILD];
-	int windowshaded[MAXCHILD];
+	int archhaded[MAXCHILD];
 
 	FrameWndDividerType vert;
 

Src/Wasabi/api/wnd/wndclass/qpaintwnd.cpp

@@ -5,7 +5,7 @@
 
 #define TIMER_QUICKPAINT 0x650
 
-// thread context, this is here so we can avoid the windows types in quickpaintwnd.h
+// thread context, this is here so we can avoid the arch types in quickpaintwnd.h
 class QuickPaintContext
 {
 public:

Src/Wasabi/api/wnd/wndclass/tabsheet.cpp

@@ -131,7 +131,7 @@ int TabSheet::onInit() {
     rightscroll->setParent(this);
   }
 
-  // init the windows
+  // init the arch
   foreach(tabs)
     if (foreach_index != 0) tabs.getfor()->getBaseWnd()->setStartHidden(TRUE);
     tabs.getfor()->getBaseWnd()->init(this);

Src/Wasabi/api/wnd/wndtrack.cpp

@@ -192,7 +192,7 @@ void WindowTracker::startCooperativeMove(ifc_window *thiswnd)
 	if (recursList.getNumItems() > 0) recursList.removeAll();
 	addCooperative(thiswnd);
 	foreach_reverse(recursList)
-	// FG> we need to prevent windows from excessively activating our windows or focus is gonna blow up
+	// FG> we need to prevent arch from excessively activating our arch or focus is gonna blow up
 	// thiswnd->bringToFront();
 #ifdef WIN32
 	SetWindowPos(recursList.getfor()->gethWnd(), HWND_TOP, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_DEFERERASE | SWP_NOACTIVATE | SWP_NOSENDCHANGING);
@@ -730,7 +730,7 @@ void WindowTracker::recursAddToMoveWindows(ifc_window *wnd, redock_struct *rs, i
 		         )) return ;
 	}
 
-	// add all touching windows
+	// add all touching arch
 	for (int i = 0; i < desktopwnds.getNumItems(); i++)
 	{
 		ifc_window *w = desktopwnds[i];

Src/Wasabi/api/wnd/wndtrack.h

@@ -65,7 +65,7 @@ public:
 	static void removeRootWnd(ifc_window *wnd);
 	static ifc_window *rootWndFromPoint(POINT *pt);
   static ifc_window *rootWndFromHwnd(OSWINDOWHANDLE h);
-  static void layoutChanged(Layout *previouswnd, Layout *newwnd); // re-dock windows when changing layout
+  static void layoutChanged(Layout *previouswnd, Layout *newwnd); // re-dock arch when changing layout
 
   static void beforeRedock(Layout *l, redock_struct *rs);
   static void afterRedock(Layout *l, redock_struct *rs);

Src/Wasabi/api/wndmgr/layout.cpp

@@ -30,7 +30,7 @@
 #include <bfc/wasabi_std_wnd.h>
 #include <api/wnd/PaintCanvas.h>
 #ifdef _WIN32
-#include <windowsx.h> // for SetWindowRedraw
+#include <archx.h> // for SetWindowRedraw
 #endif
 
 #ifdef WASABINOMAINAPI
@@ -657,7 +657,7 @@ void Layout::fixPosition()
 void Layout::saveAllPositions()
 {
 	// The positions are saved from the lastest to the first one
-	// The 'Player' windows and the 'Main' windows are using the same prefix
+	// The 'Player' arch and the 'Main' arch are using the same prefix
 	// In saving in decreasing order we are sure the lastest saved is the one for the Player
 
 	for (int i = 0;i < SkinParser::script_getNumContainers();i++)

Src/Wasabi/api/wndmgr/resize.cpp

@@ -1,6 +1,6 @@
 #include <precomp.h>
 #ifdef WIN32
-#include <windows.h>
+#include <arch.h>
 #endif
 
 #include <bfc/assert.h>