2002/07/01 21:02:57

[org.ibex.core.git] / src / org / xwt / plat / POSIX.cc

diff --git a/src/org/xwt/plat/POSIX.cc b/src/org/xwt/plat/POSIX.cc
index 1f6f4ea..10580b2 100644 (file)
--- a/src/org/xwt/plat/POSIX.cc
+++ b/src/org/xwt/plat/POSIX.cc
@@ -408,7 +408,7 @@ void org::xwt::plat::POSIX$X11Surface::natInit() {
         KeyPressMask | KeyReleaseMask | ButtonPressMask |
         ButtonReleaseMask | EnterWindowMask | LeaveWindowMask |
         PointerMotionMask | ButtonMotionMask | ConfigureNotify | FocusChangeMask;
-    *((Window*)window) = XCreateWindow(display, RootWindow(display, screen_num), 10, 10, 500, 300, 0,
+    *((Window*)window) = XCreateWindow(display, RootWindow(display, screen_num), 10, 10, 10, 10, 0,
                                        colorDepth, InputOutput, CopyFromParent,
                                        CWColormap | CWBitGravity | CWEventMask, &xswa);
     
@@ -655,8 +655,12 @@ void org::xwt::plat::POSIX$X11Surface::syncCursor() {
 jint org::xwt::plat::POSIX::_getScreenWidth() { return WidthOfScreen(DefaultScreenOfDisplay(display)); }
 jint org::xwt::plat::POSIX::_getScreenHeight() { return HeightOfScreen(DefaultScreenOfDisplay(display)); }
 
-jstring org::xwt::plat::POSIX::getBrowserEnvString() {
-    char* envstr = getenv("BROWSER");
+jstring org::xwt::plat::POSIX::getEnv(jstring key) {
+    int len = JvGetStringUTFLength(key);
+    char buf[len + 1];
+    JvGetStringUTFRegion(key, 0, len, buf);
+    buf[len] = '\0';
+    char* envstr = getenv(buf);
     return envstr == NULL ? NULL : JvNewStringLatin1(envstr);
 }
 
@@ -767,7 +771,7 @@ void org::xwt::plat::POSIX::natInit() {
     selectionWindow = XCreateWindow(display, RootWindow(display, screen_num), 0, 0, 1, 1, 0, colorDepth, InputOutput, CopyFromParent, 0, NULL);
     visual = DefaultVisual(display, screen_num);
     char buf[255];
-    sprintf(buf, "X11 DISPLAY: %s", JvNewStringLatin1(XDisplayString(display)));
+    sprintf(buf, "X11 DISPLAY: %s", XDisplayString(display));
     org::xwt::util::Log::log(this->getClass(), JvNewStringLatin1(buf));
     sprintf(buf, "X11 SHM:     %s", shm_supported ? "enabled" : "disabled");
     org::xwt::util::Log::log(this->getClass(), JvNewStringLatin1(buf));
@@ -802,7 +806,7 @@ void org::xwt::plat::POSIX::natInit() {
 
 JArray<java::lang::String*>* org::xwt::plat::POSIX::listNativeFonts() {
     int numfonts;
-    char** xfonts = XListFonts(display, "-*-*-*-*-*-*-*-*-*-*-*-*-*-*", 0xFFFFFFFF, &numfonts);
+    char** xfonts = XListFonts(display, "-*-*-*-*-normal-*-*-*-*-*-*-*-*-*", 0xFFFFFFFF, &numfonts);
     JArray<java::lang::String*>* fonts = (JArray<java::lang::String*>*)JvNewObjectArray(numfonts, &(::java::lang::String::class$), NULL);
     java::lang::String** jfonts = (java::lang::String**)(elements(fonts));
     for(int i=0; i<numfonts; i++)