--- deliantra/Deliantra-Client/bin/pclient	2006/04/21 12:27:20	1.156
+++ deliantra/Deliantra-Client/bin/pclient	2006/04/24 03:33:51	1.171
@@ -39,6 +39,9 @@
 our $FULLSCREEN;
 our $FONTSIZE;
 
+our $FONT_PROP;
+our $FONT_FIXED;
+
 our $MAP;
 our $MAPWIDGET;
 our $BUTTONBAR;
@@ -119,157 +122,301 @@
    });
    $mode_slider->emit (changed => $mode_slider->{range}[0]);
 
-   $table->add (0, 1, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen");
-   $table->add (1, 1, new CFClient::UI::CheckBox state => $CFG->{fullscreen}, connect_changed => sub {
-      my ($self, $value) = @_;
-      $CFG->{fullscreen} = $value;
-   });
+   my $row = 1;
 
-   $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
-   $table->add (1, 2, new CFClient::UI::CheckBox state => $CFG->{fast}, connect_changed => sub {
-      my ($self, $value) = @_;
-      $CFG->{fast} = $value;
-   });
+   $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen");
+   $table->add (1, $row++, new CFClient::UI::CheckBox
+      state => $CFG->{fullscreen},
+      tooltip => "Bring the client into fullscreen mode",
+      connect_changed => sub {
+         my ($self, $value) = @_;
+         $CFG->{fullscreen} = $value;
+      }
+   );
 
-   $table->add (0, 3, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War");
-   $table->add (1, 3, new CFClient::UI::CheckBox state => $CFG->{fow_enable}, connect_changed => sub {
-      my ($self, $value) = @_;
-      $CFG->{fow_enable} = $value;
-   });
+   $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
+   $table->add (1, $row++, new CFClient::UI::CheckBox
+      state => $CFG->{fast},
+      tooltip => "Lower the visual quality considerably to speed up rendering.",
+      connect_changed => sub {
+         my ($self, $value) = @_;
+         $CFG->{fast} = $value;
+      }
+   );
 
-   $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity");
-   $table->add (1, 4, new CFClient::UI::Slider range => [$CFG->{fow_intensity}, 0, 1 + 0.001, 0.001], connect_changed => sub {
-      my ($self, $value) = @_;
-      $CFG->{fow_intensity} = $value;
-   });
+   $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale");
+   $table->add (1, $row++, new CFClient::UI::Slider
+      range => [$CFG->{map_scale}, 0.25, 2, 0.05],
+      tooltip => "Enlarge or shrink the displayed map",
+      connect_changed => sub {
+         my ($self, $value) = @_;
+         $CFG->{map_scale} = 0.05 * int $value / 0.05;
+      }
+   );
 
-   $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth");
-   $table->add (1, 5, new CFClient::UI::CheckBox state => $CFG->{fow_smooth}, connect_changed => sub {
-      my ($self, $value) = @_;
-      $CFG->{fow_smooth} = $value;
-      status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::GL_VERSION < 1.2;
-   });
+   $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War");
+   $table->add (1, $row++, new CFClient::UI::CheckBox
+      state => $CFG->{fow_enable},
+      tooltip => "Fog-of-War marks areas that cannot be seen by the player",
+      connect_changed => sub {
+         my ($self, $value) = @_;
+         $CFG->{fow_enable} = $value;
+      }
+   );
+
+   $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity");
+   $table->add (1, $row++, new CFClient::UI::Slider
+      range => [$CFG->{fow_intensity}, 0, 1 + 0.001, 0.001],
+      tooltip => "The higher the intensity, the lighter the Fog-of-War color",
+      connect_changed => sub {
+         my ($self, $value) = @_;
+         $CFG->{fow_intensity} = $value;
+      }
+   );
+
+   $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth");
+   $table->add (1, $row++, new CFClient::UI::CheckBox
+      state => $CFG->{fow_smooth},
+      tooltip => "Smooth the Fog-of-War a bit to make it more realistic",
+      connect_changed => sub {
+         my ($self, $value) = @_;
+         $CFG->{fow_smooth} = $value;
+         status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::GL_VERSION < 1.2;
+      }
+   );
 
-   $table->add (0, 6, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
-   $table->add (1, 6, new CFClient::UI::Slider range => [$CFG->{gui_fontsize}, 0.7, 1.7, 0.1], connect_changed => sub {
-      $CFG->{gui_fontsize} = 0.1 * int $_[1] * 10;
+   $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
+   $table->add (1, $row++, new CFClient::UI::Slider
+      range => [$CFG->{gui_fontsize}, 0.5, 2, 0.1],
+      tooltip => "The font size used by most GUI elements",
+      connect_changed => sub {
+         $CFG->{gui_fontsize} = 0.1 * int $_[1] * 10;
 #      $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
-   });
+      }
+   );
 
-   $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Server Log Fontsize");
-   $table->add (1, 7, new CFClient::UI::Slider range => [$CFG->{log_fontsize}, 0.7, 1.7, 0.1], connect_changed => sub {
-      $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = 0.1 * int $_[1] * 10);
-   });
+   $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Server Log Fontsize");
+   $table->add (1, $row++, new CFClient::UI::Slider
+      range => [$CFG->{log_fontsize}, 0.5, 2, 0.1],
+      tooltip => "The font size used by the server log window only",
+      connect_changed => sub {
+         $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = 0.1 * int $_[1] * 10);
+      }
+   );
 
-   $table->add (1, 8, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {
-      video_shutdown ();
-      video_init ();
-   });
+   $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
 
-   $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");
-   $table->add (1, 9, new CFClient::UI::CheckBox state => $CFG->{audio_enable}, connect_changed => sub {
-      $CFG->{audio_enable} = $_[1];
-   });
+   $table->add (1, $row++, new CFClient::UI::Slider
+      range => [$CFG->{stat_fontsize}, 0.5, 2, 0.1],
+      tooltip => "The font size used by the statistics window only",
+      connect_changed => sub {
+         $CFG->{stat_fontsize} = 0.1 * int $_[1] * 10;
+         &set_stats_window_fontsize;
+      }
+   );
+
+   $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size");
+   $table->add (1, $row++, new CFClient::UI::Slider
+      range => [$CFG->{gauge_size}, 0.2, 0.8, 0.02],
+      tooltip => "Adjust the size of the stats gauges at the bottom right",
+      connect_changed => sub {
+         $CFG->{gauge_size} = $_[1];
+         my $h = int $HEIGHT * $CFG->{gauge_size};
+         $GAUGES->{win}->set_size ($WIDTH, $h);
+         $GAUGES->{win}->move (0, $HEIGHT - $h);
+      }
+   );
+
+   $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
+   $table->add (1, $row++, new CFClient::UI::Slider
+      range => [$CFG->{gauge_fontsize}, 0.5, 2.0, 0.1],
+      tooltip => "Adjusts the fontsize of the gauges at the bottom right",
+      connect_changed => sub {
+         $CFG->{gauge_fontsize} = 0.1 * int $_[1] * 10;
+         &set_gauge_window_fontsize;
+      }
+   );
+
+   $table->add (1, $row++, new CFClient::UI::Button
+      expand => 1, align => 0, text => "Apply",
+      tooltip => "Apply the video settings",
+      connect_activate => sub {
+         video_shutdown ();
+         video_init ();
+      }
+   );
+
+   $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");
+   $table->add (1, $row++, new CFClient::UI::CheckBox
+      state => $CFG->{audio_enable},
+      tooltip => "If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.",
+      connect_changed => sub {
+         $CFG->{audio_enable} = $_[1];
+      }
+   );
 #   $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume");
 #   $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], connect_changed => sub {
 #      $CFG->{effects_volume} = $_[1];
 #   });
-   $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music");
-   $table->add (1, 10, my $hbox = new CFClient::UI::HBox);
-   $hbox->add (new CFClient::UI::CheckBox expand => 1, state => $CFG->{bgm_enable}, connect_changed => sub {
-      $CFG->{bgm_enable} = $_[1];
-   });
-   $hbox->add (new CFClient::UI::Slider expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0.1], connect_changed => sub {
-      $CFG->{bgm_volume} = $_[1];
-      CFClient::MixMusic::volume $_[1] * 128;
-   });
+   $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music");
+   $table->add (1, $row++, my $hbox = new CFClient::UI::HBox);
+   $hbox->add (new CFClient::UI::CheckBox
+      expand => 1, state => $CFG->{bgm_enable},
+      tooltip => "Enable background music playing",
+      connect_changed => sub {
+         $CFG->{bgm_enable} = $_[1];
+      }
+   );
+   $hbox->add (new CFClient::UI::Slider
+      expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0.1],
+      tooltip => "The volume of the background music",
+      connect_changed => sub {
+         $CFG->{bgm_volume} = $_[1];
+         CFClient::MixMusic::volume $_[1] * 128;
+      }
+   );
 
-   $table->add (1, 11, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {
-      audio_shutdown ();
-      audio_init ();
-   });
+   $table->add (1, $row++, new CFClient::UI::Button
+      expand => 1, align => 0, text => "Apply",
+      tooltip => "Apply the audio settings",
+      connect_activate => sub {
+         audio_shutdown ();
+         audio_init ();
+      }
+   );
 
    $dialog
 }
 
+sub set_stats_window_fontsize {
+   for (values %{$STATWIDS}) {
+      $_->set_fontsize ($::CFG->{stat_fontsize});
+   }
+}
+
+sub set_gauge_window_fontsize {
+   for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) {
+      $_->set_fontsize ($::CFG->{gauge_fontsize});
+   }
+
+#   local $GAUGES->{win}{parent};#d#
+#   use PApp::Util; open D, ">:utf8", "d"; print D PApp::Util::dumpval $GAUGES->{win}; close D;
+}
+
+sub make_gauge_window {
+   my $gh = int ($HEIGHT * $CFG->{gauge_size});
+#   my $gw = int ($WIDTH * $CFG->{gauge_w_size});
+
+   my $win = new CFClient::UI::Frame (
+      y => $HEIGHT - $gh, x => 0, user_w => $WIDTH, user_h => $gh
+   );
+   $win->add (my $vb = new CFClient::UI::VBox);
+
+   $vb->add (my $hbg = new CFClient::UI::HBox expand => 1);
+
+   $hbg->add (new CFClient::UI::Empty expand => 1);
+   $hbg->add (my $hb = new CFClient::UI::HBox);
+   $hb->add (my $hg = new CFClient::UI::Gauge type => 'hp', tooltip => "Health points");
+   $hb->add (my $mg = new CFClient::UI::Gauge type => 'mana', tooltip => "Spellpoints");
+   $hb->add (my $gg = new CFClient::UI::Gauge type => 'grace', tooltip => "Grace");
+   $hb->add (my $fg = new CFClient::UI::Gauge type => 'food', tooltip => "Food");
+
+   $vb->add (my $exp = new CFClient::UI::Label valign => 0, align => 1, text => "XP: 0 LVL: 0");
+   $vb->add (my $rng = new CFClient::UI::Label valign => 0, align => 1, text => "Rng:");
+
+   $GAUGES = {
+      exp => $exp, win => $win, range => $rng,
+      food => $fg, mana => $mg, hp => $hg, grace => $gg
+   };
+
+   &set_gauge_window_fontsize;
+
+   $win
+}
+
 sub make_stats_window {
    my $tgw = new CFClient::UI::FancyFrame (x => $WIDTH * 2/5, y => 0, title => "Stats");
 
    $tgw->add (my $vb = new CFClient::UI::VBox);
-   $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:");
-   $vb->add (my $lhb = new CFClient::UI::HBox);
-   $lhb->add ($STATWIDS->{exp} = new CFClient::UI::Label valign => 0, align => -1, text => "Exp:", expand => 1);
-   $lhb->add ($STATWIDS->{lvl} = new CFClient::UI::Label valign => 0, align => -1, text => "Level:", expand => 1);
+   $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1);
+   $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1);
 
    $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
-   $hb->add (my $hg = new CFClient::UI::Gauge type => 'hp',    expand => 1);
-   $hb->add (my $mg = new CFClient::UI::Gauge type => 'mana',  expand => 1);
-   $hb->add (my $gg = new CFClient::UI::Gauge type => 'grace', expand => 1);
-   $hb->add (my $fg = new CFClient::UI::Gauge type => 'food',  expand => 1);
-   $GAUGES = { food => $fg, mana => $mg, hp => $hg, grace => $gg };
 
    $hb->add (my $tbl = new CFClient::UI::Table expand => 1);
 
-   if (0) { # this code can vanish, just wanted to preserver it for a checkin
-      $tbl->add (0, 0, $STATWIDS->{st_str} = new CFClient::UI::Label valign => 0, align => -1, text => "S");
-      $tbl->add (0, 1, $STATWIDS->{st_dex} = new CFClient::UI::Label valign => 0, align => -1, text => "D");
-      $tbl->add (0, 2, $STATWIDS->{st_con} = new CFClient::UI::Label valign => 0, align => -1, text => "Co");
-      $tbl->add (0, 3, $STATWIDS->{st_int} = new CFClient::UI::Label valign => 0, align => -1, text => "I");
-      $tbl->add (0, 4, $STATWIDS->{st_wis} = new CFClient::UI::Label valign => 0, align => -1, text => "W");
-      $tbl->add (0, 5, $STATWIDS->{st_pow} = new CFClient::UI::Label valign => 0, align => -1, text => "P");
-      $tbl->add (0, 6, $STATWIDS->{st_cha} = new CFClient::UI::Label valign => 0, align => -1, text => "Ch");
-
-      $tbl->add (1, 0, $STATWIDS->{st_wc}   = new CFClient::UI::Label valign => 0, align => -1, text => "Wc");
-      $tbl->add (1, 1, $STATWIDS->{st_ac}   = new CFClient::UI::Label valign => 0, align => -1, text => "Ac");
-      $tbl->add (1, 2, $STATWIDS->{st_dam}  = new CFClient::UI::Label valign => 0, align => -1, text => "Dam");
-      $tbl->add (1, 3, $STATWIDS->{st_arm}  = new CFClient::UI::Label valign => 0, align => -1, text => "Arm");
-      $tbl->add (1, 4, $STATWIDS->{st_spd}  = new CFClient::UI::Label valign => 0, align => -1, text => "Sp");
-      $tbl->add (1, 5, $STATWIDS->{st_wspd} = new CFClient::UI::Label valign => 0, align => -1, text => "WSp");
-   } else {
-      $tbl->add (0, 0, new CFClient::UI::Label valign => 0, align => +1, text => "S");
-      $tbl->add (0, 1, new CFClient::UI::Label valign => 0, align => +1, text => "D");
-      $tbl->add (0, 2, new CFClient::UI::Label valign => 0, align => +1, text => "Co");
-      $tbl->add (0, 3, new CFClient::UI::Label valign => 0, align => +1, text => "I");
-      $tbl->add (0, 4, new CFClient::UI::Label valign => 0, align => +1, text => "W");
-      $tbl->add (0, 5, new CFClient::UI::Label valign => 0, align => +1, text => "P");
-      $tbl->add (0, 6, new CFClient::UI::Label valign => 0, align => +1, text => "Ch");
-
-      $tbl->add (1, 0, $STATWIDS->{st_str} = new CFClient::UI::Label valign => 0, align => -1, text => "");
-      $tbl->add (1, 1, $STATWIDS->{st_dex} = new CFClient::UI::Label valign => 0, align => -1, text => "");
-      $tbl->add (1, 2, $STATWIDS->{st_con} = new CFClient::UI::Label valign => 0, align => -1, text => "");
-      $tbl->add (1, 3, $STATWIDS->{st_int} = new CFClient::UI::Label valign => 0, align => -1, text => "");
-      $tbl->add (1, 4, $STATWIDS->{st_wis} = new CFClient::UI::Label valign => 0, align => -1, text => "");
-      $tbl->add (1, 5, $STATWIDS->{st_pow} = new CFClient::UI::Label valign => 0, align => -1, text => "");
-      $tbl->add (1, 6, $STATWIDS->{st_cha} = new CFClient::UI::Label valign => 0, align => -1, text => "");
-
-      $tbl->add (2, 0, new CFClient::UI::Label valign => 0, align => +1, text => "Wc");
-      $tbl->add (2, 1, new CFClient::UI::Label valign => 0, align => +1, text => "Ac");
-      $tbl->add (2, 2, new CFClient::UI::Label valign => 0, align => +1, text => "Dam");
-      $tbl->add (2, 3, new CFClient::UI::Label valign => 0, align => +1, text => "Arm");
-      $tbl->add (2, 4, new CFClient::UI::Label valign => 0, align => +1, text => "Sp");
-      $tbl->add (2, 5, new CFClient::UI::Label valign => 0, align => +1, text => "WSp");
-
-      $tbl->add (3, 0, $STATWIDS->{st_wc}   = new CFClient::UI::Label valign => 0, align => -1, text => "");
-      $tbl->add (3, 1, $STATWIDS->{st_ac}   = new CFClient::UI::Label valign => 0, align => -1, text => "");
-      $tbl->add (3, 2, $STATWIDS->{st_dam}  = new CFClient::UI::Label valign => 0, align => -1, text => "");
-      $tbl->add (3, 3, $STATWIDS->{st_arm}  = new CFClient::UI::Label valign => 0, align => -1, text => "");
-      $tbl->add (3, 4, $STATWIDS->{st_spd}  = new CFClient::UI::Label valign => 0, align => -1, text => "");
-      $tbl->add (3, 5, $STATWIDS->{st_wspd} = new CFClient::UI::Label valign => 0, align => -1, text => "");
-   }
+   $tbl->add (0, 0, $STATWIDS->{st_str} = new CFClient::UI::Label valign => 0, align => +1, template => "30");
+   $tbl->add (0, 1, $STATWIDS->{st_dex} = new CFClient::UI::Label valign => 0, align => +1, template => "30");
+   $tbl->add (0, 2, $STATWIDS->{st_con} = new CFClient::UI::Label valign => 0, align => +1, template => "30");
+   $tbl->add (0, 3, $STATWIDS->{st_int} = new CFClient::UI::Label valign => 0, align => +1, template => "30");
+   $tbl->add (0, 4, $STATWIDS->{st_wis} = new CFClient::UI::Label valign => 0, align => +1, template => "30");
+   $tbl->add (0, 5, $STATWIDS->{st_pow} = new CFClient::UI::Label valign => 0, align => +1, template => "30");
+   $tbl->add (0, 6, $STATWIDS->{st_cha} = new CFClient::UI::Label valign => 0, align => +1, template => "30");
+
+   $tbl->add (1, 0, $STATWIDS->{st_str_lbl} = new CFClient::UI::Label valign => 0, align => -1, text => "Str");
+   $tbl->add (1, 1, $STATWIDS->{st_dex_lbl} = new CFClient::UI::Label valign => 0, align => -1, text => "Dex");
+   $tbl->add (1, 2, $STATWIDS->{st_con_lbl} = new CFClient::UI::Label valign => 0, align => -1, text => "Con");
+   $tbl->add (1, 3, $STATWIDS->{st_int_lbl} = new CFClient::UI::Label valign => 0, align => -1, text => "Int");
+   $tbl->add (1, 4, $STATWIDS->{st_wis_lbl} = new CFClient::UI::Label valign => 0, align => -1, text => "Wis");
+   $tbl->add (1, 5, $STATWIDS->{st_pow_lbl} = new CFClient::UI::Label valign => 0, align => -1, text => "Pow");
+   $tbl->add (1, 6, $STATWIDS->{st_cha_lbl} = new CFClient::UI::Label valign => 0, align => -1, text => "Cha");
+
+   $tbl->add (2, 0, $STATWIDS->{st_wc}   = new CFClient::UI::Label valign => 0, align => +1, template => "-120");
+   $tbl->add (2, 1, $STATWIDS->{st_ac}   = new CFClient::UI::Label valign => 0, align => +1, template => "-120");
+   $tbl->add (2, 2, $STATWIDS->{st_dam}  = new CFClient::UI::Label valign => 0, align => +1, template => "120");
+   $tbl->add (2, 3, $STATWIDS->{st_arm}  = new CFClient::UI::Label valign => 0, align => +1, template => "120");
+   $tbl->add (2, 4, $STATWIDS->{st_spd}  = new CFClient::UI::Label valign => 0, align => +1, template => "10.54");
+   $tbl->add (2, 5, $STATWIDS->{st_wspd} = new CFClient::UI::Label valign => 0, align => +1, template => "9");
+
+   $tbl->add (3, 0, $STATWIDS->{st_wc_lbl}   = new CFClient::UI::Label valign => 0, align => -1, text => "Wc");
+   $tbl->add (3, 1, $STATWIDS->{st_ac_lbl}   = new CFClient::UI::Label valign => 0, align => -1, text => "Ac");
+   $tbl->add (3, 2, $STATWIDS->{st_dam_lbl}  = new CFClient::UI::Label valign => 0, align => -1, text => "Dam");
+   $tbl->add (3, 3, $STATWIDS->{st_arm_lbl}  = new CFClient::UI::Label valign => 0, align => -1, text => "Arm");
+   $tbl->add (3, 4, $STATWIDS->{st_spd_lbl}  = new CFClient::UI::Label valign => 0, align => -1, text => "Sp");
+   $tbl->add (3, 5, $STATWIDS->{st_wspd_lbl} = new CFClient::UI::Label valign => 0, align => -1, text => "WSp");
 
-   $hb->add (my $tbl2 = new CFClient::UI::Table);
+   $hb->add (my $tbl2 = new CFClient::UI::Table expand => 1);
 
    my $row = 0;
    my $col = 0;
 
+   my %resist_names = (
+      slow  => "Slow",
+      holyw => "Holy Word",
+      conf  => "Confusion",
+      fire  => "Fire",
+      depl  => "Depletion",
+      magic => "Magic",
+      drain => "Draining",
+      acid  => "Acid",
+      pois  => "Poison",
+      para  => "Paralysation",
+      deat  => "Death",
+      phys  => "Physical",
+      blind => "Blind",
+      fear  => "Fear",
+      tund  => "Turn undead",
+      elec  => "Electricity",
+      cold  => "Cold",
+      ghit  => "Ghost hit",
+   );
    for (qw/slow holyw conf fire depl magic
            drain acid pois para deat phys
            blind fear tund elec cold ghit/)
    {
-      $tbl2->add ($col,     $row, new CFClient::UI::Image image => "ui/resist/resist_$_.png");
-      $tbl2->add ($col + 1, $row,
+      $tbl2->add ($col, $row,
          $STATWIDS->{"res_$_"} =
-            new CFClient::UI::Label text => "0", align => -1, valign => 0
+            new CFClient::UI::Label
+               template => "-100%",
+               align => +1,
+               valign => 0,
+               tooltip => $resist_names{$_}
+      );
+      $tbl2->add ($col + 1, $row, new CFClient::UI::Image
+         can_hover => 1,
+         can_events => 1,
+         image => "ui/resist/resist_$_.png",
+         tooltip => $resist_names{$_}
       );
 
       $row++;
@@ -279,61 +426,55 @@
       }
    }
 
+   &set_stats_window_fontsize;
    update_stats_window ({});
 
    $tgw
 }
 
+sub formsep {
+   reverse join ",", grep length, split /(...)/, reverse $_[0] * 1
+}
+
 sub update_stats_window {
    my ($stats) = @_;
 
    # i love text protocols!!!
-   my $hp   = $stats->{1};
-   my $hp_m = $stats->{2};
-   my $sp   = $stats->{3};
-   my $sp_m = $stats->{4};
-   my $fo   = $stats->{18};
+   my $hp   = $stats->{Crossfire::Protocol::CS_STAT_HP} * 1;
+   my $hp_m = $stats->{Crossfire::Protocol::CS_STAT_MAXHP} * 1;
+   my $sp   = $stats->{Crossfire::Protocol::CS_STAT_SP} * 1;
+   my $sp_m = $stats->{Crossfire::Protocol::CS_STAT_MAXSP} * 1;
+   my $fo   = $stats->{Crossfire::Protocol::CS_STAT_FOOD} * 1;
    my $fo_m = 999;
-   my $gr   = $stats->{23};
-   my $gr_m = $stats->{24};
+   my $gr   = $stats->{Crossfire::Protocol::CS_STAT_GRACE} * 1;
+   my $gr_m = $stats->{Crossfire::Protocol::CS_STAT_MAXGRACE} * 1;
 
    $GAUGES->{hp}      ->set_value ($hp, $hp_m);
    $GAUGES->{mana}    ->set_value ($sp, $sp_m);
    $GAUGES->{food}    ->set_value ($fo, $fo_m);
    $GAUGES->{grace}   ->set_value ($gr, $gr_m);
-   $STATWIDS->{title} ->set_text ("Title: " . $stats->{21});
-   $STATWIDS->{exp}   ->set_text ("Exp.: "  . ($stats->{11} || $stats->{28}));
-   $STATWIDS->{lvl}   ->set_text ("Level: " . $stats->{12});
-
-   if (0) { # this code can vanish, just wanted to preserver it for a checkin
-      $STATWIDS->{st_str} ->set_text (sprintf "S%d",     $stats->{5});
-      $STATWIDS->{st_dex} ->set_text (sprintf "D%d",     $stats->{8});
-      $STATWIDS->{st_con} ->set_text (sprintf "Co%d",    $stats->{9});
-      $STATWIDS->{st_int} ->set_text (sprintf "I%d",     $stats->{6});
-      $STATWIDS->{st_wis} ->set_text (sprintf "W%d",     $stats->{7});
-      $STATWIDS->{st_pow} ->set_text (sprintf "P%d",     $stats->{22});
-      $STATWIDS->{st_cha} ->set_text (sprintf "Ch%d",    $stats->{10});
-      $STATWIDS->{st_wc}  ->set_text (sprintf "Wc%d",    $stats->{13});
-      $STATWIDS->{st_ac}  ->set_text (sprintf "Ac%d",    $stats->{14});
-      $STATWIDS->{st_dam} ->set_text (sprintf "Dam%d",   $stats->{15});
-      $STATWIDS->{st_arm} ->set_text (sprintf "Arm%d",   $stats->{16});
-      $STATWIDS->{st_spd} ->set_text (sprintf "Sp%.1f",  $stats->{17});
-      $STATWIDS->{st_wspd}->set_text (sprintf "WSp%.1f", $stats->{19});
-   } else {
-      $STATWIDS->{st_str} ->set_text (sprintf "%d",     $stats->{5});
-      $STATWIDS->{st_dex} ->set_text (sprintf "%d",     $stats->{8});
-      $STATWIDS->{st_con} ->set_text (sprintf "%d",    $stats->{9});
-      $STATWIDS->{st_int} ->set_text (sprintf "%d",     $stats->{6});
-      $STATWIDS->{st_wis} ->set_text (sprintf "%d",     $stats->{7});
-      $STATWIDS->{st_pow} ->set_text (sprintf "%d",     $stats->{22});
-      $STATWIDS->{st_cha} ->set_text (sprintf "%d",    $stats->{10});
-      $STATWIDS->{st_wc}  ->set_text (sprintf "%d",    $stats->{13});
-      $STATWIDS->{st_ac}  ->set_text (sprintf "%d",    $stats->{14});
-      $STATWIDS->{st_dam} ->set_text (sprintf "%d",   $stats->{15});
-      $STATWIDS->{st_arm} ->set_text (sprintf "%d",   $stats->{16});
-      $STATWIDS->{st_spd} ->set_text (sprintf "%.1f",  $stats->{17});
-      $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{19});
-   }
+   $GAUGES->{exp}     ->set_text ("Exp: " . (formsep $stats->{Crossfire::Protocol::CS_STAT_EXP64})
+                                  . " (lvl " . ($stats->{Crossfire::Protocol::CS_STAT_LEVEL} * 1) . ")");
+   my $rng = $stats->{Crossfire::Protocol::CS_STAT_RANGE};
+   $rng =~ s/^Range: //;    # thank you so much dear server
+   $GAUGES->{range}   ->set_text ("Rng: "  . $rng);
+   my $title = $stats->{Crossfire::Protocol::CS_STAT_TITLE};
+   $title =~ s/^Player: //;
+   $STATWIDS->{title} ->set_text ("Title: " . $title);
+
+   $STATWIDS->{st_str} ->set_text (sprintf "%d", $stats->{5});
+   $STATWIDS->{st_dex} ->set_text (sprintf "%d", $stats->{8});
+   $STATWIDS->{st_con} ->set_text (sprintf "%d", $stats->{9});
+   $STATWIDS->{st_int} ->set_text (sprintf "%d", $stats->{6});
+   $STATWIDS->{st_wis} ->set_text (sprintf "%d", $stats->{7});
+   $STATWIDS->{st_pow} ->set_text (sprintf "%d", $stats->{22});
+   $STATWIDS->{st_cha} ->set_text (sprintf "%d", $stats->{10});
+   $STATWIDS->{st_wc}  ->set_text (sprintf "%d", $stats->{13});
+   $STATWIDS->{st_ac}  ->set_text (sprintf "%d", $stats->{14});
+   $STATWIDS->{st_dam} ->set_text (sprintf "%d", $stats->{15});
+   $STATWIDS->{st_arm} ->set_text (sprintf "%d", $stats->{16});
+   $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{Crossfire::Protocol::CS_STAT_SPEED});
+   $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{Crossfire::Protocol::CS_STAT_WEAP_SP});
 
    my %tbl = (
       phys  => 100,
@@ -350,6 +491,7 @@
       para  => 111,
       tund  => 112,
       fear  => 113,
+      depl  => 113,
       deat  => 115,
       holyw => 116,
       blind => 117
@@ -448,40 +590,69 @@
    {
       $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
 
-      $vbox->add (my $HOST = new CFClient::UI::Entry expand => 1, text => $CFG->{host}, connect_changed => sub {
-         my ($self, $value) = @_;
-         $CFG->{host} = $value;
-      });
+      $vbox->add (
+         my $HOST = new CFClient::UI::Entry
+            expand => 1,
+            text => $CFG->{host},
+            tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
+            connect_changed => sub {
+               my ($self, $value) = @_;
+               $CFG->{host} = $value;
+            }
+      );
 
       $METASERVER = metaserver_dialog;
 
-      $vbox->add (new CFClient::UI::Flopper expand => 1, text => "Metaserver", other => $METASERVER, connect_open => sub {
-         update_metaserver $HOST;
-      });
+      $vbox->add (new CFClient::UI::Flopper
+         expand => 1,
+         text => "Metaserver",
+         other => $METASERVER,
+         tooltip => "Show a list of avaible crossfire servers",
+         connect_open => sub {
+            update_metaserver $HOST;
+         }
+      );
    }
 
    $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
-   $table->add (1, 4, new CFClient::UI::Entry text => $CFG->{user}, connect_changed => sub {
-      my ($self, $value) = @_;
-      $CFG->{user} = $value;
-   });
+   $table->add (1, 4, new CFClient::UI::Entry
+      text => $CFG->{user},
+      tooltip => "The name of your character on the server",
+      connect_changed => sub {
+         my ($self, $value) = @_;
+         $CFG->{user} = $value;
+      }
+   );
 
    $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password");
-   $table->add (1, 5, new CFClient::UI::Entry text => $CFG->{password}, hidden => 1, connect_changed => sub {
-      my ($self, $value) = @_;
-      $CFG->{password} = $value;
-   });
+   $table->add (1, 5, new CFClient::UI::Entry
+      text => $CFG->{password},
+      hidden => 1,
+      tooltip => "The password for your character",
+      connect_changed => sub {
+         my ($self, $value) = @_;
+         $CFG->{password} = $value;
+      }
+   );
 
    $table->add (0, 6, new CFClient::UI::Label valign => 0, align => 1, text => "Def. say cmd");
-   $table->add (1, 6, my $saycmd = new CFClient::UI::Entry text => $CFG->{say_command}, connect_changed => sub {
-      my ($self, $value) = @_;
-      $CFG->{say_command} = $value;
-   });
+   $table->add (1, 6, my $saycmd = new CFClient::UI::Entry
+      text => $CFG->{say_command},
+      tooltip => "This is the command that will be used if you write a line in the message window entry. "
+                 ."Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
+                 ."But you could also set it to 'tell <playername>' to only chat with that user.",
+      connect_changed => sub {
+         my ($self, $value) = @_;
+         $CFG->{say_command} = $value;
+      }
+   );
 
    $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
    $table->add (1, 7, new CFClient::UI::Slider
       req_w => 100,
       range => [$CFG->{mapsize}, 10, 100 + 1, 1],
+      tooltip => "This is the size of the portion of the map update the server sends you. "
+                ."If you set this to a high value you will be able to see further for example.",
       connect_changed => sub {
          my ($self, $value) = @_;
 
@@ -507,6 +678,7 @@
 
    $vbox->add ($LOGVIEW = new CFClient::UI::TextView
       expand   => 1,
+      font     => $FONT_FIXED,
       fontsize => $::CFG->{log_fontsize},
    );
 
@@ -610,15 +782,15 @@
    $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup",   other => server_setup);
    $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window);
 
+   $CFClient::UI::ROOT->add (make_gauge_window); # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D
+   $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window);
+
    $BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub {
       CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
       status "Configuration Saved";
    });
 
    $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
-
-
-   $CFClient::UI::ROOT->add (make_stats_window);
 }
 
 sub video_shutdown {
@@ -875,6 +1047,10 @@
 
    $self->{map_info} = [$hash, $x, $y, $w, $h];
 
+   my $map = $self->{map_info}[0];
+   $map =~ s/^.*?\/([^\/]+)$/\1/;
+   $STATWIDS->{map}->set_text ("Map: " . $map);
+
    $self->load_map ($hash, $x, $y);
 }
 
@@ -948,11 +1124,71 @@
 #   warn "sound $x,$y,$soundnum,$type\n";#d#
 }
 
+my $LAST_QUERY; # server is stupid, stupid, stupid
+
 sub conn::query {
    my ($self, $flags, $prompt) = @_;
 
-   #TODO, display dialog with relevant information
-   warn "<<<<QUERY:$flags:$prompt>>>\n";#d#
+   $prompt = $LAST_QUERY unless length $prompt;
+   $LAST_QUERY = $prompt;
+
+   my $dialog = new CFClient::UI::FancyFrame
+      title => "Query",
+      child => my $vbox = new CFClient::UI::VBox;
+
+   $vbox->add (new CFClient::UI::Label
+      max_w => $::WIDTH * 0.4,
+      text => $prompt);
+
+   if ($flags & Crossfire::Protocol::CS_QUERY_YESNO) {
+      $vbox->add (my $hbox = new CFClient::HBox);
+      $hbox->add (new CFClient::Button
+         text => "No",
+         connect_activate => sub {
+            $self->send ("reply n");
+            $dialog->destroy;
+            $MAPWIDGET->focus_in;
+         }
+      );
+      $hbox->add (new CFClient::Button
+         text => "Yes",
+         connect_activate => sub {
+            $self->send ("reply y");
+            $dialog->destroy;
+            $MAPWIDGET->focus_in;
+         },
+      );
+
+      $dialog->focus_in;
+
+   } elsif ($flags & Crossfire::Protocol::CS_QUERY_SINGLECHAR) {
+      $dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)";
+      $vbox->add (my $entry = new CFClient::UI::Entry
+         connect_changed => sub {
+            $self->send ("reply $_[1]");
+            $dialog->destroy;
+            $MAPWIDGET->focus_in;
+         },
+      );
+
+      $entry->focus_in;
+
+   } else {
+      $dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";
+
+      $vbox->add (my $entry = new CFClient::UI::Entry
+         $flags & Crossfire::Protocol::CS_QUERY_HIDEINPUT ? (hiddenchar => "*") : (),
+         connect_activate => sub {
+            $self->send ("reply $_[1]");
+            $dialog->destroy;
+            $MAPWIDGET->focus_in;
+         },
+      );
+
+      $entry->focus_in;
+   }
+
+   $dialog->show;
 }
 
 sub conn::drawinfo {
@@ -980,10 +1216,10 @@
 sub conn::spell_add {
    my ($self, $spell) = @_;
 
-   $MAPWIDGET->add_command ("invoke $spell->{name}", $spell->{message}, sub {
-   });
-   $MAPWIDGET->add_command ("cast $spell->{name}", $spell->{message}, sub {
-   });
+   # TODO
+   # create a widget dynamically, using spell face (CF::Protocol downloads them)
+   $MAPWIDGET->add_command ("invoke $spell->{name}", $spell->{message});
+   $MAPWIDGET->add_command ("cast $spell->{name}", $spell->{message});
 }
 
 sub conn::spell_delete {
@@ -994,13 +1230,24 @@
    my ($self) = @_;
 
    for my $skill (values %{$self->{skill_info}}) {
-      $MAPWIDGET->add_command ("ready_skill $skill", "", sub {
-      });
-      $MAPWIDGET->add_command ("use_skill $skill", "", sub {
-      });
+      $MAPWIDGET->add_command ("ready_skill $skill", "Ready the skill '$skill'");
+      $MAPWIDGET->add_command ("use_skill $skill", "Immediately use the skill '$skill'");
    }
 }
 
+sub conn::container_add {
+   my ($self, $id, $items) = @_;
+
+   # 0 floor
+   # $self-<{player}{tag} => player inv
+   #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}};
+}
+
+sub conn::container_clear {
+   my ($self, $id) = @_;
+#   use PApp::Util; warn PApp::Util::dumpval $self->{container}{0};
+}
+
 %SDL_CB = (
    CFClient::SDL_QUIT => sub {
       Event::unloop -1;
@@ -1043,11 +1290,15 @@
    height        => 480,
    fullscreen    => 0,
    fast          => 0,
+   map_scale     => 0.5,
    fow_enable    => 1,
    fow_intensity => 0.45,
    fow_smooth    => 0,
    gui_fontsize  => 1,
-   log_fontsize  => 14,
+   log_fontsize  => 1,
+   gauge_fontsize => 1,
+   gauge_size     => 0.35,
+   stat_fontsize => 1,
    mapsize       => 100,
    host          => "crossfire.schmorp.de",
    say_command   => 'say',
@@ -1071,10 +1322,23 @@
 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
 
 {
-   my @fonts = map CFClient::find_rcfile $_, qw(uifont.ttf uifontb.ttf uifonti.ttf uifontbi.ttf);
+   my @fonts = map CFClient::find_rcfile "fonts/$_", qw(
+      DejaVuSans.ttf
+      DejaVuSansMono.ttf
+      DejaVuSans-Bold.ttf
+      DejaVuSansMono-Bold.ttf
+      DejaVuSans-Oblique.ttf
+      DejaVuSansMono-Oblique.ttf
+      DejaVuSans-BoldOblique.ttf
+      DejaVuSansMono-BoldOblique.ttf
+   );
 
    CFClient::add_font $_ for @fonts;
-   CFClient::set_font $fonts[0];
+   
+   $FONT_PROP  = new_from_file CFClient::Font $fonts[0];
+   $FONT_FIXED = new_from_file CFClient::Font $fonts[1];
+
+   $FONT_PROP->make_default;
 }
 
 video_init;