[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Stratagus-CVS] stratagus ./Rules.make.orig ./configure.in ./se...
|
From: |
Jimmy Salmon |
|
Subject: |
[Stratagus-CVS] stratagus ./Rules.make.orig ./configure.in ./se... |
|
Date: |
Thu, 16 Oct 2003 13:03:02 -0400 |
CVSROOT: /cvsroot/stratagus
Module name: stratagus
Branch:
Changes by: Jimmy Salmon <address@hidden> 03/10/16 13:03:01
Modified files:
. : Rules.make.orig configure.in setup
contrib : msvc.zip
data/ccl : stratagus.ccl
doc/ccl : ccl-index.html config.html
src/clone : ccl.c clone.c
src/include : stratagus.h ui.h video.h
src/network : lowlevel.c
src/ui : ccl_ui.c menu_proc.c ui.c
src/video : Module.make sdl.c video.c
Removed files:
src/video : X11.c
Log message:
Removed X11
Patches:
Index: stratagus/Rules.make.orig
diff -u stratagus/Rules.make.orig:1.149 stratagus/Rules.make.orig:1.150
--- stratagus/Rules.make.orig:1.149 Wed Oct 15 20:06:36 2003
+++ stratagus/Rules.make.orig Thu Oct 16 13:02:58 2003
@@ -21,7 +21,7 @@
## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
## GNU General Public License for more details.
##
-## $Id: Rules.make.orig,v 1.149 2003/10/16 00:06:36 jsalmon3 Exp $
+## $Id: Rules.make.orig,v 1.150 2003/10/16 17:02:58 jsalmon3 Exp $
##
############################################################################
@@ -54,12 +54,6 @@
#SDL = -DUSE_SDL $(SDL_CFLAGS)
# With SDL Sound
SDL = -DUSE_SDL -DUSE_SDLA $(SDL_CFLAGS)
-
-#------------------------------------------------------------------------------
-# Uncomment the next for the normal X11 support.
-
-VIDEO = -DUSE_X11
-VIDEOLIB = -lXext -lX11 -ldl
#------------------------------------------------------------------------------
# Uncomment one of the next for the SDL support.
Index: stratagus/configure.in
diff -u stratagus/configure.in:1.28 stratagus/configure.in:1.29
--- stratagus/configure.in:1.28 Wed Oct 15 20:06:36 2003
+++ stratagus/configure.in Thu Oct 16 13:02:59 2003
@@ -105,32 +105,21 @@
dnl FIXME: todo
AC_ARG_WITH(client,
- [ --with-client=sdl,x11
+ [ --with-client=sdl
[Select which client (default: sdl)]])
THREAD_LIBS=
-if test "$with_client" = "x11"; then
- AC_CHECK_HEADERS(X11/Xlib.h,, AC_MSG_ERROR(could not find X11/Xlib.h))
- VIDEO_CFLAGS="-DUSE_X11"
- VIDEO_LIBS="-lXext -lX11 -L/usr/X11R6/lib -I/usr/X11R6/include"
- if test "$PLATFORM" = "-DBSD"; then
- THREAD_LIBS="-pthread"
- else
- THREAD_LIBS="-lpthread"
- fi
+AC_CHECK_HEADERS(SDL/SDL.h,, AC_MSG_ERROR(could not find SDL/SDL.h))
+VIDEO_CFLAGS="-DUSE_SDL -DUSE_SDLA `sdl-config --cflags`"
+if test "$enable_static" != "yes"; then
+ VIDEO_LIBS="`sdl-config --libs`"
else
- AC_CHECK_HEADERS(SDL/SDL.h,, AC_MSG_ERROR(could not find SDL/SDL.h))
- VIDEO_CFLAGS="-DUSE_SDL -DUSE_SDLA `sdl-config --cflags`"
- if test "$enable_static" != "yes"; then
- VIDEO_LIBS="`sdl-config --libs`"
+ VIDEO_LIBS="`sdl-config --static-libs`"
+fi
+if test "$WIN32" = "1"; then
+ if test "`uname -a | grep -is cygwin`"; then
+ VIDEO_LIBS="$VIDEO_LIBS -lwsock32 -lws2_32"
else
- VIDEO_LIBS="`sdl-config --static-libs`"
- fi
- if test "$WIN32" = "1"; then
- if test "`uname -a | grep -is cygwin`"; then
- VIDEO_LIBS="$VIDEO_LIBS -lwsock32 -lws2_32"
- else
- VIDEO_LIBS="$VIDEO_LIBS -lwsock32 -lws2_32 -lmingwex -lgmon"
- fi
+ VIDEO_LIBS="$VIDEO_LIBS -lwsock32 -lws2_32 -lmingwex -lgmon"
fi
fi
AC_SUBST(VIDEO_CFLAGS)
Index: stratagus/contrib/msvc.zip
Index: stratagus/data/ccl/stratagus.ccl
diff -u stratagus/data/ccl/stratagus.ccl:1.20
stratagus/data/ccl/stratagus.ccl:1.21
--- stratagus/data/ccl/stratagus.ccl:1.20 Mon Oct 13 07:21:06 2003
+++ stratagus/data/ccl/stratagus.ccl Thu Oct 16 13:03:00 2003
@@ -26,7 +26,7 @@
;; along with this program; if not, write to the Free Software
;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
USA
;;
-;; $Id: stratagus.ccl,v 1.20 2003/10/13 11:21:06 n0body Exp $
+;; $Id: stratagus.ccl,v 1.21 2003/10/16 17:03:00 jsalmon3 Exp $
;; For documentation see stratagus/doc/ccl/ccl.html
@@ -245,12 +245,6 @@
;; uncomment this.
;; FIXME: this option will be renamed
(right-button-moves)
-
-;; Change next, for the wanted mouse speed. (only SVGALIB)
-(set-mouse-adjust! 15)
-
-;; Change next, for the wanted mouse scale. (only SVGALIB)
-(set-mouse-scale! 1)
;; Set the name of the missile to use when clicking
(set-click-missile! 'missile-green-cross)
Index: stratagus/doc/ccl/ccl-index.html
diff -u stratagus/doc/ccl/ccl-index.html:1.47
stratagus/doc/ccl/ccl-index.html:1.48
--- stratagus/doc/ccl/ccl-index.html:1.47 Mon Oct 13 09:53:09 2003
+++ stratagus/doc/ccl/ccl-index.html Thu Oct 16 13:03:00 2003
@@ -418,10 +418,6 @@
<dd></dd>
<dt><a href="config.html#set-minimap-terrain!">set-minimap-terrain!</a></dt>
<dd></dd>
-<dt><a href="config.html#set-mouse-adjust!">set-mouse-adjust!</a></dt>
-<dd></dd>
-<dt><a href="config.html#set-mouse-scale!">set-mouse-scale!</a></dt>
-<dd></dd>
<dt><a href="config.html#set-mouse-scroll!">set-mouse-scroll!</a></dt>
<dd></dd>
<dt><a
href="config.html#set-mouse-scroll-speed!">set-mouse-scroll-speed!</a></dt>
@@ -549,7 +545,7 @@
<!-- SCRIPT END -->
</dl>
-Last changed: $Id: ccl-index.html,v 1.47 2003/10/13 13:53:09 martinxyz Exp
$<br>
+Last changed: $Id: ccl-index.html,v 1.48 2003/10/16 17:03:00 jsalmon3 Exp $<br>
All trademarks and copyrights on this page are owned by their respective
owners.
<address>(c) 2002-2003 by <a href="http://stratagus.org";>
The Stratagus Project</a></address></body></html>
Index: stratagus/doc/ccl/config.html
diff -u stratagus/doc/ccl/config.html:1.29 stratagus/doc/ccl/config.html:1.30
--- stratagus/doc/ccl/config.html:1.29 Thu Oct 9 07:31:43 2003
+++ stratagus/doc/ccl/config.html Thu Oct 16 13:03:00 2003
@@ -85,8 +85,6 @@
<a href="#set-menu-background!">set-menu-background!</a>
<a href="#set-menu-background-with-title!">set-menu-background-with-title!</a>
<a href="#set-minimap-terrain!">set-minimap-terrain!</a>
-<a href="#set-mouse-adjust!">set-mouse-adjust!</a>
-<a href="#set-mouse-scale!">set-mouse-scale!</a>
<a href="#set-mouse-scroll!">set-mouse-scroll!</a>
<a href="#set-mouse-scroll-speed!">set-mouse-scroll-speed!</a>
<a href="#set-original-resources!">set-original-resources!</a>
@@ -945,48 +943,6 @@
<a href="../../data/ccl/stratagus.ccl"> $LIBARYPATH/ccl/stratagus.ccl </a>
-<a name="set-mouse-adjust!"></a>
-<h3>(set-mouse-adjust! speed)</h3>
-
-(Only with SVGALIB).
-
-
-<dl>
-<dt>speed</dt>
-<dd>.
-</dd>
-</dl>
-
-<h4>Example</h4>
-
-<pre>
- (set-mouse-adjust! 15)
-</pre>
-<h4>Used</h4>
-
-<a href="../../data/ccl/stratagus.ccl"> $LIBARYPATH/ccl/stratagus.ccl </a>
-
-<a name="set-mouse-scale!"></a>
-<h3>(set-mouse-scale! scale)</h3>
-
-(Only with SVGALIB).
-
-
-<dl>
-<dt>scale</dt>
-<dd>.
-</dd>
-</dl>
-
-<h4>Example</h4>
-
-<pre>
- (set-mouse-scale! 1)
-</pre>
-<h4>Used</h4>
-
-<a href="../../data/ccl/stratagus.ccl"> $LIBARYPATH/ccl/stratagus.ccl </a>
-
<a name="set-mouse-scroll!"></a>
<h3>(set-mouse-scroll! scroll)</h3>
@@ -1620,7 +1576,7 @@
<a href="../../data/ccl/stratagus.ccl"> $LIBARYPATH/ccl/stratagus.ccl </a>
<hr>
-Last changed: $Id: config.html,v 1.29 2003/10/09 11:31:43 n0body Exp $<br>
+Last changed: $Id: config.html,v 1.30 2003/10/16 17:03:00 jsalmon3 Exp $<br>
All trademarks and copyrights on this page are owned by their respective
owners.
<address>(c) 2002-2003 by <a href="http://stratagus.org";>
The Stratagus Project</a></address></body></html>
Index: stratagus/setup
diff -u stratagus/setup:1.155 stratagus/setup:1.156
--- stratagus/setup:1.155 Wed Oct 15 20:06:36 2003
+++ stratagus/setup Thu Oct 16 13:02:59 2003
@@ -23,7 +23,7 @@
## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
## GNU General Public License for more details.
##
-## $Id: setup,v 1.155 2003/10/16 00:06:36 jsalmon3 Exp $
+## $Id: setup,v 1.156 2003/10/16 17:02:59 jsalmon3 Exp $
##
##-----------------------------------------------------------------------------
## HERE ARE SOME USER-CONFIGURABLE VARIABLES
@@ -436,7 +436,6 @@
if test "$WIN32" = 0 ; then
echo
echo "VIDEO DRIVER OPTIONS"
- echo " X - X11 Support"
if test "$HAVESDL" = 1 ; then
echo " S - SDL Support"
@@ -463,12 +462,6 @@
echo "# Video support" >> $RULESFILE
case $VIDSEL in
- [xX])
- echo "-> Using X11"
- echo "VIDEO = -DUSE_X11" >> $RULESFILE
- echo "VIDEOLIB = -lXext -lX11 $DL" >> $RULESFILE
- ;;
-
*)
echo -n "-> Using SDL"
USESDL=1
Index: stratagus/src/clone/ccl.c
diff -u stratagus/src/clone/ccl.c:1.115 stratagus/src/clone/ccl.c:1.116
--- stratagus/src/clone/ccl.c:1.115 Wed Oct 15 20:06:37 2003
+++ stratagus/src/clone/ccl.c Thu Oct 16 13:03:00 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: ccl.c,v 1.115 2003/10/16 00:06:37 jsalmon3 Exp $
+// $Id: ccl.c,v 1.116 2003/10/16 17:03:00 jsalmon3 Exp $
//@{
@@ -916,9 +916,6 @@
#ifdef USE_SDLCD
gh_define("stratagus-feature-sdl-cd", SCM_BOOL_T);
#endif
-#ifdef USE_X11
- gh_define("stratagus-feature-x11", SCM_BOOL_T);
-#endif
#ifdef WITH_SOUND
gh_define("stratagus-feature-with-sound", SCM_BOOL_T);
#endif
@@ -1025,7 +1022,7 @@
}
fprintf(fd, ";;; -----------------------------------------\n");
- fprintf(fd, ";;; $Id: ccl.c,v 1.115 2003/10/16 00:06:37 jsalmon3 Exp $\n");
+ fprintf(fd, ";;; $Id: ccl.c,v 1.116 2003/10/16 17:03:00 jsalmon3 Exp $\n");
fprintf(fd, "(set-video-resolution! %d %d)\n", VideoWidth, VideoHeight);
@@ -1050,7 +1047,7 @@
}
fprintf(fd, ";;; -----------------------------------------\n");
- fprintf(fd, ";;; $Id: ccl.c,v 1.115 2003/10/16 00:06:37 jsalmon3 Exp $\n");
+ fprintf(fd, ";;; $Id: ccl.c,v 1.116 2003/10/16 17:03:00 jsalmon3 Exp $\n");
// Global options
if (OriginalFogOfWar) {
@@ -1160,7 +1157,7 @@
extern SCM oblistvar;
CLprintf(file, "\n;;; -----------------------------------------\n");
- CLprintf(file, ";;; MODULE: CCL $Id: ccl.c,v 1.115 2003/10/16 00:06:37
jsalmon3 Exp $\n\n");
+ CLprintf(file, ";;; MODULE: CCL $Id: ccl.c,v 1.116 2003/10/16 17:03:00
jsalmon3 Exp $\n\n");
for (list = oblistvar; gh_list_p(list); list = gh_cdr(list)) {
SCM sym;
Index: stratagus/src/clone/clone.c
diff -u stratagus/src/clone/clone.c:1.213 stratagus/src/clone/clone.c:1.214
--- stratagus/src/clone/clone.c:1.213 Wed Oct 15 21:36:25 2003
+++ stratagus/src/clone/clone.c Thu Oct 16 13:03:01 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: clone.c,v 1.213 2003/10/16 01:36:25 jsalmon3 Exp $
+// $Id: clone.c,v 1.214 2003/10/16 17:03:01 jsalmon3 Exp $
//@{
@@ -1190,9 +1190,6 @@
#endif
#ifdef USE_SDLCD
"SDL-CD "
-#endif
-#ifdef USE_X11
- "X11 "
#endif
#ifdef WITH_SOUND
"SOUND "
Index: stratagus/src/include/stratagus.h
diff -u stratagus/src/include/stratagus.h:1.20
stratagus/src/include/stratagus.h:1.21
--- stratagus/src/include/stratagus.h:1.20 Wed Oct 15 21:36:25 2003
+++ stratagus/src/include/stratagus.h Thu Oct 16 13:03:01 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: stratagus.h,v 1.20 2003/10/16 01:36:25 jsalmon3 Exp $
+// $Id: stratagus.h,v 1.21 2003/10/16 17:03:01 jsalmon3 Exp $
#ifndef __STRATAGUS_H__
#define __STRATAGUS_H__
@@ -44,8 +44,6 @@
#define noUSE_SDL /// Remove no for sdl support
#define noUSE_SDLA /// Remove no for sdl audio support
-#define noUSE_X11 /// Remove no for x11 support
-#define noUSE_WINCE /// Remove no for win-ce video support
/**
** Define this to support load of compressed (gzip) pud files
Index: stratagus/src/include/ui.h
diff -u stratagus/src/include/ui.h:1.72 stratagus/src/include/ui.h:1.73
--- stratagus/src/include/ui.h:1.72 Mon Oct 13 00:43:18 2003
+++ stratagus/src/include/ui.h Thu Oct 16 13:03:01 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: ui.h,v 1.72 2003/10/13 04:43:18 jsalmon3 Exp $
+// $Id: ui.h,v 1.73 2003/10/16 17:03:01 jsalmon3 Exp $
#ifndef __UI_H__
#define __UI_H__
@@ -48,29 +48,13 @@
-- Definitons
----------------------------------------------------------------------------*/
-/**
-** Defines the default SVGALIB mouse speed adjust (must be > 0)
-*/
-#define MOUSEADJUST 15
-
-/**
-** Defines the default SVGALIB mouse speed scale
-*/
-#define MOUSESCALE 1
-
- /// MACRO - HARDCODED NUMBER OF BUTTONS on screen
-#define MaxButtons 19
-
- /// typedef for buttons on screen themselves
-typedef struct _button_ Button;
-
/// buttons on screen themselves
-struct _button_ {
+typedef struct _button_ {
int X; /// x coordinate on the screen
int Y; /// y coordinate on the screen
int Width; /// width of the button on the
screen
int Height; /// height of the button on the
screen
-};
+} Button;
#define MAX_NUM_VIEWPORTS 8 /// Number of supported viewports
@@ -166,9 +150,6 @@
int MouseWarpX; /// Cursor warp X
position
int MouseWarpY; /// Cursor warp Y
position
-
- int MouseAdjust; /// Mouse speed adjust
- int MouseScale; /// Mouse speed scale
char* NormalFontColor; /// Color for normal text displayed
char* ReverseFontColor; /// Color for reverse text displayed
Index: stratagus/src/include/video.h
diff -u stratagus/src/include/video.h:1.92 stratagus/src/include/video.h:1.93
--- stratagus/src/include/video.h:1.92 Tue Oct 7 20:06:42 2003
+++ stratagus/src/include/video.h Thu Oct 16 13:03:01 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: video.h,v 1.92 2003/10/08 00:06:42 jsalmon3 Exp $
+// $Id: video.h,v 1.93 2003/10/16 17:03:01 jsalmon3 Exp $
#ifndef __VIDEO_H__
#define __VIDEO_H__
@@ -308,16 +308,16 @@
/**
** Architecture-dependant video depth. Set by InitVideoXXX, if 0.
** (8,15,16,24,32)
- ** @see InitVideo @see InitVideoX11 @see InitVideoSVGA @see InitVideoSdl
- ** @see InitVideoWin32 @see main
+ ** @see InitVideo @see InitVideoSdl
+ ** @see main
*/
extern int VideoDepth;
/**
** Architecture-dependant video bpp (bits pro pixel).
** Set by InitVideoXXX. (8,16,24,32)
- ** @see InitVideo @see InitVideoX11 @see InitVideoSVGA @see InitVideoSdl
- ** @see InitVideoWin32 @see main
+ ** @see InitVideo @see InitVideoSdl
+ ** @see main
*/
extern int VideoBpp;
@@ -331,8 +331,8 @@
/**
** Architecture-dependant videomemory. Set by InitVideoXXX.
** FIXME: need a new function to set it, see #ifdef SDL code
- ** @see InitVideo @see InitVideoX11 @see InitVideoSVGA @see InitVideoSdl
- ** @see InitVideoWin32 @see VMemType
+ ** @see InitVideo @see InitVideoSdl
+ ** @see VMemType
*/
extern VMemType* VideoMemory;
@@ -686,8 +686,7 @@
/// Simply invalidates whole window or screen.
extern void Invalidate(void);
- /// Realize videomemory. X11 implemenataion just does XFlush.
- /// SVGALIB without linear addressing should use this.
+ /// Realize video memory.
extern void RealizeVideoMemory(void);
/// Process all system events. Returns if the time for a frame is
over
Index: stratagus/src/network/lowlevel.c
diff -u stratagus/src/network/lowlevel.c:1.36
stratagus/src/network/lowlevel.c:1.37
--- stratagus/src/network/lowlevel.c:1.36 Wed Oct 1 21:37:06 2003
+++ stratagus/src/network/lowlevel.c Thu Oct 16 13:03:01 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: lowlevel.c,v 1.36 2003/10/02 01:37:06 jsalmon3 Exp $
+// $Id: lowlevel.c,v 1.37 2003/10/16 17:03:01 jsalmon3 Exp $
//@{
@@ -550,20 +550,6 @@
struct timeval tv;
fd_set mask;
-#if defined(linux) && defined(USE_X11)
- sigset_t sigmask;
-
- // FIXME: ARI: does this work with NON_UNIX hosts ? Posix, but..
- // Linux requires SIGALRM to be blocked, otherwise the
- // itimer set in VIDEO_X11 always kills the select() with EINTR.
- // The SA_RESTART in the sigaction() handler setup doesn't seem
- // to apply to the setitimer() call starting the SIGALRM ticker...
- // This broke NetSocketReady().
- sigemptyset(&sigmask);
- sigaddset(&sigmask, SIGALRM);
- sigprocmask(SIG_BLOCK, &sigmask, NULL);
-#endif
-
// Check the file descriptors for available data
do {
// Set up the mask of file descriptors
@@ -577,15 +563,9 @@
// Data available?
retval = select(sockfd + 1, &mask, NULL, NULL, &tv);
#ifdef _MSC_VER
- } while (0); // FIXME: better way?
+ } while (retval == SOCKET_ERROR && errno == WSAEINTR);
#else
} while (retval == -1 && errno == EINTR);
-#endif
-
-#if defined(linux) && defined(USE_X11)
- sigemptyset(&sigmask);
- sigaddset(&sigmask, SIGALRM);
- sigprocmask(SIG_UNBLOCK, &sigmask, NULL);
#endif
return retval;
Index: stratagus/src/ui/ccl_ui.c
diff -u stratagus/src/ui/ccl_ui.c:1.135 stratagus/src/ui/ccl_ui.c:1.136
--- stratagus/src/ui/ccl_ui.c:1.135 Mon Oct 13 00:43:18 2003
+++ stratagus/src/ui/ccl_ui.c Thu Oct 16 13:03:01 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: ccl_ui.c,v 1.135 2003/10/13 04:43:18 jsalmon3 Exp $
+// $Id: ccl_ui.c,v 1.136 2003/10/16 17:03:01 jsalmon3 Exp $
//@{
@@ -121,42 +121,6 @@
}
/**
-** Defines the SVGALIB mouse speed adjust (must be > 0)
-**
-** @param adjust mouse adjust for SVGALIB
-** @return old value
-*/
-local SCM CclSetMouseAdjust(SCM adjust)
-{
- SCM old;
- int i;
-
- old = gh_int2scm(TheUI.MouseAdjust);
- i = gh_scm2int(adjust);
- if (i > 0) {
- TheUI.MouseAdjust = i;
- }
-
- return old;
-}
-
-/**
-** Defines the SVGALIB mouse scale
-**
-** @param scale mouse scale for SVGALIB
-** @return old value
-*/
-local SCM CclSetMouseScale(SCM scale)
-{
- SCM old;
-
- old = gh_int2scm(TheUI.MouseScale);
- TheUI.MouseScale = gh_scm2int(scale);
-
- return old;
-}
-
-/**
** Set which missile is used for right click
**
** @param missile missile name to use
@@ -1078,9 +1042,6 @@
ui->MouseWarpX = -1;
ui->MouseWarpY = -1;
- ui->MouseAdjust = TheUI.MouseAdjust;
- ui->MouseScale = TheUI.MouseScale;
-
ui->Resource.File = NULL;
ui->ResourceX = -1;
ui->ResourceY = -1;
@@ -3222,9 +3183,6 @@
gh_new_procedure1_0("set-color-cycle-all!", CclSetColorCycleAll);
gh_new_procedure1_0("set-mouse-scroll-speed-default!",
CclSetMouseScrollSpeedDefault);
gh_new_procedure1_0("set-mouse-scroll-speed-control!",
CclSetMouseScrollSpeedControl);
-
- gh_new_procedure1_0("set-mouse-adjust!", CclSetMouseAdjust);
- gh_new_procedure1_0("set-mouse-scale!", CclSetMouseScale);
gh_new_procedure1_0("set-click-missile!", CclSetClickMissile);
gh_new_procedure1_0("set-damage-missile!", CclSetDamageMissile);
Index: stratagus/src/ui/menu_proc.c
diff -u stratagus/src/ui/menu_proc.c:1.106 stratagus/src/ui/menu_proc.c:1.107
--- stratagus/src/ui/menu_proc.c:1.106 Wed Oct 15 21:36:26 2003
+++ stratagus/src/ui/menu_proc.c Thu Oct 16 13:03:01 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: menu_proc.c,v 1.106 2003/10/16 01:36:26 jsalmon3 Exp $
+// $Id: menu_proc.c,v 1.107 2003/10/16 17:03:01 jsalmon3 Exp $
//@{
@@ -66,12 +66,8 @@
#undef DrawIcon
#endif
-#ifdef USE_X11
-#include <X11/Xlib.h>
-#include <X11/Xatom.h>
-#elif defined(USE_SDL)
+#ifdef USE_SDL
#include "SDL.h"
-#include "SDL_syswm.h"
#endif
/*----------------------------------------------------------------------------
Index: stratagus/src/ui/ui.c
diff -u stratagus/src/ui/ui.c:1.80 stratagus/src/ui/ui.c:1.81
--- stratagus/src/ui/ui.c:1.80 Mon Oct 13 00:43:18 2003
+++ stratagus/src/ui/ui.c Thu Oct 16 13:03:01 2003
@@ -27,7 +27,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: ui.c,v 1.80 2003/10/13 04:43:18 jsalmon3 Exp $
+// $Id: ui.c,v 1.81 2003/10/16 17:03:01 jsalmon3 Exp $
//@{
@@ -630,7 +630,7 @@
int i;
CLprintf(file, "\n;;; -----------------------------------------\n");
- CLprintf(file, ";;; MODULE: ui $Id: ui.c,v 1.80 2003/10/13 04:43:18
jsalmon3 Exp $\n\n");
+ CLprintf(file, ";;; MODULE: ui $Id: ui.c,v 1.81 2003/10/16 17:03:01
jsalmon3 Exp $\n\n");
// Contrast, Brightness, Saturation
CLprintf(file, "(set-contrast! %d)\n", TheUI.Contrast);
@@ -643,9 +643,6 @@
CLprintf(file, "(set-key-scroll-speed! %d)\n", SpeedKeyScroll);
CLprintf(file, "(set-mouse-scroll-speed-default! %d)\n",
TheUI.MouseScrollSpeedDefault);
CLprintf(file, "(set-mouse-scroll-speed-control! %d)\n",
TheUI.MouseScrollSpeedControl);
-
- CLprintf(file, "(set-mouse-adjust! %d)\n", TheUI.MouseAdjust);
- CLprintf(file, "(set-mouse-scale! %d)\n\n", TheUI.MouseScale);
// Save the UIs for all resolutions
for (i = 0; UI_Table[i]; ++i) {
Index: stratagus/src/video/Module.make
diff -u stratagus/src/video/Module.make:1.4 stratagus/src/video/Module.make:1.5
--- stratagus/src/video/Module.make:1.4 Wed Oct 15 21:43:57 2003
+++ stratagus/src/video/Module.make Thu Oct 16 13:03:01 2003
@@ -1,4 +1,4 @@
-SRC += src/video/X11.c src/video/cursor.c src/video/deco.c src/video/font.c
src/video/graphic.c src/video/linedraw.c src/video/png.c src/video/sdl.c
src/video/sprite.c src/video/sweepline.c src/video/video.c
+SRC += src/video/cursor.c src/video/deco.c src/video/font.c
src/video/graphic.c src/video/linedraw.c src/video/png.c src/video/sdl.c
src/video/sprite.c src/video/sweepline.c src/video/video.c
HDRS += src/video/intern_video.h src/video/sweepline.h
-OBJ += src/video/$(OBJDIR)/X11.o src/video/$(OBJDIR)/cursor.o
src/video/$(OBJDIR)/deco.o src/video/$(OBJDIR)/font.o
src/video/$(OBJDIR)/graphic.o src/video/$(OBJDIR)/linedraw.o
src/video/$(OBJDIR)/png.o src/video/$(OBJDIR)/sdl.o
src/video/$(OBJDIR)/sprite.o src/video/$(OBJDIR)/sweepline.o
src/video/$(OBJDIR)/video.o
+OBJ += src/video/$(OBJDIR)/cursor.o src/video/$(OBJDIR)/deco.o
src/video/$(OBJDIR)/font.o src/video/$(OBJDIR)/graphic.o
src/video/$(OBJDIR)/linedraw.o src/video/$(OBJDIR)/png.o
src/video/$(OBJDIR)/sdl.o src/video/$(OBJDIR)/sprite.o
src/video/$(OBJDIR)/sweepline.o src/video/$(OBJDIR)/video.o
MISC += src/video/_clip_rectangle
Index: stratagus/src/video/sdl.c
diff -u stratagus/src/video/sdl.c:1.100 stratagus/src/video/sdl.c:1.101
--- stratagus/src/video/sdl.c:1.100 Sat Oct 11 02:43:46 2003
+++ stratagus/src/video/sdl.c Thu Oct 16 13:03:01 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: sdl.c,v 1.100 2003/10/11 06:43:46 mr-russ Exp $
+// $Id: sdl.c,v 1.101 2003/10/16 17:03:01 jsalmon3 Exp $
//@{
@@ -163,7 +163,6 @@
if (SDL_Init(
#ifdef USE_SDLA
- // FIXME: doesn't work with SDL SVGAlib
SDL_INIT_AUDIO |
#endif
#ifdef DEBUG
Index: stratagus/src/video/video.c
diff -u stratagus/src/video/video.c:1.67 stratagus/src/video/video.c:1.68
--- stratagus/src/video/video.c:1.67 Wed Oct 15 20:06:37 2003
+++ stratagus/src/video/video.c Thu Oct 16 13:03:01 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: video.c,v 1.67 2003/10/16 00:06:37 jsalmon3 Exp $
+// $Id: video.c,v 1.68 2003/10/16 17:03:01 jsalmon3 Exp $
//@{
@@ -71,21 +71,11 @@
** dependent settings/functionailty are located within each
** separate files:
**
-** X11 : Xwindows for Linux and other Unix machines
-**
-** SVGALIB : (Super) Vga routines for Linux only
-** (visit http://www.svgalib.org)
-**
** SDL : Simple Direct Media for Linux,
** Win32 (Windows 95/98/2000), BeOs, MacOS
** (visit http://www.libsdl.org)
**
-** WINDOWS CE : just what it says..
-**
-** @see X11.c
-** @see svgalib.c
** @see sdl.c
-** @see wince.c
**
**
** @section VideoModuleLow Low Level - draw functions
@@ -126,26 +116,8 @@
// JOHNS: This is needed, because later I want to support it all with the same
// executable, choosable at runtime.
-#ifdef USE_X11
-#define UseX11 1
-#define UseSdl 0
-#define UseWin32 0
-#endif
-
#ifdef USE_SDL
-#define UseX11 0
#define UseSdl 1
-#define UseWin32 0
-#endif
-
-#ifdef noUSE_WIN32
-#define UseX11 0
-#define UseSdl 0
-#define UseWin32 1
-#endif
-
-#ifndef UseX11
-#define UseX11 0
#endif
/**
@@ -164,10 +136,6 @@
----------------------------------------------------------------------------*/
extern void InitVideoSdl(void); /// Init SDL video hardware
driver
-extern void InitVideoX11(void); /// Init X11 video hardware
driver
-extern void InitVideoSVGA(void); /// Init SVGA video hardware driver
-extern void InitVideoWin32(void); /// Init Win32 video hardware driver
-extern void InitVideoWinCE(void); /// Init WinCE video hardware driver
extern void SdlLockScreen(void); /// Do SDL hardware lock
extern void SdlUnlockScreen(void); /// Do SDL hardware unlock
@@ -196,16 +164,16 @@
/**
** Architecture-dependant video depth. Set by InitVideoXXX, if 0.
** (8,15,16,24,32)
- ** @see InitVideo @see InitVideoX11 @see InitVideoSVGA @see InitVideoSdl
- ** @see InitVideoWin32 @see main
+ ** @see InitVideo @see InitVideoSdl
+ ** @see main
*/
global int VideoDepth;
/**
** Architecture-dependant video bpp (bits pro pixel).
** Set by InitVideoXXX. (8,16,24,32)
- ** @see InitVideo @see InitVideoX11 @see InitVideoSVGA @see InitVideoSdl
- ** @see InitVideoWin32 @see main
+ ** @see InitVideo @see InitVideoSdl
+ ** @see main
*/
global int VideoBpp;
@@ -219,8 +187,8 @@
/**
** Architecture-dependant videomemory. Set by InitVideoXXX.
** FIXME: need a new function to set it, see #ifdef SDL code
- ** @see InitVideo @see InitVideoX11 @see InitVideoSVGA @see InitVideoSdl
- ** @see InitVideoWin32 @see VMemType
+ ** @see InitVideo @see InitVideoSdl
+ ** @see VMemType
*/
global VMemType* VideoMemory;
@@ -1328,11 +1296,6 @@
#if UseSdl
return SDL_GetTicks();
#endif
-#if UseX11
- extern unsigned long X11GetTicks(void);
-
- return X11GetTicks();
-#endif
}
/**
@@ -1343,10 +1306,6 @@
#ifdef __OPTIMIZE__
if (UseSdl) {
InitVideoSdl();
- } else if (UseX11) {
- InitVideoX11();
- } else if (UseWin32) {
- InitVideoWin32();
} else {
#ifdef DEBUG
abort();
@@ -1356,15 +1315,7 @@
#if UseSdl
InitVideoSdl();
#else
- #if UseX11
- InitVideoX11();
- #else
- #if UseWin32
- InitVideoWin32();
- #else
- abort();
- #endif
- #endif
+ abort();
#endif
#endif
@@ -1380,15 +1331,6 @@
default: DebugLevel0Fn("Video %d bpp unsupported\n" _C_ VideoBpp);
}
VideoTypeSize = VideoBpp / 8;
-
- //
- // Use single common palette to be used for all palettes in 8bpp
- //
-#ifndef BPP8_NORMAL
- if (UseX11 && VideoBpp == 8) { // FIXME: to be extended for all video..
- InitSingleCommonPalette8();
- }
-#endif
//
// Init video sub modules