Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adding files to create 'styl' from script runs,

Browse Source 
bug 163908, r=pink, sr=sfraser.


git-svn-id: svn://10.0.0.236/trunk@128513 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
nhotta%netscape.com
2002-08-30 01:22:43 +00:00
parent ab7a102ccf
commit ad71eabff6
4 changed files with 202 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
mozilla/widget/macbuild/widget.xml
View File

@@ -1311,6 +1311,13 @@
<FILEKIND>Text</FILEKIND>
<FILEFLAGS>Debug</FILEFLAGS>
</FILE>
<FILE>
<PATHTYPE>Name</PATHTYPE>
<PATH>nsStylClipboardUtils.cpp</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
<FILEKIND>Text</FILEKIND>
<FILEFLAGS>Debug</FILEFLAGS>
</FILE>
<FILE>
<PATHTYPE>Name</PATHTYPE>
<PATH>WidgetSupportDebug.shlb</PATH>
@@ -1597,6 +1604,11 @@
<PATH>nsMacNativeUnicodeConverter.cpp</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
</FILEREF>
<FILEREF>
<PATHTYPE>Name</PATHTYPE>
<PATH>nsStylClipboardUtils.cpp</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
</FILEREF>
<FILEREF>
<PATHTYPE>Name</PATHTYPE>
<PATH>WidgetSupportDebug.shlb</PATH>
@@ -2862,6 +2874,13 @@
<FILEKIND>Text</FILEKIND>
<FILEFLAGS>Debug</FILEFLAGS>
</FILE>
<FILE>
<PATHTYPE>Name</PATHTYPE>
<PATH>nsStylClipboardUtils.cpp</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
<FILEKIND>Text</FILEKIND>
<FILEFLAGS>Debug</FILEFLAGS>
</FILE>
<FILE>
<PATHTYPE>Name</PATHTYPE>
<PATH>WidgetSupport.shlb</PATH>
@@ -3148,6 +3167,11 @@
<PATH>nsMacNativeUnicodeConverter.cpp</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
</FILEREF>
<FILEREF>
<PATHTYPE>Name</PATHTYPE>
<PATH>nsStylClipboardUtils.cpp</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
</FILEREF>
<FILEREF>
<PATHTYPE>Name</PATHTYPE>
<PATH>WidgetSupport.shlb</PATH>
@@ -4399,6 +4423,13 @@
<FILEKIND>Text</FILEKIND>
<FILEFLAGS>Debug</FILEFLAGS>
</FILE>
<FILE>
<PATHTYPE>Name</PATHTYPE>
<PATH>nsStylClipboardUtils.cpp</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
<FILEKIND>Text</FILEKIND>
<FILEFLAGS>Debug</FILEFLAGS>
</FILE>
<FILE>
<PATHTYPE>Name</PATHTYPE>
<PATH>WidgetSupportDebug.shlb</PATH>
@@ -4675,6 +4706,11 @@
<PATH>nsMacNativeUnicodeConverter.cpp</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
</FILEREF>
<FILEREF>
<PATHTYPE>Name</PATHTYPE>
<PATH>nsStylClipboardUtils.cpp</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
</FILEREF>
<FILEREF>
<PATHTYPE>Name</PATHTYPE>
<PATH>WidgetSupportDebug.shlb</PATH>
@@ -5926,6 +5962,13 @@
<FILEKIND>Text</FILEKIND>
<FILEFLAGS>Debug</FILEFLAGS>
</FILE>
<FILE>
<PATHTYPE>Name</PATHTYPE>
<PATH>nsStylClipboardUtils.cpp</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
<FILEKIND>Text</FILEKIND>
<FILEFLAGS>Debug</FILEFLAGS>
</FILE>
<FILE>
<PATHTYPE>Name</PATHTYPE>
<PATH>WidgetSupport.shlb</PATH>
@@ -6202,6 +6245,11 @@
<PATH>nsMacNativeUnicodeConverter.cpp</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
</FILEREF>
<FILEREF>
<PATHTYPE>Name</PATHTYPE>
<PATH>nsStylClipboardUtils.cpp</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
</FILEREF>
<FILEREF>
<PATHTYPE>Name</PATHTYPE>
<PATH>WidgetSupport.shlb</PATH>
@@ -6529,6 +6577,12 @@
<PATH>nsMacNativeUnicodeConverter.cpp</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
</FILEREF>
<FILEREF>
<TARGETNAME>widgetDebug.shlb</TARGETNAME>
<PATHTYPE>Name</PATHTYPE>
<PATH>nsStylClipboardUtils.cpp</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
</FILEREF>
</GROUP>
</GROUP>
<GROUP><NAME>Static Libs</NAME>

1
mozilla/widget/src/mac/Makefile.in
View File

@@ -87,6 +87,7 @@ CPPSRCS = nsAppShell.cpp \
nsWidgetSupport.cpp \
nsWindow.cpp \
nsMacNativeUnicodeConverter.cpp \
nsStylClipboardUtils.cpp \
$(GFX_LCPPSRCS) \
$(NULL)

109
mozilla/widget/src/mac/nsStylClipboardUtils.cpp Normal file
View File

@@ -0,0 +1,109 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* ***** BEGIN LICENSE BLOCK *****
* Version: MPL 1.1
*
* The contents of this file are subject to the Mozilla Public 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.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
* The Original Code is Mozilla.
*
* The Initial Developer of the Original Code is is Netscape
* Communications Corporation.
* Portions created by the Initial Developer are Copyright (C) 2002
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
*
* ***** END LICENSE BLOCK ***** */
#include "nsStylClipboardUtils.h"
#include "nsMemory.h"
#include "nsCarbonHelpers.h"
#include <Appearance.h>
nsresult CreateStylFromScriptRuns(ScriptCodeRun *scriptCodeRuns,
ItemCount scriptRunOutLen,
char **stylData,
PRInt32 *stylLen)
{
PRInt32 scrpRecLen = sizeof(short) + sizeof(ScrpSTElement) * scriptRunOutLen;
StScrpRec *scrpRec = NS_REINTERPRET_CAST(StScrpRec*,
nsMemory::Alloc(scrpRecLen));
NS_ENSURE_TRUE(scrpRec, NS_ERROR_OUT_OF_MEMORY);
OSErr err;
Str255 themeFontName;
SInt16 textSize;
Style textStyle;
short fontFamilyID;
FontInfo fontInfo;
RGBColor textColor;
textColor.red = textColor.green = textColor.blue = 0;
// save font settings
CGrafPtr curPort;
short saveFontFamilyID;
SInt16 saveTextSize;
Style saveTextStyle;
::GetPort((GrafPtr*)&curPort);
saveFontFamilyID = ::GetPortTextFont(curPort);
saveTextSize = ::GetPortTextSize(curPort);
saveTextStyle = ::GetPortTextFace(curPort);
scrpRec->scrpNStyles = scriptRunOutLen;
for (ItemCount i = 0; i < scriptRunOutLen; i++) {
scrpRec->scrpStyleTab[i].scrpStartChar = scriptCodeRuns[i].offset;
err = ::GetThemeFont(
#if TARGET_CARBON
kThemeApplicationFont,
#else
kThemeSystemFont,
#endif
scriptCodeRuns[i].script,
themeFontName,
&textSize,
&textStyle);
if (err != noErr)
break;
::GetFNum(themeFontName, &fontFamilyID);
::TextFont(fontFamilyID);
::TextSize(textSize);
::TextFace(textStyle);
::GetFontInfo(&fontInfo);
scrpRec->scrpStyleTab[i].scrpFont = fontFamilyID;
scrpRec->scrpStyleTab[i].scrpHeight = fontInfo.ascent +
fontInfo.descent +
fontInfo.leading;
scrpRec->scrpStyleTab[i].scrpAscent = fontInfo.ascent;
scrpRec->scrpStyleTab[i].scrpFace = textStyle;
scrpRec->scrpStyleTab[i].scrpSize = textSize;
scrpRec->scrpStyleTab[i].scrpColor = textColor;
}
// restore font settings
::TextFont(saveFontFamilyID);
::TextSize(saveTextSize);
::TextFace(saveTextStyle);
if (err != noErr) {
nsMemory::Free(scrpRec);
return NS_ERROR_FAILURE;
}
*stylData = NS_REINTERPRET_CAST(char*, scrpRec);
*stylLen = scrpRecLen;
return NS_OK;
}

38
mozilla/widget/src/mac/nsStylClipboardUtils.h Normal file
View File

@@ -0,0 +1,38 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* ***** BEGIN LICENSE BLOCK *****
* Version: MPL 1.1
*
* The contents of this file are subject to the Mozilla Public 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.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
* The Original Code is Mozilla.
*
* The Initial Developer of the Original Code is is Netscape
* Communications Corporation.
* Portions created by the Initial Developer are Copyright (C) 2002
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
*
* ***** END LICENSE BLOCK ***** */
#ifndef nsStylClipboardUtils_h___
#define nsStylClipboardUtils_h___
#include "prtypes.h"
#include "nscore.h"
#include <MacTypes.h>
nsresult CreateStylFromScriptRuns(ScriptCodeRun *scriptCodeRuns,
ItemCount scriptRunOutLen,
char **stylData,
PRInt32 *stylLen);
#endif // nsStylClipboardUtils_h___