src/java.desktop/unix/native/libawt_xawt/xawt/XToolkit.c

*** 1,7 ****
  /*
!  * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
--- 1,7 ----
  /*
!  * Copyright (c) 2002, 2016, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
*** 120,134 ****
   * Signature: ()J
   */
  JNIEXPORT jlong JNICALL Java_sun_awt_X11_XToolkit_getTrayIconDisplayTimeout
    (JNIEnv *env, jclass clazz)
  {
- #ifndef JAVASE_EMBEDDED
      return (jlong) 2000;
- #else
-     return (jlong) 10000;
- #endif
  }
  
  /*
   * Class:     sun_awt_X11_XToolkit
   * Method:    getDefaultXColormap
--- 120,130 ----
*** 367,382 ****
  
  #define AWT_POLL_BUFSIZE        100 /* bytes */
  #define AWT_READPIPE            (awt_pipe_fds[0])
  #define AWT_WRITEPIPE           (awt_pipe_fds[1])
  
! #ifdef JAVASE_EMBEDDED
!   #define DEF_AWT_MAX_POLL_TIMEOUT ((uint32_t)4000000000) /* milliseconds */
! #else
!   #define DEF_AWT_MAX_POLL_TIMEOUT ((uint32_t)500) /* milliseconds */
! #endif
! 
  #define DEF_AWT_FLUSH_TIMEOUT ((uint32_t)100) /* milliseconds */
  #define AWT_MIN_POLL_TIMEOUT ((uint32_t)0) /* milliseconds */
  
  #define TIMEOUT_TIMEDOUT 0
  #define TIMEOUT_EVENTS 1
--- 363,373 ----
  
  #define AWT_POLL_BUFSIZE        100 /* bytes */
  #define AWT_READPIPE            (awt_pipe_fds[0])
  #define AWT_WRITEPIPE           (awt_pipe_fds[1])
  
! #define DEF_AWT_MAX_POLL_TIMEOUT ((uint32_t)500) /* milliseconds */
  #define DEF_AWT_FLUSH_TIMEOUT ((uint32_t)100) /* milliseconds */
  #define AWT_MIN_POLL_TIMEOUT ((uint32_t)0) /* milliseconds */
  
  #define TIMEOUT_TIMEDOUT 0
  #define TIMEOUT_EVENTS 1
*** 389,403 ****
  #define AWT_POLL_THRESHOLD 1000  // msec, Block if delay is larger
  #define AWT_POLL_BLOCK       -1  // cause poll() block
  
  // Static fields
  
! #ifdef JAVASE_EMBEDDED
!   static int          awt_poll_alg = AWT_POLL_AGING_FAST;
! #else
!   static int          awt_poll_alg = AWT_POLL_AGING_SLOW;
! #endif
  
  static uint32_t AWT_FLUSH_TIMEOUT  =  DEF_AWT_FLUSH_TIMEOUT; /* milliseconds */
  static uint32_t AWT_MAX_POLL_TIMEOUT = DEF_AWT_MAX_POLL_TIMEOUT; /* milliseconds */
  static pthread_t    awt_MainThread = 0;
  static int32_t      awt_pipe_fds[2];                   /* fds for wkaeup pipe */
--- 380,390 ----
  #define AWT_POLL_THRESHOLD 1000  // msec, Block if delay is larger
  #define AWT_POLL_BLOCK       -1  // cause poll() block
  
  // Static fields
  
! static int          awt_poll_alg = AWT_POLL_AGING_SLOW;
  
  static uint32_t AWT_FLUSH_TIMEOUT  =  DEF_AWT_FLUSH_TIMEOUT; /* milliseconds */
  static uint32_t AWT_MAX_POLL_TIMEOUT = DEF_AWT_MAX_POLL_TIMEOUT; /* milliseconds */
  static pthread_t    awt_MainThread = 0;
  static int32_t      awt_pipe_fds[2];                   /* fds for wkaeup pipe */