--- a/ImageRdr.st Tue Sep 02 23:01:46 1997 +0200
+++ b/ImageRdr.st Thu Sep 04 23:23:24 1997 +0200
@@ -21,6 +21,10 @@
!ImageReader primitiveDefinitions!
%{
+#ifdef __openVMS__
+# undef __new
+#endif
+
#ifndef _STDIO_H_INCLUDED_
# include <stdio.h>
# define _STDIO_H_INCLUDED_
@@ -1858,5 +1862,5 @@
!ImageReader class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libview/Attic/ImageRdr.st,v 1.53 1997-07-24 16:05:20 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libview/Attic/ImageRdr.st,v 1.54 1997-09-04 21:23:01 cg Exp $'
! !
--- a/ImageReader.st Tue Sep 02 23:01:46 1997 +0200
+++ b/ImageReader.st Thu Sep 04 23:23:24 1997 +0200
@@ -21,6 +21,10 @@
!ImageReader primitiveDefinitions!
%{
+#ifdef __openVMS__
+# undef __new
+#endif
+
#ifndef _STDIO_H_INCLUDED_
# include <stdio.h>
# define _STDIO_H_INCLUDED_
@@ -1858,5 +1862,5 @@
!ImageReader class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libview/ImageReader.st,v 1.53 1997-07-24 16:05:20 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libview/ImageReader.st,v 1.54 1997-09-04 21:23:01 cg Exp $'
! !
--- a/XWorkstat.st Tue Sep 02 23:01:46 1997 +0200
+++ b/XWorkstat.st Thu Sep 04 23:23:24 1997 +0200
@@ -60,6 +60,10 @@
# undef memset
#endif
+#ifdef __openVMS__
+# undef __new
+#endif
+
#include <stdio.h>
#include <X11/Xlib.h>
#include <X11/Xutil.h>
@@ -193,6 +197,147 @@
__END_PROTECT_REGISTERS__
#endif
+
+#ifdef __VMS__
+
+# define XAllocColor XALLOCCOLOR
+# define XAllocColorCells XALLOCCOLORCELLS
+# define XAllowEvents XALLOWEVENTS
+# define XBell XBELL
+# define XChangeGC XCHANGEGC
+# define XChangeProperty XCHANGEPROPERTY
+# define XChangeWindowAttributes XCHANGEWINDOWATTRIBUTES
+# define XCheckMaskEvent XCHECKMASKEVENT
+# define XCheckWindowEvent XCHECKWINDOWEVENT
+# define XClearArea XCLEARAREA
+# define XClearWindow XCLEARWINDOW
+# define XCloseDisplay XCLOSEDISPLAY
+# define XConfigureWindow XCONFIGUREWINDOW
+# define XConvertSelection XCONVERTSELECTION
+# define XCopyArea XCOPYAREA
+# define XCopyPlane XCOPYPLANE
+# define XCreateBitmapFromData XCREATEBITMAPFROMDATA
+# define XCreateFontCursor XCREATEFONTCURSOR
+# define XCreateGC XCREATEGC
+# define XCreateImage XCREATEIMAGE
+# define XCreatePixmap XCREATEPIXMAP
+# define XCreatePixmapCursor XCREATEPIXMAPCURSOR
+# define XCreateSimpleWindow XCREATESIMPLEWINDOW
+# define XCreateWindow XCREATEWINDOW
+# define XDefineCursor XDEFINECURSOR
+# define XDestroyWindow XDESTROYWINDOW
+# define XDrawArc XDRAWARC
+# define XDrawImageString XDRAWIMAGESTRING
+# define XDrawImageString16 XDRAWIMAGESTRING16
+# define XDrawPoint XDRAWPOINT
+# define XDrawLine XDRAWLINE
+# define XDrawLines XDRAWLINES
+# define XDrawRectangle XDRAWRECTANGLE
+# define XDrawString XDRAWSTRING
+# define XDrawString16 XDRAWSTRING16
+# define XEventsQueued XEVENTSQUEUED
+# define XFillArc XFILLARC
+# define XFillPolygon XFILLPOLYGON
+# define XFillRectangle XFILLRECTANGLE
+# define XFlush XFLUSH
+# define XFree XFREE
+# define XFreeColors XFREECOLORS
+# define XFreeCursor XFREECURSOR
+# define XFreeFont XFREEFONT
+# define XFreeFontNames XFREEFONTNAMES
+# define XFreeGC XFREEGC
+# define XFreeModifiermap XFREEMODIFIERMAP
+# define XFreePixmap XFREEPIXMAP
+# define XGetAtomName XGETATOMNAME
+# define XGetDefault XGETDEFAULT
+# define XGetErrorText XGETERRORTEXT
+# define XGetGeometry XGETGEOMETRY
+# define XGetIconSizes XGETICONSIZES
+# define XGetImage XGETIMAGE
+# define XGetKeyboardMapping XGETKEYBOARDMAPPING
+# define XGetModifierMapping XGETMODIFIERMAPPING
+# define XGetSelectionOwner XGETSELECTIONOWNER
+# define XGetVisualInfo XGETVISUALINFO
+# define XGetWindowProperty XGETWINDOWPROPERTY
+# define XGrabKeyboard XGRABKEYBOARD
+# define XGrabPointer XGRABPOINTER
+# define XInternAtom XINTERNATOM
+# define XKeycodeToKeysym XKEYCODETOKEYSYM
+# define XKeysymToKeycode XKEYSYMTOKEYCODE
+# define XKeysymToString XKEYSYMTOSTRING
+# define XListFonts XLISTFONTS
+# define XLoadQueryFont XLOADQUERYFONT
+# define XLookupString XLOOKUPSTRING
+# define XLowerWindow XLOWERWINDOW
+# define XMapWindow XMAPWINDOW
+# define XMatchVisualInfo XMATCHVISUALINFO
+# define XMoveResizeWindow XMOVERESIZEWINDOW
+# define XMoveWindow XMOVEWINDOW
+# define XNextEvent XNEXTEVENT
+# define XOpenDisplay XOPENDISPLAY
+# define XParseColor XPARSECOLOR
+# define XPending XPENDING
+# define XProtocolVersion XPROTOCOLVERSION
+# define XPutBackEvent XPUTBACKEVENT
+# define XPutImage XPUTIMAGE
+# define XQueryColor XQUERYCOLOR
+# define XQueryColors XQUERYCOLORS
+# define XQueryExtension XQUERYEXTENSION
+# define XQueryPointer XQUERYPOINTER
+# define XQueryTree XQUERYTREE
+# define XRaiseWindow XRAISEWINDOW
+# define XReadBitmapFile XREADBITMAPFILE
+# define XRecolorCursor XRECOLORCURSOR
+# define XRefreshKeyboardMapping XREFRESHKEYBOARDMAPPING
+# define XResizeWindow XRESIZEWINDOW
+# define XSelectInput XSELECTINPUT
+# define XSendEvent XSENDEVENT
+# define XServerVendor XSERVERVENDOR
+# define XSetBackground XSETBACKGROUND
+# define XSetClassHint XSETCLASSHINT
+# define XSetClipRectangles XSETCLIPRECTANGLES
+# define XSetDashes XSETDASHES
+# define XSetErrorHandler XSETERRORHANDLER
+# define XSetFillStyle XSETFILLSTYLE
+# define XSetFont XSETFONT
+# define XSetForeground XSETFOREGROUND
+# define XSetFunction XSETFUNCTION
+# define XSetGraphicsExposures XSETGRAPHICSEXPOSURES
+# define XSetIOErrorHandler XSETIOERRORHANDLER
+# define XSetIconName XSETICONNAME
+# define XSetInputFocus XSETINPUTFOCUS
+# define XSetLineAttributes XSETLINEATTRIBUTES
+# define XSetNormalHints XSETNORMALHINTS
+# define XSetSelectionOwner XSETSELECTIONOWNER
+# define XSetStandardProperties XSETSTANDARDPROPERTIES
+# define XSetStipple XSETSTIPPLE
+# define XSetTSOrigin XSETTSORIGIN
+# define XSetTile XSETTILE
+# define XSetTransientForHint XSETTRANSIENTFORHINT
+# define XSetWMHints XSETWMHINTS
+# define XSetWindowBackground XSETWINDOWBACKGROUND
+# define XSetWindowBackgroundPixmap XSETWINDOWBACKGROUNDPIXMAP
+# define XSetWindowBorder XSETWINDOWBORDER
+# define XSetWindowBorderPixmap XSETWINDOWBORDERPIXMAP
+# define XSetWindowBorderWidth XSETWINDOWBORDERWIDTH
+# define XSetWindowColormap XSETWINDOWCOLORMAP
+# define XStoreColor XSTORECOLOR
+# define XStoreName XSTORENAME
+# define XStringToKeysym XSTRINGTOKEYSYM
+# define XSync XSYNC
+# define XSynchronize XSYNCHRONIZE
+# define XTextWidth XTEXTWIDTH
+# define XTextWidth16 XTEXTWIDTH16
+# define XTranslateCoordinates XTRANSLATECOORDINATES
+# define XUngrabKeyboard XUNGRABKEYBOARD
+# define XUngrabPointer XUNGRABPOINTER
+# define XUnmapWindow XUNMAPWINDOW
+# define XVendorRelease XVENDORRELEASE
+# define XWarpPointer XWARPPOINTER
+
+
+#endif
+
%}
! !
@@ -1027,7 +1172,11 @@
}
dpy = myDpy;
+#ifdef __openVMS__
+ nFormats = __MKSMALLINT(1);
+#else
nFormats = __MKSMALLINT(DISPLAYACCESS(dpy)->nformats);
+#endif
%}.
formatArray := Array new:nFormats.
1 to:nFormats do:[:index |
@@ -1038,11 +1187,17 @@
ScreenFormat *format;
Display *dpy = myDpy;
+#ifdef __openVMS__
+ depthInfo = __MKSMALLINT(1);
+ bitsPerPixelInfo = __MKSMALLINT(1);
+ paddingInfo = __MKSMALLINT(8);
+#else
format = DISPLAYACCESS(dpy)->pixmap_format;
format += (__intVal(i)-1);
bitsPerPixelInfo = __MKSMALLINT(format->bits_per_pixel);
depthInfo = __MKSMALLINT(format->depth);
paddingInfo = __MKSMALLINT(format->scanline_pad);
+#endif
%}.
info := IdentityDictionary new.
info at:#depth put:depthInfo.
@@ -9370,6 +9525,6 @@
!XWorkstation class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libview/Attic/XWorkstat.st,v 1.261 1997-08-22 16:58:00 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libview/Attic/XWorkstat.st,v 1.262 1997-09-04 21:23:06 cg Exp $'
! !
XWorkstation initialize!
--- a/XWorkstation.st Tue Sep 02 23:01:46 1997 +0200
+++ b/XWorkstation.st Thu Sep 04 23:23:24 1997 +0200
@@ -60,6 +60,10 @@
# undef memset
#endif
+#ifdef __openVMS__
+# undef __new
+#endif
+
#include <stdio.h>
#include <X11/Xlib.h>
#include <X11/Xutil.h>
@@ -193,6 +197,147 @@
__END_PROTECT_REGISTERS__
#endif
+
+#ifdef __VMS__
+
+# define XAllocColor XALLOCCOLOR
+# define XAllocColorCells XALLOCCOLORCELLS
+# define XAllowEvents XALLOWEVENTS
+# define XBell XBELL
+# define XChangeGC XCHANGEGC
+# define XChangeProperty XCHANGEPROPERTY
+# define XChangeWindowAttributes XCHANGEWINDOWATTRIBUTES
+# define XCheckMaskEvent XCHECKMASKEVENT
+# define XCheckWindowEvent XCHECKWINDOWEVENT
+# define XClearArea XCLEARAREA
+# define XClearWindow XCLEARWINDOW
+# define XCloseDisplay XCLOSEDISPLAY
+# define XConfigureWindow XCONFIGUREWINDOW
+# define XConvertSelection XCONVERTSELECTION
+# define XCopyArea XCOPYAREA
+# define XCopyPlane XCOPYPLANE
+# define XCreateBitmapFromData XCREATEBITMAPFROMDATA
+# define XCreateFontCursor XCREATEFONTCURSOR
+# define XCreateGC XCREATEGC
+# define XCreateImage XCREATEIMAGE
+# define XCreatePixmap XCREATEPIXMAP
+# define XCreatePixmapCursor XCREATEPIXMAPCURSOR
+# define XCreateSimpleWindow XCREATESIMPLEWINDOW
+# define XCreateWindow XCREATEWINDOW
+# define XDefineCursor XDEFINECURSOR
+# define XDestroyWindow XDESTROYWINDOW
+# define XDrawArc XDRAWARC
+# define XDrawImageString XDRAWIMAGESTRING
+# define XDrawImageString16 XDRAWIMAGESTRING16
+# define XDrawPoint XDRAWPOINT
+# define XDrawLine XDRAWLINE
+# define XDrawLines XDRAWLINES
+# define XDrawRectangle XDRAWRECTANGLE
+# define XDrawString XDRAWSTRING
+# define XDrawString16 XDRAWSTRING16
+# define XEventsQueued XEVENTSQUEUED
+# define XFillArc XFILLARC
+# define XFillPolygon XFILLPOLYGON
+# define XFillRectangle XFILLRECTANGLE
+# define XFlush XFLUSH
+# define XFree XFREE
+# define XFreeColors XFREECOLORS
+# define XFreeCursor XFREECURSOR
+# define XFreeFont XFREEFONT
+# define XFreeFontNames XFREEFONTNAMES
+# define XFreeGC XFREEGC
+# define XFreeModifiermap XFREEMODIFIERMAP
+# define XFreePixmap XFREEPIXMAP
+# define XGetAtomName XGETATOMNAME
+# define XGetDefault XGETDEFAULT
+# define XGetErrorText XGETERRORTEXT
+# define XGetGeometry XGETGEOMETRY
+# define XGetIconSizes XGETICONSIZES
+# define XGetImage XGETIMAGE
+# define XGetKeyboardMapping XGETKEYBOARDMAPPING
+# define XGetModifierMapping XGETMODIFIERMAPPING
+# define XGetSelectionOwner XGETSELECTIONOWNER
+# define XGetVisualInfo XGETVISUALINFO
+# define XGetWindowProperty XGETWINDOWPROPERTY
+# define XGrabKeyboard XGRABKEYBOARD
+# define XGrabPointer XGRABPOINTER
+# define XInternAtom XINTERNATOM
+# define XKeycodeToKeysym XKEYCODETOKEYSYM
+# define XKeysymToKeycode XKEYSYMTOKEYCODE
+# define XKeysymToString XKEYSYMTOSTRING
+# define XListFonts XLISTFONTS
+# define XLoadQueryFont XLOADQUERYFONT
+# define XLookupString XLOOKUPSTRING
+# define XLowerWindow XLOWERWINDOW
+# define XMapWindow XMAPWINDOW
+# define XMatchVisualInfo XMATCHVISUALINFO
+# define XMoveResizeWindow XMOVERESIZEWINDOW
+# define XMoveWindow XMOVEWINDOW
+# define XNextEvent XNEXTEVENT
+# define XOpenDisplay XOPENDISPLAY
+# define XParseColor XPARSECOLOR
+# define XPending XPENDING
+# define XProtocolVersion XPROTOCOLVERSION
+# define XPutBackEvent XPUTBACKEVENT
+# define XPutImage XPUTIMAGE
+# define XQueryColor XQUERYCOLOR
+# define XQueryColors XQUERYCOLORS
+# define XQueryExtension XQUERYEXTENSION
+# define XQueryPointer XQUERYPOINTER
+# define XQueryTree XQUERYTREE
+# define XRaiseWindow XRAISEWINDOW
+# define XReadBitmapFile XREADBITMAPFILE
+# define XRecolorCursor XRECOLORCURSOR
+# define XRefreshKeyboardMapping XREFRESHKEYBOARDMAPPING
+# define XResizeWindow XRESIZEWINDOW
+# define XSelectInput XSELECTINPUT
+# define XSendEvent XSENDEVENT
+# define XServerVendor XSERVERVENDOR
+# define XSetBackground XSETBACKGROUND
+# define XSetClassHint XSETCLASSHINT
+# define XSetClipRectangles XSETCLIPRECTANGLES
+# define XSetDashes XSETDASHES
+# define XSetErrorHandler XSETERRORHANDLER
+# define XSetFillStyle XSETFILLSTYLE
+# define XSetFont XSETFONT
+# define XSetForeground XSETFOREGROUND
+# define XSetFunction XSETFUNCTION
+# define XSetGraphicsExposures XSETGRAPHICSEXPOSURES
+# define XSetIOErrorHandler XSETIOERRORHANDLER
+# define XSetIconName XSETICONNAME
+# define XSetInputFocus XSETINPUTFOCUS
+# define XSetLineAttributes XSETLINEATTRIBUTES
+# define XSetNormalHints XSETNORMALHINTS
+# define XSetSelectionOwner XSETSELECTIONOWNER
+# define XSetStandardProperties XSETSTANDARDPROPERTIES
+# define XSetStipple XSETSTIPPLE
+# define XSetTSOrigin XSETTSORIGIN
+# define XSetTile XSETTILE
+# define XSetTransientForHint XSETTRANSIENTFORHINT
+# define XSetWMHints XSETWMHINTS
+# define XSetWindowBackground XSETWINDOWBACKGROUND
+# define XSetWindowBackgroundPixmap XSETWINDOWBACKGROUNDPIXMAP
+# define XSetWindowBorder XSETWINDOWBORDER
+# define XSetWindowBorderPixmap XSETWINDOWBORDERPIXMAP
+# define XSetWindowBorderWidth XSETWINDOWBORDERWIDTH
+# define XSetWindowColormap XSETWINDOWCOLORMAP
+# define XStoreColor XSTORECOLOR
+# define XStoreName XSTORENAME
+# define XStringToKeysym XSTRINGTOKEYSYM
+# define XSync XSYNC
+# define XSynchronize XSYNCHRONIZE
+# define XTextWidth XTEXTWIDTH
+# define XTextWidth16 XTEXTWIDTH16
+# define XTranslateCoordinates XTRANSLATECOORDINATES
+# define XUngrabKeyboard XUNGRABKEYBOARD
+# define XUngrabPointer XUNGRABPOINTER
+# define XUnmapWindow XUNMAPWINDOW
+# define XVendorRelease XVENDORRELEASE
+# define XWarpPointer XWARPPOINTER
+
+
+#endif
+
%}
! !
@@ -1027,7 +1172,11 @@
}
dpy = myDpy;
+#ifdef __openVMS__
+ nFormats = __MKSMALLINT(1);
+#else
nFormats = __MKSMALLINT(DISPLAYACCESS(dpy)->nformats);
+#endif
%}.
formatArray := Array new:nFormats.
1 to:nFormats do:[:index |
@@ -1038,11 +1187,17 @@
ScreenFormat *format;
Display *dpy = myDpy;
+#ifdef __openVMS__
+ depthInfo = __MKSMALLINT(1);
+ bitsPerPixelInfo = __MKSMALLINT(1);
+ paddingInfo = __MKSMALLINT(8);
+#else
format = DISPLAYACCESS(dpy)->pixmap_format;
format += (__intVal(i)-1);
bitsPerPixelInfo = __MKSMALLINT(format->bits_per_pixel);
depthInfo = __MKSMALLINT(format->depth);
paddingInfo = __MKSMALLINT(format->scanline_pad);
+#endif
%}.
info := IdentityDictionary new.
info at:#depth put:depthInfo.
@@ -9370,6 +9525,6 @@
!XWorkstation class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libview/XWorkstation.st,v 1.261 1997-08-22 16:58:00 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libview/XWorkstation.st,v 1.262 1997-09-04 21:23:06 cg Exp $'
! !
XWorkstation initialize!
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/vms.mak Thu Sep 04 23:23:24 1997 +0200
@@ -0,0 +1,75 @@
+#
+# $Header: /cvs/stx/stx/libview/vms.mak,v 1.1 1997-09-04 21:23:24 cg Exp $
+#
+
+LIBNAME=libview
+#LIB_BASE=$(LIBCOMP_BASE)
+
+PACKAGE="-package=(stx:$(LIBNAME))"
+STCLOCALOPT=-warnNonStandard -warnGlobalAssign +optinline
+
+OBJS= \
+ GraphicsDevice.$(O) \
+ HostGraphicsDevice.$(O) \
+ DevWorkst.$(O) \
+ Image.$(O) \
+ Depth1Image.$(O) \
+ Depth2Image.$(O) \
+ Depth4Image.$(O) \
+ Depth8Image.$(O) \
+ Depth24Image.$(O) \
+ ImageRdr.$(O) \
+ Workstat.$(O) \
+ Color.$(O) \
+ Colormap.$(O) \
+ FontDescr.$(O) \
+ Font.$(O) \
+ Cursor.$(O) \
+ DevHandle.$(O) \
+ DevViewH.$(O) \
+ DevFormH.$(O) \
+ DevColorH.$(O) \
+ GC.$(O) \
+ DevGC.$(O) \
+ GMedium.$(O) \
+ Form.$(O) \
+ DSurface.$(O) \
+ SimpleView.$(O) \
+ View.$(O) \
+ TopView.$(O) \
+ StdSysV.$(O) \
+ ModalBox.$(O)\
+ PopUpView.$(O)\
+ ShadowV.$(O) \
+ DRootView.$(O) \
+ Controll.$(O) \
+ WTrans.$(O) \
+ WEvent.$(O) \
+ WGroup.$(O) \
+ WSensor.$(O) \
+ SWSensor.$(O) \
+ KeybdFwd.$(O) \
+ KeybdMap.$(O) \
+ RsrcPack.$(O) \
+ ViewStyle.$(O) \
+ Depth16Image.$(O) \
+ Depth32Image.$(O) \
+ ImageMask.$(O) \
+ AlphaMask.$(O)
+
+reallyAll: all
+
+objs: $(OBJS) XWorkstat.$(O)
+
+theLib: $(LIBNAME).olb
+ $(MAKE) objs
+ $(MAKE) vmslibinit
+ write sys$output "classlibrary $(LIBNAME).olb made."
+
+theProgram:
+ write sys$output "no program to be made here."
+
+$(LIBNAME).olb:
+ write sys$output "creating initial $(LIBNAME).olb ..."
+ lib/cre $(LIBNAME).olb
+