INTEGRATION: CWS os2port01 (1.2.2); FILE ADDED

2006/11/29 14:34:01 ydario 1.2.2.1: Initial OS/2 import.

2 files changed, 276 insertions, 0 deletions

diff --git a/vcl/os2/source/app/saltimer.cxx b/vcl/os2/source/app/saltimer.cxx
new file mode 100644
index 000000000000..13c2d8bfac38
--- /dev/null
+++ b/vcl/os2/source/app/saltimer.cxx
@@ -0,0 +1,181 @@
+/*************************************************************************
+ *
+ *  $RCSfile: saltimer.cxx,v $
+ *
+ *  $Revision: 1.3 $
+ *
+ *  last change: $Author: vg $ $Date: 2007-09-20 16:06:38 $
+ *
+ *  The Contents of this file are made available subject to the terms of
+ *  either of the following licenses
+ *
+ *         - GNU Lesser General Public License Version 2.1
+ *         - Sun Industry Standards Source License Version 1.1
+ *
+ *  Sun Microsystems Inc., October, 2000
+ *
+ *  GNU Lesser General Public License Version 2.1
+ *  =============================================
+ *  Copyright 2000 by Sun Microsystems, Inc.
+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License version 2.1, as published by the Free Software Foundation.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *  MA  02111-1307  USA
+ *
+ *
+ *  Sun Industry Standards Source License Version 1.1
+ *  =================================================
+ *  The contents of this file are subject to the Sun Industry Standards
+ *  Source License Version 1.1 (the "License"); You may not use this file
+ *  except in compliance with the License. You may obtain a copy of the
+ *  License at http://www.openoffice.org/license.html.
+ *
+ *  Software provided under this License is provided on an "AS IS" basis,
+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
+ *  See the License for the specific provisions governing your rights and
+ *  obligations concerning the Software.
+ *
+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
+ *
+ *  Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *  All Rights Reserved.
+ *
+ *  Contributor(s): _______________________________________
+ *
+ *
+ ************************************************************************/
+
+#include <svpm.h>
+
+#define _SV_SALTIMER_CXX
+
+#ifndef _SV_SALDATA_HXX
+#include <saldata.hxx>
+#endif
+#ifndef _SV_SALTIMER_H
+#include <saltimer.h>
+#endif
+#ifndef _SV_SALINST_H
+#include <salinst.h>
+#endif
+
+// =======================================================================
+
+// Maximale Periode
+#define MAX_SYSPERIOD     65533
+#define IDTIMER             10
+
+// =======================================================================
+
+void ImplSalStartTimer( ULONG nMS, BOOL bMutex )
+{
+    SalData*    pSalData = GetSalData();
+
+    // Periode darf nicht zu gross sein, da OS2 2.11 mit USHORT arbeitet
+    // Remenber the time of the timer
+    pSalData->mnTimerMS = nMS;
+    if ( !bMutex )
+        pSalData->mnTimerOrgMS = nMS;
+
+    // Periode darf nicht zu gross sein, da Windows mit USHORT arbeitet
+    if ( nMS > MAX_SYSPERIOD )
+        nMS = MAX_SYSPERIOD;
+
+    // Gibt es einen Timer, dann zerstoren
+    if ( pSalData->mnTimerId )
+        WinStopTimer( pSalData->mhAB, pSalData->mpFirstInstance->mhComWnd, pSalData->mnTimerId );
+
+    // Make a new timer with new period
+    pSalData->mnTimerId = WinStartTimer( pSalData->mhAB, pSalData->mpFirstInstance->mhComWnd, IDTIMER, nMS );
+    pSalData->mnNextTimerTime = pSalData->mnLastEventTime + nMS;
+}
+
+// -----------------------------------------------------------------------
+
+Os2SalTimer::~Os2SalTimer()
+{
+}
+
+// -----------------------------------------------------------------------
+
+void Os2SalTimer::Start( ULONG nMS )
+{
+    // Um auf Main-Thread umzuschalten
+    SalData* pSalData = GetSalData();
+    if ( pSalData->mpFirstInstance )
+    {
+        if ( pSalData->mnAppThreadId != GetCurrentThreadId() )
+            WinPostMsg( pSalData->mpFirstInstance->mhComWnd, SAL_MSG_STARTTIMER, 0, (MPARAM)nMS );
+        else
+            WinSendMsg( pSalData->mpFirstInstance->mhComWnd, SAL_MSG_STARTTIMER, 0, (MPARAM)nMS );
+    }
+    else
+        ImplSalStartTimer( nMS, FALSE);
+}
+
+// -----------------------------------------------------------------------
+
+void Os2SalTimer::Stop()
+{
+    SalData*    pSalData = GetSalData();
+
+    // Exitstiert ein Timer, dann diesen zerstoeren
+    if ( pSalData->mnTimerId ) {
+        WinStopTimer( pSalData->mhAB, pSalData->mpFirstInstance->mhComWnd, pSalData->mnTimerId );
+        pSalData->mnTimerId = 0;
+        pSalData->mnNextTimerTime = 0;
+    }
+}
+
+// -----------------------------------------------------------------------
+
+void SalTimerProc( HWND, UINT, UINT nId, ULONG )
+{
+    SalData* pSalData = GetSalData();
+    ImplSVData* pSVData = ImplGetSVData();
+
+    // Test for MouseLeave
+    SalTestMouseLeave();
+
+    bool bRecursive = pSalData->mbInTimerProc && (nId != SALTIMERPROC_RECURSIVE);
+    if ( pSVData->mpSalTimer && ! bRecursive )
+    {
+        // Try to aquire the mutex. If we don't get the mutex then we
+        // try this a short time later again.
+        if ( ImplSalYieldMutexTryToAcquire() )
+        {
+            bRecursive = pSalData->mbInTimerProc && (nId != SALTIMERPROC_RECURSIVE);
+            if ( pSVData->mpSalTimer && ! bRecursive )
+            {
+                pSalData->mbInTimerProc = TRUE;
+                pSVData->mpSalTimer->CallCallback();
+                pSalData->mbInTimerProc = FALSE;
+                ImplSalYieldMutexRelease();
+
+                // Run the timer in the correct time, if we start this
+                // with a small timeout, because we don't get the mutex
+                if ( pSalData->mnTimerId &&
+                    (pSalData->mnTimerMS != pSalData->mnTimerOrgMS) )
+                    ImplSalStartTimer( pSalData->mnTimerOrgMS, FALSE );
+            }
+        }
+        else
+            ImplSalStartTimer( 10, TRUE );
+    }
+
+}
+
diff --git a/vcl/os2/source/gdi/makefile.mk b/vcl/os2/source/gdi/makefile.mk
new file mode 100644
index 000000000000..c61c617724c6
--- /dev/null
+++ b/vcl/os2/source/gdi/makefile.mk
@@ -0,0 +1,95 @@
+#*************************************************************************
+#
+#   $RCSfile: makefile.mk,v $
+#
+#   $Revision: 1.3 $
+#
+#   last change: $Author: vg $ $Date: 2007-09-20 16:06:48 $
+#
+#   The Contents of this file are made available subject to the terms of
+#   either of the following licenses
+#
+#          - GNU Lesser General Public License Version 2.1
+#          - Sun Industry Standards Source License Version 1.1
+#
+#   Sun Microsystems Inc., October, 2000
+#
+#   GNU Lesser General Public License Version 2.1
+#   =============================================
+#   Copyright 2000 by Sun Microsystems, Inc.
+#   901 San Antonio Road, Palo Alto, CA 94303, USA
+#
+#   This library is free software; you can redistribute it and/or
+#   modify it under the terms of the GNU Lesser General Public
+#   License version 2.1, as published by the Free Software Foundation.
+#
+#   This library is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#   Lesser General Public License for more details.
+#
+#   You should have received a copy of the GNU Lesser General Public
+#   License along with this library; if not, write to the Free Software
+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+#   MA  02111-1307  USA
+#
+#
+#   Sun Industry Standards Source License Version 1.1
+#   =================================================
+#   The contents of this file are subject to the Sun Industry Standards
+#   Source License Version 1.1 (the "License"); You may not use this file
+#   except in compliance with the License. You may obtain a copy of the
+#   License at http://www.openoffice.org/license.html.
+#
+#   Software provided under this License is provided on an "AS IS" basis,
+#   WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+#   WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
+#   MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
+#   See the License for the specific provisions governing your rights and
+#   obligations concerning the Software.
+#
+#   The Initial Developer of the Original Code is: Sun Microsystems, Inc.
+#
+#   Copyright: 2000 by Sun Microsystems, Inc.
+#
+#   All Rights Reserved.
+#
+#   Contributor(s): _______________________________________
+#
+#
+#
+#*************************************************************************
+
+PRJ=..$/..$/..
+
+PRJNAME=SV
+TARGET=salgdi
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE :  svpre.mk
+.INCLUDE :  settings.mk
+.INCLUDE :  sv.mk
+
+# --- Files --------------------------------------------------------
+
+YD00_CXXFILES=   salgdi.cxx          \
+            salgdi2.cxx         \
+            salgdi3.cxx         \
+            salvd.cxx           \
+            salprn.cxx          \
+            salbmp.cxx			\
+            salogl.cxx			
+
+SLOFILES=   $(SLO)$/salgdi.obj   \
+            $(SLO)$/salgdi2.obj  \
+            $(SLO)$/salgdi3.obj  \
+            $(SLO)$/salvd.obj    \
+            $(SLO)$/salprn.obj   \
+            $(SLO)$/salbmp.obj	 \
+            $(SLO)$/salogl.obj	 \
+            $(SLO)$/os2layout.obj
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE :  target.mk