mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-02-04 03:40:07 +00:00
Code Activity

Fixed a minor AU build error and removed some old macros.

Browse source
This commit is contained in:
Julian Storer 2010-03-10 13:04:24 +00:00
parent 5419ebc520
commit 858a758aee
24 changed files with 1037 additions and 1172 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/native/linux/juce_linux_Files.cpp
View file

@ -27,11 +27,10 @@
// compiled on its own).
#if JUCE_INCLUDED_FILE
#define U_ISOFS_SUPER_MAGIC (short) 0x9660 // linux/iso_fs.h
#define U_MSDOS_SUPER_MAGIC (short) 0x4d44 // linux/msdos_fs.h
#define U_NFS_SUPER_MAGIC (short) 0x6969 // linux/nfs_fs.h
#define U_SMB_SUPER_MAGIC (short) 0x517B // linux/smb_fs.h
static const short U_ISOFS_SUPER_MAGIC = 0x9660; // linux/iso_fs.h
static const short U_MSDOS_SUPER_MAGIC = 0x4d44; // linux/msdos_fs.h
static const short U_NFS_SUPER_MAGIC = 0x6969; // linux/nfs_fs.h
static const short U_SMB_SUPER_MAGIC = 0x517B; // linux/smb_fs.h
//==============================================================================
void juce_getFileTimes (const String& fileName,

23
src/native/linux/juce_linux_Fonts.cpp
View file

@ -296,9 +296,6 @@ public:
const float scaleY = -1.0f / height;
Path destShape;
#define CONVERTX(val) (scaleX * (val).x)
#define CONVERTY(val) (scaleY * (val).y)
if (FT_Load_Glyph (face, glyphIndex, FT_LOAD_NO_SCALE | FT_LOAD_NO_BITMAP | FT_LOAD_IGNORE_TRANSFORM) != 0
|| face->glyph->format != ft_glyph_format_outline)
{
@ -317,15 +314,15 @@ public:
for (int p = startPoint; p <= endPoint; p++)
{
const float x = CONVERTX (points[p]);
const float y = CONVERTY (points[p]);
const float x = scaleX * points[p].x;
const float y = scaleY * points[p].y;
if (p == startPoint)
{
if (FT_CURVE_TAG (tags[p]) == FT_Curve_Tag_Conic)
{
float x2 = CONVERTX (points [endPoint]);
float y2 = CONVERTY (points [endPoint]);
float x2 = scaleX * points [endPoint].x;
float y2 = scaleY * points [endPoint].y;
if (FT_CURVE_TAG (tags[endPoint]) != FT_Curve_Tag_On)
{
@ -349,8 +346,8 @@ public:
else if (FT_CURVE_TAG (tags[p]) == FT_Curve_Tag_Conic)
{
const int nextIndex = (p == endPoint) ? startPoint : p + 1;
float x2 = CONVERTX (points [nextIndex]);
float y2 = CONVERTY (points [nextIndex]);
float x2 = scaleX * points [nextIndex].x;
float y2 = scaleY * points [nextIndex].y;
if (FT_CURVE_TAG (tags [nextIndex]) == FT_Curve_Tag_Conic)
{
@ -372,10 +369,10 @@ public:
const int next1 = p + 1;
const int next2 = (p == (endPoint - 1)) ? startPoint : p + 2;
const float x2 = CONVERTX (points [next1]);
const float y2 = CONVERTY (points [next1]);
const float x3 = CONVERTX (points [next2]);
const float y3 = CONVERTY (points [next2]);
const float x2 = scaleX * points [next1].x;
const float y2 = scaleY * points [next1].y;
const float x3 = scaleX * points [next2].x;
const float y3 = scaleY * points [next2].y;
if (FT_CURVE_TAG (tags[next1]) != FT_Curve_Tag_Cubic
|| FT_CURVE_TAG (tags[next2]) != FT_Curve_Tag_On)

46
src/native/linux/juce_linux_Messaging.cpp
View file

@ -35,22 +35,10 @@
Display* display = 0; // This is also referenced from WindowDriver.cpp
Window juce_messageWindowHandle = None;
#define SpecialAtom "JUCESpecialAtom"
#define BroadcastAtom "JUCEBroadcastAtom"
#define SpecialCallbackAtom "JUCESpecialCallbackAtom"
XContext improbableNumber; // This is referenced from Windowing.cpp
static Atom specialId;
static Atom broadcastId;
static Atom specialCallbackId;
// This is referenced from Windowing.cpp
XContext improbableNumber;
// Defined in Windowing.cpp
extern void juce_windowMessageReceive (XEvent* event);
// Defined in Clipboard.cpp
extern void juce_handleSelectionRequest (XSelectionRequestEvent &evt);
extern void juce_windowMessageReceive (XEvent* event); // Defined in Windowing.cpp
extern void juce_handleSelectionRequest (XSelectionRequestEvent &evt); // Defined in Clipboard.cpp
//==============================================================================
ScopedXLock::ScopedXLock() { XLockDisplay (display); }
@ -290,11 +278,6 @@ void MessageManager::doPlatformSpecificInitialisation()
Window root = RootWindow (display, screen);
Visual* visual = DefaultVisual (display, screen);
// Create atoms for our ClientMessages (these cannot be deleted)
specialId = XInternAtom (display, SpecialAtom, false);
broadcastId = XInternAtom (display, BroadcastAtom, false);
specialCallbackId = XInternAtom (display, SpecialCallbackAtom, false);
// Create a context to store user data associated with Windows we
// create in WindowDriver
improbableNumber = XUniqueContext();
@ -340,29 +323,6 @@ bool juce_postMessageToSystemQueue (void* message)
return true;
}
/*bool juce_postMessageToX11Queue (void *message)
{
XClientMessageEvent clientMsg;
clientMsg.display = display;
clientMsg.window = juce_messageWindowHandle;
clientMsg.type = ClientMessage;
clientMsg.format = 32;
clientMsg.message_type = specialId;
#if JUCE_64BIT
clientMsg.data.l[0] = (long) (0x00000000ffffffff & (((uint64) message) >> 32));
clientMsg.data.l[1] = (long) (0x00000000ffffffff & (long) message);
#else
clientMsg.data.l[0] = (long) message;
#endif
XSendEvent (display, juce_messageWindowHandle, false,
NoEventMask, (XEvent*) &clientMsg);
XFlush (display); // This is necessary to ensure the event is delivered
return true;
}*/
void MessageManager::broadcastMessage (const String& value) throw()
{
/* TODO */