diff options
Diffstat (limited to 'libXt/src')
| -rw-r--r-- | libXt/src/Converters.c | 2 | ||||
| -rw-r--r-- | libXt/src/Initialize.c | 2 | ||||
| -rw-r--r-- | libXt/src/Intrinsic.c | 2 | ||||
| -rw-r--r-- | libXt/src/Shell.c | 10 | ||||
| -rw-r--r-- | libXt/src/makefile | 77 |
5 files changed, 90 insertions, 3 deletions
diff --git a/libXt/src/Converters.c b/libXt/src/Converters.c index 45777bda1..683d8ae29 100644 --- a/libXt/src/Converters.c +++ b/libXt/src/Converters.c @@ -1619,6 +1619,7 @@ Boolean XtCvtStringToRestartStyle( "String to RestartStyle conversion needs no extra arguments", (String *)NULL, (Cardinal *)NULL); +#ifndef XT_NO_SM if (CompareISOLatin1(str, "RestartIfRunning") == 0) donestr(unsigned char, SmRestartIfRunning, XtRRestartStyle); if (CompareISOLatin1(str, "RestartAnyway") == 0) @@ -1627,6 +1628,7 @@ Boolean XtCvtStringToRestartStyle( donestr(unsigned char, SmRestartImmediately, XtRRestartStyle); if (CompareISOLatin1(str, "RestartNever") == 0) donestr(unsigned char, SmRestartNever, XtRRestartStyle); +#endif XtDisplayStringConversionWarning(dpy, str, XtRRestartStyle); return False; } diff --git a/libXt/src/Initialize.c b/libXt/src/Initialize.c index 27e3d8441..43acc357d 100644 --- a/libXt/src/Initialize.c +++ b/libXt/src/Initialize.c @@ -199,7 +199,7 @@ void _XtInherit(void) #endif -#if defined (WIN32) || defined(__CYGWIN__) +#if (defined (WIN32) || defined(__CYGWIN__)) && !defined(_MSC_VER) /* * The Symbol _XtInherit is used in two different manners. * First it could be used as a generic function and second diff --git a/libXt/src/Intrinsic.c b/libXt/src/Intrinsic.c index 77402ce8e..a25e2216e 100644 --- a/libXt/src/Intrinsic.c +++ b/libXt/src/Intrinsic.c @@ -1327,7 +1327,7 @@ static void FillInLangSubs( static char *implementation_default_path(void) { #if defined(WIN32) - static char xfilesearchpath[] = ""; + static char xfilesearchpath[] = ":"; return xfilesearchpath; #elif defined(__UNIXOS2__) diff --git a/libXt/src/Shell.c b/libXt/src/Shell.c index 2699808d3..30f45d735 100644 --- a/libXt/src/Shell.c +++ b/libXt/src/Shell.c @@ -87,7 +87,9 @@ in this Software without prior written authorization from The Open Group. #include "VendorP.h" #include <X11/Xatom.h> #include <X11/Xlocale.h> +#ifndef _MSC_VER #include <X11/ICE/ICElib.h> +#endif #include <stdio.h> #include <stdlib.h> @@ -721,9 +723,11 @@ static XtResource sessionResources[]= Offset(session.current_dir), XtRString, (XtPointer) NULL}, {XtNprogramPath, XtCProgramPath, XtRString, sizeof(String), Offset(session.program_path), XtRString, (XtPointer) NULL}, +#ifndef XT_NO_SM {XtNrestartStyle, XtCRestartStyle, XtRRestartStyle, sizeof(unsigned char), Offset(session.restart_style), XtRImmediate, (XtPointer) SmRestartIfRunning}, +#endif {XtNjoinSession, XtCJoinSession, XtRBoolean, sizeof(Boolean), Offset(session.join_session), XtRImmediate, (XtPointer) True}, {XtNsaveCallback, XtCCallback, XtRCallback, sizeof(XtPointer), @@ -1106,7 +1110,9 @@ static void ApplicationInitialize( static void JoinSession(SessionShellWidget); static void SetSessionProperties(SessionShellWidget, Boolean, unsigned long, unsigned long); +#ifndef XT_NO_SM static void StopManagingSession(SessionShellWidget, SmcConn); +#endif typedef struct _XtSaveYourselfRec { XtSaveYourself next; @@ -2653,7 +2659,6 @@ static Boolean SessionSetValues( if ((cw->session.join_session && !nw->session.join_session) || (cw->session.connection && !nw->session.connection)) StopManagingSession(nw, nw->session.connection); -#endif /* !XT_NO_SM */ if (cw->wm.client_leader != nw->wm.client_leader || cw->session.session_id != nw->session.session_id) { @@ -2676,6 +2681,7 @@ static Boolean SessionSetValues( strlen(nw->session.session_id)); } } +#endif /* !XT_NO_SM */ return False; } @@ -2762,10 +2768,12 @@ static String *EditCommand(String, String *, String *); static Boolean ExamineToken(XtPointer); static void GetIceEvent(XtPointer, int *, XtInputId *); static XtCheckpointToken GetToken(Widget, int); +#ifndef XT_NO_SM static void XtCallCancelCallbacks(SmcConn, SmPointer); static void XtCallDieCallbacks(SmcConn, SmPointer); static void XtCallSaveCallbacks(SmcConn, SmPointer, int, Bool, int, Bool); static void XtCallSaveCompleteCallbacks(SmcConn, SmPointer); +#endif /* !XT_NO_SM */ #ifndef XT_NO_SM static void StopManagingSession( diff --git a/libXt/src/makefile b/libXt/src/makefile new file mode 100644 index 000000000..37c59147c --- /dev/null +++ b/libXt/src/makefile @@ -0,0 +1,77 @@ +LIBRARY = libXt + +INCLUDES := .. ../include ../include/X11 $(INCLUDES) + +DEFINES += XT_NO_SM + +CSRCS = \ + ActionHook.c \ + Alloc.c \ + ArgList.c \ + Callback.c \ + ClickTime.c \ + Composite.c \ + Constraint.c \ + Convert.c \ + Converters.c \ + Core.c \ + Create.c \ + Destroy.c \ + Display.c \ + Error.c \ + Event.c \ + EventUtil.c \ + Functions.c \ + GCManager.c \ + Geometry.c \ + GetActKey.c \ + GetResList.c \ + GetValues.c \ + HookObj.c \ + Hooks.c \ + Initialize.c \ + Intrinsic.c \ + Keyboard.c \ + Manage.c \ + NextEvent.c \ + Object.c \ + PassivGrab.c \ + Pointer.c \ + Popup.c \ + PopupCB.c \ + RectObj.c \ + ResConfig.c \ + Resources.c \ + Selection.c \ + SetSens.c \ + SetValues.c \ + SetWMCW.c \ + Shell.c \ + TMaction.c \ + TMgrab.c \ + TMkey.c \ + TMparse.c \ + TMprint.c \ + TMstate.c \ + Threads.c \ + VarCreate.c \ + VarGet.c \ + Varargs.c \ + Vendor.c \ + sharedlib.c \ + StringDefs.c + +BUILT_SOURCE = StringDefs.c +BUILT_HEADER = ../include/X11/StringDefs.h ../include/X11/Shell.h +BUILT_FILES = $(BUILT_SOURCE) $(BUILT_HEADER) + +STRING_LIST = ../util/string.list + +$(BUILT_HEADER): $(BUILT_SOURCE) + +load_makefile ../util/makefile DEBUG=$(DEBUG) MAKESERVER=0 + +$(BUILT_SOURCE) $(BUILT_HEADER) : ../util/$(OBJDIR)/makestrs.exe $(STRING_LIST) ../util/StrDefs.ht ../util/StrDefs.ct ../util/Shell.ht + ../util/$(OBJDIR)/makestrs -i .. $(STRINGSABIOPTIONS) < $(STRING_LIST) > StringDefs.c + move StringDefs.h ..\include\X11 + move Shell.h ..\include\X11 |