--- deliantra/Deliantra-Client/DC/Protocol.pm 2007/08/21 02:39:17 1.157
+++ deliantra/Deliantra-Client/DC/Protocol.pm 2007/11/12 23:25:37 1.178
@@ -12,8 +12,6 @@
use CFPlus::Macro;
use CFPlus::Item;
-use Crossfire::Protocol::Base 0.95;
-
use base 'Crossfire::Protocol::Base';
sub new {
@@ -23,7 +21,7 @@
setup_req => {
extmap => 1,
excmd => 1,
- xwidget1 => 1,#d#
+ widget => 1,
%{$arg{setup_req} || {}},
},
);
@@ -50,258 +48,251 @@
} sort { $a->{par} <=> $b->{par} }
CFPlus::Pod::find command => "*";
- $self->connect_ext (ambient_music => sub {
- my ($songs) = @_;
- &::audio_music_set_ambient ($songs);
- });
+ $self->{json_coder}
+ ->convert_blessed
+ ->filter_json_single_key_object ("\fw" => sub {
+ $self->{widget}{$_[0]}
+ })
+ ->filter_json_single_key_object ("\fc" => sub {
+ my ($id) = @_;
+ sub {
+ $self->send_exti_msg (w_e => $id, @_);
+ }
+ });
- $self->connect_ext (capabilities => sub {
- my (%cap) = @_;
+ # destroy widgets on logout
+ $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
+ for my $ws (values %{delete $self->{widgetset} || {}}) {
+ $_->destroy
+ for values %{delete $ws->{w} || {}};
+ }
+ });
- #$self->send ("setup sound 0"); # we use a different protocol
- $self->update_fx_want;
+ $self->{map_widget}->add_command (@$_)
+ for @cmd_help;
- $self->send_exti_req (resource => "exp_table", sub {
- my ($exp_table) = @_;
+ {
+ $self->{dialogue} = my $tex = new_from_file CFPlus::Texture
+ CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
+ $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
+ }
- $self->register_face_handler ($exp_table, sub {
- my ($face) = @_;
+ {
+ $self->{noface} = my $tex = new_from_file CFPlus::Texture
+ CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
+ $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}});
+ }
- $self->{exp_table} = $self->{json_coder}->decode (delete $face->{data});
- $_->() for values %{ $self->{on_exp_update} || {} };
- });
+ $self->{open_container} = 0;
- ()
- });
+ # per server
+ $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
- if (my $ts = $cap{tileset}) {
- if (my ($default) = grep $_->[2] & 1, @$ts) {
- $self->{tileset} = $default;
- $self->{tilesize} = $default->[3];
- $self->setup_req (tileset => $default->[0]);
+ $self
+}
- my $w = int $self->{mapw} * 32 / $self->{tilesize};
- my $h = int $self->{maph} * 32 / $self->{tilesize};
+sub update_fx_want {
+ my ($self) = @_;
- $self->setup_req (mapsize => "${w}x${h}");
- }
- }
+ $self->send_exti_msg (fx_want => {
+ 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
+ 5 => !!$::CFG->{audio_enable}, # FT_SOUND
+ 6 => 1, # FT_RSRC
});
+}
- $self->{json_coder}
- ->convert_blessed
- ->filter_json_single_key_object (__w_ => sub {
- $self->{widget}{$_[0]}
- });
+sub ext_capabilities {
+ my ($self, %cap) = @_;
- # widgetset new
- $self->connect_ext (ws_n => sub {
- my ($id) = @_;
+ #$self->send ("setup sound 0"); # we use a different protocol
+ $self->update_fx_want;
- $self->{widgetset}{$id} = {
- w => {},
- };
- });
+ $self->send_exti_req (resource => "exp_table", sub {
+ my ($exp_table) = @_;
- # widgetset destroy
- $self->connect_ext (ws_d => sub {
- my ($id) = @_;
+ $self->register_face_handler ($exp_table, sub {
+ my ($face) = @_;
- my $ws = delete $self->{widgetset}{$id}
- or return;
+ $self->{exp_table} = $self->{json_coder}->decode (delete $face->{data});
+ $_->() for values %{ $self->{on_exp_update} || {} };
+ });
- $_->destroy
- for values %{$ws->{w}};
+ ()
});
- # widgetset create
- $self->connect_ext (ws_c => sub {
- my ($ws, $id, $class, $args) = @_;
-
- for my $ev (grep /^on_/, keys %$args) {
- my $rid = $args->{$ev};
- $args->{$ev} = sub {
- my $id = shift->{s_id};
- $self->send_exti_msg (w_e => $id, $rid, @_);
+ if (my $ts = $cap{tileset}) {
+ if (my ($default) = grep $_->[2] & 1, @$ts) {
+ $self->{tileset} = $default;
+ $self->{tilesize} = $default->[3];
+ $self->setup_req (tileset => $default->[0]);
- 1
- };
- }
+ my $w = int $self->{mapw} * 32 / $self->{tilesize};
+ my $h = int $self->{maph} * 32 / $self->{tilesize};
- $self->widget_associate (
- $ws, $id => scalar eval {
- local $SIG{__DIE__};
- "CFPlus::UI::$class"->new (%$args)
- }
- ) or warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n";
- });
+ $self->setup_req (mapsize => "${w}x${h}");
+ }
+ }
+}
- # widgetset associate
- $self->connect_ext (ws_a => sub {
- my (%ass) = @_;
-
- # everything that has a name, wether conceivably useful or not
- my %wkw = (
- root => $CFPlus::UI::ROOT,
- tooltip => $CFPlus::UI::TOOLTIP,
-
- mapwidget => $::MAPWIDGET,
- buttonbar => $::BUTTONBAR,
- metaserver => $::METASERVER,
- buttonbar => $::BUTTONBAR,
- login_button => $::LOGIN_BUTTON,
- quit_dialog => $::QUIT_DIALOG,
- host_entry => $::HOST_ENTRY,
- metaserver => $::METASERVER,
- server_info => $::SERVER_INFO,
-
- setup_dialog => $::SETUP_DIALOG,
- setup_notebook => $::SETUP_NOTEBOOK,
- setup_server => $::SETUP_SERVER,
- setup_keyboard => $::SETUP_KEYBOARD,
-
- pl_notebook => $::PL_NOTEBOOK,
- pl_window => $::PL_WINDOW,
- inventory_page => $::INVENTORY_PAGE,
- stats_page => $::STATS_PAGE,
- skill_page => $::SKILL_PAGE,
- spell_page => $::SPELL_PAGE,
- spell_list => $::SPELL_LIST,
-
- floorbox => $::FLOORBOX,
- help_window => $::HELP_WINDOW,
- message_window => $::MESSAGE_WINDOW,
- statusbox => $::SDTATUSBOX,
-
- inv => $::INV,
- invr => $::INVR,
- invr_hb => $::INVR_HB,
- );
+sub ext_ambient_music {
+ my ($self, $songs) = @_;
+ &::audio_music_set_ambient ($songs);
+}
- while (my ($id, $name) = each %ass) {
- $self->widget_associate (undef, $id => $wkw{$name})
- or warn "server failed to associate non-existent well-known widget $name\n";
- }
- });
+#############################################################################
- # widget call
- $self->connect_ext (w_c => sub {
- my ($id, $rid, $method, @args) = @_;
+sub widget_associate {
+ my ($self, $ws, $id, $widget) = @_;
- my $w = $self->{widget}{$id}
- or return;
+ $widget ||= new CFPlus::UI::Bin;
- if ($rid) {
- $self->send_exti_msg (w_r => $rid, $w->$method (@args));
- } else {
- $w->$method (@args);
- }
- });
+ $widget->{s_id} = $id;
+ $self->{widget}{$id} = $widget;
- # widget set
- $self->connect_ext (w_s => sub {
- my ($id, $attr) = @_;
+ if ($ws) {
+ $widget->{s_ws} = $ws;
+ $self->{widgetset}{$ws}{w}{$id} = $widget;
+ }
- my $w = $self->{widget}{$id}
- or return;
+ $widget->connect (on_destroy => sub {
+ my ($widget) = @_;
- for (my $i = 0; $i < $#$attr; $i += 2) {
- my ($member, $value) = @$attr[$i, $i+1];
- if (defined $value) {
- $w->{$member} = $value;
- } else {
- delete $w->{$member};
- }
- $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
- }
+ delete $self->{widget}{$widget->{s_id}};
+ delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}}
+ if exists $widget->{s_ws};
});
+}
- # widget get
- $self->connect_ext (w_g => sub {
- my ($id, $rid, $attr) = @_;
+# widgetset new
+sub ext_ws_n {
+ my ($self, $id) = @_;
- my $w = $self->{widget}{$id}
- or return;
+ $self->{widgetset}{$id} = {
+ w => {},
+ };
+}
- $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]);
- });
+# widgetset destroy
+sub ext_ws_d {
+ my ($self, $id) = @_;
- # message window
- $self->connect_ext (channel_info => sub {
- my ($info) = @_;
- $self->{channels}->{$info->{id}} = $info;
- $::MESSAGE_WINDOW->add_channel ($info);
- });
+ my $ws = delete $self->{widgetset}{$id}
+ or return;
- # destroy widgets on logout
- $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
- for my $ws (values %{delete $self->{widgetset} || {}}) {
- $_->destroy
- for values %{delete $ws->{w} || {}};
- }
- });
+ $_->destroy
+ for values %{$ws->{w}};
+}
- $self->{map_widget}->add_command (@$_)
- for @cmd_help;
+# widgetset create
+sub ext_ws_c {
+ my ($self, $ws, $id, $class, $args) = @_;
+
+ $self->widget_associate (
+ $ws, $id => scalar eval {
+ local $SIG{__DIE__};
+ "CFPlus::UI::$class"->new (%$args)
+ }
+ );
+}
- {
- $self->{dialogue} = my $tex = new_from_file CFPlus::Texture
- CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
- $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
- }
+# widgetset associate
+sub ext_ws_a {
+ my ($self, %ass) = @_;
+
+ # everything that has a name, wether conceivably useful or not
+ my %wkw = (
+ root => $CFPlus::UI::ROOT,
+ tooltip => $CFPlus::UI::TOOLTIP,
+
+ mapwidget => $::MAPWIDGET,
+ buttonbar => $::BUTTONBAR,
+ metaserver => $::METASERVER,
+ buttonbar => $::BUTTONBAR,
+ login_button => $::LOGIN_BUTTON,
+ quit_dialog => $::QUIT_DIALOG,
+ host_entry => $::HOST_ENTRY,
+ metaserver => $::METASERVER,
+ server_info => $::SERVER_INFO,
+
+ setup_dialog => $::SETUP_DIALOG,
+ setup_notebook => $::SETUP_NOTEBOOK,
+ setup_server => $::SETUP_SERVER,
+ setup_keyboard => $::SETUP_KEYBOARD,
+
+ pl_notebook => $::PL_NOTEBOOK,
+ pl_window => $::PL_WINDOW,
+ inventory_page => $::INVENTORY_PAGE,
+ stats_page => $::STATS_PAGE,
+ skill_page => $::SKILL_PAGE,
+ spell_page => $::SPELL_PAGE,
+ spell_list => $::SPELL_LIST,
+
+ floorbox => $::FLOORBOX,
+ help_window => $::HELP_WINDOW,
+ message_window => $::MESSAGE_WINDOW,
+ statusbox => $::SDTATUSBOX,
+
+ inv => $::INV,
+ invr => $::INVR,
+ invr_hb => $::INVR_HB,
+ );
- {
- $self->{noface} = my $tex = new_from_file CFPlus::Texture
- CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
- $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}});
+ while (my ($id, $name) = each %ass) {
+ $self->widget_associate (undef, $id => $wkw{$name});
}
+}
- $self->{open_container} = 0;
+# widget call
+sub ext_w_c {
+ my ($self, $id, $rcb, $method, @args) = @_;
- # per server
- $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
+ my $w = $self->{widget}{$id}
+ or return;
- $self
+ if ($rcb) {
+ $rcb->($w->$method (@args));
+ } else {
+ $w->$method (@args);
+ }
}
-sub widget_associate {
- my ($self, $ws, $id, $widget) = @_;
+# widget set
+sub ext_w_s {
+ my ($self, $id, $attr) = @_;
- if ($widget) {
- $widget->{s_id} = $id;
- $self->{widget}{$id} = $widget;
-
- if ($ws) {
- $widget->{s_ws} = $ws;
- $self->{widgetset}{$ws}{w}{$id} = $widget;
- }
+ my $w = $self->{widget}{$id}
+ or return;
- $widget->connect (on_destroy => sub {
- my ($widget) = @_;
+ for (my $i = 0; $i < $#$attr; $i += 2) {
+ my ($member, $value) = @$attr[$i, $i+1];
+ if (defined $value) {
+ $w->{$member} = $value;
+ } else {
+ delete $w->{$member};
+ }
+ $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
+ }
+}
- delete $self->{widget}{$widget->{s_id}};
- delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}}
- if exists $widget->{s_ws};
- });
+# widget get
+sub ext_w_g {
+ my ($self, $id, $rid, @attr) = @_;
- 1
- } else {
- $self->send_exti_msg (w_e => $id, undef);
+ my $w = $self->{widget}{$id}
+ or return;
- 0
- }
+ $self->send_exti_msg (w_e => $rid, map $w->{$_}, @attr);
}
-sub update_fx_want {
- my ($self) = @_;
-
- $self->send_exti_msg (fx_want => {
- 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
- 5 => !!$::CFG->{audio_enable}, # FT_SOUND
- 6 => 1, # FT_RSRC
- });
+# message window
+sub ext_channel_info {
+ my ($self, $info) = @_;
+ $self->{channels}->{$info->{id}} = $info;
+ $::MESSAGE_WINDOW->add_channel ($info);
}
+#############################################################################
+
sub logprint {
my ($self, @a) = @_;
@@ -399,7 +390,7 @@
my @diffs = map $_->[1]->($self, $_->[2], $prev->{$_->[0]}, $stats->{$_->[0]}), @statchange
) {
my $msg = "stat change: " . (join " ", @diffs);
- $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 10);
+ $self->{statusbox}->add ($msg, group => "stat $msg", fg => [0.8, 1, 0.2, 1], timeout => 20);
}
$self->update_stats_window ($stats, $prev);
@@ -476,12 +467,17 @@
my $sktbl = $::STATWIDS->{skill_tbl};
my @skills = keys %{ $self->{skill_info} };
- if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
- $sktbl->clear;
+ my @order = sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
+ map [$_, $self->{skill_info}{$_}],
+ grep exists $stats->{$_},
+ @skills;
+
+ if ($self->{stat_order} ne join ",", map $_->[0], @order) {
+ $self->{stat_order} = join ",", map $_->[0], @order;
- my @add;
+ $sktbl->clear;
- push @add,
+ my $sw = $self->{skillwid}{""} ||= [
0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
2, 0, (new CFPlus::UI::Label text => "Progress", align => 0),
@@ -490,7 +486,9 @@
5, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
6, 0, (new CFPlus::UI::Label text => "Progress", align => 0),
7, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
- ;
+ ];
+
+ my @add = @$sw;
my $TOOLTIP_ALL = "\n\nLeft click - ready skill\nMiddle click - use spell\nRight click - further options";
@@ -498,12 +496,7 @@
my @TOOLTIP_EXP = (tooltip => "Experience. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
my ($x, $y) = (0, 1);
- for (
- sort { $stats->{$b->[0]}[1] <=> $stats->{$a->[0]}[1] or $a->[1] cmp $b->[1] }
- map [$_, $self->{skill_info}{$_}],
- grep exists $stats->{$_},
- @skills
- ) {
+ for (@order) {
my ($idx, $name) = @$_;
my $spell_cb = sub {
@@ -528,14 +521,28 @@
1
};
+ my $sw = $self->{skillwid}{$idx} ||= [
+ # exp
+ (new CFPlus::UI::Label
+ align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
+
+ # level
+ (new CFPlus::UI::Label
+ text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
+
+ # progress
+ (new CFPlus::UI::ExperienceProgress),
+
+ # label
+ (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
+ can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
+ ];
+
push @add,
- $x * 4 + 0, $y, ($self->{stat_widget_exp}{$idx} ||= new CFPlus::UI::Label
- align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
- $x * 4 + 1, $y, ($self->{stat_widget_lvl}{$idx} ||= new CFPlus::UI::Label
- text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
- $x * 4 + 2, $y, ($self->{stat_widget_prg}{$idx} ||= new CFPlus::UI::ExperienceProgress),
- $x * 4 + 3, $y, ($self->{stat_widget_lbl}{$idx} ||= new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
- can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
+ $x * 4 + 0, $y, $sw->[0],
+ $x * 4 + 1, $y, $sw->[1],
+ $x * 4 + 2, $y, $sw->[2],
+ $x * 4 + 3, $y, $sw->[3],
;
$x++ and ($x, $y) = (0, $y + 1);
@@ -544,18 +551,19 @@
$sktbl->add_at (@add);
}
- for (grep exists $stats->{$_}, @skills) {
- $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
- $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
- $self->{stat_widget_prg}{$_}->set_value (@{$stats->{$_}});
- }
-}
-
-sub macro_send {
- my ($self, $macro) = @_;
+ for (@order) {
+ my ($idx, $name) = @$_;
+ my $val = $stats->{$idx};
+
+ next if $prev->{$idx}[1] eq $val->[1];
+
+ my $sw = $self->{skillwid}{$idx};
+ $sw->[0]->set_text (::formsep ($val->[1]));
+ $sw->[1]->set_text ($val->[0] * 1);
+ $sw->[2]->set_value (@$val);
- for my $cmd (@{ $macro->{action} }) {
- $self->send_command ($cmd);
+ $::GAUGES->{sklprg}->set_label ("$name %d%%");
+ $::GAUGES->{sklprg}->set_value (@$val);
}
}
@@ -567,7 +575,6 @@
$self->logprint ("send: ", $command);
$self->send_command ($command);
- ::status ($command);
}
sub record {
@@ -608,10 +615,11 @@
if ($delay) {
# delay the map drawing a tiny bit in the hope of getting the missing fetched
- Event->timer (after => 0.03, cb => sub {
- $_[0]->w->cancel;
- $self->{map_widget}->update;
- });
+ my $delay_draw; $delay_draw = EV::timer 0.03, 0, sub {
+ undef $delay_draw;
+ $self->{map_widget}->update
+ if $self->{map_widget};
+ };
} else {
$self->{map_widget}->update;
}
@@ -859,23 +867,19 @@
my ($meta, $data) = unpack "(w/a*)*", $face->{data};
$face->{data} = $meta;
+ # rely on strict ordering here and also on later fetch
CFPlus::DB::put res_data => $face->{name} => $data, sub { };
CFPlus::DB::put res_meta => $face->{name} => $meta, sub { };
}
$face->{data} = $self->{json_coder}->decode ($face->{data});
-
::add_license ($face);
+ ::message ({ markup => CFPlus::asxml "downloaded resource '$face->{data}{name}', type $face->{type}." })
+ if $changed;
if ($face->{type} == 3) { # FT_MUSIC
- ::message ({ markup => "downloaded song #$facenum" })
- if $changed;
-
&::audio_music_push ($facenum);
} elsif ($face->{type} == 5) { # FT_SOUND
- ::message ({ markup => "downloaded sound #$facenum" })
- if $changed;
-
&::audio_sound_push ($facenum);
}
@@ -965,7 +969,11 @@
local $_ = shift;
# we now weed out all tags we do not support
- s%<(?!/?i>|/?u>|/?b>|fg |/fg>)%<%g;
+ s{ <(?! /?i> | /?u> | /?b> | /?big | /?small | /?s | /?tt | fg\ | /fg>)
+ }{
+ "<"
+ }gex;
+
# now all entities
s/&(?!amp;|lt;|gt;|apos;|quot;|#[0-9]+;|#x[0-9a-fA-F]+;)/&/g;
@@ -1028,20 +1036,28 @@
# no longer neecssary with TRT servers
#$text =~ s/(?<=\S)\n(?=\w)/ /g;
- ::message ({
- fg => $fg,
- markup => $_,
- type => $type,
- extra => [@extra],
- color_flags => $color
- }) for split /\n/, $text;
+ for (split /\n/, $text) {
+ ::message ({
+ fg => $fg,
+ markup => $_,
+ type => $type,
+ extra => [@extra],
+ color_flags => $color, #d# ugly, kill
+ });
+
+ $color &= ~NDI_CLEAR; # only clear once for multiline messages
+ # actually, this is an ugly design. _we_ should control the channels,
+ # not some random other widget, as the channels are clearly protocol-specific.
+ # then we could also react to flags such as CLEAR without resorting to
+ # hacks such as color_flags, above.
+ }
$self->{statusbox}->add ($text,
group => $text,
fg => $fg,
timeout => $color >= 2 ? 180 : 10,
tooltip_font => $::FONT_FIXED,
- );
+ ) if $type eq "info";
}
}
@@ -1289,8 +1305,6 @@
$self->update_server_info;
- $self->send_command ("output-sync $::CFG->{output_sync}");
- $self->send_command ("output-count $::CFG->{output_count}");
$self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
$self->send_command ("pickup $::CFG->{pickup}");
}