* cleanup, removed warnings

* external decls moved from implementation to interface
This commit is contained in:
peter 2000-02-27 13:11:31 +00:00
parent 3a5a62b567
commit febb7a0d06
6 changed files with 1155 additions and 1720 deletions

View File

@ -1,5 +1,5 @@
#
# Makefile generated by fpcmake v0.99.13 [2000/02/09]
# Makefile generated by fpcmake v0.99.13 [2000/02/24]
#
defaultrule: all
@ -184,7 +184,7 @@ endif
# Targets
override UNITOBJECTS+=x xresource xlib xutil
override UNITOBJECTS+=x xlib xutil xresource
# Clean

View File

@ -3,7 +3,7 @@
#
[targets]
units=x xresource xlib xutil
units=x xlib xutil xresource
[dirs]
fpcdir=../..

View File

@ -10,18 +10,18 @@ unit x;
X_PROTOCOL = 11;
X_PROTOCOL_REVISION = 0;
type
{ Inserted the following by hand. It was under a ifndef _XSERVER64. All
were unsigned longs originally
-- MVC. }
TXID = cardinal ;
TMask = cardinal ;
TAtom = cardinal ;
TVisualID = cardinal ;
TTime = cardinal ;
{ End of insert }
-- MVC. }
TXID = cardinal ;
TMask = cardinal ;
TAtom = cardinal ;
TVisualID = cardinal ;
TTime = cardinal ;
{ End of insert }
TWindow = TXID;
TDrawable = TXID;
TFont = TXID;
@ -33,13 +33,13 @@ unit x;
TKeyCode = char;
PKeyCode = ^TKeyCode;
{ Pointers to all these things. Needed for C calls. MVC }
PAtom = ^TAtom;
PAtom = ^TAtom;
PPAtom = ^PAtom;
PWindow = ^TWindow;
PColormap = ^TColormap;
PKeySym = ^TKeysym;
PPixmap = ^TPixmap;
{*****************************************************************
* RESERVED RESOURCE AND CONSTANT DEFINITIONS
*****************************************************************}
@ -48,12 +48,12 @@ unit x;
const
None = 0;
{* background pixmap in CreateWindow
and ChangeWindowAttributes *}
and ChangeWindowAttributes *}
ParentRelative = 1;
{* border pixmap in CreateWindow
and ChangeWindowAttributes
special VisualID and special window
class passed to CreateWindow *}
and ChangeWindowAttributes
special VisualID and special window
class passed to CreateWindow *}
CopyFromParent = 0;
{* destination window in SendEvent *}
PointerWindow = 0;
@ -72,8 +72,8 @@ unit x;
{* special Time *}
CurrentTime = 0;
{* special KeySym *}
{*****************************************************************
* EVENT DEFINITIONS
{*****************************************************************
* EVENT DEFINITIONS
*****************************************************************}
{* Input Event Masks. Used as event-mask window attribute and as arguments
to Grab requests. Not to be confused with event names. *}
@ -233,7 +233,7 @@ unit x;
{* Used in SetInputFocus, GetInputFocus *}
SyncBoth = 7;
{*****************************************************************
* ERROR CODES
* ERROR CODES
*****************************************************************}
RevertToParent = 2;
{* everything's okay *}
@ -257,14 +257,14 @@ unit x;
{* parameter not a Pixmap or Window *}
BadDrawable = 9;
{* depending on context:
- key/button already grabbed
- attempt to free an illegal
cmap entry
- attempt to store into a read-only
color map entry.
- attempt to modify the access control
list from other than the local host.
*}
- key/button already grabbed
- attempt to free an illegal
cmap entry
- attempt to store into a read-only
color map entry.
- attempt to modify the access control
list from other than the local host.
*}
BadAccess = 10;
{* insufficient resources *}
BadAlloc = 11;
@ -282,7 +282,7 @@ unit x;
BadImplementation = 17;
FirstExtensionError = 128;
{*****************************************************************
* WINDOW DEFINITIONS
* WINDOW DEFINITIONS
*****************************************************************}
{* Window classes used by CreateWindow *}
{* Note that CopyFromParent is already defined as 0 above *}
@ -463,14 +463,14 @@ unit x;
GCDashList = (1) shl (21);
GCArcMode = (1) shl (22);
{*****************************************************************
* FONTS
* FONTS
*****************************************************************}
{* used in QueryFont -- draw direction *}
GCLastBit = 22;
FontLeftToRight = 0;
FontRightToLeft = 1;
{*****************************************************************
* IMAGING
* IMAGING
*****************************************************************}
{* ImageFormat -- PutImage, GetImage *}
FontChange = 255;
@ -480,7 +480,7 @@ unit x;
XYPixmap = 1;
{* depth == drawable depth *}
{*****************************************************************
* COLOR MAP STUFF
* COLOR MAP STUFF
*****************************************************************}
{* For CreateColormap *}
ZPixmap = 2;
@ -501,7 +501,7 @@ unit x;
{* size tiled fastest *}
TileShape = 1;
{* size stippled fastest *}
{*****************************************************************
{*****************************************************************
* KEYBOARD/POINTER STUFF
*****************************************************************}
StippleShape = 2;
@ -525,7 +525,7 @@ unit x;
MappingModifier = 0;
MappingKeyboard = 1;
{*****************************************************************
* SCREEN SAVER STUFF
* SCREEN SAVER STUFF
*****************************************************************}
MappingPointer = 2;
DontPreferBlanking = 0;
@ -547,7 +547,7 @@ unit x;
{* for ChangeAccessControl *}
HostDelete = 1;
EnableAccess = 1;
{* Display classes used in opening the connection
{* Display classes used in opening the connection
* Note that the statically allocated ones are even numbered and the
* dynamically changeable ones are odd numbered *}
DisableAccess = 0;

File diff suppressed because it is too large Load Diff

View File

@ -1,113 +1,106 @@
{
$Id$
}
unit xresource;
interface
uses xlib;
uses
xlib;
{***************************************************************
*
* Quark Management
*
***************************************************************}
type
TXrmQuark = Integer;
PXrmQuark = ^TXrmQuark;
TXrmQuarkList = PXrmQuark;
Const NULLQUARK = 0 ;
type
TXrmQuark = Longint;
PXrmQuark = ^TXrmQuark;
TXrmQuarkList = PXrmQuark;
TXrmString = Pchar;
type TXrmString = Pchar;
const NULLSTRING = 0;
Const
NULLQUARK = 0 ;
NULLSTRING = 0;
{ find quark for string, create new quark if none already exists }
Function XrmStringToQuark( p1 : pchar ) : TXrmQuark;cdecl;
Function XrmPermStringToQuark( p1 : pchar ) : TXrmQuark;cdecl;
Function XrmStringToQuark( p1 : pchar ) : TXrmQuark;cdecl;external;
Function XrmPermStringToQuark( p1 : pchar ) : TXrmQuark;cdecl;external;
{ find string for quark }
Function XrmQuarkToString( p1 : TXrmQuark) : TXrmString;cdecl;
Function XrmUniqueQuark : TXrmQuark;cdecl;
Function XrmQuarkToString( p1 : TXrmQuark) : TXrmString;cdecl;external;
Function XrmUniqueQuark : TXrmQuark;cdecl;external;
{
#define XrmStringsEqual(a1, a2) (strcmp(a1, a2) == 0)
}
{***************************************************************
*
* Conversion of Strings to Lists
*
***************************************************************}
type
TXrmBinding = integer;
TXrmBindingList = ^Integer;
Const XrmBindTightly = 0;
XrmBindLoosely = 1;
TXrmBinding = longint;
TXrmBindingList = ^longint;
Const
XrmBindTightly = 0;
XrmBindLoosely = 1;
procedure XrmStringToQuarkList(
p1 : pchar { string };
p2 : TXrmQuarkList { quarks_return }
);cdecl;
p1 : pchar { string };
p2 : TXrmQuarkList { quarks_return }
);cdecl;external;
procedure XrmStringToBindingQuarkList(
p1 : pchar { string };
p2 : TXrmBindingList { bindings_return };
p3 : TXrmQuarkList { quarks_return }
);cdecl;
p1 : pchar { string };
p2 : TXrmBindingList { bindings_return };
p3 : TXrmQuarkList { quarks_return }
);cdecl;external;
{***************************************************************
*
* Name and Class lists.
*
***************************************************************}
type TXrmName = TXrmQuark;
TXrmNameList = TXrmQuarkList ;
{
#define XrmNameToString(name) XrmQuarkToString(name)
#define XrmStringToName(string) XrmStringToQuark(string)
#define XrmStringToNameList(str, name) XrmStringToQuarkList(str, name)
type
TXrmName = TXrmQuark;
TXrmNameList = TXrmQuarkList ;
{
#define XrmNameToString(name) XrmQuarkToString(name)
#define XrmStringToName(string) XrmStringToQuark(string)
#define XrmStringToNameList(str, name) XrmStringToQuarkList(str, name)
}
TXrmClass = TXrmQuark;
TXrmClassList = TXrmQuarkList;
{
#define XrmClassToString(c_class) XrmQuarkToString(c_class)
#define XrmStringToClass(c_class) XrmStringToQuark(c_class)
#define XrmClassToString(c_class) XrmQuarkToString(c_class)
#define XrmStringToClass(c_class) XrmStringToQuark(c_class)
#define XrmStringToClassList(str,c_class) XrmStringToQuarkList(str, c_class)
}
{***************************************************************
*
* Resource Representation Types and Values
*
***************************************************************}
type TXrmRepresentation = TXrmQuark ;
PXrmRepresentation = ^TXrmRepresentation;
type
TXrmRepresentation = TXrmQuark ;
PXrmRepresentation = ^TXrmRepresentation;
{
#define XrmStringToRepresentation(string) XrmStringToQuark(string)
#define XrmRepresentationToString(type) XrmQuarkToString(type)
#define XrmRepresentationToString(type) XrmQuarkToString(type)
}
type TXrmValue = record
type
TXrmValue = record
size : word;
theaddr : TXPointer;
end;
end;
PXrmValue = ^TXrmValue;
TXrmValuePtr = PXrmValue;
{***************************************************************
*
* Resource Manager Functions
*
***************************************************************}
{
typedef struct _XrmHashBucketRec *XrmHashBucket;
@ -115,79 +108,80 @@ typedef XrmHashBucket *XrmHashTable;
typedef XrmHashTable XrmSearchList[];
typedef struct _XrmHashBucketRec *XrmDatabase;
}
Type TXrmHashBucket = pointer;
TXrmHashTable = ^TXrmHashBucket;
TXrmSearchList = ^TXrmHashTable;
TXrmDatabase = pointer;
PXrmDatabase = ^TXrmDatabase;
Type
TXrmHashBucket = pointer;
TXrmHashTable = ^TXrmHashBucket;
TXrmSearchList = ^TXrmHashTable;
TXrmDatabase = pointer;
PXrmDatabase = ^TXrmDatabase;
procedure XrmDestroyDatabase(
p1 : TXrmDatabase { database }
);cdecl;
p1 : TXrmDatabase { database }
);cdecl;external;
Procedure XrmQPutResource(
p1 : PXrmDatabase { database };
p2 : TXrmBindingList { bindings };
p3 : TXrmQuarkList { quarks };
p4 : TXrmRepresentation { type };
p5 : PXrmValue { value }
);cdecl;
p1 : PXrmDatabase { database };
p2 : TXrmBindingList { bindings };
p3 : TXrmQuarkList { quarks };
p4 : TXrmRepresentation { type };
p5 : PXrmValue { value }
);cdecl;external;
Procedure XrmPutResource(
p1 : PXrmDatabase { database };
p2 : pchar { specifier };
p3 : pchar { type };
p4 : PXrmValue { value }
);cdecl;
p1 : PXrmDatabase { database };
p2 : pchar { specifier };
p3 : pchar { type };
p4 : PXrmValue { value }
);cdecl;external;
Procedure XrmQPutStringResource(
p1 : PXrmDatabase { database };
p1 : PXrmDatabase { database };
p2 : TXrmBindingList { bindings };
p3 : TXrmQuarkList { quarks };
p4 : Pchar { value }
);cdecl;
p3 : TXrmQuarkList { quarks };
p4 : Pchar { value }
);cdecl;external;
Procedure XrmPutStringResource(
P1 : PXrmDatabase { database };
P1 : PXrmDatabase { database };
p2,p3 : pchar
);cdecl;
);cdecl;external;
Procedure XrmPutLineResource(
p1 : PXrmDatabase { database };
p2 : pchar { line }
);cdecl;
p1 : PXrmDatabase { database };
p2 : pchar { line }
);cdecl;external;
Function XrmQGetResource(
p1 : PXrmDatabase { database };
p2 : TXrmNameList { quark_name };
p3 : TXrmClassList { quark_class };
p4 : PXrmRepresentation { quark_type_return };
p5 : PXrmValue { value_return }
) : Integer;cdecl;
p1 : PXrmDatabase { database };
p2 : TXrmNameList { quark_name };
p3 : TXrmClassList { quark_class };
p4 : PXrmRepresentation { quark_type_return };
p5 : PXrmValue { value_return }
) : Integer;cdecl;external;
Function XrmGetResource(
p1 : TXrmDatabase { database };
p2 : pchar { str_name };
p3 : pchar { str_class };
p4 : ppchar { str_type_return };
p5 : PXrmValue { value_return }
) : Tbool;cdecl;
p1 : TXrmDatabase { database };
p2 : pchar { str_name };
p3 : pchar { str_class };
p4 : ppchar { str_type_return };
p5 : PXrmValue { value_return }
) : Tbool;cdecl;external;
Function XrmQGetSearchList(
p1 : TXrmDatabase { database };
p2 : TXrmNameList { names };
p3 : TXrmClassList { classes };
p4 : TXrmSearchList { list_return };
p5 : integer { list_length }
) : Tbool;cdecl;
p1 : TXrmDatabase { database };
p2 : TXrmNameList { names };
p3 : TXrmClassList { classes };
p4 : TXrmSearchList { list_return };
p5 : integer { list_length }
) : Tbool;cdecl;external;
Function XrmQGetSearchResource(
P1 : TXrmSearchList { list };
p2 : TXrmName { name };
p3 : TXrmClass { class };
p4 : PXrmRepresentation { type_return };
p5 : PXrmValue { value_return }
) : TBool;cdecl;
P1 : TXrmSearchList { list };
p2 : TXrmName { name };
p3 : TXrmClass { class };
p4 : PXrmRepresentation { type_return };
p5 : PXrmValue { value_return }
) : TBool;cdecl;external;
{***************************************************************
*
@ -196,69 +190,69 @@ Function XrmQGetSearchResource(
***************************************************************}
procedure XrmSetDatabase(
p1 : PDisplay { display };
p2 : TXrmDatabase { database }
);cdecl;
p1 : PDisplay { display };
p2 : TXrmDatabase { database }
);cdecl;external;
Function XrmGetDatabase(
p1 : PDisplay { display }
) : TXrmDatabase;cdecl;
p1 : PDisplay { display }
) : TXrmDatabase;cdecl;external;
Function XrmGetFileDatabase(
p1 : pchar { filename }
) : TXrmDatabase ;cdecl;
p1 : pchar { filename }
) : TXrmDatabase ;cdecl;external;
Function XrmCombineFileDatabase(
p1 : pchar { filename };
p2 : PXrmDatabase { target };
p3 : TBool { override }
) : TStatus ;cdecl;
p1 : pchar { filename };
p2 : PXrmDatabase { target };
p3 : TBool { override }
) : TStatus ;cdecl;external;
function XrmGetStringDatabase(
p1 : pchar { data } { null terminated string }
) : TXrmDatabase ;cdecl;
p1 : pchar { data } { null terminated string }
) : TXrmDatabase ;cdecl;external;
Procedure XrmPutFileDatabase(
p1 : TXrmDatabase { database };
p2: pchar { filename }
);cdecl;
p1 : TXrmDatabase { database };
p2: pchar { filename }
);cdecl;external;
Procedure XrmMergeDatabases(
p1 : TXrmDatabase { source_db };
p2 : PXrmDatabase { target_db }
);cdecl;
p1 : TXrmDatabase { source_db };
p2 : PXrmDatabase { target_db }
);cdecl;external;
procedure XrmCombineDatabase(
p1 : TXrmDatabase { source_db };
p2 : PXrmDatabase { target_db };
p3 : TBool { override }
);cdecl;
p1 : TXrmDatabase { source_db };
p2 : PXrmDatabase { target_db };
p3 : TBool { override }
);cdecl;external;
const
XrmEnumAllLevels = 0;
XrmEnumOneLevel = 1;
{
(*
Function XrmEnumerateDatabase(
XrmDatabase { db };
XrmNameList { name_prefix };
XrmClassList { class_prefix };
int { mode };
Bool (*)(#if NeedNestedPrototypes
XrmDatabase* { db };
XrmBindingList { bindings };
XrmQuarkList { quarks };
XrmRepresentation* { type };
XrmValue* { value };
XPointer { closure }
XrmDatabase { db };
XrmNameList { name_prefix };
XrmClassList { class_prefix };
int { mode };
Bool *(#if NeedNestedPrototypes
XrmDatabase* { db };
XrmBindingList { bindings };
XrmQuarkList { quarks };
XrmRepresentation* { type };
XrmValue* { value };
XPointer { closure }
) { proc };
XPointer { closure }
) { proc };
XPointer { closure }
) : TBool;
}
*)
Function XrmLocaleOfDatabase(
P1 : TXrmDatabase { database }
) : Pchar;cdecl;
P1 : TXrmDatabase { database }
) : Pchar;cdecl;external;
{***************************************************************
@ -268,190 +262,43 @@ Function XrmLocaleOfDatabase(
***************************************************************}
Const
XrmoptionNoArg = 0; { Value is specified in OptionDescRec.value }
XrmoptionIsArg = 1; { Value is the option string itself }
XrmoptionNoArg = 0; { Value is specified in OptionDescRec.value }
XrmoptionIsArg = 1; { Value is the option string itself }
XrmoptionStickyArg = 2; { Value is characters immediately following option }
XrmoptionSepArg = 3; { Value is next argument in argv }
XrmoptionResArg = 4; { Resource and value in next argument in argv }
XrmoptionSepArg = 3; { Value is next argument in argv }
XrmoptionResArg = 4; { Resource and value in next argument in argv }
XrmoptionSkipArg = 5; { Ignore this option and the next argument in argv }
XrmoptionSkipLine = 6; { Ignore this option and the rest of argv }
XrmoptionSkipNArgs = 7; { Ignore this option and the next
OptionDescRes.value arguments in argv }
XrmoptionSkipLine = 6; { Ignore this option and the rest of argv }
XrmoptionSkipNArgs = 7; { Ignore this option and the next
OptionDescRes.value arguments in argv }
Type TXrmOptionKind = Integer;
TXrmOptionDescRec = record
option : pchar; { Option abbreviation in argv }
specifier : pchar; { Resource specifier }
argKind : TXrmOptionKind; { Which style of option it is }
value : TXpointer; { Value to provide if XrmoptionNoArg }
option : pchar; { Option abbreviation in argv }
specifier : pchar; { Resource specifier }
argKind : TXrmOptionKind; { Which style of option it is }
value : TXpointer; { Value to provide if XrmoptionNoArg }
end;
PXrmOptionDescRec= ^TXrmOptionDescRec;
PXrmOptionDescRec= ^TXrmOptionDescRec;
TXrmOptionDescList = PXrmOptionDescRec;
Procedure XrmParseCommand(
p1 : TXrmDatabase { database };
p2 : TXrmOptionDescList { table };
p3 : integer { table_count };
p4 : pchar { name };
p5 : Pointer { argc_in_out };
p6 : ppchar { argv_in_out }
);cdecl;
p1 : TXrmDatabase { database };
p2 : TXrmOptionDescList { table };
p3 : integer { table_count };
p4 : pchar { name };
p5 : Pointer { argc_in_out };
p6 : ppchar { argv_in_out }
);cdecl;external;
Implementation
Function XrmStringToQuark( p1 : pchar ) : TXrmQuark; cdecl; external;
Function XrmPermStringToQuark( p1 : pchar ) : TXrmQuark; cdecl; external;
Function XrmQuarkToString( p1 : TXrmQuark) : TXrmString; cdecl; external;
Function XrmUniqueQuark : TXrmQuark; cdecl; external;
procedure XrmStringToQuarkList(
p1 : pchar { string };
p2 : TXrmQuarkList { quarks_return }
); cdecl; external;
procedure XrmStringToBindingQuarkList(
p1 : pchar { string };
p2 : TXrmBindingList { bindings_return };
p3 : TXrmQuarkList { quarks_return }
); cdecl; external;
procedure XrmDestroyDatabase(
p1 : TXrmDatabase { database }
); cdecl; external;
Procedure XrmQPutResource(
p1 : PXrmDatabase { database };
p2 : TXrmBindingList { bindings };
p3 : TXrmQuarkList { quarks };
p4 : TXrmRepresentation { type };
p5 : PXrmValue { value }
); cdecl; external;
Procedure XrmPutResource(
p1 : PXrmDatabase { database };
p2 : pchar { specifier };
p3 : pchar { type };
p4 : PXrmValue { value }
); cdecl; external;
Procedure XrmQPutStringResource(
p1 : PXrmDatabase { database };
p2 : TXrmBindingList { bindings };
p3 : TXrmQuarkList { quarks };
p4 : Pchar { value }
); cdecl; external;
procedure XrmPutStringResource(
P1 : PXrmDatabase { database };
p2,p3 : pchar
); cdecl; external;
Procedure XrmPutLineResource(
p1 : PXrmDatabase { database };
p2 : pchar { line }
); cdecl; external;
Function XrmQGetResource(
p1 : PXrmDatabase { database };
p2 : TXrmNameList { quark_name };
p3 : TXrmClassList { quark_class };
p4 : PXrmRepresentation { quark_type_return };
p5 : PXrmValue { value_return }
) : Integer; cdecl; external;
Function XrmGetResource(
p1 : TXrmDatabase { database };
p2 : pchar { str_name };
p3 : pchar { str_class };
p4 : ppchar { str_type_return };
p5 : PXrmValue { value_return }
) : Tbool; cdecl; external;
Function XrmQGetSearchList(
p1 : TXrmDatabase { database };
p2 : TXrmNameList { names };
p3 : TXrmClassList { classes };
p4 : TXrmSearchList { list_return };
p5 : integer { list_length }
) : Tbool; cdecl; external;
Function XrmQGetSearchResource(
P1 : TXrmSearchList { list };
p2 : TXrmName { name };
p3 : TXrmClass { class };
p4 : PXrmRepresentation { type_return };
p5 : PXrmValue { value_return }
) : TBool; cdecl; external;
procedure XrmSetDatabase(
p1 : PDisplay { display };
p2 : TXrmDatabase { database }
); cdecl; external;
Function XrmGetDatabase(
p1 : PDisplay { display }
) : TXrmDatabase; cdecl; external;
Function XrmGetFileDatabase(
p1 : pchar { filename }
) : TXrmDatabase ; cdecl; external;
Function XrmCombineFileDatabase(
p1 : pchar { filename };
p2 : PXrmDatabase { target };
p3 : TBool { override }
) : TStatus ; cdecl; external;
function XrmGetStringDatabase(
p1 : pchar { data } { null terminated string }
) : TXrmDatabase ; cdecl; external;
Procedure XrmPutFileDatabase(
p1 : TXrmDatabase { database };
p2: pchar { filename }
); cdecl; external;
Procedure XrmMergeDatabases(
p1 : TXrmDatabase { source_db };
p2 : PXrmDatabase { target_db }
); cdecl; external;
procedure XrmCombineDatabase(
p1 : TXrmDatabase { source_db };
p2 : PXrmDatabase { target_db };
p3 : TBool { override }
); cdecl; external;
end.
{
Function XrmEnumerateDatabase(
XrmDatabase { db };
XrmNameList { name_prefix };
XrmClassList { class_prefix };
int { mode };
Bool (*)(#if NeedNestedPrototypes
XrmDatabase* { db };
XrmBindingList { bindings };
XrmQuarkList { quarks };
XrmRepresentation* { type };
XrmValue* { value };
XPointer { closure }
$Log$
Revision 1.2 2000-02-27 13:11:31 peter
* cleanup, removed warnings
* external decls moved from implementation to interface
) { proc };
XPointer { closure }
) : TBool; cdecl; external;
}
Function XrmLocaleOfDatabase(
P1 : TXrmDatabase { database }
) : Pchar; cdecl; external;
Procedure XrmParseCommand(
p1 : TXrmDatabase { database };
p2 : TXrmOptionDescList { table };
p3 : integer { table_count };
p4 : pchar { name };
p5 : Pointer { argc_in_out };
p6 : ppchar { argv_in_out }
); cdecl; external;
end.

File diff suppressed because it is too large Load Diff