Print this page
Added gradle and cmake project

Split Close
Expand all
Collapse all
          --- old/src/java.desktop/macosx/native/libawt_lwawt/awt/AWTView.m
          +++ new/src/java.desktop/macosx/native/libawt_lwawt/awt/AWTView.m
↓ open down ↓ 29 lines elided ↑ open up ↑
  30   30  #import "JavaComponentAccessibility.h"
  31   31  #import "JavaTextAccessibility.h"
  32   32  #import "JavaAccessibilityUtilities.h"
  33   33  #import "GeomUtilities.h"
  34   34  #import "OSVersion.h"
  35   35  #import "ThreadUtilities.h"
  36   36  
  37   37  #import <Carbon/Carbon.h>
  38   38  #import <JavaNativeFoundation/JavaNativeFoundation.h>
  39   39  
       40 +jboolean metalEnabled = JNI_FALSE;
       41 +
  40   42  @interface AWTView()
  41   43  @property (retain) CDropTarget *_dropTarget;
  42   44  @property (retain) CDragSource *_dragSource;
  43   45  
  44   46  -(void) deliverResize: (NSRect) rect;
  45   47  -(void) resetTrackingArea;
  46   48  -(void) deliverJavaKeyEventHelper: (NSEvent*) event;
  47   49  -(BOOL) isCodePointInUnicodeBlockNeedingIMEvent: (unichar) codePoint;
  48   50  -(NSMutableString *) parseString : (id) complexString;
  49   51  @end
  50   52  
  51   53  // Uncomment this line to see fprintfs of each InputMethod API being called on this View
  52   54  //#define IM_DEBUG TRUE
  53   55  //#define EXTRA_DEBUG
  54   56  
       57 +#define METAL_DEBUG
       58 +
  55   59  static BOOL shouldUsePressAndHold() {
  56   60      static int shouldUsePressAndHold = -1;
  57   61      if (shouldUsePressAndHold != -1) return shouldUsePressAndHold;
  58   62      shouldUsePressAndHold = !isSnowLeopardOrLower();
  59   63      return shouldUsePressAndHold;
  60   64  }
  61   65  
  62   66  @implementation AWTView
  63   67  
  64   68  @synthesize _dropTarget;
↓ open down ↓ 1426 lines elided ↑ open up ↑
1491 1495      [ThreadUtilities performOnMainThreadWaiting:YES block:^(){
1492 1496          NSPoint ptWindowCoords = [[nsView window] mouseLocationOutsideOfEventStream];
1493 1497          NSPoint ptViewCoords = [nsView convertPoint:ptWindowCoords fromView:nil];
1494 1498          underMouse = [nsView hitTest:ptViewCoords] != nil;
1495 1499      }];
1496 1500  
1497 1501      JNF_COCOA_EXIT(env);
1498 1502  
1499 1503      return underMouse;
1500 1504  }
     1505 +
     1506 +jboolean GetStaticBoolean(JNIEnv *env, jclass fClass, const char *fieldName)
     1507 +{
     1508 +    jfieldID fieldID = (*env)->GetStaticFieldID(env, fClass, fieldName, "Z");
     1509 +    return (*env)->GetStaticBooleanField(env, fClass, fieldID);
     1510 +}
     1511 +
     1512 +JNIEXPORT void JNICALL
     1513 +Java_sun_java2d_macos_MacOSFlags_initNativeFlags(JNIEnv *env,
     1514 +                                                     jclass flagsClass)
     1515 +{
     1516 +  metalEnabled = GetStaticBoolean(env, flagsClass, "metalEnabled");
     1517 +#ifdef METAL_DEBUG
     1518 +  fprintf(stderr, "metalEnabled=%d\n", metalEnabled);
     1519 +#endif
     1520 +}
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX