From: Jay Freeman (saurik) <saurik@saurik.com>
Date: Fri, 12 Sep 2008 21:19:04 +0000 (+0000)
Subject: Merge branch 'master' of git@git.saurik.com:iphone-api
X-Git-Url: https://git.saurik.com/iphone-api.git/commitdiff_plain/415897ee6b490ac9ff21363c6d87e4cf03266d48?ds=inline;hp=-c

Merge branch 'master' of git@git.saurik.com:iphone-api
---

415897ee6b490ac9ff21363c6d87e4cf03266d48
diff --combined GraphicsServices/GraphicsServices.h
index a855fee,f880b0a..4550a2f
--- a/GraphicsServices/GraphicsServices.h
+++ b/GraphicsServices/GraphicsServices.h
@@@ -40,20 -40,18 +40,21 @@@
  
  #include <mach/port.h>
  #include <CoreGraphics/CGGeometry.h>
+ #include <GraphicsServices/GSWindow.h>
  
  #ifdef __cplusplus
  extern "C" {
  #endif
  
  struct GSPathInfo {
 -    /*0x00*/ uint32_t x00;
 -    /*0x04*/ uint32_t x04;
 -    /*0x08*/ uint32_t x08;
 -    /*0x0c*/ CGPoint position;
 -    /*0x14*/ uint32_t x14;
 +    /*0x00:13c*/ uint8_t x00; // key
 +    /*0x01:13d*/ uint8_t x01;
 +    /*0x02:13e*/ uint8_t x02; // 2=no
 +    /*0x03:13f*/ uint8_t x03;
 +    /*0x04:140*/ uint32_t x04;
 +    /*0x08:144*/ uint32_t x08;
 +    /*0x0c:148*/ CGPoint position;
 +    /*0x14:14c*/ uint32_t x14;
  };
  
  struct GSEventRecord {
@@@ -69,13 -67,6 +70,13 @@@
      /*0x2c:34*/ uint32_t size;
  };
  
 +struct GSEventKeyInfo {
 +    /*0x30:38*/ uint32_t type;
 +    /*0x34:3c*/ uint16_t character;
 +    /*0x38:3e*/ uint16_t characterSet;
 +    /*0x3a:40*/ uint8_t keyRepeating;
 +};
 +
  struct GSEventHandInfo {
      /*0x30:38:00:5c*/ uint32_t type;
      /*0x34:3c:04:60*/ uint16_t x34;
@@@ -167,7 -158,7 +168,7 @@@ mach_port_name_t GSGetPurpleNamedPort(C
  uint64_t GSCurrentEventTimestamp(void);
  void GSSendSystemEvent(struct GSEventRecord *record);
  void GSSendEvent(struct GSEventRecord *record, mach_port_name_t port);
- GSPathInfo GSEventGetPathInfoAtIndex(GSEventRef event, unsigned index);
+ struct GSPathInfo GSEventGetPathInfoAtIndex(GSEventRef event, unsigned index);
  
  #ifdef __cplusplus
  }