Changeset 377 for trunk/icedtea-web/plugin/icedteanp/os2

Timestamp:

Jun 5, 2012, 9:51:10 AM (13 years ago)

Author:

dmik

Message:

icedtea-web: Wrap OS/2 HWND in WinOS2 HWND.

Java expects WinOS2 HWNDs while the plugin gets the OS/2 HWND
from the browser.

This commit also includes some source file reorganization (for clarity).

Location:

trunk/icedtea-web/plugin/icedteanp/os2

Files:

• OS_OS2.cc (moved) (moved from trunk/icedtea-web/extra/OS.cc ) (2 diffs)
• OS_OS2.h (moved) (moved from trunk/icedtea-web/extra/OS.h ) (2 diffs)
• OS_OS2_WinOS2.cc (added)
• OS_OS2_WinOS2.h (added)

trunk/icedtea-web/plugin/icedteanp/os2/OS_OS2.cc

@@ -1 @@
-/* OS.cc
+/* OS_OS2.cc
 
    Copyright (C) 2009, 2010  Red Hat
@@ -37 +37 @@
 exception statement from your version. */
 
+#define INCL_DOS
+#define INCL_PM
+#include <os2.h>
+
 #include <stdlib.h>
 
-#include "OS.h"
-
-#ifdef __OS2__
+#include "OS_OS2.h"
+#include "OS_OS2_WinOS2.h"
 
 const char *icedtea_web_data_dir()
 {
-  const char *home = getenv("ICEDTEA_WEB_DATA");
-  if (!home)
-    home = ICEDTEA_WEB_DATA_DIR;
-  return home;
+    const char *home = getenv("ICEDTEA_WEB_DATA");
+    if (!home)
+        home = ICEDTEA_WEB_DATA_DIR;
+    return home;
 }
 
 const char *icedtea_web_jre_dir()
 {
-  const char *jre = getenv("ICEDTEA_WEB_JRE");
-  if (!jre)
-    jre = ICEDTEA_WEB_JRE_DIR;
-  return jre;
+    const char *jre = getenv("ICEDTEA_WEB_JRE");
+    if (!jre)
+        jre = ICEDTEA_WEB_JRE_DIR;
+    return jre;
 }
 
-#endif // __OS2__
+bool init_os()
+{
+    return init_os_winos2();
+}

trunk/icedtea-web/plugin/icedteanp/os2/OS_OS2.h

@@ -1 @@
-/* OS.h
+/* OS_OS2.h
 
    Copyright (C) 2009, 2010  Red Hat
@@ -37 +37 @@
 exception statement from your version. */
 
-#ifndef __OS_H__
-#define __OS_H__
+#ifndef __OS_OS2_H__
+#define __OS_OS2_H__
 
-#ifdef __OS2__
 const char *icedtea_web_data_dir();
 const char *icedtea_web_jre_dir();
-#endif
 
-#endif // __OS_H__
+bool init_os();
+
+void *wrap_window_handle (void *handle);
+
+#endif // __OS_OS2_H__