--- deliantra/Deliantra-Client/bin/pclient 2006/04/14 11:32:22 1.101
+++ deliantra/Deliantra-Client/bin/pclient 2006/04/16 07:25:30 1.116
@@ -15,6 +15,8 @@
use Crossfire;
use Crossfire::Protocol;
+use Compress::LZF;
+
use CFClient;
use CFClient::UI;
@@ -23,7 +25,11 @@
my $MAX_FPS = 60;
my $MIN_FPS = 5; # unused as of yet
-our $FACECACHE;
+our $META_SERVER = "crossfire.real-time.com:13326";
+
+our $FACEMAP;
+our $TILECACHE;
+our $MAPCACHE;
our $LAST_REFRESH;
our $NOW;
@@ -40,6 +46,10 @@
our $MAP;
our $MAPWIDGET;
+our $BUTTONBAR;
+our $LOGVIEW;
+our $CONSOLE;
+our $METASERVER;
our $SDL_ACTIVE;
our $SDL_EV;
@@ -48,8 +58,6 @@
our $ALT_ENTER_MESSAGE;
our $STATUS_LINE;
our $DEBUG_STATUS;
-our $BUTTONBAR;
-our $LOGVIEW;
sub status {
$STATUS_LINE->set_text ($_[0]);
@@ -66,13 +74,17 @@
sub start_game {
status "logging in...";
- my $mapsize = List::Util::min 64, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
+ my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
+
+ $MAPCACHE = CFClient::db_table "mapcache_$CFG->{host}";
$MAP = new CFClient::Map $mapsize, $mapsize;
+
+ my ($host, $port) = split /:/, $CFG->{host};
$CONN = new conn
- host => $CFG->{host},
- port => $CFG->{port},
+ host => $host,
+ port => $port || 13327,
user => $CFG->{user},
pass => $CFG->{password},
mapw => $mapsize,
@@ -88,7 +100,7 @@
undef $CONN;
}
-sub config_dialog {
+sub client_setup {
my $dialog = new CFClient::UI::FancyFrame
child => (my $vbox = new CFClient::UI::VBox);
$vbox->add (new CFClient::UI::Label align => 0, text => "Client Setup");
@@ -138,33 +150,126 @@
$CFG->{fow_smooth} = $value;
});
- $table->add (1, 6, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {
+ $table->add (0, 6, new CFClient::UI::Label align => 1, text => "Log Fontsize");
+ $table->add (1, 6, new CFClient::UI::Slider range => [$CFG->{log_fontsize}, 8, 30, 1], connect_changed => sub {
+ my ($self, $value) = @_;
+ $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = int $value);
+ });
+
+ $table->add (1, 7, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {
destroy_screen ();
init_screen ();
});
+
+ $dialog
+}
+
+sub metaserver_dialog {
+ my $dialog = new CFClient::UI::FancyFrame
+ child => (my $vbox = new CFClient::UI::VBox);
+
+ $vbox->add ($dialog->{table} = new CFClient::UI::Table);
+
+ $dialog
+}
+
+sub update_metaserver {
+ my ($HOST) = @_;
+
+ status "fetching metaserver list...";
+
+ my $buf;
+
+ my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0;
+
+ Event->io (fd => $fh, poll => 'r', cb => sub {
+ my $res = sysread $fh, $buf, 8192, length $buf;
+
+ if (!defined $res) {
+ $_[0]->w->cancel;
+ status "metaserver: $!";
+ } elsif ($res == 0) {
+ $_[0]->w->cancel;
+ status "server list retrieved";
+
+ my $table = $METASERVER->{table};
+
+ $table->clear;
+
+ my @col = qw(Use #Users Host Uptime Version Description);
+ $table->add ($_, 0, new CFClient::UI::Label align => 0, fg => [1, 1, 0], text => $col[$_])
+ for 0 .. $#col;
+
+ my @align = qw(1 0 1 1 -1);
+
+ my $y = 0;
+ for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) {
+ my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = @$m;
+
+ for ($desc) {
+ s/
/\n/gi;
+ s/
/\n· /gi;
+ s/<.*?>//sgi;
+ s/&/&/g;
+ s/</g;
+ s/>/>/g;
+ }
+
+ $uptime = sprintf "%dd %02d:%02d:%02d",
+ (int $m->[8] / 86400),
+ (int $m->[8] / 3600) % 24,
+ (int $m->[8] / 60) % 60,
+ $m->[8] % 60;
+
+ $m = [$users, $host, $uptime, $version, $desc];
+
+ $y++;
+
+ $table->add (0, $y, new CFClient::UI::VBox children => [
+ (new CFClient::UI::Button text => " ", connect_activate => sub {
+ $HOST->set_text ($CFG->{host} = $host);
+ }),
+ (new CFClient::UI::Empty expand => 1),
+ ]);
+
+ $table->add ($_ + 1, $y, new CFClient::UI::Label align => $align[$_], text => $m->[$_], fontsize => $FONTSIZE * 0.8)
+ for 0 .. $#$m;
+ }
+ }
+ });
+}
+
+sub server_setup {
+ my $dialog = new CFClient::UI::FancyFrame
+ child => (my $vbox = new CFClient::UI::VBox);
$vbox->add (new CFClient::UI::Label align => 0, text => "Server Setup");
$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
- $table->add (0, 2, new CFClient::UI::Label align => 1, text => "Host");
- $table->add (1, 2, my $host = new CFClient::UI::Entry text => $CFG->{host}, connect_changed => sub {
- my ($self, $value) = @_;
- $CFG->{host} = $value;
- });
+ $table->add (0, 2, new CFClient::UI::Label align => 1, text => "Host:Port");
- $table->add (0, 3, new CFClient::UI::Label align => 1, text => "Port");
- $table->add (1, 3, my $port = new CFClient::UI::Entry text => $CFG->{port}, connect_changed => sub {
- my ($self, $value) = @_;
- $CFG->{port} = $value;
- });
+ {
+ $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
+
+ $vbox->add (my $HOST = new CFClient::UI::Entry text => $CFG->{host}, connect_changed => sub {
+ my ($self, $value) = @_;
+ $CFG->{host} = $value;
+ });
+
+ $METASERVER = metaserver_dialog;
+
+ $vbox->add (new CFClient::UI::Flopper text => "Metaserver", other => $METASERVER, connect_open => sub {
+ update_metaserver $HOST;
+ });
+ }
$table->add (0, 4, new CFClient::UI::Label align => 1, text => "Username");
- $table->add (1, 4, my $user = new CFClient::UI::Entry text => $CFG->{user}, connect_changed => sub {
+ $table->add (1, 4, new CFClient::UI::Entry text => $CFG->{user}, connect_changed => sub {
my ($self, $value) = @_;
$CFG->{user} = $value;
});
$table->add (0, 5, new CFClient::UI::Label align => 1, text => "Password");
- $table->add (1, 5, my $pass = new CFClient::UI::Entry text => $CFG->{password}, hidden => 1, connect_changed => sub {
+ $table->add (1, 5, new CFClient::UI::Entry text => $CFG->{password}, hidden => 1, connect_changed => sub {
my ($self, $value) = @_;
$CFG->{password} = $value;
});
@@ -190,25 +295,24 @@
start_game;
});
- $vbox->add (my $hbox = new CFClient::UI::HBox);
-
- $hbox->add (new CFClient::UI::Button expand => 1, align => 0, text => "Save", connect_activate => sub {
- CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
- status "Configuration Saved";
- });
-
$dialog
}
-sub console_window {
+sub message_window {
my $window = new CFClient::UI::FancyFrame
border_bg => [1, 1, 1, 0.5],
bg => [0.3, 0.3, 0.3, 0.8],
+ user_w => $::WIDTH/4,
+ user_h => $::HEIGHT,
child => (my $vbox = new CFClient::UI::VBox);
- $vbox->add ($LOGVIEW = new CFClient::UI::TextView expand => 1);
- $vbox->add (my $input = new CFClient::UI::LineEntry);
- $input->connect (activate => sub {
+ $vbox->add ($LOGVIEW = new CFClient::UI::TextView
+ expand => 1,
+ fontsize => $::CFG->{log_fontsize},
+ );
+
+ $vbox->add (my $input = new CFClient::UI::LineEntry
+ connect_activate => sub {
my ($input, $text) = @_;
$input->set_text ('');
@@ -218,13 +322,22 @@
my $say_cmd = $::CFG->{say_command} || 'say';
$::CONN->user_send ("command $say_cmd $text");
}
- 1
- });
+ },
+ connect_escape => sub {
+ $MAPWIDGET->focus_in
+ },
+ );
+
+ $CONSOLE = {
+ window => $window,
+ input => $input
+ };
$window
}
sub sdl_init {
+ #SDL::Init SDL_INIT_AUDIO | SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE
SDL::Init SDL_INIT_AUDIO | SDL_INIT_VIDEO
and die "SDL::Init failed!\n";
}
@@ -239,7 +352,7 @@
SDL::GLSetAttribute SDL_GL_RED_SIZE, 5;
SDL::GLSetAttribute SDL_GL_GREEN_SIZE, 5;
SDL::GLSetAttribute SDL_GL_BLUE_SIZE, 5;
- SDL::GLSetAttribute SDL_GL_ALPHA_SIZE, 0;
+ SDL::GLSetAttribute SDL_GL_ALPHA_SIZE, 1;
SDL::GLSetAttribute SDL_GL_ACCUM_RED_SIZE, 0;
SDL::GLSetAttribute SDL_GL_ACCUM_GREEN_SIZE, 0;
@@ -271,31 +384,50 @@
#############################################################################
$DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100;
- $CFClient::UI::TOPLEVEL->add ($DEBUG_STATUS);
+ $CFClient::UI::ROOT->add ($DEBUG_STATUS);
$STATUS_LINE = new CFClient::UI::Label
padding => 0,
y => $HEIGHT * 44 / 45 - $FONTSIZE;
- $CFClient::UI::TOPLEVEL->add ($STATUS_LINE);
+ $CFClient::UI::ROOT->add ($STATUS_LINE);
$ALT_ENTER_MESSAGE = new CFClient::UI::Label
padding => 0,
y => $HEIGHT * 44 / 45,
height => $HEIGHT / 45,
text => "Use Alt-Enter to toggle fullscreen mode";
- $CFClient::UI::TOPLEVEL->add ($ALT_ENTER_MESSAGE);
+ $CFClient::UI::ROOT->add ($ALT_ENTER_MESSAGE);
- $CFClient::UI::TOPLEVEL->add ($MAPWIDGET = new CFClient::UI::MapWidget);
+ $CFClient::UI::ROOT->add ($MAPWIDGET = new CFClient::UI::MapWidget);
$MAPWIDGET->focus_in;
+ $MAPWIDGET->connect (activate_console => sub {
+ my ($mapwidget, $preset) = @_;
+
+ if ($CONSOLE) {
+ $CONSOLE->{input}->focus_in;
- $CFClient::UI::TOPLEVEL->add ($BUTTONBAR = new CFClient::UI::HBox);
+ if ($preset && $CONSOLE->{input}->get_text eq '') {
+ $CONSOLE->{input}->set_text ($preset);
+ }
+ }
+ });
+
+ $CFClient::UI::ROOT->add ($BUTTONBAR = new CFClient::UI::HBox);
+
+ $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup);
+ $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup);
+ $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window);
+
+ $BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub {
+ CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
+ status "Configuration Saved";
+ });
- $BUTTONBAR->add (my $setup = new CFClient::UI::Flopper x => 0, y => 0, text => "Setup", other => config_dialog, state => 1);
- $BUTTONBAR->add (my $setup = new CFClient::UI::Flopper x => 0, y => 0, text => "Console", other => console_window);
+ $BUTTONBAR->{children}[0]->emit ("activate");
}
sub destroy_screen {
- $CFClient::UI::TOPLEVEL->{children} = [];
+ $CFClient::UI::ROOT->{children} = [];
undef $SDL_ACTIVE;
undef $SDL_EV;
SDL::Quit;
@@ -316,18 +448,7 @@
$want_refresh = 0;
$can_refresh = 0;
- glViewport 0, 0, $WIDTH, $HEIGHT;
-
- glMatrixMode GL_PROJECTION;
- glLoadIdentity;
- glOrtho 0, $WIDTH, $HEIGHT, 0, -10000 , 10000;
- glMatrixMode GL_MODELVIEW;
- glLoadIdentity;
-
- glClearColor +($CFG->{fow_intensity}) x 3, 1;
- glClear GL_COLOR_BUFFER_BIT;
-
- $CFClient::UI::TOPLEVEL->draw;
+ $CFClient::UI::ROOT->draw;
SDL::GLSwapBuffers;
@@ -385,35 +506,106 @@
$MAPWIDGET->update;
}
-#sub conn::map_update {
-# my ($self, $dirty) = @_;
-#
-# $MAPWIDGET->update;
-#}
+sub conn::flush_map {
+ my ($self) = @_;
+
+ my $map_info = delete $self->{map_info}
+ or return;
+
+ my ($hash, $x, $y, $w, $h) = @$map_info;
+
+ my $data = $MAP->get_rect ($x, $y, $w, $h);
+ $MAPCACHE->put ($hash => Compress::LZF::compress $data);
+
+ warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
+
+}
sub conn::map_clear {
my ($self) = @_;
+ $self->flush_map;
+
$MAP->clear;
+}
+
+sub conn::map_info {
+ my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
-# refresh;
+ $self->flush_map;
+
+ $x = $::MAP->ox - $x;
+ $y = $::MAP->oy - $y;
+
+ $self->{map_info} = [$hash, $x, $y, $w, $h];
+
+ if (defined (my $data = $MAPCACHE->get ($hash))) {
+ $data = Compress::LZF::decompress $data;
+ warn sprintf "LOADmap[%s] length %d\n", $hash, length $data;#d#
+ for my $id ($MAP->set_rect ($x, $y, $data)) {
+ my $data = $TILECACHE->get ($id)
+ or next;
+
+ $self->set_texture ($id => $data);
+ }
+ }
}
sub conn::face_find {
- my ($self, $face) = @_;
+ my ($self, $facenum, $face) = @_;
+
+ my $hash = "$face->{chksum},$face->{name}";
+
+ my $id = $FACEMAP->get ($hash);
+
+ unless ($id) {
+ # create new id for face
+ # i love transactions
+ for (1..100) {
+ my $txn = $CFClient::DB_ENV->txn_begin;
+ my $status = $FACEMAP->db_get (id => $id, BerkeleyDB::DB_RMW);
+ if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
+ $id++;
+ if ($FACEMAP->put (id => $id) == 0
+ && $FACEMAP->put ($hash => $id) == 0) {
+ $txn->txn_commit;
+
+ goto gotid;
+ }
+ }
+ $txn->abort;
+ }
- $FACECACHE->{"$face->{chksum},$face->{name}"}
+ CFClient::fatal "maximum number of transaction retries reached - database problems?";
+ }
+
+gotid:
+ $face->{id} = $id;
+ $MAP->set_face ($facenum => $id);
+ $TILECACHE->get ($id)
}
sub conn::face_update {
my ($self, $facenum, $face) = @_;
- $FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image};
+ $TILECACHE->put ($face->{id} => $face->{image}); #TODO: try to avoid duplicate writes
- my $tex = $face->{texture} = new_from_image CFClient::Texture delete $face->{image};
+ $self->set_texture ($face->{id} => delete $face->{image});
+}
- $MAP->set_texture ($facenum, @$tex{qw(name w h s t)});
- $MAPWIDGET->update;
+sub conn::set_texture {
+ my ($self, $id, $data) = @_;
+
+ $self->{texture}[$id] ||= do {
+ my $tex =
+ new_from_image CFClient::Texture
+ $data, minify => 1;
+
+ $MAP->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
+ $MAPWIDGET->update;
+
+ $tex
+ };
}
sub conn::query {
@@ -429,7 +621,7 @@
my @color = (
[1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
[1.00, 1.00, 1.00],
- [0.00, 0.00, 0.55],
+ [0.50, 0.50, 1.00], # changed
[1.00, 0.00, 0.00],
[1.00, 0.54, 0.00],
[0.11, 0.56, 1.00],
@@ -483,20 +675,23 @@
#############################################################################
+$TILECACHE = CFClient::db_table "tilecache";
+$FACEMAP = CFClient::db_table "facemap";
+
CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
my %DEF_CFG = (
+ sdl_mode => 0,
width => 640,
height => 480,
+ fullscreen => 0,
fast => 0,
fow_enable => 1,
fow_intensity => 0.45,
fow_smooth => 0,
- fullscreen => 0,
- sdl_mode => 0,
+ log_fontsize => 14,
mapsize => 100,
host => "crossfire.schmorp.de",
- port => 13327,
say_command => 'say',
);
@@ -524,9 +719,6 @@
CFClient::set_font $fonts[0];
}
-$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } || {};
-
Event::loop;
-Crossfire::save_ref $FACECACHE, "$Crossfire::VARDIR/pclient.faces";