linux: Adding events to windowless plugins on Linux

third_party/npapi/bindings/npapi.h

 /* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
  *
  * Software distributed under the License is distributed on an "AS IS" basis,
@@ skipping 89 matching lines @@
 
 #       ifndef XP_WIN
 #               define XP_WIN 1
 #       endif /* XP_WIN */
 #endif /* _WINDOWS */
 
 // BEGIN GOOGLE MODIFICATIONS
 // On Linux and Mac, be sure to set Mozilla-specific macros.
 #if defined(OS_LINUX)
 #define XP_UNIX 1
+#define MOZ_X11 1
 #elif defined(OS_MACOSX)
 #ifndef XP_MACOSX
 #define XP_MACOSX 1
 #endif
 #endif
 // END GOOGLE MODIFICATIONS
 
 #ifdef __MWERKS__
 #       define _declspec __declspec
 #       ifdef __INTEL__
 #               undef NULL
 #               ifndef XP_WIN
 #                       define XP_WIN 1
 #               endif /* XP_WIN */
 #       endif /* __INTEL__ */
 #endif /* __MWERKS__ */
 
 #ifdef XP_MACOSX
 #include <Carbon/Carbon.h>
 #ifdef __LP64__
 #define NP_NO_QUICKDRAW
 #endif
 #endif
 
 #if defined(XP_UNIX) 
 #       include <stdio.h>
+// BEGIN GOOGLE MODIFICATIONS
+#if 0
+// END GOOGLE MODIFICATIONS
 #       if defined(MOZ_X11)
 #               include <X11/Xlib.h>
 #               include <X11/Xutil.h>
 #       endif
+// BEGIN GOOGLE MODIFICATIONS
+#endif
+// END GOOGLE MODIFICATIONS
 #endif
 
 /*----------------------------------------------------------------------*/
 /*                        Plugin Version Constants                      */
 /*----------------------------------------------------------------------*/
 
 #define NP_VERSION_MAJOR 0
 #define NP_VERSION_MINOR 19
 
 
@@ skipping 184 matching lines @@
 enum {
   NP_SETWINDOW = 1,
   NP_PRINT
 };
 
 typedef struct
 {
   int32 type;
 } NPAnyCallbackStruct;
 
-typedef struct
-{
-  int32        type;
-#ifdef MOZ_X11
-  Display*     display;
-  Visual*      visual;
-  Colormap     colormap;
-  unsigned int depth;
-#endif
-} NPSetWindowCallbackStruct;
+// BEGIN GOOGLE MODIFICATIONS
+typedef struct _NPSetWindowCallbackStruct NPSetWindowCallbackStruct;
+// END GOOGLE MODIFICATIONS
 
 typedef struct
 {
   int32 type;
   FILE* fp;
 } NPPrintCallbackStruct;
 
 #endif /* XP_UNIX */
 
 
@@ skipping 193 matching lines @@
   uint32 lParam;
 } NPEvent;
 #elif defined(XP_OS2)
 typedef struct _NPEvent
 {
   uint32 event;
   uint32 wParam;
   uint32 lParam;
 } NPEvent;
 #elif defined (XP_UNIX) && defined(MOZ_X11)
+// BEGIN GOOGLE MODIFICATIONS
+typedef union _XEvent XEvent;
+// END GOOGLE MODIFICATIONS
 typedef XEvent NPEvent;
 #else
 typedef void*                   NPEvent;
 #endif /* XP_MACOSX */
 
 #ifdef XP_MACOSX
 typedef void* NPRegion;
 #ifndef NP_NO_QUICKDRAW
 typedef RgnHandle NPQDRegion;
 #endif
 typedef CGPathRef NPCGRegion;
 #elif defined(XP_WIN)
 typedef HRGN NPRegion;
 #elif defined(XP_UNIX) && defined(MOZ_X11)
+// BEGIN GOOGLE MODIFICATIONS
+typedef struct _XRegion *Region;
+// END GOOGLE MODIFICATIONS
 typedef Region NPRegion;
 #else
 typedef void *NPRegion;
 #endif /* XP_MACOSX */
 
 #ifdef XP_MACOSX
 /*
  *  Mac-specific structures and definitions.
  */
 
@@ skipping 201 matching lines @@
 #ifdef __cplusplus
 }  /* end extern "C" */
 #endif
 
 #endif /* RC_INVOKED */
 #ifdef __OS2__
 #pragma pack()
 #endif
 
 #endif /* _NPAPI_H_ */