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

Diff Legend

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