aboutsummaryrefslogtreecommitdiff
path: root/libXt/src
diff options
context:
space:
mode:
Diffstat (limited to 'libXt/src')
-rw-r--r--libXt/src/Converters.c2
-rw-r--r--libXt/src/Initialize.c35
-rw-r--r--libXt/src/Intrinsic.c2
-rw-r--r--libXt/src/Shell.c10
-rw-r--r--libXt/src/Vendor.c4
-rw-r--r--libXt/src/makefile76
6 files changed, 118 insertions, 11 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..abd82826d 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
@@ -387,19 +387,23 @@ static void CombineAppUserDefaults(
Boolean deallocate = False;
if (!(path = getenv("XUSERFILESEARCHPATH"))) {
+ char *old_path=NULL;
+ char homedir[PATH_MAX]=".";
#if !defined(WIN32) || !defined(__MINGW32__)
- char *old_path;
- char homedir[PATH_MAX];
GetRootDirName(homedir, PATH_MAX);
- if (!(old_path = getenv("XAPPLRESDIR"))) {
+ if (!(old_path = getenv("XAPPLRESDIR")))
+#endif
+ {
char *path_default = "%s/%%L/%%N%%C:%s/%%l/%%N%%C:%s/%%N%%C:%s/%%L/%%N:%s/%%l/%%N:%s/%%N";
if (!(path =
ALLOCATE_LOCAL(6*strlen(homedir) + strlen(path_default))))
_XtAllocError(NULL);
sprintf( path, path_default,
homedir, homedir, homedir, homedir, homedir, homedir );
- } else {
- char *path_default = "%s/%%L/%%N%%C:%s/%%l/%%N%%C:%s/%%N%%C:%s/%%N%%C:%s/%%L/%%N:%s/%%l/%%N:%s/%%N:%s/%%N";
+ }
+#if !defined(WIN32) || !defined(__MINGW32__)
+ else
+ { char *path_default = "%s/%%L/%%N%%C:%s/%%l/%%N%%C:%s/%%N%%C:%s/%%N%%C:%s/%%L/%%N:%s/%%l/%%N:%s/%%N:%s/%%N";
if (!(path =
ALLOCATE_LOCAL( 6*strlen(old_path) + 2*strlen(homedir)
+ strlen(path_default))))
@@ -407,8 +411,8 @@ static void CombineAppUserDefaults(
sprintf(path, path_default, old_path, old_path, old_path, homedir,
old_path, old_path, old_path, homedir );
}
- deallocate = True;
#endif
+ deallocate = True;
}
filename = XtResolvePathname(dpy, NULL, NULL, NULL, path, NULL, 0, NULL);
@@ -424,20 +428,28 @@ static void CombineUserDefaults(
Display *dpy,
XrmDatabase *pdb)
{
+#ifdef _MSC_VER
+ char *slashDotXdefaults = ".Xdefaults";
+#else
#ifdef __MINGW32__
char *slashDotXdefaults = "/Xdefaults";
#else
char *slashDotXdefaults = "/.Xdefaults";
#endif
+#endif
char *dpy_defaults = XResourceManagerString(dpy);
if (dpy_defaults) {
XrmCombineDatabase(XrmGetStringDatabase(dpy_defaults), pdb, False);
} else {
char filename[PATH_MAX];
+#ifndef _MSC_VER
(void) GetRootDirName(filename,
PATH_MAX - strlen (slashDotXdefaults) - 1);
(void) strcat(filename, slashDotXdefaults);
+#else
+ strcpy(filename, slashDotXdefaults);
+#endif
(void)XrmCombineFileDatabase(filename, pdb, False);
}
}
@@ -566,15 +578,24 @@ XrmDatabase XtScreenDatabase(
if (!(filename = getenv("XENVIRONMENT"))) {
int len;
+#ifdef _MSC_VER
+ char *slashDotXdefaultsDash = "Xdefaults-";
+#else
#ifdef __MINGW32__
char *slashDotXdefaultsDash = "/Xdefaults-";
#else
char *slashDotXdefaultsDash = "/.Xdefaults-";
#endif
+#endif
+#ifndef _MSC_VER
(void) GetRootDirName(filename = filenamebuf,
PATH_MAX - strlen (slashDotXdefaultsDash) - 1);
(void) strcat(filename, slashDotXdefaultsDash);
+#else
+ filename = filenamebuf;
+ strcpy(filename, slashDotXdefaultsDash);
+#endif
len = strlen(filename);
GetHostname (filename+len, PATH_MAX-len);
}
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/Vendor.c b/libXt/src/Vendor.c
index 2d3090189..94ca36e41 100644
--- a/libXt/src/Vendor.c
+++ b/libXt/src/Vendor.c
@@ -67,7 +67,7 @@ SOFTWARE.
*
***************************************************************************/
-#if defined(__UNIXOS2__) || defined(__CYGWIN__) || defined(__MINGW32__)
+#if defined(__UNIXOS2__) || defined(__CYGWIN__) || defined(__MINGW32__) && !defined(_MSC_VER)
/* to fix the EditRes problem because of wrong linker semantics */
extern WidgetClass vendorShellWidgetClass;
@@ -153,7 +153,7 @@ externaldef(vendorshellclassrec) VendorShellClassRec vendorShellClassRec = {
}
};
-#if !defined(AIXSHLIB) || !defined(SHAREDCODE)
+#if (!defined(AIXSHLIB) || !defined(SHAREDCODE)) && !defined(_MSC_VER)
externaldef(vendorshellwidgetclass) WidgetClass vendorShellWidgetClass =
(WidgetClass) (&vendorShellClassRec);
#endif
diff --git a/libXt/src/makefile b/libXt/src/makefile
new file mode 100644
index 000000000..a129f418b
--- /dev/null
+++ b/libXt/src/makefile
@@ -0,0 +1,76 @@
+LIBRARY = libXt
+
+INCLUDES := .. ../include ../include/X11 $(INCLUDES)
+
+DEFINES += XT_NO_SM ERRORDB="""XtErrorDB"""
+
+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 \
+ 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-30 21:48:54 +0000