ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/bin/pclient
(Generate patch)

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.190 by elmex, Thu Apr 27 08:55:35 2006 UTC vs.
Revision 1.211 by root, Fri May 12 02:08:52 2006 UTC

… …
37use CFClient; 37use CFClient;
38use CFClient::UI; 38use CFClient::UI;
39use CFClient::MapWidget; 39use CFClient::MapWidget;
40 40
41$Event::DIED = sub { 41$Event::DIED = sub {
42 # TODO: display dialog box or so
42 CFClient::error $_[1]; 43 CFClient::error $_[1];
43}; 44};
44 45
45#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d# 46#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d#
46 47
… …
59our $NOW; 60our $NOW;
60 61
61our $CFG; 62our $CFG;
62our $CONN; 63our $CONN;
63our $FAST; # fast, low-quality mode, possibly useful for software-rendering 64our $FAST; # fast, low-quality mode, possibly useful for software-rendering
65
66our $WANT_REFRESH;
67our $CAN_REFRESH;
64 68
65our @SDL_MODES; 69our @SDL_MODES;
66our $WIDTH; 70our $WIDTH;
67our $HEIGHT; 71our $HEIGHT;
68our $FULLSCREEN; 72our $FULLSCREEN;
… …
76our $MAPWIDGET; 80our $MAPWIDGET;
77our $BUTTONBAR; 81our $BUTTONBAR;
78our $LOGVIEW; 82our $LOGVIEW;
79our $CONSOLE; 83our $CONSOLE;
80our $METASERVER; 84our $METASERVER;
85our $LOGIN_BUTTON;
81 86
82our $FLOORBOX; 87our $FLOORBOX;
83our $GAUGES; 88our $GAUGES;
84our $STATWIDS; 89our $STATWIDS;
85 90
… …
92 97
93our $ALT_ENTER_MESSAGE; 98our $ALT_ENTER_MESSAGE;
94our $STATUS_LINE; 99our $STATUS_LINE;
95our $DEBUG_STATUS; 100our $DEBUG_STATUS;
96 101
102our $INVWIN;
103our $INV;
104
97sub status { 105sub status {
98 $STATUS_LINE->set_text ($_[0]); 106 $STATUS_LINE->add ($_[0], pri => -10, group => "status", timeout => 20, color => [1, 1, 0, 1]);
99 $STATUS_LINE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $STATUS_LINE->{h}); 107 $CFClient::UI::ROOT->on_post_alloc ($STATUS_LINE => sub {
108 $STATUS_LINE->move (0, $HEIGHT - $STATUS_LINE->{h});#d# to in toplevel
109 });
100} 110}
101 111
102sub debug { 112sub debug {
103 $DEBUG_STATUS->set_text ($_[0]); 113 $DEBUG_STATUS->set_text ($_[0]);
104 $DEBUG_STATUS->move ($WIDTH - $DEBUG_STATUS->{w}, 0, $DEBUG_STATUS->{w}, $DEBUG_STATUS->{h}); 114 my ($w, $h) = $DEBUG_STATUS->size_request;
115 $DEBUG_STATUS->move ($WIDTH - $w, 0);
105} 116}
106 117
107sub start_game { 118sub start_game {
108 status "logging in..."; 119 status "logging in...";
109 120
110 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 121 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
111 122
112 $MAPCACHE = CFClient::db_table "mapcache_$CFG->{host}"; 123 $MAPCACHE = CFClient::db_table "mapcache_$CFG->{host}";
113
114 $MAP = new CFClient::Map $mapsize, $mapsize; 124 $MAP = new CFClient::Map $mapsize, $mapsize;
115 125
116 my ($host, $port) = split /:/, $CFG->{host}; 126 my ($host, $port) = split /:/, $CFG->{host};
117 127
118 $CONN = new conn 128 $CONN = eval {
129 new conn
119 host => $host, 130 host => $host,
120 port => $port || 13327, 131 port => $port || 13327,
121 user => $CFG->{user}, 132 user => $CFG->{user},
122 pass => $CFG->{password}, 133 pass => $CFG->{password},
123 mapw => $mapsize, 134 mapw => $mapsize,
124 maph => $mapsize, 135 maph => $mapsize,
136 ;
125 ; 137 };
126 138
139 if ($CONN) {
140 $LOGIN_BUTTON->set_text ("Logout");
141
127 status "login successful"; 142 status "login successful";
128 143
129 CFClient::lowdelay fileno $CONN->{fh}; 144 CFClient::lowdelay fileno $CONN->{fh};
145 } else {
146 status "unable to connect";
147 stop_game();
148 }
130} 149}
131 150
132sub stop_game { 151sub stop_game {
152 return unless $CONN;
153
154 status "connection closed";
155 $LOGIN_BUTTON->set_text ("Login");
156 $CONN->destroy;
157 $CONN = 0; # false, does not autovivify
158
159 undef $MAPCACHE;
133 undef $CONN; 160 undef $MAP;
134} 161}
135 162
136sub client_setup { 163sub client_setup {
137 my $dialog = new CFClient::UI::FancyFrame 164 my $dialog = new CFClient::UI::FancyFrame
138 title => "Client Setup", 165 title => "Client Setup",
… …
562 589
563} 590}
564 591
565sub metaserver_dialog { 592sub metaserver_dialog {
566 my $dialog = new CFClient::UI::FancyFrame 593 my $dialog = new CFClient::UI::FancyFrame
567 title => "Metaserver", 594 title => "Server List",
568 child => (my $vbox = new CFClient::UI::VBox); 595 child => (my $vbox = new CFClient::UI::VBox);
569 596
570 $vbox->add ($dialog->{table} = new CFClient::UI::Table); 597 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
571 598
572 $dialog 599 $dialog
… …
674 701
675 $METASERVER = metaserver_dialog; 702 $METASERVER = metaserver_dialog;
676 703
677 $vbox->add (new CFClient::UI::Flopper 704 $vbox->add (new CFClient::UI::Flopper
678 expand => 1, 705 expand => 1,
679 text => "Metaserver", 706 text => "Server List",
680 other => $METASERVER, 707 other => $METASERVER,
681 tooltip => "Show a list of avaible crossfire servers", 708 tooltip => "Show a list of available crossfire servers",
682 connect_open => sub { 709 connect_open => sub {
683 update_metaserver $HOST; 710 update_metaserver $HOST;
684 } 711 }
685 ); 712 );
686 } 713 }
… …
717 744
718 $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 745 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
719 }, 746 },
720 ); 747 );
721 748
722 $table->add (1, 8, new CFClient::UI::Button expand => 1, align => 0, text => "Login", connect_activate => sub { 749 $table->add (1, 8, $LOGIN_BUTTON = new CFClient::UI::Button
750 expand => 1,
751 align => 0,
752 text => "Login",
753 connect_activate => sub {
754 $CONN ? stop_game
723 start_game; 755 : start_game;
756 },
724 }); 757 );
725 758
726 $dialog 759 $dialog
727} 760}
728 761
729sub message_window { 762sub message_window {
… …
778 }; 811 };
779 812
780 $window 813 $window
781} 814}
782 815
816sub make_inventory_window {
817 my $invwin = new CFClient::UI::FancyFrame user_w => 300, user_h => 300, title => "Inventory";
818 $invwin->add ($INV = new CFClient::UI::Inventory expand => 1);
819 $invwin
820}
821
783sub sdl_init { 822sub sdl_init {
784 CFClient::SDL_Init 823 CFClient::SDL_Init
785 and die "SDL::Init failed!\n"; 824 and die "SDL::Init failed!\n";
786} 825}
787 826
788sub video_init { 827sub video_init {
789 sdl_init; 828 sdl_init;
790 829
830 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
831
791 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 832 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
792 $FULLSCREEN = $CFG->{fullscreen}; 833 $FULLSCREEN = $CFG->{fullscreen};
793 $FAST = $CFG->{fast}; 834 $FAST = $CFG->{fast};
794 835
795 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 836 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN
796 or die "SDL_SetVideoMode failed!\n"; 837 or die "SDL_SetVideoMode failed!\n";
797 838
798 $SDL_ACTIVE = 1; 839 $SDL_ACTIVE = 1;
799
800 $LAST_REFRESH = time - 0.01; 840 $LAST_REFRESH = time - 0.01;
801 841
802 CFClient::gl_init; 842 CFClient::gl_init;
803 843
804 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 844 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
805 845
846 $CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
847
806 ############################################################################# 848 #############################################################################
807 849
850 if ($DEBUG_STATUS) {
851 # reconfigure all widgets
852 $CFClient::UI::ROOT->reconfigure;
853
854 } else {
855 # create the widgets
856
808 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100; 857 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, text => "hulla", x => 100;#d#
809 $DEBUG_STATUS->show; 858 $DEBUG_STATUS->show;
810 859
811 $STATUS_LINE = new CFClient::UI::Label 860 $STATUS_LINE = new CFClient::UI::Statusbox;
812 padding => 0, 861 $STATUS_LINE->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, size => 0.8, color => [1, 1, 1, 0.8]);
813 y => $HEIGHT - $FONTSIZE * 1.8;
814 $STATUS_LINE->show; 862 $STATUS_LINE->show;
815 863
816 $ALT_ENTER_MESSAGE = new CFClient::UI::Label
817 padding => 0,
818 fontsize => 0.8,
819 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode";
820 $ALT_ENTER_MESSAGE->show;
821 $ALT_ENTER_MESSAGE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h});
822
823 CFClient::UI::FancyFrame->new ( 864 CFClient::UI::FancyFrame->new (
824 border_bg => [1, 1, 1, 192/255], 865 border_bg => [1, 1, 1, 192/255],
825 bg => [1, 1, 1, 0], 866 bg => [1, 1, 1, 0],
826 child => ($MAPMAP = new CFClient::MapWidget::MapMap), 867 child => ($MAPMAP = new CFClient::MapWidget::MapMap),
827 )->show; 868 )->show;
828 869
829 $MAPWIDGET = new CFClient::MapWidget; 870 $MAPWIDGET = new CFClient::MapWidget;
830 $MAPWIDGET->connect (activate_console => sub { 871 $MAPWIDGET->connect (activate_console => sub {
831 my ($mapwidget, $preset) = @_; 872 my ($mapwidget, $preset) = @_;
832 873
833 if ($CONSOLE) { 874 if ($CONSOLE) {
834 $CONSOLE->{input}->{auto_activated} = 1; 875 $CONSOLE->{input}->{auto_activated} = 1;
835 $CONSOLE->{input}->focus_in; 876 $CONSOLE->{input}->focus_in;
836 877
837 if ($preset && $CONSOLE->{input}->get_text eq '') { 878 if ($preset && $CONSOLE->{input}->get_text eq '') {
838 $CONSOLE->{input}->set_text ($preset); 879 $CONSOLE->{input}->set_text ($preset);
880 }
839 } 881 }
840 } 882 });
841 });
842 $MAPWIDGET->show; 883 $MAPWIDGET->show;
843 $MAPWIDGET->focus_in; 884 $MAPWIDGET->focus_in;
844 885
845 $BUTTONBAR = new CFClient::UI::HBox; 886 $BUTTONBAR = new CFClient::UI::HBox;
846 887
847 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup); 888 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup);
848 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup); 889 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup);
849 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window); 890 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window);
850 891
851 $CFClient::UI::ROOT->add (make_gauge_window); # 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 892 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
893
852 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window); 894 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window);
895 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window);
853 896
854 $BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub { 897 $BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub {
855 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 898 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
856 status "Configuration Saved"; 899 status "Configuration Saved";
857 }); 900 });
858 901
859 $BUTTONBAR->show; 902 $BUTTONBAR->show;
860 903
904 # delay till geometry is constant
905 $CFClient::UI::ROOT->on_post_alloc (startup => sub {
861 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup 906 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
907 });
908 force_refresh ();
909 }
862} 910}
863 911
864sub video_shutdown { 912sub video_shutdown {
865 $CFClient::UI::ROOT->{children} = [];
866 undef $CFClient::UI::GRAB;
867 undef $CFClient::UI::HOVER;
868 undef $SDL_ACTIVE; 913 undef $SDL_ACTIVE;
869} 914}
870 915
871my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d# 916my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
872my $bgmusic;#TODO#hack#d# 917my $bgmusic;#TODO#hack#d#
918
919sub audio_channel_finished {
920 my ($channel) = @_;
921
922 warn "channel $channel finished\n";#d#
923}
873 924
874sub audio_music_finished { 925sub audio_music_finished {
875 return unless $CFG->{bgm_enable}; 926 return unless $CFG->{bgm_enable};
876 927
877 # TODO: hack, do play loop and mood music 928 # TODO: hack, do play loop and mood music
… …
881 push @bgmusic, shift @bgmusic; 932 push @bgmusic, shift @bgmusic;
882} 933}
883 934
884sub audio_init { 935sub audio_init {
885 if ($CFG->{audio_enable}) { 936 if ($CFG->{audio_enable}) {
886 if (open my $fh, "<:utf8", CFClient::find_rcfile "sounds/config") { 937 if (open my $fh, "<", CFClient::find_rcfile "sounds/config") {
887 $SDL_MIXER = !CFClient::Mix_OpenAudio; 938 $SDL_MIXER = !CFClient::Mix_OpenAudio;
888 CFClient::Mix_AllocateChannels 8; 939 CFClient::Mix_AllocateChannels 8;
889 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128; 940 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128;
890 941
891 audio_music_finished; 942 audio_music_finished;
… …
918} 969}
919 970
920my %animate_object; 971my %animate_object;
921my $animate_timer; 972my $animate_timer;
922 973
923my $want_refresh;
924my $can_refresh;
925
926my $fps = 9; 974my $fps = 9;
927 975
928sub force_refresh { 976sub force_refresh {
929 $fps = $fps * 0.95 + 1 / ($NOW - $LAST_REFRESH) * 0.05; 977 $fps = $fps * 0.95 + 1 / ($NOW - $LAST_REFRESH) * 0.05;
930 debug sprintf "%3.2f", $fps; 978 debug sprintf "%3.2f", $fps;
931 979
932 $want_refresh = 0;
933 $can_refresh = 0;
934
935 $CFClient::UI::ROOT->draw; 980 $CFClient::UI::ROOT->draw;
936
937 CFClient::SDL_GL_SwapBuffers; 981 CFClient::SDL_GL_SwapBuffers;
938 982
983 $WANT_REFRESH = 0;
984 $CAN_REFRESH = 0;
939 $LAST_REFRESH = $NOW; 985 $LAST_REFRESH = $NOW;
940} 986}
941 987
942my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub { 988my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub {
943 $NOW = time; 989 $NOW = time;
… …
945 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 991 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
946 for CFClient::SDL_PollEvent; 992 for CFClient::SDL_PollEvent;
947 993
948 if (%animate_object) { 994 if (%animate_object) {
949 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 995 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
950 $want_refresh++; 996 $WANT_REFRESH++;
951 } 997 }
952 998
953 if ($want_refresh) { 999 if ($WANT_REFRESH) {
954 force_refresh; 1000 force_refresh;
955 } else { 1001 } else {
956 $can_refresh = 1; 1002 $CAN_REFRESH = 1;
957 } 1003 }
958}); 1004});
959
960sub refresh {
961 $want_refresh++;
962}
963 1005
964sub animation_start { 1006sub animation_start {
965 my ($widget) = @_; 1007 my ($widget) = @_;
966 $animate_object{$widget} = $widget; 1008 $animate_object{$widget} = $widget;
967} 1009}
… …
1279 [0.55, 0.41, 0.13], 1321 [0.55, 0.41, 0.13],
1280 [0.99, 0.77, 0.26], 1322 [0.99, 0.77, 0.26],
1281 [0.74, 0.65, 0.41], 1323 [0.74, 0.65, 0.41],
1282 ); 1324 );
1283 1325
1326 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
1327
1328 $text =~ s/&/&amp;/g; $text =~ s/</&lt;/g;
1329 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
1330 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
1331
1284 $LOGVIEW->add_paragraph ($color[$color], $text); 1332 $LOGVIEW->add_paragraph ($color[$color],
1333 join "\n", map "$time $_", split /\n/, $text);
1334
1335 $STATUS_LINE->add ($text,
1336 group => $text,
1337 color => $color[$color],
1338 timeout => 60,
1339 tooltip_font => $::FONT_FIXED,
1340 );
1341}
1342
1343sub conn::drawextinfo {
1344 my ($self, $color, $type, $subtype, $message) = @_;
1345
1346 $self->drawinfo ($color, $message);
1285} 1347}
1286 1348
1287sub conn::spell_add { 1349sub conn::spell_add {
1288 my ($self, $spell) = @_; 1350 my ($self, $spell) = @_;
1289 1351
… …
1302 1364
1303 for my $skill (values %{$self->{skill_info}}) { 1365 for my $skill (values %{$self->{skill_info}}) {
1304 $MAPWIDGET->add_command ("ready_skill $skill", "Ready the skill '$skill'"); 1366 $MAPWIDGET->add_command ("ready_skill $skill", "Ready the skill '$skill'");
1305 $MAPWIDGET->add_command ("use_skill $skill", "Immediately use the skill '$skill'"); 1367 $MAPWIDGET->add_command ("use_skill $skill", "Immediately use the skill '$skill'");
1306 } 1368 }
1369
1370 $MAPWIDGET->add_command ("pet\\_mode defend", "Tell pets to stay close to you and defend you");
1371 $MAPWIDGET->add_command ("pet\\_mode arena", "Same as petmode attack, but also attack other players");
1372 $MAPWIDGET->add_command ("pet\\_mode sad", "Search &amp; Destroy - tell pets to roam about and attack enemies");
1373 $MAPWIDGET->add_command ("kill\\_pets", "kill your pets");
1374}
1375
1376sub conn::eof {
1377 stop_game;
1307} 1378}
1308 1379
1309sub update_floorbox { 1380sub update_floorbox {
1310 $CFClient::UI::ROOT->on_refresh ($FLOORBOX => sub { 1381 $CFClient::UI::ROOT->on_refresh ($FLOORBOX => sub {
1382 return unless $CONN;
1383
1311 $FLOORBOX->clear; 1384 $FLOORBOX->clear;
1312 $FLOORBOX->add (new CFClient::UI::Empty expand => 1); 1385 $FLOORBOX->add (new CFClient::UI::Empty expand => 1);
1313 1386
1314 my @items = values %{ $CONN->{container}{0} }; 1387 my $count = 4;
1315 1388 for (@{ $CONN->{container}{0} }) {
1316 # we basically have to use the same sorting as everybody else 1389 if (--$count) {
1317 @items = sort { $a->{type} <=> $b->{type} } @items; 1390 $FLOORBOX->add (new CFClient::UI::InventoryItem item => $_);
1318 1391 } else {
1319 for my $item (reverse @items) { 1392 $FLOORBOX->add (new CFClient::UI::Label text => "More...");
1320 my $desc = $item->{nrof} < 2
1321 ? $item->{name}
1322 : "$item->{nrof} $item->{name_pl}";
1323 # todo: animation widget, face widget, weight(?) etc.
1324 $FLOORBOX->add (my $hbox = new CFClient::UI::HBox
1325 tooltip => (CFClient::UI::Label->escape ($desc)
1326 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
1327 can_hover => 1,
1328 can_events => 1,
1329 connect_button_down => sub {
1330 my ($self, $ev, $x, $y) = @_;
1331
1332 # todo: maybe put examine on 1? but should just be a tooltip :(
1333 if ($ev->{button} == 1) {
1334 $CONN->send ("move $CONN->{player}{tag} $item->{tag} 0");
1335 } elsif ($ev->{button} == 2) {
1336 $CONN->send ("apply $item->{tag}");
1337 } elsif ($ev->{button} == 3) {
1338 CFClient::UI::Menu->new (
1339 items => [
1340 ["examine", sub { $CONN->send ("examine $item->{tag}") }],
1341 [
1342 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
1343 sub { $CONN->send ("lock $item->{tag}") },
1344 ],
1345 ["mark", sub { $CONN->send ("mark $item->{tag}") }],
1346 ["apply", sub { $CONN->send ("apply $item->{tag}") }],
1347 ],
1348 )->popup ($ev);
1349 }
1350
1351 1
1352 }, 1393 last;
1353 );
1354
1355 $hbox->add (new CFClient::UI::Face
1356 can_events => 0,
1357 face => $item->{face},
1358 anim => $item->{anim},
1359 animspeed => $item->{animspeed},
1360 );
1361 1394 }
1362 $hbox->add (new CFClient::UI::Label
1363 can_events => 0,
1364 text => $desc,
1365 );
1366 } 1395 }
1367 }); 1396 });
1368 refresh; 1397
1398 $WANT_REFRESH++;
1369} 1399}
1370 1400
1371sub conn::container_add { 1401sub conn::container_add {
1372 my ($self, $id, $items) = @_; 1402 my ($self, $tag, $items) = @_;
1373 1403
1374 update_floorbox if $id == 0; 1404 update_floorbox if $tag == 0;
1405
1406 $INV->set_items ($self->{container}{$self->{player}{tag}})
1407 if $tag == $self->{player}{tag};
1408
1375 # $self-<{player}{tag} => player inv 1409 # $self-<{player}{tag} => player inv
1376 #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}}; 1410 #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}};
1377} 1411}
1378 1412
1379sub conn::container_clear { 1413sub conn::container_clear {
1380 my ($self, $id) = @_; 1414 my ($self, $tag) = @_;
1381 1415
1382 update_floorbox if $id == 0; 1416 update_floorbox if $tag == 0;
1417
1418 $INV->set_items ($self->{container}{$tag})
1419 if $tag == $self->{player}{tag};
1420
1383# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0}; 1421# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0};
1384} 1422}
1385 1423
1386sub conn::item_delete { 1424sub conn::item_delete {
1387 my ($self, @items) = @_; 1425 my ($self, @items) = @_;
1388 1426
1389 for (@items) { 1427 for (@items) {
1390 update_floorbox if $_->{container} == 0; 1428 update_floorbox if $_->{container} == 0;
1429
1430 $INV->set_items ($self->{container}{$_->{container}})
1431 if $_->{container} == $self->{player}{tag};
1391 } 1432 }
1392} 1433}
1393 1434
1394sub conn::item_update { 1435sub conn::item_update {
1395 my ($self, $item) = @_; 1436 my ($self, $item) = @_;
1396 1437
1397 update_floorbox if $item->{container} == 0; 1438 update_floorbox if $item->{container} == 0;
1439
1440 $INV->set_items ($self->{container}{$item->{container}})
1441 if $item->{container} == $self->{player}{tag};
1398} 1442}
1399 1443
1400%SDL_CB = ( 1444%SDL_CB = (
1401 CFClient::SDL_QUIT => sub { 1445 CFClient::SDL_QUIT => sub {
1402 Event::unloop -1; 1446 Event::unloop -1;
1403 }, 1447 },
1404 CFClient::SDL_VIDEORESIZE => sub { 1448 CFClient::SDL_VIDEORESIZE => sub {
1405 }, 1449 },
1406 CFClient::SDL_VIDEOEXPOSE => \&refresh, 1450 CFClient::SDL_VIDEOEXPOSE => sub {
1451 $WANT_REFRESH++;
1452 },
1407 CFClient::SDL_ACTIVEEVENT => sub { 1453 CFClient::SDL_ACTIVEEVENT => sub {
1408# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 1454# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
1409 }, 1455 },
1410 CFClient::SDL_KEYDOWN => sub { 1456 CFClient::SDL_KEYDOWN => sub {
1411 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) { 1457 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {
… …
1415 video_init; 1461 video_init;
1416 } else { 1462 } else {
1417 CFClient::UI::feed_sdl_key_down_event ($_[0]); 1463 CFClient::UI::feed_sdl_key_down_event ($_[0]);
1418 } 1464 }
1419 }, 1465 },
1420 CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event, 1466 CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event,
1421 CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event, 1467 CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event,
1422 CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event, 1468 CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event,
1423 CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event, 1469 CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event,
1424 CFClient::SDL_USEREVENT => \&audio_music_finished, 1470 CFClient::SDL_USEREVENT => sub {
1471 if ($_[0]{code} == 1) {
1472 audio_channel_finished $_[0]{data1};
1473 } elsif ($_[0]{code} == 0) {
1474 audio_music_finished;
1475 }
1476 },
1425); 1477);
1426 1478
1427############################################################################# 1479#############################################################################
1428 1480
1429$SIG{INT} = $SIG{TERM} = sub { exit }; 1481$SIG{INT} = $SIG{TERM} = sub { exit };
1430 1482
1431$TILECACHE = CFClient::db_table "tilecache";
1432$FACEMAP = CFClient::db_table "facemap";
1433
1434CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
1435
1436my %DEF_CFG = (
1437 sdl_mode => 0,
1438 width => 640,
1439 height => 480,
1440 fullscreen => 0,
1441 fast => 0,
1442 map_scale => 0.5,
1443 fow_enable => 1,
1444 fow_intensity => 0.45,
1445 fow_smooth => 0,
1446 gui_fontsize => 1,
1447 log_fontsize => 1,
1448 gauge_fontsize => 1,
1449 gauge_size => 0.35,
1450 stat_fontsize => 1,
1451 mapsize => 100,
1452 host => "crossfire.schmorp.de",
1453 say_command => 'say',
1454 audio_enable => 1,
1455 bgm_enable => 1,
1456 bgm_volume => 0.25,
1457);
1458
1459while (my ($k, $v) = each %DEF_CFG) {
1460 $CFG->{$k} = $v unless exists $CFG->{$k};
1461}
1462
1463sdl_init;
1464
1465@SDL_MODES = reverse
1466 grep $_->[0] >= 640 && $_->[1] >= 480,
1467 CFClient::SDL_ListModes;
1468
1469@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
1470
1471$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1472
1473{ 1483{
1484 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] };
1485
1486 CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
1487
1488 $TILECACHE = CFClient::db_table "tilecache";
1489 $FACEMAP = CFClient::db_table "facemap";
1490
1491 my %DEF_CFG = (
1492 sdl_mode => 0,
1493 width => 640,
1494 height => 480,
1495 fullscreen => 0,
1496 fast => 0,
1497 map_scale => 0.5,
1498 fow_enable => 1,
1499 fow_intensity => 0.45,
1500 fow_smooth => 0,
1501 gui_fontsize => 1,
1502 log_fontsize => 1,
1503 gauge_fontsize=> 1,
1504 gauge_size => 0.35,
1505 stat_fontsize => 1,
1506 mapsize => 100,
1507 host => "crossfire.schmorp.de",
1508 say_command => 'say',
1509 audio_enable => 1,
1510 bgm_enable => 1,
1511 bgm_volume => 0.25,
1512 );
1513
1514 while (my ($k, $v) = each %DEF_CFG) {
1515 $CFG->{$k} = $v unless exists $CFG->{$k};
1516 }
1517
1518 sdl_init;
1519
1520 @SDL_MODES = reverse
1521 grep $_->[0] >= 640 && $_->[1] >= 480,
1522 CFClient::SDL_ListModes;
1523
1524 @SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
1525
1526 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1527
1528 {
1474 my @fonts = map CFClient::find_rcfile "fonts/$_", qw( 1529 my @fonts = map CFClient::find_rcfile "fonts/$_", qw(
1475 DejaVuSans.ttf 1530 DejaVuSans.ttf
1476 DejaVuSansMono.ttf 1531 DejaVuSansMono.ttf
1477 DejaVuSans-Bold.ttf 1532 DejaVuSans-Bold.ttf
1478 DejaVuSansMono-Bold.ttf 1533 DejaVuSansMono-Bold.ttf
1479 DejaVuSans-Oblique.ttf 1534 DejaVuSans-Oblique.ttf
1480 DejaVuSansMono-Oblique.ttf 1535 DejaVuSansMono-Oblique.ttf
1481 DejaVuSans-BoldOblique.ttf 1536 DejaVuSans-BoldOblique.ttf
1482 DejaVuSansMono-BoldOblique.ttf 1537 DejaVuSansMono-BoldOblique.ttf
1483 ); 1538 );
1484 1539
1485 CFClient::add_font $_ for @fonts; 1540 CFClient::add_font $_ for @fonts;
1486 1541
1487 $FONT_PROP = new_from_file CFClient::Font $fonts[0]; 1542 $FONT_PROP = new_from_file CFClient::Font $fonts[0];
1488 $FONT_FIXED = new_from_file CFClient::Font $fonts[1]; 1543 $FONT_FIXED = new_from_file CFClient::Font $fonts[1];
1489 1544
1490 $FONT_PROP->make_default; 1545 $FONT_PROP->make_default;
1491} 1546 }
1492 1547
1493video_init; 1548 video_init;
1494audio_init; 1549 audio_init;
1550}
1495 1551
1496Event::loop; 1552Event::loop;
1497 1553
1498END { CFClient::SDL_Quit } 1554END { CFClient::SDL_Quit }
1499 1555

Diff Legend

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