--- deliantra/Deliantra-Client/bin/pclient 2006/04/12 18:09:22 1.86
+++ deliantra/Deliantra-Client/bin/pclient 2006/04/16 17:43:17 1.118
@@ -3,8 +3,8 @@
use strict;
use utf8;
-use Glib;
-use Gtk2 -init;
+use Time::HiRes 'time';
+use Event;
use SDL;
use SDL::App;
@@ -15,16 +15,24 @@
use Crossfire;
use Crossfire::Protocol;
+use Compress::LZF;
+
use CFClient;
use CFClient::UI;
our $VERSION = '0.1';
my $MAX_FPS = 60;
-my $MIN_FPS = 5; # unused
-my $TICKS_PER_FRAME = int 1000 / $MAX_FPS - 1; # min ticks per frame
+my $MIN_FPS = 5; # unused as of yet
+
+our $META_SERVER = "crossfire.real-time.com:13326";
-our $FACECACHE;
+our $FACEMAP;
+our $TILECACHE;
+our $MAPCACHE;
+
+our $LAST_REFRESH;
+our $NOW;
our $CFG;
our $CONN;
@@ -34,13 +42,15 @@
our $WIDTH;
our $HEIGHT;
our $FULLSCREEN;
+our $FONTSIZE;
-our $NOW;
-
+our $MAP;
our $MAPWIDGET;
-our $FONTSIZE;
+our $BUTTONBAR;
+our $LOGVIEW;
+our $CONSOLE;
+our $METASERVER;
-our $SDL_TIMER;
our $SDL_ACTIVE;
our $SDL_EV;
our %SDL_CB;
@@ -49,10 +59,6 @@
our $STATUS_LINE;
our $DEBUG_STATUS;
-my $last_refresh;
-my %ANIMATE;
-my $refresh_handler;
-
sub status {
$STATUS_LINE->set_text ($_[0]);
my ($w, $h) = $STATUS_LINE->size_request;
@@ -68,11 +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,8 +100,8 @@
undef $CONN;
}
-sub config_dialog {
- my $dialog = new CFClient::UI::FancyFrame x => 300, y => 100,
+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]);
@@ -114,27 +126,162 @@
$CFG->{fullscreen} = $value;
});
- $table->add (1, 2, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {
+ $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");
+ $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});
-
- $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});
+ $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, my $user = new CFClient::UI::Entry text => $CFG->{user});
+ $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);
+ $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 => "Map Size");
- $table->add (1, 6, new CFClient::UI::Slider
+ $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 {
@@ -144,30 +291,82 @@
},
);
- $table->add (1, 7, new CFClient::UI::Button expand => 1, align => 0, text => "Login", connect_activate => sub {
+ $table->add (1, 8, new CFClient::UI::Button expand => 1, align => 0, text => "Login", connect_activate => sub {
start_game;
});
- $vbox->add (my $hbox = new CFClient::UI::HBox);
+ $dialog
+}
- $hbox->add (new CFClient::UI::Button expand => 1, align => 0, text => "Save", connect_activate => sub {
- CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
- status "Configuration Saved";
- });
- $CFClient::UI::TOPLEVEL->add ($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 => $::WIDTH/4,
+ user_h => $::HEIGHT,
+ 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::LineEntry
+ 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 ("command $1");
+ } else {
+ my $say_cmd = $::CFG->{say_command} || 'say';
+ $::CONN->user_send ("command $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
+ };
+
+ $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";
}
sub init_screen {
+ sdl_init;
+
($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
$FULLSCREEN = $CFG->{fullscreen};
-
- SDL::Init SDL_INIT_TIMER | SDL_INIT_AUDIO | SDL_INIT_VIDEO
- and die "SDL::Init failed!\n";
+ $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, 0;
+ SDL::GLSetAttribute SDL_GL_ALPHA_SIZE, 1;
SDL::GLSetAttribute SDL_GL_ACCUM_RED_SIZE, 0;
SDL::GLSetAttribute SDL_GL_ACCUM_GREEN_SIZE, 0;
@@ -190,14 +389,7 @@
$SDL_ACTIVE = 1;
- $SDL_TIMER = add Glib::Timeout 1000 / $MAX_FPS, sub {
- ($SDL_CB{$SDL_EV->type} || sub { warn "unhandled event ", $SDL_EV->type })->()
- while $SDL_EV->poll;
-
- 1
- };
-
- $last_refresh = SDL::GetTicks;
+ $LAST_REFRESH = time - 0.01;
CFClient::gl_init;
@@ -205,107 +397,264 @@
#############################################################################
- $DEBUG_STATUS = new CFClient::UI::Label padding => 0;
- $CFClient::UI::TOPLEVEL->add ($DEBUG_STATUS);
+ $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 * 49 / 50 - $FONTSIZE;
- $CFClient::UI::TOPLEVEL->add ($STATUS_LINE);
+ y => $HEIGHT * 44 / 45 - $FONTSIZE;
+ $CFClient::UI::ROOT->add ($STATUS_LINE);
$ALT_ENTER_MESSAGE = new CFClient::UI::Label
padding => 0,
- y => $HEIGHT * 49 / 50,
- height => $HEIGHT / 50,
+ 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);
- $MAPWIDGET = new CFClient::UI::MapWidget;
- $CFClient::UI::TOPLEVEL->add ($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}->{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);
- config_dialog;
+ $BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub {
+ CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
+ status "Configuration Saved";
+ });
+
+ $BUTTONBAR->{children}[0]->emit ("activate");
}
sub destroy_screen {
- $CFClient::UI::TOPLEVEL->{children} = [];
- remove Glib::Source $SDL_TIMER;
- remove Glib::Source $refresh_handler if $refresh_handler;
- undef $refresh_handler;
+ $CFClient::UI::ROOT->{children} = [];
undef $SDL_ACTIVE;
undef $SDL_EV;
SDL::Quit;
}
-sub force_refresh {
- glViewport 0, 0, $WIDTH, $HEIGHT;
+my %animate_object;
+my $animate_timer;
+
+my $want_refresh;
+my $can_refresh;
+
+my $fps = 9;
- glMatrixMode GL_PROJECTION;
- glLoadIdentity;
- glOrtho 0, $WIDTH, $HEIGHT, 0, -10000 , 10000;
- glMatrixMode GL_MODELVIEW;
- glLoadIdentity;
+sub force_refresh {
+ $fps = $fps * 0.95 + 1 / ($NOW - $LAST_REFRESH) * 0.05;
+ debug sprintf "%3.2f", $fps;
- glClear GL_COLOR_BUFFER_BIT;
+ $want_refresh = 0;
+ $can_refresh = 0;
- $CFClient::UI::TOPLEVEL->draw;
+ $CFClient::UI::ROOT->draw;
SDL::GLSwapBuffers;
+
+ $LAST_REFRESH = $NOW;
}
-my $FPS;
+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 {
- $refresh_handler ||= add Glib::Idle sub {
- if ($SDL_ACTIVE) {
- $NOW = SDL::GetTicks;
-
- if ($NOW - $last_refresh < $TICKS_PER_FRAME) {
- SDL::Delay $TICKS_PER_FRAME - ($NOW - $last_refresh);
- $NOW = SDL::GetTicks;
- }
-
- my $interval = ($NOW - $last_refresh) * 0.001;
- $last_refresh = $NOW;
-
- if ($interval) {
- $FPS ||= 1 / $interval;
- $FPS = $FPS * 0.9 + (1 / $interval) * 0.1;
- debug sprintf "%5.02f", $FPS;
- }
+ $want_refresh++;
+}
- force_refresh;
- $_->animate ($interval) for grep $_, values %ANIMATE;
+sub animation_start {
+ my ($widget) = @_;
+ $animate_object{$widget} = $widget;
+}
- if (%ANIMATE) {
- 1
- } else {
- undef $refresh_handler;
- 0
+sub animation_stop {
+ my ($widget) = @_;
+ delete $animate_object{$widget};
+}
+
+@conn::ISA = Crossfire::Protocol::;
+
+sub conn::user_send {
+ my ($self, $command) = @_;
+
+ $self->send ($command);
+ status $command;
+}
+
+sub conn::feed_map1a {
+ my ($self, $data) = @_;
+
+# $self->Crossfire::Protocol::feed_map1a ($data);
+
+ $MAP->scroll (delete $self->{delayed_scroll_x}, delete $self->{delayed_scroll_y});
+ $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;
+
+ $MAP->clear;
+}
+
+sub conn::map_info {
+ my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
+
+ $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, $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;
+ }
}
- } else {
- undef $refresh_handler;
- 0
+ $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 animation_start {
- my ($widget) = @_;
- $ANIMATE{$widget} = $widget;
- Scalar::Util::weaken $ANIMATE{$widget};
+sub conn::query {
+ my ($self, $flags, $prompt) = @_;
- refresh;
+ #TODO
+ warn "<<<>>\n";#d#
}
-sub animation_stop {
- my ($widget) = @_;
- delete $ANIMATE{$widget};
+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 {
- main_quit Gtk2;
+ Event::unloop -1;
},
SDL_VIDEORESIZE() => sub {
},
@@ -315,8 +664,8 @@
SDL_KEYDOWN() => sub {
if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {
# alt-enter
- $FULLSCREEN = !$FULLSCREEN;
destroy_screen;
+ $CFG->{fullscreen} = !$CFG->{fullscreen};
init_screen;
} else {
CFClient::UI::feed_sdl_key_down_event ($SDL_EV);
@@ -339,160 +688,44 @@
},
);
-@conn::ISA = Crossfire::Protocol::;
-
-sub conn::map_update {
- my ($self, $dirty) = @_;
-
- $MAPWIDGET->update;
-}
-
-sub conn::map_scroll {
- my ($self, $dx, $dy) = @_;
-
-# refresh;
-}
-
-sub conn::map_clear {
- my ($self) = @_;
-
-# refresh;
-}
-
-sub conn::face_find {
- my ($self, $face) = @_;
-
- $FACECACHE->{"$face->{chksum},$face->{name}"}
-}
-
-sub conn::face_update {
- my ($self, $face) = @_;
-
- $FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image};
-
- $face->{texture} = new_from_image CFClient::Texture delete $face->{image};
-}
-
-sub conn::query {
- my ($self, $flags, $prompt) = @_;
-
- warn "<<<>>\n";#d#
-}
-
-sub gtk_add_cfg_field {
- my ($tbl, $cfg, $klbl, $key, $value) = @_;
- my $i = $cfg->{_i}++;
- $tbl->attach_defaults (my $lbl = Gtk2::Label->new ($klbl), 0, 1, $i, $i + 1);
- $tbl->attach_defaults (my $ent = Gtk2::Entry->new, 1, 2, $i, $i + 1);
- if ($key eq 'password') {
- $ent->set_invisible_char ("*");
- $ent->set (visibility => 0)
- }
- $ent->set_text ($value);
- $ent->signal_connect (changed => sub {
- my ($ent) = @_;
- $cfg->{$key} = $ent->get_text;
- # TODO: Mapsize should be a slider in the game gui
- if ($key eq 'mapsize' and $cfg->{$key} > 100) {
- $cfg->{$key} = 100;
- } elsif ($key eq 'mapsize' and $cfg->{$key} < 50) {
- $cfg->{$key} = 50;
- }
- });
-}
-
-sub run_config_dialog {
- my (%events) = @_;
-
- my $w = Gtk2::Window->new;
-
- my @cfg = (
- [qw/Host host/],
- [qw/Port port/],
- [qw/Mapsize% mapsize/],
- [qw/Username user/],
- [qw/Password password/],
- );
+#############################################################################
- my $cfg = {};
+$TILECACHE = CFClient::db_table "tilecache";
+$FACEMAP = CFClient::db_table "facemap";
- $w->add (my $vb = Gtk2::VBox->new);
- $vb->pack_start (my $t = Gtk2::Table->new (2, scalar @cfg), 0, 0, 0);
- my $selmode = $::CFG->{width} . 'x' . $::CFG->{height};
- $t->attach_defaults (Gtk2::Label->new ("Modes"), 0, 1, 0, 1);
- $t->attach_defaults (my $cb = Gtk2::ComboBox->new_text, 1, 2, 0, 1);
- my $i = 0;
- my $act = 0;
- for (map { "$_->[0]x$_->[1]" } @SDL_MODES) {
- if ($_ eq $selmode) { $act = $i }
- $cb->append_text ($_);
- $i++;
- }
- $cb->set_active ($act);
- $cb->signal_connect (changed => sub {
- my ($cb) = @_;
- my $txt = $cb->get_active_text;
- if ($txt =~ m/(\d+)x(\d+)/) {
- $::CFG->{width} = $1;
- $::CFG->{height} = $2;
- }
- });
-
- $cfg->{_i} = 1;
- for (@cfg) {
- gtk_add_cfg_field ($t, $cfg, $_->[0], $_->[1], $::CFG->{$_->[1]});
- }
-
- $vb->pack_start (my $hb = Gtk2::HBox->new, 0, 0, 0);
- $hb->pack_start (my $cb = Gtk2::Button->new ("save"), 1, 1, 5);
- $cb->signal_connect (clicked => sub {
- for (keys %$cfg) {
- $::CFG->{$_} = $cfg->{$_}
- if $_ ne '_i';
- }
- CFClient::write_cfg "$CFrossfire::VARDIR/pclientrc";
- });
- $hb->pack_start (my $cb = Gtk2::Button->new ("login"), 1, 1, 5);
- $cb->signal_connect (clicked => sub {
- for (keys %$cfg) {
- $::CFG->{$_} = $cfg->{$_}
- if $_ ne '_i';
- }
- my $cb = $events{login} || sub {};
- $cb->($::CFG->{user}, $::CFG->{password});
- });
- $hb->pack_start (my $cb = Gtk2::Button->new ("logout"), 1, 1, 5);
- $cb->signal_connect (clicked => sub {
- my $cb = $events{logout} || sub {};
- $cb->();
- });
- $hb->pack_start (my $cb = Gtk2::Button->new ("quit"), 1, 1, 5);
- $cb->signal_connect (clicked => sub { $w->destroy });
+CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
- $w->show_all;
+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',
+);
- $w->signal_connect (destroy => sub { Gtk2->main_quit });
+while (my ($k, $v) = each %DEF_CFG) {
+ $CFG->{$k} = $v unless exists $CFG->{$k};
}
+sdl_init;
-#############################################################################
-
-SDL::Init SDL_INIT_EVERYTHING;
+@SDL_MODES = reverse
+ grep $_->[0] >= 640 && $_->[1] >= 480,
+ map [SDL::RectW ($_), SDL::RectH ($_)],
+ @{ SDL::ListModes 0, SDL_FULLSCREEN | SDL_HWSURFACE | SDL_OPENGL };
-@SDL_MODES = reverse map [SDL::RectW ($_), SDL::RectH ($_)],
- @{ SDL::ListModes 0, SDL_FULLSCREEN|SDL_HWSURFACE };
+@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
-CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
+$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
-$CFG ||= {
- width => 640,
- height => 480,
- fullscreen => 0,
- sdl_mode => 0,
- mapsize => 100,
- host => "crossfire.schmorp.de",
- port => 13327,
-};
+init_screen;
{
my @fonts = map CFClient::find_rcfile $_, qw(uifont.ttf uifontb.ttf uifonti.ttf uifontbi.ttf);
@@ -501,11 +734,6 @@
CFClient::set_font $fonts[0];
}
-$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } || {};
-
-init_screen;
-
-main Gtk2;
+Event::loop;
-Crossfire::save_ref $FACECACHE, "$Crossfire::VARDIR/pclient.faces";