--- deliantra/Deliantra-Client/bin/pclient 2006/04/29 16:17:10 1.193
+++ deliantra/Deliantra-Client/bin/pclient 2006/05/12 01:47:04 1.210
@@ -39,6 +39,7 @@
use CFClient::MapWidget;
$Event::DIED = sub {
+ # TODO: display dialog box or so
CFClient::error $_[1];
};
@@ -62,6 +63,9 @@
our $CONN;
our $FAST; # fast, low-quality mode, possibly useful for software-rendering
+our $WANT_REFRESH;
+our $CAN_REFRESH;
+
our @SDL_MODES;
our $WIDTH;
our $HEIGHT;
@@ -78,6 +82,7 @@
our $LOGVIEW;
our $CONSOLE;
our $METASERVER;
+our $LOGIN_BUTTON;
our $FLOORBOX;
our $GAUGES;
@@ -98,13 +103,16 @@
our $INV;
sub status {
- $STATUS_LINE->set_text ($_[0]);
- $STATUS_LINE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $STATUS_LINE->{h});
+ $STATUS_LINE->add ($_[0], pri => -10, group => "status", timeout => 20, color => [1, 1, 0, 1]);
+ $CFClient::UI::ROOT->on_refresh ($STATUS_LINE => sub {
+ $STATUS_LINE->move (0, $HEIGHT - $STATUS_LINE->{h});#d# to in toplevel
+ });
}
sub debug {
$DEBUG_STATUS->set_text ($_[0]);
- $DEBUG_STATUS->move ($WIDTH - $DEBUG_STATUS->{w}, 0, $DEBUG_STATUS->{w}, $DEBUG_STATUS->{h});
+ my ($w, $h) = $DEBUG_STATUS->size_request;
+ $DEBUG_STATUS->move ($WIDTH - $w, 0);
}
sub start_game {
@@ -113,27 +121,43 @@
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 => $host,
- port => $port || 13327,
- user => $CFG->{user},
- pass => $CFG->{password},
- mapw => $mapsize,
- maph => $mapsize,
- ;
+ $CONN = eval {
+ new conn
+ host => $host,
+ port => $port || 13327,
+ user => $CFG->{user},
+ pass => $CFG->{password},
+ mapw => $mapsize,
+ maph => $mapsize,
+ ;
+ };
+
+ if ($CONN) {
+ $LOGIN_BUTTON->set_text ("Logout");
- status "login successful";
+ status "login successful";
- CFClient::lowdelay fileno $CONN->{fh};
+ CFClient::lowdelay fileno $CONN->{fh};
+ } else {
+ status "unable to connect";
+ stop_game();
+ }
}
sub stop_game {
- undef $CONN;
+ return unless $CONN;
+
+ status "connection closed";
+ $LOGIN_BUTTON->set_text ("Login");
+ $CONN->destroy;
+ $CONN = 0; # false, does not autovivify
+
+ undef $MAPCACHE;
+ undef $MAP;
}
sub client_setup {
@@ -567,7 +591,7 @@
sub metaserver_dialog {
my $dialog = new CFClient::UI::FancyFrame
- title => "Metaserver",
+ title => "Server List",
child => (my $vbox = new CFClient::UI::VBox);
$vbox->add ($dialog->{table} = new CFClient::UI::Table);
@@ -679,9 +703,9 @@
$vbox->add (new CFClient::UI::Flopper
expand => 1,
- text => "Metaserver",
+ text => "Server List",
other => $METASERVER,
- tooltip => "Show a list of avaible crossfire servers",
+ tooltip => "Show a list of available crossfire servers",
connect_open => sub {
update_metaserver $HOST;
}
@@ -722,9 +746,15 @@
},
);
- $table->add (1, 8, new CFClient::UI::Button expand => 1, align => 0, text => "Login", connect_activate => sub {
- start_game;
- });
+ $table->add (1, 8, $LOGIN_BUTTON = new CFClient::UI::Button
+ expand => 1,
+ align => 0,
+ text => "Login",
+ connect_activate => sub {
+ $CONN ? stop_game
+ : start_game;
+ },
+ );
$dialog
}
@@ -785,10 +815,7 @@
sub make_inventory_window {
my $invwin = new CFClient::UI::FancyFrame user_w => 300, user_h => 300, title => "Inventory";
- $invwin->add (my $hb = new CFClient::UI::HBox);
- $hb->add ($INV = new CFClient::UI::Inventory expand => 1);
- $hb->add (my $rng = new CFClient::UI::Slider vertical => 1);
- $INV->set_range ($rng);
+ $invwin->add ($INV = new CFClient::UI::Inventory expand => 1);
$invwin
}
@@ -800,6 +827,8 @@
sub video_init {
sdl_init;
+ $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
+
($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
$FULLSCREEN = $CFG->{fullscreen};
$FAST = $CFG->{fast};
@@ -808,83 +837,91 @@
or die "SDL_SetVideoMode failed!\n";
$SDL_ACTIVE = 1;
-
$LAST_REFRESH = time - 0.01;
CFClient::gl_init;
$FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
+ $CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
+
#############################################################################
- $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100;
- $DEBUG_STATUS->show;
-
- $STATUS_LINE = new CFClient::UI::Label
- padding => 0,
- y => $HEIGHT - $FONTSIZE * 1.8;
- $STATUS_LINE->show;
-
- $ALT_ENTER_MESSAGE = new CFClient::UI::Label
- padding => 0,
- fontsize => 0.8,
- markup => "Use Alt-Enter to toggle fullscreen mode";
- $ALT_ENTER_MESSAGE->show;
- $ALT_ENTER_MESSAGE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h});
-
- CFClient::UI::FancyFrame->new (
- border_bg => [1, 1, 1, 192/255],
- bg => [1, 1, 1, 0],
- child => ($MAPMAP = new CFClient::MapWidget::MapMap),
- )->show;
-
- $MAPWIDGET = new CFClient::MapWidget;
- $MAPWIDGET->connect (activate_console => sub {
- my ($mapwidget, $preset) = @_;
-
- if ($CONSOLE) {
- $CONSOLE->{input}->{auto_activated} = 1;
- $CONSOLE->{input}->focus_in;
+ if ($DEBUG_STATUS) {
+ # reconfigure all widgets
+ $CFClient::UI::ROOT->reconfigure;
+
+ } else {
+ # create the widgets
+
+ $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, text => "hulla", x => 100;#d#
+ $DEBUG_STATUS->show;
+
+ $STATUS_LINE = new CFClient::UI::Statusbox;
+ $STATUS_LINE->add ("Use Alt-Enter to toggle fullscreen mode", pri => -100, size => 0.8, color => [1, 1, 1, 0.8]);
+ $STATUS_LINE->show;
+
+ CFClient::UI::FancyFrame->new (
+ border_bg => [1, 1, 1, 192/255],
+ bg => [1, 1, 1, 0],
+ child => ($MAPMAP = new CFClient::MapWidget::MapMap),
+ )->show;
+
+ $MAPWIDGET = new CFClient::MapWidget;
+ $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);
+ if ($preset && $CONSOLE->{input}->get_text eq '') {
+ $CONSOLE->{input}->set_text ($preset);
+ }
}
- }
- });
- $MAPWIDGET->show;
- $MAPWIDGET->focus_in;
+ });
+ $MAPWIDGET->show;
+ $MAPWIDGET->focus_in;
- $BUTTONBAR = new CFClient::UI::HBox;
+ $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::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);
- make_gauge_window->show; # 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
+ make_gauge_window->show; # 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::Flopper text => "Inventory", other => make_inventory_window);
+ $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window);
+ $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window);
- $BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub {
- CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
- status "Configuration Saved";
- });
+ $BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub {
+ CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
+ status "Configuration Saved";
+ });
- $BUTTONBAR->show;
+ $BUTTONBAR->show;
- $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
+ # delay till geometry is constant
+ $CFClient::UI::ROOT->on_refresh (startup => sub {
+ $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
+ });
+ force_refresh ();
+ }
}
sub video_shutdown {
- $CFClient::UI::ROOT->{children} = [];
- undef $CFClient::UI::GRAB;
- undef $CFClient::UI::HOVER;
undef $SDL_ACTIVE;
}
my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
my $bgmusic;#TODO#hack#d#
+sub audio_channel_finished {
+ my ($channel) = @_;
+
+ warn "channel $channel finished\n";#d#
+}
+
sub audio_music_finished {
return unless $CFG->{bgm_enable};
@@ -897,7 +934,7 @@
sub audio_init {
if ($CFG->{audio_enable}) {
- if (open my $fh, "<:utf8", CFClient::find_rcfile "sounds/config") {
+ if (open my $fh, "<", CFClient::find_rcfile "sounds/config") {
$SDL_MIXER = !CFClient::Mix_OpenAudio;
CFClient::Mix_AllocateChannels 8;
CFClient::MixMusic::volume $CFG->{bgm_volume} * 128;
@@ -934,22 +971,17 @@
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;
-
CFClient::SDL_GL_SwapBuffers;
+ $WANT_REFRESH = 0;
+ $CAN_REFRESH = 0;
$LAST_REFRESH = $NOW;
}
@@ -961,20 +993,16 @@
if (%animate_object) {
$_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
- $want_refresh++;
+ $WANT_REFRESH++;
}
- if ($want_refresh) {
+ if ($WANT_REFRESH) {
force_refresh;
} else {
- $can_refresh = 1;
+ $CAN_REFRESH = 1;
}
});
-sub refresh {
- $want_refresh++;
-}
-
sub animation_start {
my ($widget) = @_;
$animate_object{$widget} = $widget;
@@ -1295,7 +1323,21 @@
[0.74, 0.65, 0.41],
);
- $LOGVIEW->add_paragraph ($color[$color], $text);
+ my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
+
+ $text =~ s/&/&/g; $text =~ s/\1<\/b>/g;
+ $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/\2<\/span>/g;
+
+ $LOGVIEW->add_paragraph ($color[$color],
+ join "\n", map "$time $_", split /\n/, $text);
+ $STATUS_LINE->add ($text, color => $color[$color], timeout => 60);
+}
+
+sub conn::drawextinfo {
+ my ($self, $color, $type, $subtype, $message) = @_;
+
+ $self->drawinfo ($color, $message);
}
sub conn::spell_add {
@@ -1318,84 +1360,57 @@
$MAPWIDGET->add_command ("ready_skill $skill", "Ready the skill '$skill'");
$MAPWIDGET->add_command ("use_skill $skill", "Immediately use the skill '$skill'");
}
+
+ $MAPWIDGET->add_command ("pet\\_mode defend", "Tell pets to stay close to you and defend you");
+ $MAPWIDGET->add_command ("pet\\_mode arena", "Same as petmode attack, but also attack other players");
+ $MAPWIDGET->add_command ("pet\\_mode sad", "Search & Destroy - tell pets to roam about and attack enemies");
+ $MAPWIDGET->add_command ("kill\\_pets", "kill your pets");
+}
+
+sub conn::eof {
+ stop_game;
}
sub update_floorbox {
$CFClient::UI::ROOT->on_refresh ($FLOORBOX => sub {
+ return unless $CONN;
+
$FLOORBOX->clear;
$FLOORBOX->add (new CFClient::UI::Empty expand => 1);
- # we basically have to use the same sorting as everybody else
- for my $item (@{ $CONN->{container}{0} }) {
- my $desc = $item->{nrof} < 2
- ? $item->{name}
- : "$item->{nrof} $item->{name_pl}";
- # todo: animation widget, face widget, weight(?) etc.
- $FLOORBOX->add (my $hbox = new CFClient::UI::HBox
- tooltip => (CFClient::UI::Label->escape ($desc)
- . "\nleftclick - pick up\nmiddle click - apply\nrightclick - menu"),
- can_hover => 1,
- can_events => 1,
- connect_button_down => sub {
- my ($self, $ev, $x, $y) = @_;
-
- # todo: maybe put examine on 1? but should just be a tooltip :(
- if ($ev->{button} == 1) {
- $CONN->send ("move $CONN->{player}{tag} $item->{tag} 0");
- } elsif ($ev->{button} == 2) {
- $CONN->send ("apply $item->{tag}");
- } elsif ($ev->{button} == 3) {
- CFClient::UI::Menu->new (
- items => [
- ["examine", sub { $CONN->send ("examine $item->{tag}") }],
- [
- $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
- sub { $CONN->send ("lock $item->{tag}") },
- ],
- ["mark", sub { $CONN->send ("mark $item->{tag}") }],
- ["apply", sub { $CONN->send ("apply $item->{tag}") }],
- ],
- )->popup ($ev);
- }
-
- 1
- },
- );
-
- $hbox->add (new CFClient::UI::Face
- can_events => 0,
- face => $item->{face},
- anim => $item->{anim},
- animspeed => $item->{animspeed},
- );
-
- $hbox->add (new CFClient::UI::Label
- can_events => 0,
- text => $desc,
- );
+ my $count = 4;
+ for (@{ $CONN->{container}{0} }) {
+ if (--$count) {
+ $FLOORBOX->add (new CFClient::UI::InventoryItem item => $_);
+ } else {
+ $FLOORBOX->add (new CFClient::UI::Label text => "More...");
+ last;
+ }
}
});
- refresh;
+
+ $WANT_REFRESH++;
}
sub conn::container_add {
- my ($self, $id, $items) = @_;
+ my ($self, $tag, $items) = @_;
+
+ update_floorbox if $tag == 0;
+
+ $INV->set_items ($self->{container}{$self->{player}{tag}})
+ if $tag == $self->{player}{tag};
- update_floorbox if $id == 0;
- if ($self->{player}{tag} == $id) {
- $INV->set_items ($self->{container}{$self->{player}{tag}});
- }
# $self-<{player}{tag} => player inv
#use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}};
}
sub conn::container_clear {
- my ($self, $id) = @_;
+ my ($self, $tag) = @_;
- update_floorbox if $id == 0;
- if ($self->{player}{tag} == $id) {
- $INV->set_items ($self->{container}{$id});
- }
+ update_floorbox if $tag == 0;
+
+ $INV->set_items ($self->{container}{$tag})
+ if $tag == $self->{player}{tag};
# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0};
}
@@ -1405,9 +1420,9 @@
for (@items) {
update_floorbox if $_->{container} == 0;
- if ($self->{player}{tag} == $_->{container}) {
- $INV->set_items ($self->{container}{$_->{container}});
- }
+
+ $INV->set_items ($self->{container}{$_->{container}})
+ if $_->{container} == $self->{player}{tag};
}
}
@@ -1415,9 +1430,9 @@
my ($self, $item) = @_;
update_floorbox if $item->{container} == 0;
- if ($self->{player}{tag} == $item->{container}) {
- $INV->set_items ($self->{container}{$item->{container}});
- }
+
+ $INV->set_items ($self->{container}{$item->{container}})
+ if $item->{container} == $self->{player}{tag};
}
%SDL_CB = (
@@ -1426,7 +1441,9 @@
},
CFClient::SDL_VIDEORESIZE => sub {
},
- CFClient::SDL_VIDEOEXPOSE => \&refresh,
+ CFClient::SDL_VIDEOEXPOSE => sub {
+ $WANT_REFRESH++;
+ },
CFClient::SDL_ACTIVEEVENT => sub {
# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
},
@@ -1440,81 +1457,91 @@
CFClient::UI::feed_sdl_key_down_event ($_[0]);
}
},
- CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event,
- CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event,
+ CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event,
+ CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event,
CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event,
- CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event,
- CFClient::SDL_USEREVENT => \&audio_music_finished,
+ CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event,
+ CFClient::SDL_USEREVENT => sub {
+ if ($_[0]{code} == 1) {
+ audio_channel_finished $_[0]{data1};
+ } elsif ($_[0]{code} == 0) {
+ audio_music_finished;
+ }
+ },
);
#############################################################################
$SIG{INT} = $SIG{TERM} = sub { exit };
-$TILECACHE = CFClient::db_table "tilecache";
-$FACEMAP = CFClient::db_table "facemap";
+{
+ local $SIG{__DIE__} = sub { CFClient::fatal $_[0] };
-CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
+ CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
-my %DEF_CFG = (
- sdl_mode => 0,
- width => 640,
- 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 => 1,
- gauge_fontsize => 1,
- gauge_size => 0.35,
- stat_fontsize => 1,
- mapsize => 100,
- host => "crossfire.schmorp.de",
- say_command => 'say',
- audio_enable => 1,
- bgm_enable => 1,
- bgm_volume => 0.25,
-);
+ $TILECACHE = CFClient::db_table "tilecache";
+ $FACEMAP = CFClient::db_table "facemap";
-while (my ($k, $v) = each %DEF_CFG) {
- $CFG->{$k} = $v unless exists $CFG->{$k};
-}
+ my %DEF_CFG = (
+ sdl_mode => 0,
+ width => 640,
+ 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 => 1,
+ gauge_fontsize=> 1,
+ gauge_size => 0.35,
+ stat_fontsize => 1,
+ mapsize => 100,
+ host => "crossfire.schmorp.de",
+ say_command => 'say',
+ audio_enable => 1,
+ bgm_enable => 1,
+ bgm_volume => 0.25,
+ );
+
+ while (my ($k, $v) = each %DEF_CFG) {
+ $CFG->{$k} = $v unless exists $CFG->{$k};
+ }
-sdl_init;
+ sdl_init;
-@SDL_MODES = reverse
- grep $_->[0] >= 640 && $_->[1] >= 480,
- CFClient::SDL_ListModes;
+ @SDL_MODES = reverse
+ grep $_->[0] >= 640 && $_->[1] >= 480,
+ CFClient::SDL_ListModes;
-@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
+ @SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
-$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
+ $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
-{
- 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
- );
+ {
+ 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;
-
- $FONT_PROP = new_from_file CFClient::Font $fonts[0];
- $FONT_FIXED = new_from_file CFClient::Font $fonts[1];
+ CFClient::add_font $_ for @fonts;
+
+ $FONT_PROP = new_from_file CFClient::Font $fonts[0];
+ $FONT_FIXED = new_from_file CFClient::Font $fonts[1];
- $FONT_PROP->make_default;
-}
+ $FONT_PROP->make_default;
+ }
-video_init;
-audio_init;
+ video_init;
+ audio_init;
+}
Event::loop;