// Copyright 2002 Adam Megacz, see the COPYING file for licensing [LGPL]
// see below for copyright information on the second portion of this file
-#include "POSIX.cc"
-
#include <X11/Xlib.h>
#include <X11/extensions/XShm.h>
#include <X11/keysymdef.h>
#include <X11/Xmu/StdCmap.h>
#include <java/lang/String.h>
-#include <org/ibex/Surface.h>
-#include <org/ibex/Picture.h>
-#include <org/ibex/Box.h>
+#include <org/ibex/graphics/Surface.h>
+#include <org/ibex/graphics/Picture.h>
+#include <org/ibex/core/Box.h>
#include <org/ibex/plat/X11.h>
#include <org/ibex/plat/X11$X11Surface.h>
#include <org/ibex/plat/X11$X11Picture.h>
#include <org/ibex/plat/X11$X11PixelBuffer.h>
#include <org/ibex/util/Semaphore.h>
-#include <org/ibex/Platform.h>
+#include <org/ibex/plat/Platform.h>
#include <java/lang/Long.h>
#include <java/util/Hashtable.h>
#include <org/ibex/util/Log.h>
#include <java/lang/System.h>
#include <java/io/PrintStream.h>
+#include "POSIX.cc"
+
// static (per-xserver) data
static Visual* visual;
static Colormap s_colormap;
}
}
-void org::ibex::plat::X11$X11PixelBuffer::fastDrawPicture(org::ibex::Picture* s,
+void org::ibex::plat::X11$X11PixelBuffer::fastDrawPicture(org::ibex::graphics::Picture* s,
jint dx, jint dy, jint cx1, jint cy1, jint cx2, jint cy2) {
org::ibex::plat::X11$X11Picture* source = (org::ibex::plat::X11$X11Picture*)s;
cx1 - dx, cy1 - dy, cx2 - cx1, cy2 - cy1, cx1, cy1);
}
-void org::ibex::plat::X11$X11PixelBuffer::slowDrawPicture(org::ibex::Picture* s,
+void org::ibex::plat::X11$X11PixelBuffer::slowDrawPicture(org::ibex::graphics::Picture* s,
jint dx, jint dy, jint cx1, jint cy1, jint cx2, jint cy2,
jint rgb, jboolean alphaOnly) {
(((int)*(current_pixel + 1)) << 8) |
(((int)*(current_pixel + 2))); break;
case 32: targetpixel = *((int*)current_pixel); break;
- default: org::ibex::Platform::criticalAbort(JvNewStringLatin1("ERROR: bpp not a multiple of 8!"));
+ default: org::ibex::plat::Platform::criticalAbort(JvNewStringLatin1("ERROR: bpp not a multiple of 8!"));
}
targetpixel -= colormap_info->base_pixel;
break;
}
case 32: *((uint32_t*)current_pixel) = destpixel; break;
- default: org::ibex::Platform::criticalAbort(JvNewStringLatin1("ERROR: bpp not a multiple of 8!"));
+ default: org::ibex::plat::Platform::criticalAbort(JvNewStringLatin1("ERROR: bpp not a multiple of 8!"));
}
}
}
XPutImage(display, (*((Pixmap*)stipple)), stipple_gc, &xi, 0, 0, 0, 0, width, height);
}
-void org::ibex::plat::X11$X11Surface::blit(org::ibex::PixelBuffer* db, jint sx, jint sy, jint dx, jint dy, jint dx2, jint dy2) {
+void org::ibex::plat::X11$X11Surface::blit(org::ibex::graphics::PixelBuffer* db, jint sx, jint sy, jint dx, jint dy, jint dx2, jint dy2) {
org::ibex::plat::X11$X11PixelBuffer *xdb = (org::ibex::plat::X11$X11PixelBuffer*)db;
XCopyArea(display, *((Pixmap*)xdb->pm), *((Window*)window), *((GC*)gc), sx, sy, dx2 - dx, dy2 - dy, dx, dy);
XFlush(display);
// X11Surface //////////////////////////////////////////////////////////////////////
-void org::ibex::plat::X11$X11Surface::setIcon(org::ibex::Picture* pic) {
+void org::ibex::plat::X11$X11Surface::setIcon(org::ibex::graphics::Picture* pic) {
org::ibex::plat::X11$X11Picture* p = ((org::ibex::plat::X11$X11Picture*)pic);
org::ibex::plat::X11$X11PixelBuffer* old_dbuf = p->doublebuf;
p->buildPixelBuffer(1);
void org::ibex::plat::X11::natInit() {
if (!XInitThreads())
- org::ibex::Platform::criticalAbort(JvNewStringLatin1("Your X11 libraries do not support multithreaded programs"));
+ org::ibex::plat::Platform::criticalAbort(JvNewStringLatin1("Your X11 libraries do not support multithreaded programs"));
char* DISPLAY = getenv("DISPLAY");
if (DISPLAY == NULL || strlen(DISPLAY) == 0) DISPLAY = ":0.0";
display = XOpenDisplay(DISPLAY);
if (display == 0)
- org::ibex::Platform::criticalAbort(JvNewStringLatin1("Unable to connect to X11 display server"));
+ org::ibex::plat::Platform::criticalAbort(JvNewStringLatin1("Unable to connect to X11 display server"));
screen_num = XDefaultScreen(display);
colorDepth = (jint)(DefaultDepth(((Display*)display), 0));
// FIXME: don't know why (True, False) is the best solution...
if(XmuLookupStandardColormap(display, screen_num, visual->visualid, colorDepth, XA_RGB_BEST_MAP, True, False) == 0)
- org::ibex::Platform::criticalAbort(JvNewStringLatin1("ERROR: XmuLookupStandardColormap failed"));
+ org::ibex::plat::Platform::criticalAbort(JvNewStringLatin1("ERROR: XmuLookupStandardColormap failed"));
XStandardColormap* best_map_info = NULL;
int count;
if (XGetRGBColormaps(display, RootWindow(display, screen_num), &best_map_info, &count, XA_RGB_BEST_MAP) == 0)
- org::ibex::Platform::criticalAbort(JvNewStringLatin1("ERROR: couldn't allocate a standard colormap"));
+ org::ibex::plat::Platform::criticalAbort(JvNewStringLatin1("ERROR: couldn't allocate a standard colormap"));
if (!best_map_info->colormap)
- org::ibex::Platform::criticalAbort(JvNewStringLatin1("ERROR: XmuLookupStandardColomap succeded, but no colormap was found on the root window"));
+ org::ibex::plat::Platform::criticalAbort(JvNewStringLatin1("ERROR: XmuLookupStandardColomap succeded, but no colormap was found on the root window"));
if (best_map_info->red_max == 0)
- org::ibex::Platform::criticalAbort(JvNewStringLatin1("ERROR: standard colormap exists, but was improperly allocated"));
+ org::ibex::plat::Platform::criticalAbort(JvNewStringLatin1("ERROR: standard colormap exists, but was improperly allocated"));
s_colormap = best_map_info->colormap;
colormap_info = best_map_info;