diff -Nur -X/home/thue/freeciv-dev/no.freeciv /home/thue/freeciv-dev/freeciv/client/control.c hack/client/control.c
--- /home/thue/freeciv-dev/freeciv/client/control.c Mon Apr 3 21:42:57 2000
+++ hack/client/control.c Tue Apr 4 17:47:58 2000
@@ -270,6 +270,32 @@
/**************************************************************************
...
**************************************************************************/
+void blink_active_unit(void)
+{
+ static int is_shown;
+ struct unit *punit;
+
+ if((punit=get_unit_in_focus())) {
+ struct tile *ptile;
+ ptile=map_get_tile(punit->x, punit->y);
+
+ if(is_shown) {
+ struct unit_list units;
+ units=ptile->units;
+ unit_list_init(&ptile->units);
+ refresh_tile_mapcanvas(punit->x, punit->y, 1);
+ ptile->units=units;
+ } else {
+ refresh_tile_mapcanvas(punit->x, punit->y, 1);
+ }
+
+ is_shown=!is_shown;
+ }
+}
+
+/**************************************************************************
+...
+**************************************************************************/
void request_unit_goto(void)
{
struct unit *punit=get_unit_in_focus();
@@ -1229,3 +1255,4 @@
if(get_unit_in_focus())
request_unit_wakeup(punit_focus);
}
+
diff -Nur -X/home/thue/freeciv-dev/no.freeciv /home/thue/freeciv-dev/freeciv/client/control.h hack/client/control.h
--- /home/thue/freeciv-dev/freeciv/client/control.h Mon Apr 3 21:42:57 2000
+++ hack/client/control.h Tue Apr 4 17:46:34 2000
@@ -57,6 +57,7 @@
void update_unit_focus(void);
struct unit *find_visible_unit(struct tile *ptile);
void set_units_in_combat(struct unit *pattacker, struct unit *pdefender);
+void blink_active_unit(void)
void key_cancel_action(void);
void key_city_names_toggle(void);
diff -Nur -X/home/thue/freeciv-dev/no.freeciv /home/thue/freeciv-dev/freeciv/client/gui-gtk/Freeciv.h hack/client/gui-gtk/Freeciv.h
--- /home/thue/freeciv-dev/freeciv/client/gui-gtk/Freeciv.h Thu Jan 1 01:00:00 1970
+++ hack/client/gui-gtk/Freeciv.h Tue Apr 4 17:29:32 2000
@@ -0,0 +1,32 @@
+/*****************************************************/
+/* DO NOT EDIT THIS FILE, EDIT ../../data/freeciv.rc */
+/*****************************************************/
+"style \"city_label\"\n"
+"{\n"
+" font = \"-b&h-lucidatypewriter-bold-r-normal-*-10-*-*-*-*-*-*-*\"\n"
+"}\n"
+"style \"notify_label\"\n"
+"{\n"
+" font = \"-b&h-lucidatypewriter-bold-r-normal-*-12-*-*-*-*-*-*-*\"\n"
+"}\n"
+"style \"spaceship_label\"\n"
+"{\n"
+" font = \"-b&h-lucidatypewriter-bold-r-normal-*-12-*-*-*-*-*-*-*\"\n"
+"}\n"
+"style \"help_label\"\n"
+"{\n"
+" font = \"-adobe-helvetica-medium-r-normal-*-*-120-*-*-*-*-*-*\"\n"
+" fg[PRELIGHT] = { 1.0, 0.0, 0.0 }\n"
+" fg[ACTIVE] = { 1.0, 0.0, 0.0 }\n"
+" fg[NORMAL] = { 1.0, 0.0, 0.0 }\n"
+" fg[INSENSITIVE] = { 1.0, 0.0, 0.0 }\n"
+"}\n"
+"style \"help_text\"\n"
+"{\n"
+" font = \"-*-fixed-medium-r-*-*-14-*-*-*-*-*-iso8859-*\"\n"
+"}\n"
+"widget \"Freeciv*.city label\" style \"city_label\"\n"
+"widget \"Freeciv*.notify label\" style \"notify_label\"\n"
+"widget \"Freeciv*.spaceship label\" style \"spaceship_label\"\n"
+"widget \"Freeciv*.help label\" style \"help_label\"\n"
+"widget \"Freeciv*.help text\" style \"help_text\"\n"
diff -Nur -X/home/thue/freeciv-dev/no.freeciv /home/thue/freeciv-dev/freeciv/client/gui-gtk/mapview.c hack/client/gui-gtk/mapview.c
--- /home/thue/freeciv-dev/freeciv/client/gui-gtk/mapview.c Mon Apr 3 21:42:58 2000
+++ hack/client/gui-gtk/mapview.c Tue Apr 4 17:45:14 2000
@@ -215,37 +215,6 @@
/**************************************************************************
...
**************************************************************************/
-void blink_active_unit(void)
-{
- static int is_shown;
- struct unit *punit;
-
- if((punit=get_unit_in_focus())) {
- struct tile *ptile;
- ptile=map_get_tile(punit->x, punit->y);
-
- if(is_shown) {
- struct unit_list units;
- units=ptile->units;
- unit_list_init(&ptile->units);
- refresh_tile_mapcanvas(punit->x, punit->y, 1);
- ptile->units=units;
- }
- else {
- /* make sure that the blinking unit is always on the top */
- unit_list_unlink(&ptile->units, punit);
- unit_list_insert(&ptile->units, punit);
- refresh_tile_mapcanvas(punit->x, punit->y, 1);
- }
-
- is_shown=!is_shown;
- }
-}
-
-
-/**************************************************************************
-...
-**************************************************************************/
void set_overview_dimensions(int x, int y)
{
gtk_widget_set_usize(overview_canvas, 2*x, 2*y);
diff -Nur -X/home/thue/freeciv-dev/no.freeciv /home/thue/freeciv-dev/freeciv/client/gui-mui/mapview.c hack/client/gui-mui/mapview.c
--- /home/thue/freeciv-dev/freeciv/client/gui-mui/mapview.c Mon Apr 3 21:42:58 2000
+++ hack/client/gui-mui/mapview.c Tue Apr 4 17:49:58 2000
@@ -155,40 +155,6 @@
}
/**************************************************************************
- gui independend
-**************************************************************************/
-void blink_active_unit(void)
-{
- static int is_shown;
- struct unit *punit;
-
- if ((punit = get_unit_in_focus()))
- {
- struct tile *ptile;
- ptile = map_get_tile(punit->x, punit->y);
-
- if (is_shown)
- {
- struct unit_list units;
- units = ptile->units;
- unit_list_init(&ptile->units);
- refresh_tile_mapcanvas(punit->x, punit->y, 1);
- ptile->units = units;
- }
- else
- {
- /* make sure that the blinking unit is always on the top */
- unit_list_unlink(&ptile->units, punit);
- unit_list_insert(&ptile->units, punit);
- refresh_tile_mapcanvas(punit->x, punit->y, 1);
- }
-
- is_shown = !is_shown;
- }
-}
-
-
-/**************************************************************************
Set the dimensions of the overviewmap
**************************************************************************/
void set_overview_dimensions(int x, int y)
diff -Nur -X/home/thue/freeciv-dev/no.freeciv /home/thue/freeciv-dev/freeciv/client/gui-stub/mapview.c hack/client/gui-stub/mapview.c
--- /home/thue/freeciv-dev/freeciv/client/gui-stub/mapview.c Mon Apr 3 21:42:59 2000
+++ hack/client/gui-stub/mapview.c Tue Apr 4 17:51:15 2000
@@ -129,12 +129,6 @@
}
void
-blink_active_unit(void)
-{
- /* PORTME */
-}
-
-void
move_unit_map_canvas(struct unit *punit, int x0, int y0, int x1, int y1)
{
/* PORTME */
diff -Nur -X/home/thue/freeciv-dev/no.freeciv /home/thue/freeciv-dev/freeciv/client/gui-xaw/mapview.c hack/client/gui-xaw/mapview.c
--- /home/thue/freeciv-dev/freeciv/client/gui-xaw/mapview.c Mon Apr 3 21:43:00 2000
+++ hack/client/gui-xaw/mapview.c Tue Apr 4 17:50:27 2000
@@ -186,38 +186,6 @@
refresh_tile_mapcanvas(punit1->x, punit1->y, 1);
}
-
-/**************************************************************************
-...
-**************************************************************************/
-void blink_active_unit(void)
-{
- static int is_shown;
- struct unit *punit;
-
- if((punit=get_unit_in_focus())) {
- struct tile *ptile;
- ptile=map_get_tile(punit->x, punit->y);
-
- if(is_shown) {
- struct unit_list units;
- units=ptile->units;
- unit_list_init(&ptile->units);
- refresh_tile_mapcanvas(punit->x, punit->y, 1);
- ptile->units=units;
- }
- else {
- /* make sure that the blinking unit is always on the top */
- unit_list_unlink(&ptile->units, punit);
- unit_list_insert(&ptile->units, punit);
- refresh_tile_mapcanvas(punit->x, punit->y, 1);
- }
-
- is_shown=!is_shown;
- }
-}
-
-
/**************************************************************************
...
**************************************************************************/
diff -Nur -X/home/thue/freeciv-dev/no.freeciv /home/thue/freeciv-dev/freeciv/client/include/mapview_g.h hack/client/include/mapview_g.h
--- /home/thue/freeciv-dev/freeciv/client/include/mapview_g.h Mon Apr 3 21:43:00 2000
+++ hack/client/include/mapview_g.h Tue Apr 4 17:48:49 2000
@@ -47,7 +47,6 @@
void put_cross_overlay_tile(int x,int y);
void put_city_workers(struct city *pcity, int color);
-void blink_active_unit(void);
void move_unit_map_canvas(struct unit *punit, int x0, int y0, int x1, int y1);
void decrease_unit_hp_smooth(struct unit *punit0, int hp0,
struct unit *punit1, int hp1);