ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/Protocol.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.154 by elmex, Tue Aug 14 13:25:25 2007 UTC vs.
Revision 1.157 by root, Tue Aug 21 02:39:17 2007 UTC

… …
21 21
22 my $self = $class->SUPER::new (%arg, 22 my $self = $class->SUPER::new (%arg,
23 setup_req => { 23 setup_req => {
24 extmap => 1, 24 extmap => 1,
25 excmd => 1, 25 excmd => 1,
26 ywidget => 1,#d# 26 xwidget1 => 1,#d#
27 %{$arg{setup_req} || {}}, 27 %{$arg{setup_req} || {}},
28 }, 28 },
29 ); 29 );
30 30
31 $self->{map_widget}->clr_commands; 31 $self->{map_widget}->clr_commands;
… …
59 my (%cap) = @_; 59 my (%cap) = @_;
60 60
61 #$self->send ("setup sound 0"); # we use a different protocol 61 #$self->send ("setup sound 0"); # we use a different protocol
62 $self->update_fx_want; 62 $self->update_fx_want;
63 63
64 $self->send_exti_req (resource => "exp_table", sub {
65 my ($exp_table) = @_;
66
67 $self->register_face_handler ($exp_table, sub {
68 my ($face) = @_;
69
70 $self->{exp_table} = $self->{json_coder}->decode (delete $face->{data});
71 $_->() for values %{ $self->{on_exp_update} || {} };
72 });
73
74 ()
75 });
76
64 if (my $ts = $cap{tileset}) { 77 if (my $ts = $cap{tileset}) {
65 if (my ($default) = grep $_->[2] & 1, @$ts) { 78 if (my ($default) = grep $_->[2] & 1, @$ts) {
66 $self->{tileset} = $default; 79 $self->{tileset} = $default;
67 $self->{tilesize} = $default->[3]; 80 $self->{tilesize} = $default->[3];
68 $self->setup_req (tileset => $default->[0]); 81 $self->setup_req (tileset => $default->[0]);
… …
104 # widgetset create 117 # widgetset create
105 $self->connect_ext (ws_c => sub { 118 $self->connect_ext (ws_c => sub {
106 my ($ws, $id, $class, $args) = @_; 119 my ($ws, $id, $class, $args) = @_;
107 120
108 for my $ev (grep /^on_/, keys %$args) { 121 for my $ev (grep /^on_/, keys %$args) {
122 my $rid = $args->{$ev};
109 $args->{$ev} = sub { 123 $args->{$ev} = sub {
110 my $id = shift->{s_id}; 124 my $id = shift->{s_id};
111 $self->send_exti_msg (w_e => $id, $ev, \@_); 125 $self->send_exti_msg (w_e => $id, $rid, @_);
112 126
113 1 127 1
114 }; 128 };
115 } 129 }
116 130
117 if (my $widget = eval { 131 $self->widget_associate (
132 $ws, $id => scalar eval {
118 local $SIG{__DIE__}; 133 local $SIG{__DIE__};
119 "CFPlus::UI::$class"->new ( 134 "CFPlus::UI::$class"->new (%$args)
120 %$args,
121 s_ws => $ws,
122 s_id => $id,
123 )
124 } 135 }
125 ) {
126 $self->{widget}{$id}
127 = $self->{widgetset}{$ws}{w}{$id}
128 = $widget;
129
130 $widget->connect (on_destroy => sub {
131 my ($widget) = @_;
132
133 delete $self->{widget}{$widget->{s_id}};
134 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
135 });
136 } else {
137 warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n"; 136 ) or warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n";
138 $self->send_exti_msg (w_e => $id, "destroy"); 137 });
138
139 # widgetset associate
140 $self->connect_ext (ws_a => sub {
141 my (%ass) = @_;
142
143 # everything that has a name, wether conceivably useful or not
144 my %wkw = (
145 root => $CFPlus::UI::ROOT,
146 tooltip => $CFPlus::UI::TOOLTIP,
147
148 mapwidget => $::MAPWIDGET,
149 buttonbar => $::BUTTONBAR,
150 metaserver => $::METASERVER,
151 buttonbar => $::BUTTONBAR,
152 login_button => $::LOGIN_BUTTON,
153 quit_dialog => $::QUIT_DIALOG,
154 host_entry => $::HOST_ENTRY,
155 metaserver => $::METASERVER,
156 server_info => $::SERVER_INFO,
157
158 setup_dialog => $::SETUP_DIALOG,
159 setup_notebook => $::SETUP_NOTEBOOK,
160 setup_server => $::SETUP_SERVER,
161 setup_keyboard => $::SETUP_KEYBOARD,
162
163 pl_notebook => $::PL_NOTEBOOK,
164 pl_window => $::PL_WINDOW,
165 inventory_page => $::INVENTORY_PAGE,
166 stats_page => $::STATS_PAGE,
167 skill_page => $::SKILL_PAGE,
168 spell_page => $::SPELL_PAGE,
169 spell_list => $::SPELL_LIST,
170
171 floorbox => $::FLOORBOX,
172 help_window => $::HELP_WINDOW,
173 message_window => $::MESSAGE_WINDOW,
174 statusbox => $::SDTATUSBOX,
175
176 inv => $::INV,
177 invr => $::INVR,
178 invr_hb => $::INVR_HB,
179 );
180
181 while (my ($id, $name) = each %ass) {
182 $self->widget_associate (undef, $id => $wkw{$name})
183 or warn "server failed to associate non-existent well-known widget $name\n";
139 } 184 }
140 }); 185 });
141 186
142 # widget call 187 # widget call
143 $self->connect_ext (w_c => sub { 188 $self->connect_ext (w_c => sub {
144 my ($id, $rid, $method, $args) = @_; 189 my ($id, $rid, $method, @args) = @_;
145 190
146 my $w = $self->{widget}{$id} 191 my $w = $self->{widget}{$id}
147 or return; 192 or return;
148 193
149 $args ||= [];
150
151 if ($rid) { 194 if ($rid) {
152 $self->send_exti_msg (w_r => $rid, [$w->$method (@$args)]); 195 $self->send_exti_msg (w_r => $rid, $w->$method (@args));
153 } else { 196 } else {
154 $w->$method (@$args); 197 $w->$method (@args);
155 } 198 }
156 }); 199 });
157 200
158 # widget set 201 # widget set
159 $self->connect_ext (w_s => sub { 202 $self->connect_ext (w_s => sub {
… …
219 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}"; 262 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
220 263
221 $self 264 $self
222} 265}
223 266
267sub widget_associate {
268 my ($self, $ws, $id, $widget) = @_;
269
270 if ($widget) {
271 $widget->{s_id} = $id;
272 $self->{widget}{$id} = $widget;
273
274 if ($ws) {
275 $widget->{s_ws} = $ws;
276 $self->{widgetset}{$ws}{w}{$id} = $widget;
277 }
278
279 $widget->connect (on_destroy => sub {
280 my ($widget) = @_;
281
282 delete $self->{widget}{$widget->{s_id}};
283 delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}}
284 if exists $widget->{s_ws};
285 });
286
287 1
288 } else {
289 $self->send_exti_msg (w_e => $id, undef);
290
291 0
292 }
293}
294
224sub update_fx_want { 295sub update_fx_want {
225 my ($self) = @_; 296 my ($self) = @_;
226 297
227 $self->send_exti_msg (fx_want => { 298 $self->send_exti_msg (fx_want => {
228 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC 299 3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
229 5 => !!$::CFG->{audio_enable}, # FT_SOUND 300 5 => !!$::CFG->{audio_enable}, # FT_SOUND
301 6 => 1, # FT_RSRC
230 }); 302 });
231} 303}
232 304
233sub logprint { 305sub logprint {
234 my ($self, @a) = @_; 306 my ($self, @a) = @_;
… …
374 $::GAUGES->{mana} ->set_value ($sp, $sp_m); 446 $::GAUGES->{mana} ->set_value ($sp, $sp_m);
375 $::GAUGES->{food} ->set_value ($fo, $fo_m); 447 $::GAUGES->{food} ->set_value ($fo, $fo_m);
376 $::GAUGES->{grace} ->set_value ($gr, $gr_m); 448 $::GAUGES->{grace} ->set_value ($gr, $gr_m);
377 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64})) 449 $::GAUGES->{exp} ->set_text ("Exp: " . (::formsep ($stats->{+CS_STAT_EXP64}))
378 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")"); 450 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
451 $::GAUGES->{prg} ->set_value ($stats->{+CS_STAT_LEVEL}, $stats->{+CS_STAT_EXP64});
379 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE}); 452 $::GAUGES->{range} ->set_text ($stats->{+CS_STAT_RANGE});
380 my $title = $stats->{+CS_STAT_TITLE}; 453 my $title = $stats->{+CS_STAT_TITLE};
381 $title =~ s/^Player: //; 454 $title =~ s/^Player: //;
382 $::STATWIDS->{title} ->set_text ("Title: " . $title); 455 $::STATWIDS->{title} ->set_text ("Title: " . $title);
383 456
… …
409 my @add; 482 my @add;
410 483
411 push @add, 484 push @add,
412 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1), 485 0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
413 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), 486 1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
487 2, 0, (new CFPlus::UI::Label text => "Progress", align => 0),
414 2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), 488 3, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
415 3, 0, (new CFPlus::UI::Label text => "Experience", align => 1), 489 4, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
416 4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1), 490 5, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
491 6, 0, (new CFPlus::UI::Label text => "Progress", align => 0),
417 5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1), 492 7, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
418 ; 493 ;
419 494
420 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>"; 495 my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
421 496
422 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1); 497 my @TOOLTIP_LVL = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
… …
452 527
453 1 528 1
454 }; 529 };
455 530
456 push @add, 531 push @add,
457 $x * 3 + 0, $y, ($self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label 532 $x * 4 + 0, $y, ($self->{stat_widget_exp}{$idx} ||= new CFPlus::UI::Label
458 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP), 533 align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
459 $x * 3 + 1, $y, ($self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label 534 $x * 4 + 1, $y, ($self->{stat_widget_lvl}{$idx} ||= new CFPlus::UI::Label
460 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL), 535 text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
536 $x * 4 + 2, $y, ($self->{stat_widget_prg}{$idx} ||= new CFPlus::UI::ExperienceProgress),
461 $x * 3 + 2, $y, (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb, 537 $x * 4 + 3, $y, ($self->{stat_widget_lbl}{$idx} ||= new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
462 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL), 538 can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
463 ; 539 ;
464 540
465 $x++ and ($x, $y) = (0, $y + 1); 541 $x++ and ($x, $y) = (0, $y + 1);
466 } 542 }
… …
469 } 545 }
470 546
471 for (grep exists $stats->{$_}, @skills) { 547 for (grep exists $stats->{$_}, @skills) {
472 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1])); 548 $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
473 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1); 549 $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
550 $self->{stat_widget_prg}{$_}->set_value (@{$stats->{$_}});
474 } 551 }
475} 552}
476 553
477sub macro_send { 554sub macro_send {
478 my ($self, $macro) = @_; 555 my ($self, $macro) = @_;
… …
520 $tex->upload; 597 $tex->upload;
521 } else { 598 } else {
522 $self->{delay}{$tile} = 1; 599 $self->{delay}{$tile} = 1;
523 600
524 # we assume the face is in-flight and will eventually come 601 # we assume the face is in-flight and will eventually come
525 push @{$self->{face_cb}{$tile}}, sub { 602 push @{$self->{tile_cb}{$tile}}, sub {
526 delete $self->{delay}{$tile}; 603 delete $self->{delay}{$tile};
527 $_[0]->upload; 604 $_[0]->upload;
528 }; 605 };
529 } 606 }
530 } 607 }
… …
570} 647}
571 648
572sub bg_fetch { 649sub bg_fetch {
573 my ($self) = @_; 650 my ($self) = @_;
574 651
575 my $id; 652 my $tile;
576 653
577 do { 654 do {
578 $id = pop @{$self->{bg_fetch}} 655 $tile = pop @{$self->{bg_fetch}}
579 or return; 656 or return;
580 } while $self->{texture}[$id]; 657 } while $self->{texture}[$tile];
581 658
582 CFPlus::DB::exists tilecache => $id, sub { 659 CFPlus::DB::get tilecache => $tile, sub {
583 my ($exists) = @_; 660 my ($data) = @_;
584 661
585 return unless $self->{map}; # stop when destroyed 662 return unless $self->{map}; # stop when destroyed
586 663
587 if ($exists) { 664 if (defined $data) {
588 $self->have_tile ($id); 665 $self->have_tile ($tile, $data);
589 $self->{texture}[$id]->upload; 666 $self->{texture}[$tile]->upload;
590 } 667 }
591 668
592 $self->bg_fetch; 669 $self->bg_fetch;
593 }; 670 };
594} 671}
… …
751 my ($self, $facenum, $face, $cb) = @_; 828 my ($self, $facenum, $face, $cb) = @_;
752 829
753 if ($face->{type} == 0) { # FT_FACE 830 if ($face->{type} == 0) { # FT_FACE
754 my $id = CFPlus::DB::get_tile_id_sync $face->{name}; 831 my $id = CFPlus::DB::get_tile_id_sync $face->{name};
755 832
756 $face->{id} = $id; 833 $face->{id} = $id;
757 $self->{faceid}[$facenum] = $id;
758
759 $self->{map}->set_tileid ($facenum => $id); 834 $self->{map}->set_tileid ($facenum => $id);
760 835
761 CFPlus::DB::get tilecache => $id, $cb; 836 CFPlus::DB::get tilecache => $id, $cb;
762 837
763 } elsif ($face->{type} & 1) { # with metadata 838 } elsif ($face->{type} & 1) { # with metadata
764 CFPlus::DB::get res_meta => $face->{name}, $cb; 839 CFPlus::DB::get res_meta => $face->{name}, $cb;
840
841 } else { # no metadata
842 CFPlus::DB::get res_data => $face->{name}, $cb;
765 } 843 }
766} 844}
767 845
768sub face_update { 846sub face_update {
769 my ($self, $facenum, $face, $changed) = @_; 847 my ($self, $facenum, $face, $changed) = @_;
770 848
771 if ($face->{type} == 0) { # FT_FACE 849 if ($face->{type} == 0) {
850 # image, FT_FACE
772 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { } 851 CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
773 if $changed; 852 if $changed;
774 853
775 $self->have_tile ($face->{id}); 854 $self->have_tile ($face->{id}, delete $face->{data});
776 855
777 } elsif ($face->{type} & 1) { # split metadata 856 } elsif ($face->{type} & 1) {
857 # split metadata case, FT_MUSIC, FT_SOUND
778 if ($changed) { # new data 858 if ($changed) { # new data
779 my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data}; 859 my ($meta, $data) = unpack "(w/a*)*", $face->{data};
780 $face->{meta} = $self->{json_coder}->decode ($meta_json); 860 $face->{data} = $meta;
781 861
782 CFPlus::DB::put res_data => $face->{name} => $data, sub { }; 862 CFPlus::DB::put res_data => $face->{name} => $data, sub { };
783 CFPlus::DB::put res_meta => $face->{name} => $meta_json, sub { }; 863 CFPlus::DB::put res_meta => $face->{name} => $meta, sub { };
784 } else { 864 }
865
785 $face->{meta} = $self->{json_coder}->decode (delete $face->{data}); 866 $face->{data} = $self->{json_coder}->decode ($face->{data});
786 }
787 867
788 ::add_license ($face); 868 ::add_license ($face);
789 869
790 if ($face->{type} == 3) { # FT_MUSIC 870 if ($face->{type} == 3) { # FT_MUSIC
791 $self->{music_meta}{$facenum} = $face;
792
793 ::message ({ markup => "downloaded song #$facenum" }) 871 ::message ({ markup => "downloaded song #$facenum" })
794 if $changed; 872 if $changed;
795 873
796 &::audio_music_push ($facenum); 874 &::audio_music_push ($facenum);
797 } elsif ($face->{type} == 5) { # FT_SOUND 875 } elsif ($face->{type} == 5) { # FT_SOUND
798 $self->{sound_meta}{$facenum} = $face;
799
800 ::message ({ markup => "downloaded sound #$facenum" }) 876 ::message ({ markup => "downloaded sound #$facenum" })
801 if $changed; 877 if $changed;
802 878
803 &::audio_sound_push ($facenum); 879 &::audio_sound_push ($facenum);
804 } 880 }
805 881
882 } else {
883 # flat resource case, FT_RSRC
884 CFPlus::DB::put res_data => $face->{name} => $face->{data}, sub { }
885 if $changed;
886 }
887
888 if (my $cbs = $self->{face_cb}{$facenum}) {
889 $_->($face, $changed) for @$cbs;
806 } 890 }
807} 891}
808 892
809sub smooth_update { 893sub smooth_update {
810 my ($self, $facenum, $face) = @_; 894 my ($self, $facenum, $face) = @_;
811 895
812 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel}); 896 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
813} 897}
814 898
815sub have_tile { 899sub have_tile {
816 my ($self, $tile) = @_; 900 my ($self, $tile, $data) = @_;
817 901
818 return unless $self->{map}; 902 return unless $self->{map};
819 903
820 my $tex = $self->{texture}[$tile] ||= 904 my $tex = $self->{texture}[$tile] ||=
821 new CFPlus::Texture 905 new CFPlus::Texture
822 tile => $tile, minify => 1, mipmap => 1, delay => 1; 906 tile => $tile,
907 image => $data, delete_image => 1,
908 minify => 1, mipmap => 1;
823 909
824 $_->($tex) for @{(delete $self->{face_cb}{$tile}) || []}; 910 if (my $cbs = delete $self->{tile_cb}{$tile}) {
911 $_->($tex) for @$cbs;
912 }
825} 913}
826 914
827sub connect_face_update { 915# call in non-void context registers a temporary
916# hook with handle, otherwise its permanent
917sub on_face_change {
828 my ($self, $id, $cb) = @_; 918 my ($self, $num, $cb) = @_;
829 919
830 push @{$self->{face_cb}{$id}}, $cb; 920 push @{$self->{face_cb}{$num}}, $cb;
831 921
922 defined wantarray
832 CFPlus::guard { 923 ? CFPlus::guard {
833 @{$self->{face_cb}{$id}} 924 @{$self->{face_cb}{$num}}
834 = grep $_ != $cb, 925 = grep $_ != $cb,
835 @{$self->{face_cb}{$id}}; 926 @{$self->{face_cb}{$num}};
836 } 927 }
928 : ()
929}
930
931# call in non-void context registers a temporary
932# hook with handle, otherwise its permanent
933sub register_face_handler {
934 my ($self, $num, $cb) = @_;
935
936 return unless $num;
937
938 # invoke if available right now
939 $cb->($self->{face}[$num], 0)
940 unless exists $self->{face}[$num]{loading};
941
942 # future changes
943 $self->on_face_change ($num => $cb)
837} 944}
838 945
839sub sound_play { 946sub sound_play {
840 my ($self, $type, $face, $dx, $dy, $vol) = @_; 947 my ($self, $type, $face, $dx, $dy, $vol) = @_;
841 948
… …
1037sub set_opencont { 1144sub set_opencont {
1038 my ($conn, $tag, $name) = @_; 1145 my ($conn, $tag, $name) = @_;
1039 $conn->{open_container} = $tag; 1146 $conn->{open_container} = $tag;
1040 update_floorbox; 1147 update_floorbox;
1041 1148
1042 $::INV_RIGHT_HB->clear (); 1149 $::INVR_HB->clear ();
1043 $::INV_RIGHT_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name); 1150 $::INVR_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name);
1044 1151
1045 if ($tag != 0) { # Floor isn't closable, is it? 1152 if ($tag != 0) { # Floor isn't closable, is it?
1046 $::INV_RIGHT_HB->add (new CFPlus::UI::Button 1153 $::INVR_HB->add (new CFPlus::UI::Button
1047 text => "Close container", 1154 text => "Close container",
1048 tooltip => "Close the currently open container (if one is open)", 1155 tooltip => "Close the currently open container (if one is open)",
1049 on_activate => sub { 1156 on_activate => sub {
1050 $::CONN->send ("apply $tag") # $::CONN->{open_container}") 1157 $::CONN->send ("apply $tag") # $::CONN->{open_container}")
1051 if $tag != 0; 1158 if $tag != 0;
1052 #if $CONN->{open_container} != 0;
1053 0 1159 0
1054 }, 1160 },
1055 ); 1161 );
1056 } 1162 }
1057 1163

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines