[Freeciv-commits] r27121 - /trunk/client/gui-gtk-3.0/canvas.c
Author: cazfi
Date: Mon Nov 24 18:32:40 2014
New Revision: 27121
URL: http://svn.gna.org/viewcvs/freeciv?rev=27121view=rev
Log:
Cleaned up gtk3-client canvas cairo usage
See patch #5448
Modified:
trunk/client/gui-gtk-3.0/canvas.c
Modified: trunk/client/gui-gtk-3.0/canvas.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.0/canvas.c?rev=27121r1=27120r2=27121view=diff
==
--- trunk/client/gui-gtk-3.0/canvas.c (original)
+++ trunk/client/gui-gtk-3.0/canvas.c Mon Nov 24 18:32:40 2014
@@ -72,13 +72,10 @@
cairo_save(cr);
}
- cairo_rectangle(cr,
- dest_x * dest-zoom / src-zoom, dest_y * dest-zoom /
src-zoom,
- width, height);
cairo_scale(cr, dest-zoom / src-zoom, dest-zoom / src-zoom);
- cairo_clip(cr);
- cairo_set_source_surface(cr, src-surface, dest_x-src_x, dest_y-src_y);
- cairo_paint(cr);
+ cairo_set_source_surface(cr, src-surface, dest_x - src_x, dest_y - src_y);
+ cairo_rectangle(cr, dest_x, dest_y, width, height);
+ cairo_fill(cr);
if (!dest-drawable) {
cairo_destroy(cr);
@@ -110,15 +107,12 @@
cairo_save(cr);
}
- cairo_rectangle(cr,
- offset_x + canvas_x * pcanvas-zoom,
- offset_y + canvas_y * pcanvas-zoom,
- MIN(width, MAX(0, sswidth - offset_x)) * pcanvas-zoom,
- MIN(height, MAX(0, ssheight - offset_y)) * pcanvas-zoom);
- cairo_clip(cr);
cairo_scale(cr, pcanvas-zoom, pcanvas-zoom);
- cairo_set_source_surface(cr, sprite-surface, canvas_x, canvas_y);
- cairo_paint(cr);
+ cairo_set_source_surface(cr, sprite-surface, canvas_x - offset_x, canvas_y
- offset_y);
+ cairo_rectangle(cr, canvas_x - offset_x, canvas_y - offset_y,
+ MIN(width, MAX(0, sswidth - offset_x)),
+ MIN(height, MAX(0, ssheight - offset_y)));
+ cairo_fill(cr);
if (!pcanvas-drawable) {
cairo_destroy(cr);
@@ -173,10 +167,9 @@
cairo_save(cr);
}
+ cairo_scale(cr, pcanvas-zoom, pcanvas-zoom);
gdk_cairo_set_source_rgba(cr, pcolor-color);
- cairo_rectangle(cr, canvas_x * pcanvas-zoom, canvas_y * pcanvas-zoom,
- width, height);
- cairo_scale(cr, pcanvas-zoom, pcanvas-zoom);
+ cairo_rectangle(cr, canvas_x, canvas_y, width, height);
cairo_fill(cr);
if (!pcanvas-drawable) {
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r27122 - /branches/S2_4/po/es.po
Author: jtn Date: Mon Nov 24 21:37:55 2014 New Revision: 27122 URL: http://svn.gna.org/viewcvs/freeciv?rev=27122view=rev Log: Updated Spanish translation by Jordi Negrevernis i Font. 100%: 7208 translated. Modified: branches/S2_4/po/es.po [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/S2_4/po/es.po URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_4/po/es.po?rev=27122r1=27121r2=27122view=diff ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r27123 - in /trunk/client: ./ gui-sdl/ gui-sdl2/
Author: cazfi Date: Tue Nov 25 02:44:00 2014 New Revision: 27123 URL: http://svn.gna.org/viewcvs/freeciv?rev=27123view=rev Log: Include SDL headers as system headers, i.e., SDL.h instead of SDL.h See patch #5432 Modified: trunk/client/audio_sdl.c trunk/client/gui-sdl/canvas.h trunk/client/gui-sdl/chatline.c trunk/client/gui-sdl/citydlg.c trunk/client/gui-sdl/citydlg.h trunk/client/gui-sdl/cityrep.c trunk/client/gui-sdl/cma_fe.c trunk/client/gui-sdl/colors.c trunk/client/gui-sdl/colors.h trunk/client/gui-sdl/connectdlg.c trunk/client/gui-sdl/dialogs.c trunk/client/gui-sdl/dialogs.h trunk/client/gui-sdl/diplodlg.c trunk/client/gui-sdl/finddlg.c trunk/client/gui-sdl/gotodlg.c trunk/client/gui-sdl/graphics.c trunk/client/gui-sdl/graphics.h trunk/client/gui-sdl/gui_iconv.h trunk/client/gui-sdl/gui_main.c trunk/client/gui-sdl/gui_main.h trunk/client/gui-sdl/gui_mouse.c trunk/client/gui-sdl/gui_string.c trunk/client/gui-sdl/gui_string.h trunk/client/gui-sdl/gui_tilespec.c trunk/client/gui-sdl/helpdlg.c trunk/client/gui-sdl/inteldlg.c trunk/client/gui-sdl/mapctrl.c trunk/client/gui-sdl/mapctrl.h trunk/client/gui-sdl/mapview.c trunk/client/gui-sdl/mapview.h trunk/client/gui-sdl/menu.c trunk/client/gui-sdl/messagewin.c trunk/client/gui-sdl/optiondlg.c trunk/client/gui-sdl/repodlgs.h trunk/client/gui-sdl/sprite.c trunk/client/gui-sdl/themebackgrounds.h trunk/client/gui-sdl/unistring.c trunk/client/gui-sdl/unistring.h trunk/client/gui-sdl/widget.c trunk/client/gui-sdl/widget_button.c trunk/client/gui-sdl/widget_combo.c trunk/client/gui-sdl/widget_core.c trunk/client/gui-sdl/widget_edit.c trunk/client/gui-sdl/widget_icon.c trunk/client/gui-sdl/widget_label.c trunk/client/gui-sdl/widget_scrollbar.c trunk/client/gui-sdl/widget_window.c trunk/client/gui-sdl/wldlg.c trunk/client/gui-sdl2/canvas.h trunk/client/gui-sdl2/chatline.c trunk/client/gui-sdl2/citydlg.c trunk/client/gui-sdl2/citydlg.h trunk/client/gui-sdl2/cityrep.c trunk/client/gui-sdl2/cma_fe.c trunk/client/gui-sdl2/colors.c trunk/client/gui-sdl2/colors.h trunk/client/gui-sdl2/connectdlg.c trunk/client/gui-sdl2/dialogs.c trunk/client/gui-sdl2/dialogs.h trunk/client/gui-sdl2/diplodlg.c trunk/client/gui-sdl2/finddlg.c trunk/client/gui-sdl2/gotodlg.c trunk/client/gui-sdl2/graphics.c trunk/client/gui-sdl2/graphics.h trunk/client/gui-sdl2/gui_iconv.h trunk/client/gui-sdl2/gui_main.c trunk/client/gui-sdl2/gui_main.h trunk/client/gui-sdl2/gui_mouse.c trunk/client/gui-sdl2/gui_string.c trunk/client/gui-sdl2/gui_string.h trunk/client/gui-sdl2/gui_tilespec.c trunk/client/gui-sdl2/helpdlg.c trunk/client/gui-sdl2/inteldlg.c trunk/client/gui-sdl2/mapctrl.c trunk/client/gui-sdl2/mapctrl.h trunk/client/gui-sdl2/mapview.c trunk/client/gui-sdl2/mapview.h trunk/client/gui-sdl2/menu.c trunk/client/gui-sdl2/messagewin.c trunk/client/gui-sdl2/optiondlg.c trunk/client/gui-sdl2/repodlgs.h trunk/client/gui-sdl2/sprite.c trunk/client/gui-sdl2/themebackgrounds.h trunk/client/gui-sdl2/unistring.c trunk/client/gui-sdl2/unistring.h trunk/client/gui-sdl2/widget.c trunk/client/gui-sdl2/widget_button.c trunk/client/gui-sdl2/widget_combo.c trunk/client/gui-sdl2/widget_core.c trunk/client/gui-sdl2/widget_edit.c trunk/client/gui-sdl2/widget_icon.c trunk/client/gui-sdl2/widget_label.c trunk/client/gui-sdl2/widget_scrollbar.c trunk/client/gui-sdl2/widget_window.c trunk/client/gui-sdl2/wldlg.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/client/audio_sdl.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/audio_sdl.c?rev=27123r1=27122r2=27123view=diff Modified: trunk/client/gui-sdl/canvas.h URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-sdl/canvas.h?rev=27123r1=27122r2=27123view=diff Modified: trunk/client/gui-sdl/chatline.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-sdl/chatline.c?rev=27123r1=27122r2=27123view=diff Modified: trunk/client/gui-sdl/citydlg.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-sdl/citydlg.c?rev=27123r1=27122r2=27123view=diff Modified: trunk/client/gui-sdl/citydlg.h URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-sdl/citydlg.h?rev=27123r1=27122r2=27123view=diff Modified: trunk/client/gui-sdl/cityrep.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-sdl/cityrep.c?rev=27123r1=27122r2=27123view=diff Modified: trunk/client/gui-sdl/cma_fe.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-sdl/cma_fe.c?rev=27123r1=27122r2=27123view=diff Modified: trunk/client/gui-sdl/colors.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-sdl/colors.c?rev=27123r1=27122r2=27123view=diff
[Freeciv-commits] r27124 - /trunk/doc/freeciv.doxygen
Author: cazfi Date: Tue Nov 25 03:00:00 2014 New Revision: 27124 URL: http://svn.gna.org/viewcvs/freeciv?rev=27124view=rev Log: Updated freeciv.dogyxen to doxygen-1.8.8 format See patch #5435 Modified: trunk/doc/freeciv.doxygen [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/doc/freeciv.doxygen URL: http://svn.gna.org/viewcvs/freeciv/trunk/doc/freeciv.doxygen?rev=27124r1=27123r2=27124view=diff ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r27125 - in /trunk: configure.ac doc/README.AI_modules
Author: cazfi
Date: Tue Nov 25 03:05:13 2014
New Revision: 27125
URL: http://svn.gna.org/viewcvs/freeciv?rev=27125view=rev
Log:
Added configure option --with-ai-lib to force default AI build for
custom ai types to use even when no ai type using it is being built
See patch #5447
Modified:
trunk/configure.ac
trunk/doc/README.AI_modules
Modified: trunk/configure.ac
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/configure.ac?rev=27125r1=27124r2=27125view=diff
==
--- trunk/configure.ac (original)
+++ trunk/configure.ac Tue Nov 25 03:05:13 2014
@@ -441,6 +441,10 @@
AS_HELP_STRING([--with-default-ai], [default ai type [first static]]),
[default_ai_set=${withval}],
[])
+
+AC_ARG_WITH([ai-lib],
+ AS_HELP_STRING([--with-ai-lib], [build in default AI code [if needed]]),
+ [ai_mod_default_needed=yes], [])
AM_CONDITIONAL([AI_MOD_DEFAULT_NEEDED],
[test x${ai_mod_default_needed} = xyes || test x${default_ai_set} =
x])
Modified: trunk/doc/README.AI_modules
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/doc/README.AI_modules?rev=27125r1=27124r2=27125view=diff
==
--- trunk/doc/README.AI_modules (original)
+++ trunk/doc/README.AI_modules Tue Nov 25 03:05:13 2014
@@ -108,6 +108,10 @@
to make sure data needed by default AI is in the beginning of the allocated
data blocks.
For example, see threaded AI: tai_player_alloc(), tai_player_free(), and
struct tai_plr.
+Default AI code is usually built in freeciv only if some AI type using it has
been built;
+either 'classic' or 'threaded'. If no such ai type has been built, you can
still force
+it in for custom ai types to use by passing configure option --with-ai-lib
+
6. Callback interface ChangeLog
---
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r27127 - in /trunk: ./ client/ common/ server/scripting/
Author: cazfi
Date: Tue Nov 25 03:32:07 2014
New Revision: 27127
URL: http://svn.gna.org/viewcvs/freeciv?rev=27127view=rev
Log:
Made it possible for lua script to request player client to play music
associated with a tag.
See patch #5439
Modified:
trunk/client/audio.c
trunk/client/audio.h
trunk/client/music.c
trunk/client/music.h
trunk/client/packhand.c
trunk/common/packets.def
trunk/fc_version
trunk/server/scripting/api_server_base.c
trunk/server/scripting/api_server_base.h
trunk/server/scripting/tolua_server.pkg
Modified: trunk/client/audio.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/audio.c?rev=27127r1=27126r2=27127view=diff
==
--- trunk/client/audio.c(original)
+++ trunk/client/audio.cTue Nov 25 03:32:07 2014
@@ -61,7 +61,7 @@
static int audio_play_tag(struct section_file *sfile,
const char *tag, bool repeat,
- int exclude);
+ int exclude, bool keepstyle);
/**
Returns a static string vector of all sound plugins
@@ -364,7 +364,8 @@
**/
static void music_finished_callback(void)
{
- current_track = audio_play_tag(mfcb.sfile, mfcb.tag, TRUE, current_track);
+ current_track = audio_play_tag(mfcb.sfile, mfcb.tag, TRUE, current_track,
+ FALSE);
}
/**
@@ -372,7 +373,8 @@
there's no alternative tags, or negative value in case of error.
**/
static int audio_play_tag(struct section_file *sfile,
- const char *tag, bool repeat, int exclude)
+ const char *tag, bool repeat, int exclude,
+ bool keepstyle)
{
const char *soundfile;
const char *fullpath = NULL;
@@ -419,8 +421,10 @@
ret++;
}
if (repeat) {
- mfcb.sfile = sfile;
- mfcb.tag = tag;
+ if (!keepstyle) {
+mfcb.sfile = sfile;
+mfcb.tag = tag;
+ }
cb = music_finished_callback;
}
}
@@ -447,15 +451,16 @@
**/
static bool audio_play_sound_tag(const char *tag, bool repeat)
{
- return (audio_play_tag(ss_tagfile, tag, repeat, -1) = 0);
+ return (audio_play_tag(ss_tagfile, tag, repeat, -1, FALSE) = 0);
}
/**
Play tag from music set
**/
-static int audio_play_music_tag(const char *tag, bool repeat)
-{
- return audio_play_tag(ms_tagfile, tag, repeat, -1);
+static int audio_play_music_tag(const char *tag, bool repeat,
+bool keepstyle)
+{
+ return audio_play_tag(ms_tagfile, tag, repeat, -1, keepstyle);
}
/**
@@ -479,9 +484,11 @@
}
/**
- Loop sound sample as suggested by sound tags
-**/
-void audio_play_music(const char *const tag, char *const alt_tag)
+ Play music, either in loop or just one track in the middle of the style
+ music.
+**/
+static void real_audio_play_music(const char *const tag, char *const alt_tag,
+ bool keepstyle)
{
char *pretty_alt_tag = alt_tag ? alt_tag : (null);
@@ -490,15 +497,31 @@
log_debug(audio_play_music('%s', '%s'), tag, pretty_alt_tag);
/* try playing primary tag first, if not go to alternative tag */
- current_track = audio_play_music_tag(tag, TRUE);
+ current_track = audio_play_music_tag(tag, TRUE, keepstyle);
if (current_track 0) {
-current_track = audio_play_music_tag(alt_tag, TRUE);
+current_track = audio_play_music_tag(alt_tag, TRUE, keepstyle);
if (current_track 0) {
log_verbose(Neither of tags %s or %s found, tag, pretty_alt_tag);
}
}
+}
+
+/**
+ Loop music as suggested by sound tags
+**/
+void audio_play_music(const char *const tag, char *const alt_tag)
+{
+ real_audio_play_music(tag, alt_tag, FALSE);
+}
+
+/**
+ Play single track as suggested by sound tags
+**/
