Skip to content

Commit c337a66

Browse files
authored
Merge pull request #273 from smalltalking/Cog
Make sqUnixHostWindowPlugin.c compile on 64-bit systems
2 parents 8085115 + 2eb250b commit c337a66

File tree

8 files changed

+28
-28
lines changed

8 files changed

+28
-28
lines changed

build.linux64x64/newspeak.cog.spur/plugins.int

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ FileCopyPlugin \
1111
FilePlugin \
1212
FloatArrayPlugin \
1313
FloatMathPlugin \
14-
# HostWindowPlugin \
14+
HostWindowPlugin \
1515
ZipPlugin \
1616
JPEGReadWriter2Plugin \
1717
JPEGReaderPlugin \

build.linux64x64/newspeak.sista.spur/plugins.int

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ FileCopyPlugin \
1111
FilePlugin \
1212
FloatArrayPlugin \
1313
FloatMathPlugin \
14-
# HostWindowPlugin \
14+
HostWindowPlugin \
1515
ZipPlugin \
1616
JPEGReadWriter2Plugin \
1717
JPEGReaderPlugin \

build.linux64x64/newspeak.stack.spur/plugins.int

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ FileCopyPlugin \
1111
FilePlugin \
1212
FloatArrayPlugin \
1313
FloatMathPlugin \
14-
# HostWindowPlugin \
14+
HostWindowPlugin \
1515
ZipPlugin \
1616
JPEGReadWriter2Plugin \
1717
JPEGReaderPlugin \

build.linux64x64/nsnac.cog.spur/plugins.int

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ FileCopyPlugin \
1111
FilePlugin \
1212
FloatArrayPlugin \
1313
FloatMathPlugin \
14-
# HostWindowPlugin \
14+
HostWindowPlugin \
1515
ZipPlugin \
1616
JPEGReadWriter2Plugin \
1717
JPEGReaderPlugin \

build.linux64x64/squeak.cog.spur.immutability/plugins.int

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ B2DPlugin \
77
BitBltPlugin \
88
BMPReadWriterPlugin \
99
CroquetPlugin \
10-
# HostWindowPlugin \
10+
HostWindowPlugin \
1111
ZipPlugin \
1212
DropPlugin \
1313
DSAPrims \

build.linux64x64/squeak.cog.spur/plugins.int

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ B2DPlugin \
77
BitBltPlugin \
88
BMPReadWriterPlugin \
99
CroquetPlugin \
10-
# HostWindowPlugin \
10+
HostWindowPlugin \
1111
ZipPlugin \
1212
DropPlugin \
1313
DSAPrims \

build.linux64x64/squeak.stack.spur/plugins.int

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ B2DPlugin \
77
BitBltPlugin \
88
BMPReadWriterPlugin \
99
CroquetPlugin \
10-
# HostWindowPlugin \
10+
HostWindowPlugin \
1111
ZipPlugin \
1212
DropPlugin \
1313
DSAPrims \

platforms/unix/plugins/HostWindowPlugin/sqUnixHostWindowPlugin.c

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@ static struct SqDisplay *dpy= 0;
3737

3838
#define noDisplay ( (!dpy && !(dpy= ioGetDisplayModule())) || (dpy->version < 0x10002) )
3939

40-
/* closeWindow: arg is int windowIndex. Fail (return 0) if anything goes wrong
40+
/* closeWindow: arg is sqInt windowIndex. Fail (return 0) if anything goes wrong
4141
* - typically the windowIndex invalid or similar
4242
*/
43-
int closeWindow(int index)
43+
sqInt closeWindow(sqInt index)
4444
{
4545
if (noDisplay)
4646
return 0;
@@ -49,14 +49,14 @@ int closeWindow(int index)
4949
}
5050

5151

52-
/* createWindow: takes int width, height and origin x/y plus a char* list of
53-
* as yet undefined attributes. Returns an int window index or 0 for failure
52+
/* createWindow: takes sqInt width, height and origin x/y plus a char* list of
53+
* as yet undefined attributes. Returns an sqInt window index or 0 for failure
5454
* Failure may occur because of an inability to add the window, too many
5555
* windows already extant (platform dependant), the specified size being
5656
* unreasonable etc.
5757
*/
58-
int createWindowWidthheightoriginXyattrlength(
59-
int w, int h, int x, int y, char *list, int attributeListLength)
58+
sqInt createWindowWidthheightoriginXyattrlength(
59+
sqInt w, sqInt h, sqInt x, sqInt y, char *list, sqInt attributeListLength)
6060
{
6161
if (noDisplay)
6262
return 0;
@@ -65,7 +65,7 @@ int createWindowWidthheightoriginXyattrlength(
6565
}
6666

6767

68-
/* ioShowDisplayOnWindow: similar to ioShowDisplay but adds the int windowIndex
68+
/* ioShowDisplayOnWindow: similar to ioShowDisplay but adds the sqInt windowIndex
6969
* Return true if ok, false if not, but not currently checked
7070
*/
7171
sqInt ioShowDisplayOnWindow(
@@ -82,13 +82,13 @@ sqInt ioShowDisplayOnWindow(
8282
}
8383

8484

85-
/* ioSizeOfWindow: arg is int windowIndex. Return the size of the specified
85+
/* ioSizeOfWindow: arg is sqInt windowIndex. Return the size of the specified
8686
* window in (width<<16 || height) format like ioScreenSize.
8787
* Return -1 for failure - typically invalid windowIndex
8888
* -1 is chosen since itwould correspond to a window size of 64k@64k which
8989
* I hope is unlikely for some time to come
9090
*/
91-
int ioSizeOfWindow(int windowIndex)
91+
sqInt ioSizeOfWindow(sqInt windowIndex)
9292
{
9393
if (noDisplay)
9494
return -1;
@@ -97,11 +97,11 @@ int ioSizeOfWindow(int windowIndex)
9797
}
9898

9999

100-
/* ioSizeOfWindowSetxy: args are int windowIndex, int w & h for the
100+
/* ioSizeOfWindowSetxy: args are sqInt windowIndex, sqInt w & h for the
101101
* width / height to make the window. Return the actual size the OS
102102
* produced in (width<<16 || height) format or -1 for failure as above.
103103
*/
104-
int ioSizeOfWindowSetxy(int windowIndex, int w, int h)
104+
sqInt ioSizeOfWindowSetxy(sqInt windowIndex, sqInt w, sqInt h)
105105
{
106106
if (noDisplay)
107107
return -1;
@@ -110,11 +110,11 @@ int ioSizeOfWindowSetxy(int windowIndex, int w, int h)
110110
}
111111

112112

113-
/* ioPositionOfWindow: arg is int windowIndex. Return the pos of the specified
113+
/* ioPositionOfWindow: arg is sqInt windowIndex. Return the pos of the specified
114114
* window in (left<<16 || top) format like ioScreenSize.
115115
* Return -1 (as above) for failure - typically invalid windowIndex
116116
*/
117-
int ioPositionOfWindow(int windowIndex)
117+
sqInt ioPositionOfWindow(sqInt windowIndex)
118118
{
119119
if (noDisplay)
120120
return -1;
@@ -123,11 +123,11 @@ int ioPositionOfWindow(int windowIndex)
123123
}
124124

125125

126-
/* ioPositionOfWindowSetxy: args are int windowIndex, int x & y for the
126+
/* ioPositionOfWindowSetxy: args are sqInt windowIndex, sqInt x & y for the
127127
* origin x/y for the window. Return the actual origin the OS
128128
* produced in (left<<16 || top) format or -1 for failure, as above
129129
*/
130-
int ioPositionOfWindowSetxy(int windowIndex, int x, int y)
130+
sqInt ioPositionOfWindowSetxy(sqInt windowIndex, sqInt x, sqInt y)
131131
{
132132
if (noDisplay)
133133
return -1;
@@ -136,11 +136,11 @@ int ioPositionOfWindowSetxy(int windowIndex, int x, int y)
136136
}
137137

138138

139-
/* ioSetTitleOfWindow: args are int windowIndex, char* newTitle and
140-
* int size of new title. Fail with -1 if windowIndex is invalid, string is too
139+
/* ioSetTitleOfWindow: args are sqInt windowIndex, char* newTitle and
140+
* sqInt size of new title. Fail with -1 if windowIndex is invalid, string is too
141141
* long for platform etc. Leave previous title in place on failure
142142
*/
143-
int ioSetTitleOfWindow(int windowIndex, char *newTitle, int sizeOfTitle)
143+
sqInt ioSetTitleOfWindow(sqInt windowIndex, char *newTitle, sqInt sizeOfTitle)
144144
{
145145
if (noDisplay)
146146
return -1;
@@ -149,8 +149,8 @@ int ioSetTitleOfWindow(int windowIndex, char *newTitle, int sizeOfTitle)
149149
}
150150

151151

152-
/* ioSetIconOfWindow: args are int windowIndex, char* iconPath and
153-
* int size of new logo path. If one of the function is failing, the logo is not set.
152+
/* ioSetIconOfWindow: args are sqInt windowIndex, char* iconPath and
153+
* sqInt size of new logo path. If one of the function is failing, the logo is not set.
154154
*/
155155
sqInt ioSetIconOfWindow(sqInt windowIndex, char * iconPath, sqInt sizeOfPath) {
156156
//Not implemented
@@ -161,7 +161,7 @@ sqInt ioSetIconOfWindow(sqInt windowIndex, char * iconPath, sqInt sizeOfPath) {
161161
* Close all the windows that appear to be open.
162162
* No useful return value since we're getting out of Dodge anyway.
163163
*/
164-
int ioCloseAllWindows(void)
164+
sqInt ioCloseAllWindows(void)
165165
{
166166
if (noDisplay)
167167
return 0;

0 commit comments

Comments
 (0)