[Freeciv-Dev] [bug #16668] Per-topology client tileset preference

2016-01-28 Thread Marko Lindqvist 
Update of bug #16668 (project freeciv):

  Status:  Ready For Test => Fixed  
 Assigned to:None => cazfi  
 Open/Closed:Open => Closed 


___

Reply to this item at:

  

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] [bug #16668] Per-topology client tileset preference

2016-01-28 Thread Marko Lindqvist 
Follow-up Comment #12, bug #16668 (project freeciv):

> To be resolved in future ticket: Initial default tileset is filled only for
one topology

-> patch #6875

___

Reply to this item at:

  

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] [bug #16668] Per-topology client tileset preference

2016-01-27 Thread Jacob Nevins 
Follow-up Comment #11, bug #16668 (project freeciv):

Works for me, thanks.

___

Reply to this item at:

  

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] [bug #16668] Per-topology client tileset preference

2016-01-26 Thread Marko Lindqvist 
Update of bug #16668 (project freeciv):

  Status: In Progress => Ready For Test 

___

Follow-up Comment #10:

- Avoid tileset loading recursion when setting initial value for topology
specific tileset option

(file #26493, file #26494)
___

Additional Item Attachment:

File name: FourTilesetOptions-4.patch.bz2 Size:8 KB
File name: FourTilesetOptions-S2_6-4.patch.bz2 Size:8 KB


___

Reply to this item at:

  

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] [bug #16668] Per-topology client tileset preference

2016-01-26 Thread Marko Lindqvist 
Update of bug #16668 (project freeciv):

  Status:  Ready For Test => In Progress

___

Follow-up Comment #9:

It seems to be because there's an recursion which we should avoid. Once
suitable tileset has been found by loading it, related option is updated to
match, which causes option change callback to attempt to reload the same
tileset.

___

Reply to this item at:

  

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] [bug #16668] Per-topology client tileset preference

2016-01-26 Thread Jacob Nevins 
Follow-up Comment #8, bug #16668 (project freeciv):

Thanks for taking this on.

Tried file #26486 against S2_6 r31617. The Gtk2 client (specifically) seems to
segfault in the absence of the new per-topology client options (so if I happen
to run Gtk3 or Qt first, the new options get written to my rc-file and then
Gtk2 is apparently fine.

default_tileset_name="amplio2" in my freeciv-client-rc-2.6 (prior to running
this code).


#0  0x7fe96250911d in ?? ()
   from /usr/lib/x86_64-linux-gnu/libgdk-x11-2.0.so.0
No symbol table info available.
#1  0x7fe96250a7c1 in gdk_rgb_get_colormap ()
   from /usr/lib/x86_64-linux-gnu/libgdk-x11-2.0.so.0
No symbol table info available.
#2  0x7fe96250165b in gdk_pixbuf_render_pixmap_and_mask ()
   from /usr/lib/x86_64-linux-gnu/libgdk-x11-2.0.so.0
No symbol table info available.
#3  0x0046d1d9 in ctor_sprite (pixbuf=0x1664400)
at ../../../client/gui-gtk-2.0/sprite.c:189
sprite = 0x15a1fc0
has_alpha = 
has_mask = false
#4  0x0046d53f in load_gfxfile (
filename=filename@entry=0x15b2240
"/home/jtn/src/freeciv/git/bS2_6/../data/misc/treaty.png") at
../../../client/gui-gtk-2.0/sprite.c:257
im = 
err = 0x0
__FUNCTION__ = "load_gfxfile"
#5  0x004c9398 in load_gfx_file (gfx_filename=0x15818e0
"misc/treaty")
at ../../client/tilespec.c:1416
real_full_name = 0x15b2240
"/home/jtn/src/freeciv/git/bS2_6/../data/misc/treaty.png"
full_name = 0x7ffcea325538 "misc/treaty.png"
gfx_fileexts = 0x92c6b0 
gfx_fileext = 
s = 
__FUNCTION__ = "load_gfx_file"
#6  0x004cb09f in ensure_big_sprite (sf=0x1640640)
at ../../client/tilespec.c:1454
file = 0x15a2c20
gfx_filename = 
#7  load_sprite (
tag_name=tag_name@entry=0x67d779 "treaty.disagree_thumb_down",
t=0x16149a0)
at ../../client/tilespec.c:2367
sf_w = 32764
sf_h = 22844224
ss = 0x15c9340
#8  0x004cc395 in tileset_lookup_sprite_tags (t=t@entry=0x16149a0)
at ../../client/tilespec.c:2671
buffer =
"\260[2\352\374\177\000\000\222\bd\000\000\000\000\000\320V2\352\374\177\000\000\365\315c\000\000\000\000\000\030\224\\\001\000\000\000\000\030\000\000\000\060\000\000\000\300[2\352\374\177\000\000\340Z2\352\374\177\000\000tilespec.prefered_themes\000\000tes2.tag\000y\000\000\000\000\001",
'\000' , "\340$d\001", '\000' ,
"\004\306e\000\000\000\000\000n/src/fr\220W2\352\374\177\000\000pY2\352\374\177\000\000"...
buffer2 = "\300X2\352\374\177\000\000ɛc\000\000\000\000\000\030",
'\000' ,
"@\355Z\001\000\000\000\000\340X2\352\374\177\000\000\266\234c", '\000'
, "\020Y2\352\374\177\000\000\t\350a\000\000\000\000\000
,Z\001\000\000\000\000\001\000\000\000\000\000\000\000x[2\352\374\177\000\000\000\000\000\000\000\000\000\000\200Z2\352\374\177\000\000dE\204a\351\177\000\000\000\000\000\000\000\000\000\000\360TZ\001\000\000\000\000hW\260a\351\177\000\000`UZ\001\000\000\000\000P,Z\001\000\000\000\000\000.prefer
UZ\001\000\000\000\000\361"...
W = 96
H = 48
i = 
j = 
f = 
__FUNCTION__ = "tileset_lookup_sprite_tags"
#9  0x004daa9e in tileset_load_tiles (t=0x16149a0)
at ../../client/tilespec.c:3130
No locals.
#10 tilespec_reread (
new_tileset_name=new_tileset_name@entry=0x9214a5 
"amplio2", game_fully_initialized=) at
../../client/tilespec.c:1272
id = 
center_tile = 0x0
state = 
name = 
tileset_name = 
old_name = 0x7ffcea325ce8 "amplio2"
i = 160
__FUNCTION__ = "tilespec_reread"
#11 0x004dafae in tilespec_reread_callback (poption=)
at ../../client/tilespec.c:1383
tileset_name = 0x9214a5  "amplio2"
state = 
__FUNCTION__ = "tilespec_reread_callback"
#12 0x004ba3da in option_changed (
poption=0x91b8e0 ) at ../../client/options.c:650
No locals.
#13 0x004baeeb in option_str_set (
poption=0x91b8e0 , str=)
at ../../client/options.c:825
No locals.
#14 0x004da7b2 in tilespec_try_read (tileset_name=, 
verbose=verbose@entry=false) at ../../client/tilespec.c:1215
__FUNCTION__ = "tilespec_try_read"
#15 0x00478656 in client_main (argc=1, argv=0x7ffcea326148)
at ../../client/client_main.c:665
i = 1
loglevel = LOG_NORMAL
ui_options = 
ui_separator = 
option = 
fatal_assertions = -1
aii = 2
__FUNCTION__ = "client_main"
#16 0x7fe961768ec5 in __libc_start_main (main=0x449de0 , argc=1, 
argv=0x7ffcea326148, init=, fini=, 
rtld_fini=, stack_end=0x7ffcea326138) at libc-start.c:287
result = 
unwind_buf = {cancel_jmp_buf = {{jmp_buf = {0, -790452621252361109, 
4496880, 140724237656384, 0, 0, 792189210027754603, 
780668006626755691}, mask_was_saved = 0}}, priv = {pad = {0x0,

  0x0, 0x65da40 <__libc_csu_init>, 0x7ffc

[Freeciv-Dev] [bug #16668] Per-topology client tileset preference

2016-01-26 Thread Marko Lindqvist 
Update of bug #16668 (project freeciv):

  Status: In Progress => Ready For Test 

___

Follow-up Comment #7:

New versions for both TRUNK and S2_6. Compared to previous S2_6 version:

- Removed unintentional gui-gtk-3.0/theme_dlg.c whitespace change
- No magic numbers used as tileset topology values


(file #26485, file #26486)
___

Additional Item Attachment:

File name: FourTilesetOptions-3.patch.bz2 Size:8 KB
File name: FourTilesetOptions-S2_6-3.patch.bz2 Size:8 KB


___

Reply to this item at:

  

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] [bug #16668] Per-topology client tileset preference

2016-01-26 Thread Marko Lindqvist 
Follow-up Comment #6, bug #16668 (project freeciv):

Commit candidate for S2_6. TRUNK version to follow.

To be resolved in future ticket: Initial default tileset is filled only for
one topology (in practice it selects same tileset as before this patch, and
then assigns it as default to the topology it represents). This has
unfortunate effect that until user has manually set values for other
topologies, client can't automatically change tileset when topology changes to
such a topology.

(file #26484)
___

Additional Item Attachment:

File name: FourTilesetOptions-S2_6-2.patch.bz2 Size:8 KB


___

Reply to this item at:

  

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] [bug #16668] Per-topology client tileset preference

2016-01-26 Thread Marko Lindqvist 
Update of bug #16668 (project freeciv):

  Depends on: => bugs #24350


___

Reply to this item at:

  

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] [bug #16668] Per-topology client tileset preference

2016-01-25 Thread Marko Lindqvist 
Follow-up Comment #5, bug #16668 (project freeciv):

WIP patch

TODO:
- Correct handling of all pre-game tileset changing situations (ruleset either
is already received, or it's only coming)
- Migrating tileset selection fron pre-2.6 settings file
- Tileset given via commandline "-t" to be more persistent than automatically
selected default, and should migrate to settings

(file #26470, file #26471)
___

Additional Item Attachment:

File name: FourTilesetOptions.patch.bz2   Size:6 KB
File name: FourTilesetOptions-S2_6.patch.bz2 Size:6 KB


___

Reply to this item at:

  

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] [bug #16668] Per-topology client tileset preference

2016-01-22 Thread Marko Lindqvist 
Update of bug #16668 (project freeciv):

 Planned Release:   2.6.0 => 2.6.0, 3.0.0   


___

Reply to this item at:

  

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] [bug #16668] Per-topology client tileset preference

2016-01-22 Thread Marko Lindqvist 
Update of bug #16668 (project freeciv):

  Depends on: => patch #6844


___

Reply to this item at:

  

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] [bug #16668] Per-topology client tileset preference

2016-01-21 Thread Marko Lindqvist 
Update of bug #16668 (project freeciv):

  Status:   Need Info => In Progress


___

Reply to this item at:

  

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] [bug #16668] Per-topology client tileset preference

2016-01-20 Thread Marko Lindqvist 
Follow-up Comment #4, bug #16668 (project freeciv):

For the implementation part, consider also how it affects bug #21263

___

Reply to this item at:

  

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] [bug #16668] Per-topology client tileset preference

2014-01-26 Thread Marko Lindqvist 
Update of bug #16668 (project freeciv):

 Planned Release: => 2.6.0  

___

Follow-up Comment #3:

> Maybe should we move the tileset loading when the client
> receive the packet_map_info?

We need the tilese for main menu already, at least unless we make the picture
there not-tileset-defined (which would make sense from the point of view that
despite the modpack being used, it's always *freeciv* - the opposite view
being that the picture there is about the game/modpack being played, for
"Alien World" game the graphics should be different from classic game)

___

Reply to this item at:

  

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] [bug #16668] Per-topology client tileset preference

2010-09-10 Thread pepeto 

Follow-up Comment #2, bug #16668 (project freeciv):

I like the idea, and the comment by HanduMan also makes sense: how the client
will guess what tileset to load? Maybe should we move the tileset loading when
the client receive the packet_map_info?


___

Reply to this item at:

  

___
  Message posté via/par Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] [bug #16668] Per-topology client tileset preference

2010-09-09 Thread HanduMan 

Follow-up Comment #1, bug #16668 (project freeciv):

Good idea. Only I think the default tileset is being loaded already when the
client is first started. So, which of the four defaults should be chosen at
startup? Maybe the one that matches the topology choice saved in
preferences?

But to make this work, the client should propose a chance of tileset when a
new game is started, a saved one is loaded or an online game is being joined
to with topology unsuitable for current tileset. 

___

Reply to this item at:

  

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] [bug #16668] Per-topology client tileset preference

2010-09-08 Thread Jacob Nevins 

URL:
  

 Summary: Per-topology client tileset preference
 Project: Freeciv
Submitted by: jtn
Submitted on: Wednesday 09/08/10 at 23:43
Category: client
Severity: 1 - Wish
Priority: 1 - Later
  Status: Need Info
 Assigned to: None
Originator Email: 
 Open/Closed: Open
 Release: 
 Discussion Lock: Any
Operating System: None
 Planned Release: 

___

Details:

It's bugged me for a while that it's too easy for the client to end up with a
tileset that isn't a good match for the server's topology, even in a
single-player situation.

I think this will confuse new users exploring the topology options; it's
always possible to manually choose an appropriate tileset, but it's not
obvious.

Also, if I'm switching between two games with different topologies, I have to
switch tilesets.

One way to solve this would be to have four tileset preferences in the client
instead of one: one per topology type (rect, iso, hex, iso-hex), with the
client choosing the one to load based on the topology of the server it
connects to. Give these sensible defaults, and I think everything works out
of the box.




___

Reply to this item at:

  

___
  Message sent via/by Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev