--- deliantra/Deliantra-Client/bin/pclient 2006/04/07 19:58:55 1.20
+++ deliantra/Deliantra-Client/bin/pclient 2006/04/17 19:50:23 1.124
@@ -1,106 +1,716 @@
#!/opt/bin/perl
+
use strict;
+use utf8;
-use Glib;
-use Gtk2 -init;
+use Time::HiRes 'time';
+use Event;
use SDL;
use SDL::App;
use SDL::Event;
use SDL::Surface;
use SDL::OpenGL;
-use SDL::OpenGL::Constants;
use Crossfire;
-use Crossfire::Client;
use Crossfire::Protocol;
-use Crossfire::Client::Util;
-use Crossfire::Client::Widget;
+use Compress::LZF;
-our $FACECACHE;
+use CFClient;
+use CFClient::UI;
our $VERSION = '0.1';
+my $MAX_FPS = 60;
+my $MIN_FPS = 5; # unused as of yet
+
+our $META_SERVER = "crossfire.real-time.com:13326";
+
+our $FACEMAP;
+our $TILECACHE;
+our $MAPCACHE;
+
+our $LAST_REFRESH;
+our $NOW;
+
our $CFG;
our $CONN;
+our $FAST; # fast, low-quality mode, possibly useful for software-rendering
+
+our @SDL_MODES;
+our $WIDTH;
+our $HEIGHT;
+our $FULLSCREEN;
+our $FONTSIZE;
+
+our $MAP;
+our $MAPWIDGET;
+our $BUTTONBAR;
+our $LOGVIEW;
+our $CONSOLE;
+our $METASERVER;
-our $SDL_TIMER;
-our $SDL_APP;
-our $SDL_EV = new SDL::Event;
+our $SDL_ACTIVE;
+our $SDL_EV;
our %SDL_CB;
-our @GL_INIT; # hooks called on every gl init
+our $ALT_ENTER_MESSAGE;
+our $STATUS_LINE;
+our $DEBUG_STATUS;
+
+sub status {
+ $STATUS_LINE->set_text ($_[0]);
+ my ($w, $h) = $STATUS_LINE->size_request;
+ $STATUS_LINE->size_allocate (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $h, $w, $h);
+}
-sub init_screen {
- $SDL_APP = new SDL::App
- -flags => SDL_ANYFORMAT | SDL_HWSURFACE,
- -title => "Crossfire+ Client",
- -width => $CFG->{width},
- -height => $CFG->{height},
- -opengl => 1,
- -red_size => 8,
- -green_size => 8,
- -blue_size => 8,
- -double_buffer => 1,
- -fullscreen => $CFG->{fullscreen},
- -resizeable => 0;
-
- glClearColor 0, 0, 0, 0;
-
- glEnable GL_TEXTURE_2D;
- glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
- glShadeModel GL_FLAT;
- glDisable GL_DEPTH_TEST;
- glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
- glEnable GL_BLEND;
-
- glMatrixMode GL_PROJECTION;
- glLoadIdentity;
- glOrtho 0, $CFG->{width} / 32, $CFG->{height} / 32, 0, -100 , 100;
+sub debug {
+ $DEBUG_STATUS->set_text ($_[0]);
+ my ($w, $h) = $DEBUG_STATUS->size_request;
+ $DEBUG_STATUS->size_allocate ($WIDTH - $w, 0, $w, $h);
+}
+
+sub start_game {
+ status "logging in...";
+
+ my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
- glMatrixMode GL_MODELVIEW;
+ $MAPCACHE = CFClient::db_table "mapcache_$CFG->{host}";
- $_->() for @GL_INIT;
+ $MAP = new CFClient::Map $mapsize, $mapsize;
+
+ my ($host, $port) = split /:/, $CFG->{host};
+
+ $CONN = new conn
+ host => $host,
+ port => $port || 13327,
+ user => $CFG->{user},
+ pass => $CFG->{password},
+ mapw => $mapsize,
+ maph => $mapsize,
+ ;
+
+ status "login successful";
+
+ CFClient::lowdelay fileno $CONN->{fh};
}
-sub start_game {
- $SDL_TIMER = add Glib::Timeout 1000/20, sub {
- while ($SDL_EV->poll) {
- ($SDL_CB{$SDL_EV->type} || sub { warn "unhandled event ", $SDL_EV->type })->();
+sub stop_game {
+ undef $CONN;
+}
+
+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");
+ $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
+
+ $table->add (0, 0, new CFClient::UI::Label align => 1, text => "Video Mode");
+ $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
+
+ $hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1]);
+ $hbox->add (my $mode_label = new CFClient::UI::Label height => $FONTSIZE * 0.8);
+
+ $mode_slider->connect (changed => sub {
+ my ($self, $value) = @_;
+
+ $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
+ $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});
+ });
+ $mode_slider->emit (changed => $mode_slider->{range}[0]);
+
+ $table->add (0, 1, new CFClient::UI::Label align => 1, text => "Fullscreen");
+ $table->add (1, 1, new CFClient::UI::CheckBox state => $CFG->{fullscreen}, connect_changed => sub {
+ my ($self, $value) = @_;
+ $CFG->{fullscreen} = $value;
+ });
+
+ $table->add (0, 2, new CFClient::UI::Label 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, 3, new CFClient::UI::Label 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, 4, new CFClient::UI::Label 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, 5, new CFClient::UI::Label 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;
+ });
+
+ $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:Port");
+
+ {
+ $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, 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, new CFClient::UI::Entry text => $CFG->{password}, hidden => 1, connect_changed => sub {
+ my ($self, $value) = @_;
+ $CFG->{password} = $value;
+ });
+
+ $table->add (0, 6, new CFClient::UI::Label 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 (0, 7, new CFClient::UI::Label align => 1, text => "Map Size");
+ $table->add (1, 7, new CFClient::UI::Slider
+ req_w => 100,
+ range => [$CFG->{mapsize}, 10, 100 + 1, 1],
+ connect_changed => sub {
+ my ($self, $value) = @_;
+
+ $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
+ },
+ );
+
+ $table->add (1, 8, new CFClient::UI::Button expand => 1, align => 0, text => "Login", connect_activate => sub {
+ start_game;
+ });
- 1
+ $dialog
+}
+
+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 => int $::WIDTH / 3,
+ user_h => int $::HEIGHT / 5,
+ child => (my $vbox = new CFClient::UI::VBox);
+
+ $vbox->add ($LOGVIEW = new CFClient::UI::TextView
+ expand => 1,
+ fontsize => $::CFG->{log_fontsize},
+ );
+
+ $vbox->add (my $input = new CFClient::UI::Entry
+ connect_focus_in => sub {
+ my ($input, $prev_focus) = @_;
+
+ delete $input->{refocus_map};
+
+ if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
+ $input->{refocus_map} = 1;
+ }
+ delete $input->{auto_activated};
+ },
+ connect_activate => sub {
+ my ($input, $text) = @_;
+ $input->set_text ('');
+
+ if ($text =~ /^\/(.*)/) {
+ $::CONN->user_send ($1);
+ } else {
+ my $say_cmd = $::CFG->{say_command} || 'say';
+ $::CONN->user_send ("$say_cmd $text");
+ }
+ if ($input->{refocus_map}) {
+ delete $input->{refocus_map};
+ $MAPWIDGET->focus_in
+ }
+ },
+ connect_escape => sub {
+ $MAPWIDGET->focus_in
+ },
+ );
+
+ $CONSOLE = {
+ window => $window,
+ input => $input
};
- init_screen;
+ $window
+}
- $CONN = new conn
- host => $CFG->{host},
- port => $CFG->{port};
+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";
}
-sub stop_game {
- remove Glib::Source $SDL_TIMER;
+sub init_screen {
+ sdl_init;
+
+ ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
+ $FULLSCREEN = $CFG->{fullscreen};
+ $FAST = $CFG->{fast};
+
+ 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, 1;
+
+ SDL::GLSetAttribute SDL_GL_ACCUM_RED_SIZE, 0;
+ SDL::GLSetAttribute SDL_GL_ACCUM_GREEN_SIZE, 0;
+ SDL::GLSetAttribute SDL_GL_ACCUM_BLUE_SIZE, 0;
+ SDL::GLSetAttribute SDL_GL_ACCUM_ALPHA_SIZE, 0;
+
+ SDL::GLSetAttribute SDL_GL_DOUBLEBUFFER, 1;
+ SDL::GLSetAttribute SDL_GL_BUFFER_SIZE, 15;
+ SDL::GLSetAttribute SDL_GL_DEPTH_SIZE, 0;
+
+ SDL::SetVideoMode $WIDTH, $HEIGHT, 0,
+ SDL_HWSURFACE | SDL_ANYFORMAT | SDL_OPENGL | SDL_DOUBLEBUF
+ | ($FULLSCREEN ? SDL_FULLSCREEN : 0)
+ or die "SDL::SetVideoMode failed!\n";
+
+ SDL::WMSetCaption "Crossfire+ Client", "Crossfire+";
- undef $SDL_APP;
+ $SDL_EV = new SDL::Event;
+ $SDL_EV->set_unicode (1);
+
+ $SDL_ACTIVE = 1;
+
+ $LAST_REFRESH = time - 0.01;
+
+ CFClient::gl_init;
+
+ $FONTSIZE = int $HEIGHT / 40;
+
+ #############################################################################
+
+ $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100;
+ $CFClient::UI::ROOT->add ($DEBUG_STATUS);
+
+ $STATUS_LINE = new CFClient::UI::Label
+ padding => 0,
+ y => $HEIGHT * 44 / 45 - $FONTSIZE;
+ $CFClient::UI::ROOT->add ($STATUS_LINE);
+
+ $ALT_ENTER_MESSAGE = new CFClient::UI::Label
+ padding => 0,
+ y => $HEIGHT * 44 / 45,
+ fontsize => $HEIGHT / 45,
+ markup => "Use Alt-Enter to toggle fullscreen mode";
+ $CFClient::UI::ROOT->add ($ALT_ENTER_MESSAGE);
+
+ $CFClient::UI::ROOT->add ($MAPWIDGET = new CFClient::UI::MapWidget);
+ $MAPWIDGET->focus_in;
+ $MAPWIDGET->connect (activate_console => sub {
+ my ($mapwidget, $preset) = @_;
+
+ if ($CONSOLE) {
+ $CONSOLE->{input}->{auto_activated} = 1;
+ $CONSOLE->{input}->focus_in;
+
+ 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->{children}[1]->emit ("activate"); # pop up server setup
+}
+
+sub destroy_screen {
+ $CFClient::UI::ROOT->{children} = [];
+ undef $SDL_ACTIVE;
+ undef $SDL_EV;
SDL::Quit;
}
+my %animate_object;
+my $animate_timer;
+
+my $want_refresh;
+my $can_refresh;
+
+my $fps = 9;
+
+sub force_refresh {
+ $fps = $fps * 0.95 + 1 / ($NOW - $LAST_REFRESH) * 0.05;
+ debug sprintf "%3.2f", $fps;
+
+ $want_refresh = 0;
+ $can_refresh = 0;
+
+ $CFClient::UI::ROOT->draw;
+
+ SDL::GLSwapBuffers;
+
+ $LAST_REFRESH = $NOW;
+}
+
+my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub {
+ $NOW = time;
+
+ ($SDL_CB{$SDL_EV->type} || sub { warn "unhandled event ", $SDL_EV->type })->()
+ while $SDL_EV->poll;
+
+ if (%animate_object) {
+ $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
+ $want_refresh++;
+ }
+
+ if ($want_refresh) {
+ force_refresh;
+ } else {
+ $can_refresh = 1;
+ }
+});
+
sub refresh {
- glClear GL_COLOR_BUFFER_BIT;
+ $want_refresh++;
+}
+
+sub animation_start {
+ my ($widget) = @_;
+ $animate_object{$widget} = $widget;
+}
+
+sub animation_stop {
+ my ($widget) = @_;
+ delete $animate_object{$widget};
+}
+
+@conn::ISA = Crossfire::Protocol::;
+
+sub conn::user_send {
+ my ($self, $command) = @_;
+
+ $self->send_command ($command);
+ status $command;
+}
+
+sub conn::map_scroll {
+ my ($self, $dx, $dy) = @_;
- for (values %Client::Widget::ACTIVE_WIDGETS) {
- $_->draw
+ $MAP->scroll ($dx, $dy);
+}
+
+sub conn::feed_map1a {
+ my ($self, $data) = @_;
+
+# $self->Crossfire::Protocol::feed_map1a ($data);
+
+ $MAP->map1a_update ($data);
+ $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;
+ delete $self->{neigh};
+
+ $MAP->clear;
+}
+
+
+sub conn::load_map($$$) {
+ my ($self, $hash, $x, $y) = @_;
+
+ if (defined (my $data = $MAPCACHE->get ($hash))) {
+ $data = Compress::LZF::decompress $data;
+ warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
+ for my $id ($MAP->set_rect ($x, $y, $data)) {
+ my $data = $TILECACHE->get ($id)
+ or next;
+
+ $self->set_texture ($id => $data);
+ }
}
+}
- SDL::GLSwapBuffers;
+sub conn::flood_fill {
+ my ($self, $path, $hash, $flags, $x0, $y0, $x1, $y1) = @_;
+
+ # the server does not allow map paths > 6
+ return if 6 <= length $path;
+
+ for my $tile (1..4) {
+ next if $self->{neigh}{$hash}[$tile];
+ next unless $flags & (1 << ($tile - 1));
+
+ my $neigh = $self->{neigh}{$hash} ||= [];
+
+ $self->send_mapinfo ("spatial $path$tile", sub {
+ my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
+
+ #warn "map<$path>_$tile=<$mode,$x,$y,$w,$h,$hash>\n";#d#
+ return if $mode ne "spatial";
+
+ $x += $MAP->ox;
+ $y += $MAP->oy;
+
+ $self->load_map ($hash, $x, $y)
+ unless $self->{neigh}{$hash}[5]++;#d#
+
+ $neigh->[$tile] = [$x, $y, $w, $h];
+
+ $self->flood_fill ("$path$tile", $hash, $flags, $x0, $y0, $x1, $y1)
+ if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
+ });
+ }
+}
+
+sub conn::map_change {
+ my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
+
+ $self->flush_map;
+
+ my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
+
+ warn "$ox $oy map_info<$flags, $x, $y, $w, $h, $hash>\n";#d#
+
+ my $mapmapw = 250;
+ my $mapmaph = 250;
+
+ $self->flood_fill ("", $hash, $flags,
+ $ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5,
+ $ox + $mapmapw * 0.5, $oy + $mapmapw * 0.5);
+
+ $x += $ox;
+ $y += $oy;
+
+ $self->{map_info} = [$hash, $x, $y, $w, $h];
+
+ $self->load_map ($hash, $x, $y);
+}
+
+sub conn::face_find {
+ 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;
+ }
+
+ 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) = @_;
+
+ $TILECACHE->put ($face->{id} => $face->{image}); #TODO: try to avoid duplicate writes
+
+ $self->set_texture ($face->{id} => delete $face->{image});
+}
+
+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 {
+ my ($self, $flags, $prompt) = @_;
+
+ #TODO
+ warn "<<<>>\n";#d#
+}
+
+sub conn::drawinfo {
+ my ($self, $color, $text) = @_;
+
+ my @color = (
+ [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
+ [1.00, 1.00, 1.00],
+ [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
+ [1.00, 0.00, 0.00],
+ [1.00, 0.54, 0.00],
+ [0.11, 0.56, 1.00],
+ [0.93, 0.46, 0.00],
+ [0.18, 0.54, 0.34],
+ [0.56, 0.73, 0.56],
+ [0.80, 0.80, 0.80],
+ [0.55, 0.41, 0.13],
+ [0.99, 0.77, 0.26],
+ [0.74, 0.65, 0.41],
+ );
+
+ $LOGVIEW->add_paragraph ($color[$color], $text);
}
%SDL_CB = (
SDL_QUIT() => sub {
- warn "sdl quit\n";#d#
- main_quit Gtk2;
+ Event::unloop -1;
},
SDL_VIDEORESIZE() => sub {
},
@@ -110,90 +720,76 @@
SDL_KEYDOWN() => sub {
if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {
# alt-enter
+ destroy_screen;
$CFG->{fullscreen} = !$CFG->{fullscreen};
init_screen;
} else {
- Client::Widget::feed_sdl_key_down_event ($SDL_EV);
+ CFClient::UI::feed_sdl_key_down_event ($SDL_EV);
}
},
SDL_KEYUP() => sub {
- Client::Widget::feed_sdl_key_up_event ($SDL_EV);
+ CFClient::UI::feed_sdl_key_up_event ($SDL_EV);
},
SDL_MOUSEMOTION() => sub {
- warn "sdl motion\n";#d#
+ CFClient::UI::feed_sdl_motion_event ($SDL_EV);
},
SDL_MOUSEBUTTONDOWN() => sub {
- Client::Widget::feed_sdl_button_down_event ($SDL_EV);
+ CFClient::UI::feed_sdl_button_down_event ($SDL_EV);
},
SDL_MOUSEBUTTONUP() => sub {
- Client::Widget::feed_sdl_button_up_event ($SDL_EV);
+ CFClient::UI::feed_sdl_button_up_event ($SDL_EV);
},
SDL_ACTIVEEVENT() => sub {
- warn "active\n";#d#
+# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
},
);
-@conn::ISA = Crossfire::Protocol::;
+#############################################################################
-sub conn::map_update {
- my ($self, $dirty) = @_;
+$TILECACHE = CFClient::db_table "tilecache";
+$FACEMAP = CFClient::db_table "facemap";
- refresh;
-}
+CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
-sub conn::map_scroll {
- my ($self, $dx, $dy) = @_;
+my %DEF_CFG = (
+ sdl_mode => 0,
+ width => 640,
+ height => 480,
+ fullscreen => 0,
+ fast => 0,
+ fow_enable => 1,
+ fow_intensity => 0.45,
+ fow_smooth => 0,
+ log_fontsize => 14,
+ mapsize => 100,
+ host => "crossfire.schmorp.de",
+ say_command => 'say',
+);
- refresh;
+while (my ($k, $v) = each %DEF_CFG) {
+ $CFG->{$k} = $v unless exists $CFG->{$k};
}
-sub conn::map_clear {
- my ($self) = @_;
+sdl_init;
- refresh;
-}
+@SDL_MODES = reverse
+ grep $_->[0] >= 640 && $_->[1] >= 480,
+ map [SDL::RectW ($_), SDL::RectH ($_)],
+ @{ SDL::ListModes 0, SDL_FULLSCREEN | SDL_HWSURFACE | SDL_OPENGL };
-sub conn::face_find {
- my ($self, $face) = @_;
+@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
- $FACECACHE->{"$face->{chksum},$face->{name}"}
-}
-
-sub conn::face_update {
- my ($self, $face) = @_;
+$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
- $FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image};
+{
+ my @fonts = map CFClient::find_rcfile $_, qw(uifont.ttf uifontb.ttf uifonti.ttf uifontbi.ttf);
- $face->{texture} = new_from_image Crossfire::Client::Texture delete $face->{image};
+ CFClient::add_font $_ for @fonts;
+ CFClient::set_font $fonts[0];
}
-#############################################################################
-
-SDL::Init(SDL_INIT_EVERYTHING());
-
-my $mapwidget = Crossfire::Client::Widget::MapWidget->new;
-
-#find_rcfile "uifont.ttf";
-
-$mapwidget->activate;
-$mapwidget->focus_in;
-
-read_cfg "$Crossfire::VARDIR/pclientrc";
-
-$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } || {};
-
-$CFG ||= {
- width => 640,
- height => 480,
- fullscreen => 0,
- host => "crossfire.schmorp.de",
- port => 13327,
-};
+init_screen;
-Crossfire::Client::Util::run_config_dialog
- login => sub { start_game },
- logout => sub { stop_game };
+Event::loop;
-main Gtk2;
-Crossfire::save_ref $FACECACHE, "$Crossfire::VARDIR/pclient.faces";