GraphicsServices: fixed __cplusplus, added _GSEventGetGSEventRecord, organizined...

diff --git a/GraphicsServices/GSFont.h b/GraphicsServices/GSFont.h
new file mode 100644 (file)
index 0000000..2e93391
--- /dev/null
+++ b/GraphicsServices/GSFont.h
@@ -0,0 +1,25 @@
+#ifndef GRAPHICSSERVICES_GSFONT_H_
+#define GRAPHICSSERVICES_GSFONT_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+enum {
+    kGSFontItalicTrait    = (1 <<  0),
+    kGSFontBoldTrait      = (1 <<  1),
+    kGSFontExpandedTrait  = (1 <<  5),
+    kGSFontCondensedTrait = (1 <<  6),
+    kGSFontMonoSpaceTrait = (1 << 10),
+    kGSFontVerticalTrait  = (1 << 11),
+}; typedef uint32_t GSFontSymbolicTraits;
+
+typedef struct __GSFont *GSFontRef;
+
+GSFontRef GSFontCreateWithName(const char *name, GSFontSymbolicTraits traits, float size);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif/*GRAPHICSSERVICES_GSFONT_H_*/

diff --git a/GraphicsServices/GSWindow.h b/GraphicsServices/GSWindow.h
index d5a10ea9107bbfb4e5b5e9bd6c5a7250ebbb12fa..9d966976f883950d4071b579ddecf139568c5618 100644 (file)
--- a/GraphicsServices/GSWindow.h
+++ b/GraphicsServices/GSWindow.h
@@ -38,13 +38,13 @@
 #ifndef GRAPHICSSERVICS_GSWINDOW_H_
 #define GRAPHICSSERVICS_GSWINDOW_H_
 
-#ifdef __plusplus
+#ifdef __cplusplus
 extern "C" {
 #endif
 
 typedef struct __GSWindow *GSWindowRef;
 
-#ifdef __plusplus
+#ifdef __cplusplus
 }
 #endif
 

diff --git a/GraphicsServices/GraphicsServices.h b/GraphicsServices/GraphicsServices.h
index c23c21dbf5cbcdc6d56f1a4d00a24834d5911c21..c4c349ff857652a6bb07306429ec2b76711ff7e2 100644 (file)
--- a/GraphicsServices/GraphicsServices.h
+++ b/GraphicsServices/GraphicsServices.h
@@ -41,9 +41,9 @@
 #include <mach/port.h>
 #import <CoreFoundation/CoreFoundation.h>
 #include <CoreGraphics/CGGeometry.h>
-#include <GraphicsServices/GSWindow.h>
 
-typedef struct __GSFont *GSFontRef;
+#include <GraphicsServices/GSFont.h>
+#include <GraphicsServices/GSWindow.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -88,6 +88,12 @@ struct GSEventHandInfo {
     /*0x40:48:10:70*/ uint32_t x40; //handInfoScale scales
 };
 
+struct GSEventApplicationInfo {
+    /*0x30:00*/ uint32_t pid;
+    /*0x34:04*/ uint32_t x34;
+    /*0x38:08*/ char name[];
+};
+
 struct GSEventRecordInfo {
     /*0x30:38:00:5c*/ struct GSEventHandInfo handInfo;
     /*0x44:4c:14:74*/ uint32_t x44;
@@ -168,11 +174,12 @@ typedef struct __GSEvent *GSEventRef;
 mach_port_name_t GSCopyPurpleSystemEventPort(void);
 uint64_t GSCurrentEventTimestamp(void);
 struct GSEventHandInfo GSEventGetHandInfo(GSEventRef event);
-struct CGRect GSEventGetLocationInWindow(GSEventRef ev);
+struct CGRect GSEventGetLocationInWindow(GSEventRef event);
 struct GSPathInfo GSEventGetPathInfoAtIndex(GSEventRef event, unsigned index);
 mach_port_name_t GSGetPurpleNamedPort(CFStringRef name);
 void GSSendEvent(struct GSEventRecord *record, mach_port_name_t port);
 void GSSendSystemEvent(struct GSEventRecord *record);
+struct GSEventRecord *_GSEventGetGSEventRecord(GSEventRef event);
 
 CFArrayRef GSSystemGetCapability(CFStringRef type);
 extern CFStringRef const kGSDisplayIdentifiersCapability;