[Freeciv-Dev] Virus rejected

[postmaster@xxxxxxxxxxxxxx]

Received: from [198.76.25.3] (HELO nns.voyanttech.com)
  by voyanttech.com (CommuniGate Pro SMTP 3.4b3)
  with SMTP id 1627383 for marc.butler@xxxxxxxxxxxxxx; Mon, 03 Dec 2001 
15:10:53 -0700
Received: from mail.acm.org (mail.acm.org [199.222.69.4])
        by nns.voyanttech.com (8.9.3+Sun/8.9.3) with SMTP id QAA13972
        for <marc.butler@xxxxxxxxxxxxxx>; Mon, 3 Dec 2001 16:12:51 -0500 (EST)
Received: from pi.glockenspiel.complete.org 
(postfix@xxxxxxxxxxxxxxxxxxxxxxxxxxxx [64.242.77.171])
        by mail.acm.org (8.9.3/8.9.3) with ESMTP id RAA10958
        for <marcbutler@xxxxxxx>; Mon, 3 Dec 2001 17:10:48 -0500
Received: from pi (localhost [127.0.0.1])
        by pi.glockenspiel.complete.org (Postfix) with ESMTP
        id 75FA43BA41; Mon,  3 Dec 2001 17:10:46 -0500 (EST)
Received: with LISTAR (v1.0.0; list freeciv-dev); Mon, 03 Dec 2001 17:10:46 
-0500 (EST)
Delivered-To: virtual-freeciv.org-freeciv-dev@xxxxxxxxxxxx
Received: from freeciv.freeciv.org (www.freeciv.org [64.37.156.68])
        by pi.glockenspiel.complete.org (Postfix) with ESMTP id 5080C3BA40
        for <freeciv-dev@xxxxxxxxxxx>; Mon,  3 Dec 2001 17:10:45 -0500 (EST)
Received: from localhost (localhost [127.0.0.1])
        by freeciv.freeciv.org (8.9.3+Sun/8.9.1) with ESMTP id OAA18064
        for <freeciv-dev@xxxxxxxxxxx>; Mon, 3 Dec 2001 14:10:40 -0800 (PST)
Date: Mon, 3 Dec 2001 14:10:40 -0800 (PST)
From: jdorje@xxxxxxxxxxxxxxxxxxxxx
Message-Id: <200112032210.OAA18064@xxxxxxxxxxxxxxxxxxx>
To: freeciv-dev@xxxxxxxxxxx
Subject: [Freeciv-Dev] PATCH: cityview unification (PR#1085)
Cc: bugs@xxxxxxxxxxxxxxxxxxx
X-Loop: bugs@xxxxxxxxxxxxxxxxxxx
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed;
 boundary="------------030902080103020800010300"
X-archive-position: 4873
X-listar-version: Listar v1.0.0
Sender: freeciv-dev-bounce@xxxxxxxxxxx
Errors-To: freeciv-dev-bounce@xxxxxxxxxxx
X-original-sender: jdorje@xxxxxxxxxxxxxxxxxxxxx
Precedence: bulk
X-list: freeciv-dev

This is a multi-part message in MIME format.
--------------030902080103020800010300
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Transfer-Encoding: 7bit

The attached patch unifies city_get_canvas_xy/city_get_map_xy from all 
GUI's (except xaw) into one set of common functions.  I did this just 
because I've grown tired of seeing the identical code in so many places.

Some issues:

- These functions should rightfully go into a file cityview_common.[ch]. 
  However, no such file currently exists so I've placed them into 
mapview_common.[ch].  I'll fix this if desired (creating the new file).

- I don't clean up the functions any; I just copy them as-is.  I would 
like to clean them up, though (at the same time that I clean up the 
corresponding mapview functions).

- I've changed the names from city_get_[canvas|map]_xy to 
canvas_pos_to_city_pos/city_pos_to_canvas_pos.  This results in a lot of 
extra bloat to the diff file, since these name changes were made in many 
places.  If desired, I'll undo this - but the new name seems much more 
logical and matches the corresponding mapview functions.


Aside from general code cleanup, this isn't a crucial change.  It does 
make the codebase smaller and IMO more maintainable.  It will make it 
easier to supply isometric-view to the xaw client (since the xaw client 
can now use these functions).  And it will make it easier for me to 
clean up these functions to match the mapview ones (it will be necessary 
to clean up the mapview ones for the general-topologies change, and 
would be very bad IMO to not clean up this code at the same time).


All in all, this change shouldn't be very intrusive.

jason

--------------030902080103020800010300
Content-Type: text/plain;
 name="cityview_unification.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;

FOR ANTI-VIRUS SECURITY, THIS EMAIL HAS BEEN CLEANED.

REASON:
THE ATTACHMENT CONTAINED AN INVALID EXTENSION OF '.diff'