Window management and sizer layout corrections

[wxWidgets.git] / include / wx / x11 / nanox / X11 / Xlib.h

diff --git a/include/wx/x11/nanox/X11/Xlib.h b/include/wx/x11/nanox/X11/Xlib.h
index 8698db12a35606bdc9fe23adb3aef7fa167bb7da..3a4fb63db28e52887c04efe7d4d382d4631d4e5e 100644 (file)
--- a/include/wx/x11/nanox/X11/Xlib.h
+++ b/include/wx/x11/nanox/X11/Xlib.h
@@ -5,7 +5,15 @@
 #ifndef _DUMMY_XLIBH_
 #define _DUMMY_XLIBH_
 
 #ifndef _DUMMY_XLIBH_
 #define _DUMMY_XLIBH_
 

+#ifdef __GNUG__
+    #pragma interface "Xlib.h"
+#endif
+
+/* Move away the typedef in XtoNX.h */
+#define XFontStruct XFontStruct1

 #include <XtoNX.h>
 #include <XtoNX.h>

+#undef XFontStruct
+#undef XCharStruct

 
 /* Data types */
 
 
 /* Data types */
 


@@ -15,7 +23,40 @@ typedef int Status;
 typedef unsigned long VisualID;
 typedef int Bool;
 typedef long XID;
 typedef unsigned long VisualID;
 typedef int Bool;
 typedef long XID;

-typedef XID KeySym;
+typedef GR_SCANCODE KeySym;
+typedef GR_EVENT_KEYSTROKE XKeyEvent;
+typedef struct {
+    GR_FONT_INFO info;
+    GR_FONT_ID fid;
+} XFontStruct;
+typedef struct {
+    short      lbearing;       /* origin to left edge of raster */
+    short      rbearing;       /* origin to right edge of raster */
+    short      width;          /* advance to next char's origin */
+    short      ascent;         /* baseline to top edge of raster */
+    short      descent;        /* baseline to bottom edge of raster */
+    unsigned short attributes; /* per char flags (not predefined) */
+} XCharStruct;
+
+/* Configure window value mask bits */
+#define   CWX                         (1<<0)
+#define   CWY                         (1<<1)
+#define   CWWidth                     (1<<2)
+#define   CWHeight                    (1<<3)
+#define   CWBorderWidth               (1<<4)
+#define   CWSibling                   (1<<5)
+#define   CWStackMode                 (1<<6)
+
+/* Values */
+ 
+typedef struct {
+        int x, y;
+        int width, height;
+        int border_width;
+        Window sibling;
+        int stack_mode;
+} XWindowChanges;
+

 /* typedef unsigned long Time; */
 
 #define Success 0
 /* typedef unsigned long Time; */
 
 #define Success 0


@@ -30,12 +71,88 @@ typedef XID KeySym;
 #define PropertyChangeMask GR_EVENT_MASK_SELECTION_CHANGED
 #define GraphicsExpose GR_EVENT_TYPE_EXPOSURE
 #define GraphicsExposeMask GR_EVENT_MASK_EXPOSURE
 #define PropertyChangeMask GR_EVENT_MASK_SELECTION_CHANGED
 #define GraphicsExpose GR_EVENT_TYPE_EXPOSURE
 #define GraphicsExposeMask GR_EVENT_MASK_EXPOSURE

+#define ColormapChangeMask 0
+#define FillSolid 0
+#define LineSolid 0
+#define LineOnOffDash 0
+#define CapNotLast 0
+#define CapRound 0
+#define CapProjecting 0
+#define CapButt 0
+#define JoinRound 0
+#define JoinBevel 0
+#define JoinMiter 0
+#define IncludeInferiors 0
+#define ClipByChildren 0
+#define DoRed 0
+#define DoGreen 0
+#define DoBlue 0
+#define NoEventMask GR_EVENT_MASK_NONE
+#define RevertToParent 0
+#define CurrentTime 0
+#define GrabModeAsync 0
+
+#define GXcopy GR_MODE_COPY
+#define GXclear GR_MODE_CLEAR
+#ifndef GXxor
+#define GXxor GR_MODE_OR
+#endif
+#define GXinvert GR_MODE_INVERT
+#define GXorReverse GR_MODE_ORREVERSE
+#define GXandReverse GR_MODE_ANDREVERSE
+#define GXand GR_MODE_AND
+#define GXor GR_MODE_OR
+#define GXandInverted GR_MODE_ANDINVERTED
+#define GXnoop GR_MODE_NOOP
+#define GXnor GR_MODE_NOR
+#define GXequiv GR_MODE_EQUIV
+#define GXcopyInverted GR_MODE_COPYINVERTED
+#define GXorInverted GR_MODE_ORINVERTED
+#define GXnand GR_MODE_NAND
+#define GXset GR_MODE_SET

 
 #define XSynchronize(display,sync)
 #define XDefaultRootWindow(d) GR_ROOT_WINDOW_ID
 
 #define XSynchronize(display,sync)
 #define XDefaultRootWindow(d) GR_ROOT_WINDOW_ID

+#define RootWindowOfScreen(s) GR_ROOT_WINDOW_ID

 #define XFreePixmap(d, p) GrDestroyWindow(p)
 #define XFreeCursor(d, c) GrDestroyCursor(c)
 #define XFreePixmap(d, p) GrDestroyWindow(p)
 #define XFreeCursor(d, c) GrDestroyCursor(c)

+#define XFreeGC(d, gc) GrDestroyGC(gc)
+#define XSetBackground(d, gc, c) GrSetGCBackground(gc, c)

 #define DefaultVisual(d, s) ((Visual*) NULL)
 #define DefaultVisual(d, s) ((Visual*) NULL)

+#define DefaultColormap(d, s) DefaultColormapOfScreen((Screen*) NULL)
+#define DefaultScreenOfDisplay(d) 0
+#define XSetFillStyle(d, gc, s) wxNoop()
+#define XSetLineAttributes(d, gc, a, b, c, e) wxNoop()
+#define XSetClipMask(d, gc, m) wxNoop()
+#define XSetTSOrigin(d, gc, x, y) wxNoop()
+#define XFillArc(d, w, gc, x, y, rx, ry, a1, a2) GrArcAngle(w, gc, x, y, rx, ry, a1, a2, GR_PIE)
+#define XDrawArc(d, w, gc, x, y, rx, ry, a1, a2) GrArcAngle(w, gc, x, y, rx, ry, a1, a2, GR_ARC)
+#define XDrawPoint(d, w, gc, x, y) GrPoint(w, gc, x, y)
+#define XFillPolygon(d, w, gc, p, n, s, m) GrFillPoly(w, gc, n, p)
+#define XDrawRectangle(d, w, gc, x, y, width, height) GrRect(w, gc, x, y, width, height)
+#define XSetClipOrigin(d, gc, x, y) GrSetGCClipOrigin(gc, x, y)
+#define XSetRegion(d, gc, r) GrSetGCRegion(gc, r)
+#define XSetTile(d, gc, p) wxNoop()
+#define XSetStipple(d, gc, p) wxNoop()
+#define XSetSubwindowMode(d, gc, mode) wxNoop()
+#define XFreeColormap(d, cmap) wxNoop()
+#define XSetTransientForHint(d, w, p) wxNoop()
+#define XUnionRegion(sr1,sr2,r)        GrUnionRegion(r,sr1,sr2)
+#define XIntersectRegion(sr1,sr2,r)    GrIntersectRegion(r,sr1,sr2)
+#define XEqualRegion(r1, r2) GrEqualRegion(r1, r2)
+#define XEmptyRegion(r) GrEmptyRegion(r)
+#define XOffsetRegion(r, x, y) GrOffsetRegion(r, x, y)
+#define XClipBox(r, rect) GrGetRegionBox(r, rect)
+#define XPointInRegion(r, x, y) GrPointInRegion(r, x, y)
+#define XXorRegion(sr1, sr2, r) GrXorRegion(r, sr1, sr2)
+/* TODO: Cannot find equivalent for this. */
+#define XIconifyWindow(d, w, s) 0
+#define XCreateWindowWithColor(d,p,x,y,w,h,bw,depth,cl,vis,backColor,foreColor) \
+                       GrNewWindow(p,x,y,w,h,bw,backColor,foreColor)
+#define XLookupString(event, buf, len, sym, status) (*sym = (event)->scancode)
+#define XBell(a, b) GrBell()
+#define DisplayWidthMM(d, s) 100
+#define DisplayHeightMM(d, s) 100

 
 /* These defines are wrongly defined in XtoNX.h, IMHO,
  * since they reference a static global.
 
 /* These defines are wrongly defined in XtoNX.h, IMHO,
  * since they reference a static global.


@@ -163,6 +280,10 @@ typedef int (*XErrorHandler) (         /* WARNING, this type not in Xlib spec */
 #define PointerMotionMask GR_EVENT_MASK_MOUSE_POSITION
 #endif
 
 #define PointerMotionMask GR_EVENT_MASK_MOUSE_POSITION
 #endif
 

+#define ButtonMotionMask GR_EVENT_MASK_MOUSE_POSITION
+#define KeymapStateMask 0
+#define StructureNotifyMask GR_EVENT_MASK_UPDATE
+

 #ifndef FocusIn
 #define FocusIn GR_EVENT_TYPE_FOCUS_IN
 #define FocusOut GR_EVENT_TYPE_FOCUS_OUT
 #ifndef FocusIn
 #define FocusIn GR_EVENT_TYPE_FOCUS_IN
 #define FocusOut GR_EVENT_TYPE_FOCUS_OUT


@@ -171,13 +292,14 @@ typedef int (*XErrorHandler) (        /* WARNING, this type not in Xlib spec */
 
 /* Fuunctions */
 
 
 /* Fuunctions */
 

-#ifdef __cpluplus
+#ifdef __cplusplus

 extern "C" {
 #endif
 
 extern "C" {
 #endif
 

+Display *XOpenDisplay(char *name);

 Colormap DefaultColormapOfScreen(Screen* /* screen */) ;
 int XSetGraphicsExposures( Display* /* display */, GC /* gc */, Bool /* graphics_exposures */) ;
 Colormap DefaultColormapOfScreen(Screen* /* screen */) ;
 int XSetGraphicsExposures( Display* /* display */, GC /* gc */, Bool /* graphics_exposures */) ;

-int XWarpPointer( Display* /* display */, Window /* srcW */, Window /* srcW */,
+int XWarpPointer( Display* /* display */, Window /* srcW */, Window /* destW */,

                  int /* srcX */, int /* srcY */,
                  unsigned int /* srcWidth */,
                  unsigned int /* srcHeight */,
                  int /* srcX */, int /* srcY */,
                  unsigned int /* srcWidth */,
                  unsigned int /* srcHeight */,


@@ -188,7 +310,7 @@ int XGrabPointer(Display* /* display */, Window /* grab_window */,
                  Bool /* owner_events */, unsigned int /* event_mask */,
                  int /* pointer_mode */, int /* keyboard_mode */,
                  Window /* confine_to */, Cursor /* cursor */, Time /* time */) ;
                  Bool /* owner_events */, unsigned int /* event_mask */,
                  int /* pointer_mode */, int /* keyboard_mode */,
                  Window /* confine_to */, Cursor /* cursor */, Time /* time */) ;

-int XUngrabPointer(Display /* display */, Time /* time */) ;
+int XUngrabPointer(Display* /* display */, Time /* time */) ;

 int XCopyArea(Display* /* display */, Drawable src, Drawable dest, GC gc,
               int src_x, int src_y, unsigned int width, unsigned int height,
               int dest_x, int dest_y) ;
 int XCopyArea(Display* /* display */, Drawable src, Drawable dest, GC gc,
               int src_x, int src_y, unsigned int width, unsigned int height,
               int dest_x, int dest_y) ;


@@ -197,7 +319,6 @@ int XCopyPlane(Display* /* display */, Drawable src, Drawable dest, GC gc,
               int dest_x, int dest_y, unsigned long /* plane */) ;
 
 XErrorHandler XSetErrorHandler (XErrorHandler /* handler */);
               int dest_x, int dest_y, unsigned long /* plane */) ;
 
 XErrorHandler XSetErrorHandler (XErrorHandler /* handler */);

-Display *XOpenDisplay(const char *name);

 Screen *XScreenOfDisplay(Display* /* display */,
                          int /* screen_number */);
 int DisplayWidth(Display* /* display */, int /* screen */);
 Screen *XScreenOfDisplay(Display* /* display */,
                          int /* screen_number */);
 int DisplayWidth(Display* /* display */, int /* screen */);


@@ -207,8 +328,23 @@ int XAllocColor(Display* /* display */, Colormap /* cmap */,
                 XColor* color);
 int XParseColor(Display* display, Colormap cmap,
                 const char* cname, XColor* color);
                 XColor* color);
 int XParseColor(Display* display, Colormap cmap,
                 const char* cname, XColor* color);

+int XDrawLine(Display* display, Window win, GC gc,
+              int x1, int y1, int x2, int y2);
+int XTextExtents( XFontStruct* font, char* s, int len, int* direction,
+        int* ascent, int* descent2, XCharStruct* overall);
+int XPending(Display *d);
+XFontStruct* XLoadQueryFont(Display* display, const char* fontSpec);
+int XFreeFont(Display* display, XFontStruct* fontStruct);
+int XQueryColor(Display* display, Colormap cmap, XColor* color);
+Status XGetWindowAttributes(Display* display, Window w,
+                            XWindowAttributes* window_attributes);
+
+int XConfigureWindow(Display* display, Window w, int mask, XWindowChanges* changes);
+int XTranslateCoordinates(Display* display, Window srcWindow, Window destWindow, int srcX, int srcY, int* destX, int* destY, Window* childReturn);
+
+void wxNoop();

 
 

-#ifdef __cpluplus
+#ifdef __cplusplus

 }
 #endif
 
 }
 #endif