Commit Graph

5227 Commits (4cae3b8f1b623115ab8a20e4720789bc71a8e72f)

Author SHA1 Message Date
Giel van Schijndel 7e18d7e5aa * Compile and link in svgManager.[ch] (its complaining about linker errors otherwise)
* Detect libsvg-cairo in the configure script
 * Link against libsvg-cairo


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6440 4a71c877-e1ca-e34f-864e-861f7616d084
2008-12-07 03:03:50 +00:00
Giel van Schijndel d261ddbbd1 * Generate the (size_t count, const T* array) typemap using a SWIG macro
* Use this macro definition for widget:addAnimation(frames) instead of the previously custom crafted typemap
 * Add src/lua_memberfnptr.i and src/lua_table_as_array.i to the Makefile's EXTRA_DIST list


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6439 4a71c877-e1ca-e34f-864e-861f7616d084
2008-12-07 01:29:59 +00:00
Giel van Schijndel c71d586739 Betawidget Lua interface:
* Alter the "(callback handler, callback destructor, void *userData)" typemap such that it can be used as a more generic member-function callback
  * Additionally place this typemap in a file of its own for greater ease of reuse
 * Use this new typemap (for type SWIGLUA_MEMBER_FN) in the interface definition because of its greater simplicity


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6438 4a71c877-e1ca-e34f-864e-861f7616d084
2008-12-06 20:00:20 +00:00
Freddie Witherden 3e9530696d Commit patch #157 by Elio which adds SVG support to betawidget, along with some modifications by myself.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6437 4a71c877-e1ca-e34f-864e-861f7616d084
2008-12-06 19:43:10 +00:00
Giel van Schijndel a60dcc9b31 Alter the AC_PROG_SWIG macro:
* Make its dependency on AC_PROG_SED and AC_PROG_GREP explicit (AC_REQUIRE)
 * Depend on AX_WITH_PROG for finding out about SWIG's location
 * Use AX_COMPARE_VERSION (instead of lost of customly crafted code) to compare SWIG's version to that required
 * Instead of emitting a warning error out when SWIG can't be found or it doesn't satisfy the required version
 * Use a ''correct'' commandline (parameters to SWIG and correct regex + substitution) to find out SWIG's version


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6436 4a71c877-e1ca-e34f-864e-861f7616d084
2008-12-06 15:12:18 +00:00
Gerard Krol abbcda662f Remove some code duplication from the getProduction* functions and a lot of code duplication from the pickATile* functions.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6435 4a71c877-e1ca-e34f-864e-861f7616d084
2008-12-04 22:21:10 +00:00
Gerard Krol 94b7867399 Remove duplicate code responsible for drawing the health and construction progress of buildings.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6434 4a71c877-e1ca-e34f-864e-861f7616d084
2008-12-04 20:56:16 +00:00
Giel van Schijndel f0f937a0aa * Make sure that we use the correct printf formats
* Use ASSERT_HELPER where required (and ASSERT as used)

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6433 4a71c877-e1ca-e34f-864e-861f7616d084
2008-12-04 14:19:21 +00:00
Giel van Schijndel 1538c2af41 * Don't use an yyerror implementation with printf-format parsing for parsers/lexers that don't use it
- This reduces the complexity of those functions ''significantly''
 * Mark yyerror functions with printf formatting with WZ_DECL_FORMAT(printf, ...)

(@trunk = the original intented target for r6430)

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6432 4a71c877-e1ca-e34f-864e-861f7616d084
2008-12-04 12:58:42 +00:00
Giel van Schijndel 550efd000a Remove unused functions setMouseDown and setMouseDown
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6429 4a71c877-e1ca-e34f-864e-861f7616d084
2008-12-03 21:16:15 +00:00
Freddie Witherden b7a866a01d Fix a typo in widgetCairoCreate and be sure to explicity set the type of anti-aliasing we want.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6428 4a71c877-e1ca-e34f-864e-861f7616d084
2008-12-03 12:11:50 +00:00
Freddie Witherden 179920cb15 Add an interator-like interface to vector.h. Based off patch #157 by Elio.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6425 4a71c877-e1ca-e34f-864e-861f7616d084
2008-12-02 21:03:13 +00:00
Freddie Witherden 670ebcd4bb Improve the Doxygen documentation for vector.h
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6424 4a71c877-e1ca-e34f-864e-861f7616d084
2008-12-02 20:47:21 +00:00
Freddie Witherden f25687e130 Remove an unnecessary cast in widget.c.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6422 4a71c877-e1ca-e34f-864e-861f7616d084
2008-12-01 13:12:58 +00:00
Freddie Witherden fe1954ca69 Fix some indentation errors in widget.c
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6421 4a71c877-e1ca-e34f-864e-861f7616d084
2008-12-01 12:57:13 +00:00
Freddie Witherden 0c0828cf79 Modify the event handling and propagation in betawidget; events are now passed top-down with keyboard and click events terminating once handled.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6420 4a71c877-e1ca-e34f-864e-861f7616d084
2008-11-30 23:44:16 +00:00
Gerard Krol bb7e111e00 Updated CoordInRadar function which somehow did not make it into r6410 (rotating radar). This fixes an assert in CalcRadarPosition.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6418 4a71c877-e1ca-e34f-864e-861f7616d084
2008-11-30 22:44:58 +00:00
Giel van Schijndel 0dc0addab9 music_1.0.wz got renamed to community-music_1.0.wz so update the URL in the installer
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6414 4a71c877-e1ca-e34f-864e-861f7616d084
2008-11-30 18:05:27 +00:00
Giel van Schijndel 6ed88bec7b Bump version numbers for 2.1 RC2 and update changelogs
Addresses #165

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6412 4a71c877-e1ca-e34f-864e-861f7616d084
2008-11-30 15:27:37 +00:00
Giel van Schijndel 753db46b5e Italian translation:
* Add 1073 newly translated messages (93% translated)

This addresses #150 and applies it to trunk.

Patch by Cristiano Odorico and Federico Aromolo


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6411 4a71c877-e1ca-e34f-864e-861f7616d084
2008-11-30 15:21:03 +00:00
Gerard Krol 0906040c8b Add an option to rotate the radar when the player rotates the camera. The viewing window on the radar
is thus always facing upwards.  This option is now enabled by default to obtain some feedback.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6410 4a71c877-e1ca-e34f-864e-861f7616d084
2008-11-30 15:10:49 +00:00
Elio Gubser 28f63005bc revert changes to min/max functions, getMinSize and getMaxSize should remain un-implemented in widget.c
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6408 4a71c877-e1ca-e34f-864e-861f7616d084
2008-11-30 11:48:50 +00:00
Elio Gubser d6c203c74a added widgetGetMinSizeImpl() and widgetGetMaxSizeImpl() copied from window.[c/h],because there was an assert when using textEntry
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6407 4a71c877-e1ca-e34f-864e-861f7616d084
2008-11-30 11:27:13 +00:00
Freddie Witherden 4363b11a15 Tidy up the Xcode project, ensuring files are in the correct group rather than all over the place.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6400 4a71c877-e1ca-e34f-864e-861f7616d084
2008-11-27 10:35:31 +00:00
Freddie Witherden 26233ae6f5 Enable dead-code stripping on OS X, which knocks 400KiB off of the executable size.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6399 4a71c877-e1ca-e34f-864e-861f7616d084
2008-11-27 08:37:30 +00:00
Giel van Schijndel b2b9e78bbe Use $(LUA_LIBS) instead of $(LUA_LIBTOOL) to link with Lua (the latter variable isn't defined anymore)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6398 4a71c877-e1ca-e34f-864e-861f7616d084
2008-11-26 22:17:15 +00:00
Freddie Witherden d54a1e8566 Colored => Coloured. We use British spelling by convention.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6397 4a71c877-e1ca-e34f-864e-861f7616d084
2008-11-26 21:22:47 +00:00
Freddie Witherden 9f2e0680eb Bump the SDL version from 1.2.11 to 1.2.13. Cursor trapping with (but not without) coloured cursors now works.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6396 4a71c877-e1ca-e34f-864e-861f7616d084
2008-11-26 21:21:17 +00:00
Freddie Witherden 8c92c4931b Rewrite the hBox class in terms of the table class. This helps to cut down on code duplication.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6394 4a71c877-e1ca-e34f-864e-861f7616d084
2008-11-26 20:42:03 +00:00
Freddie Witherden 6bf597ba14 Improve the tableSetPadding function that it now returns false on failure and true on success.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6393 4a71c877-e1ca-e34f-864e-861f7616d084
2008-11-26 20:40:10 +00:00
Freddie Witherden cc25793143 Fix compilation of betawidget after the source move.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6387 4a71c877-e1ca-e34f-864e-861f7616d084
2008-11-26 00:49:02 +00:00
Giel van Schijndel 0d99e81fb9 Only accept Perl versions >= 5.10
* NOTE: Perl is only required when one of build_tools/code-generators/* or src/*.tpl* changes

This should fix #161


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6386 4a71c877-e1ca-e34f-864e-861f7616d084
2008-11-26 00:25:08 +00:00
Giel van Schijndel 0723d7a5b9 Fix compiling on MSVC:
* Use C89 style variable declarations (i.e. at the beginning of scope-blocks)
 * Use a proper set of #include paths

This should fix #160, patch by <i-NoD> slightly modified by me (moved variable declarations to the most local scope where used)


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6385 4a71c877-e1ca-e34f-864e-861f7616d084
2008-11-25 23:53:44 +00:00
Giel van Schijndel ed6ae1b949 Update POTFILES.in
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6376 4a71c877-e1ca-e34f-864e-861f7616d084
2008-11-24 01:39:38 +00:00
Giel van Schijndel e63189b4f9 * Add libtool version information to betawidget
- Use 0:0:0 as current version (API=0, API_IMPLEMENTATION=0, IMPLEMENTATION_AGE=0)


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6375 4a71c877-e1ca-e34f-864e-861f7616d084
2008-11-23 21:38:25 +00:00
Giel van Schijndel 0e80daf989 * Don't bother trying to get at the libtool libraries (.la)
- We currently do this for Lua
  - Libtool is apparently smart enough to find out about libtool libraries on its own (so we don't need to "hack" our way to finding those)


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6374 4a71c877-e1ca-e34f-864e-861f7616d084
2008-11-23 21:32:26 +00:00
Giel van Schijndel 11f4f2df83 Lets generate a pkg-config .pc-file for betawidget.
This allows easy detection of betawidget by means of pkg-config


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6373 4a71c877-e1ca-e34f-864e-861f7616d084
2008-11-23 20:58:30 +00:00
Giel van Schijndel 2c1e2e282c Include tools/sdl-testapp.lua, src/betawidget.i and src/lua-wrap.h as part of "make dist" (i.e. they're required at build time)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6372 4a71c877-e1ca-e34f-864e-861f7616d084
2008-11-23 20:26:26 +00:00
Giel van Schijndel 0505129930 Lets build table.[ch] along with the rest of betawidget
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6371 4a71c877-e1ca-e34f-864e-861f7616d084
2008-11-23 20:24:16 +00:00
Giel van Schijndel 97931f21eb Move the actual library code of betawidget from lib/betawidget/ into lib/betawidget/src/
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6370 4a71c877-e1ca-e34f-864e-861f7616d084
2008-11-23 19:49:36 +00:00
Giel van Schijndel b48b300697 * Use "recursive make" to build the test apps in lib/betawidget/tools/
- Make sure to build libbetawidget.la in lib/betawidget/ first though (because tools/ depends on that)


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6369 4a71c877-e1ca-e34f-864e-861f7616d084
2008-11-23 19:32:54 +00:00
Giel van Schijndel d719e9977b Betawidget:
* Use plain "cairo" instead of "cairo-svg" because "cairo-svg" is an ''output'' backend in which we're not interested
 * When re-running aclocal make sure to pass `-I m4` to it
 * For lack of -Werror lets compile with -Werror-implicit-function-declaration to die at implicit function declarations (rather than getting stranger errors)


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6368 4a71c877-e1ca-e34f-864e-861f7616d084
2008-11-23 17:57:23 +00:00
Giel van Schijndel fc808a8c89 Only #define va_copy if it isn't #defined yet
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6367 4a71c877-e1ca-e34f-864e-861f7616d084
2008-11-23 17:24:48 +00:00
Giel van Schijndel 3d92823e49 * Use the more readable $arrayreference->[$index] and $hashreference->{$key} instead of ${$arrayreference}[$index] and ${$hashreference}{$key} respectively
* Use 'my $var = $expression || "";' instead of 'my $var = ""; $var = $expression if $expression;'

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6366 4a71c877-e1ca-e34f-864e-861f7616d084
2008-11-23 13:32:02 +00:00
Giel van Schijndel 8f6eb3c17c Use || as shortcut operator (I used "or" before, which didn't work as expected due to having a too low precedence) in assignment to $valprefix and $valsuffix to circumvent having to test explicitly whether they exist
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6365 4a71c877-e1ca-e34f-864e-861f7616d084
2008-11-23 00:18:12 +00:00
Giel van Schijndel 216cbe8789 * Use a spiral-like search for VTOL landing sites instead of expanding square search
- This will result in smaller travel distances in some cases

This closes #143 ("true distance instead of manhattan distance"), patch by <mfreire> with some modifications by me

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6363 4a71c877-e1ca-e34f-864e-861f7616d084
2008-11-22 18:41:39 +00:00
Freddie Witherden 2b11839902 Fix an indentation error in table.h
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6361 4a71c877-e1ca-e34f-864e-861f7616d084
2008-11-22 13:55:01 +00:00
Freddie Witherden 5bca9c8df9 Add support for setting the horizontal/vertical padding of a table and fix a bug in the padding alignment code.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6360 4a71c877-e1ca-e34f-864e-861f7616d084
2008-11-21 18:51:34 +00:00
Freddie Witherden 4d163dd309 Provide a complete, mostly working, table widget implementation. Unit tests are still required.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6357 4a71c877-e1ca-e34f-864e-861f7616d084
2008-11-21 18:10:56 +00:00
Freddie Witherden b278bbb4ee Add the concept of a NUL size to betawidget which is needed to allow widgets to be added to a parent-less container.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6356 4a71c877-e1ca-e34f-864e-861f7616d084
2008-11-21 17:52:21 +00:00