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.205 by root, Tue May 9 16:22:44 2006 UTC vs.
Revision 1.224 by root, Wed May 17 15:18:57 2006 UTC

1#!/opt/bin/perl 1#!/opt/bin/perl
2 2
3use strict; 3use strict;
4use utf8; 4use utf8;
5 5
6# do things only needed for single-binary version (par)
6BEGIN { 7BEGIN {
7 if (%PAR::LibCache) { 8 if (%PAR::LibCache) {
8 @INC = grep ref, @INC; # weed out all paths except pars loader refs 9 @INC = grep ref, @INC; # weed out all paths except pars loader refs
9 10
10 while (my ($filename, $zip) = each %PAR::LibCache) { 11 while (my ($filename, $zip) = each %PAR::LibCache) {
… …
13 $zip->extractMember ($_, "$ENV{PAR_TEMP}/$1") 14 $zip->extractMember ($_, "$ENV{PAR_TEMP}/$1")
14 unless -e "$ENV{PAR_TEMP}/$1"; 15 unless -e "$ENV{PAR_TEMP}/$1";
15 } 16 }
16 } 17 }
17 18
19 # TODO: pango-rc file, anybody?
20
18 unshift @INC, $ENV{PAR_TEMP}; 21 unshift @INC, $ENV{PAR_TEMP};
19
20 if ($^O eq "MSWin32") {
21 $ENV{GTK_RC_FILES} = "$ENV{PAR_TEMP}/share/themes/MS-Windows/gtk-2.0/gtkrc";
22 }
23 } 22 }
24} 23}
25 24
26# need to do it again because that pile of garbage called PAR nukes it before main 25# need to do it again because that pile of garbage called PAR nukes it before main
27unshift @INC, $ENV{PAR_TEMP}; 26unshift @INC, $ENV{PAR_TEMP}
27 if %PAR::LibCache;
28 28
29use Time::HiRes 'time'; 29use Time::HiRes 'time';
30use Pod::POM;
30use Event; 31use Event;
31 32
32use Crossfire; 33use Crossfire;
33use Crossfire::Protocol; 34use Crossfire::Protocol;
34 35
… …
37use CFClient; 38use CFClient;
38use CFClient::UI; 39use CFClient::UI;
39use CFClient::MapWidget; 40use CFClient::MapWidget;
40 41
41$Event::DIED = sub { 42$Event::DIED = sub {
43 # TODO: display dialog box or so
42 CFClient::error $_[1]; 44 CFClient::error $_[1];
43}; 45};
44 46
45#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d# 47#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d#
46 48
… …
59our $NOW; 61our $NOW;
60 62
61our $CFG; 63our $CFG;
62our $CONN; 64our $CONN;
63our $FAST; # fast, low-quality mode, possibly useful for software-rendering 65our $FAST; # fast, low-quality mode, possibly useful for software-rendering
66
67our $WANT_REFRESH;
68our $CAN_REFRESH;
64 69
65our @SDL_MODES; 70our @SDL_MODES;
66our $WIDTH; 71our $WIDTH;
67our $HEIGHT; 72our $HEIGHT;
68our $FULLSCREEN; 73our $FULLSCREEN;
… …
90our $SDL_MIXER; 95our $SDL_MIXER;
91our @SOUNDS; # event => file mapping 96our @SOUNDS; # event => file mapping
92our %AUDIO_CHUNKS; # audio files 97our %AUDIO_CHUNKS; # audio files
93 98
94our $ALT_ENTER_MESSAGE; 99our $ALT_ENTER_MESSAGE;
95our $STATUS_LINE; 100our $STATUSBOX;
96our $DEBUG_STATUS; 101our $DEBUG_STATUS;
97 102
98our $INVWIN; 103our $INVWIN;
99our $INV; 104our $INV;
105our $INVR;
106our $INVR_LBL;
107our $OPENCONT;
100 108
101sub status { 109sub status {
102 $STATUS_LINE->set_text ($_[0]); 110 $STATUSBOX->add ($_[0], pri => -10, group => "status", timeout => 20, fg => [1, 1, 0, 1]);
103 $STATUS_LINE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $STATUS_LINE->{h});
104} 111}
105 112
106sub debug { 113sub debug {
107 $DEBUG_STATUS->set_text ($_[0]); 114 $DEBUG_STATUS->set_text ($_[0]);
108 $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);
109} 117}
110 118
111sub start_game { 119sub start_game {
112 status "logging in..."; 120 status "logging in...";
113 121
… …
160 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 168 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
161 169
162 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode"); 170 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode");
163 $table->add (1, 0, my $hbox = new CFClient::UI::HBox); 171 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
164 172
165 $hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1]); 173 $hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 1, 1]);
166 $hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999"); 174 $hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
167 175
168 $mode_slider->connect (changed => sub { 176 $mode_slider->connect (changed => sub {
169 my ($self, $value) = @_; 177 my ($self, $value) = @_;
170 178
… …
195 } 203 }
196 ); 204 );
197 205
198 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale"); 206 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale");
199 $table->add (1, $row++, new CFClient::UI::Slider 207 $table->add (1, $row++, new CFClient::UI::Slider
200 range => [$CFG->{map_scale}, 0.25, 2, 0.05], 208 range => [$CFG->{map_scale}, 0.25, 2, 0.05, 0.05],
201 tooltip => "Enlarge or shrink the displayed map", 209 tooltip => "Enlarge or shrink the displayed map",
202 connect_changed => sub { 210 connect_changed => sub {
203 my ($self, $value) = @_; 211 my ($self, $value) = @_;
204 $CFG->{map_scale} = 0.05 * int $value / 0.05; 212 $CFG->{map_scale} = $value;
205 } 213 }
206 ); 214 );
207 215
208 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War"); 216 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War");
209 $table->add (1, $row++, new CFClient::UI::CheckBox 217 $table->add (1, $row++, new CFClient::UI::CheckBox
… …
236 } 244 }
237 ); 245 );
238 246
239 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); 247 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
240 $table->add (1, $row++, new CFClient::UI::Slider 248 $table->add (1, $row++, new CFClient::UI::Slider
241 range => [$CFG->{gui_fontsize}, 0.5, 2, 0.1], 249 range => [$CFG->{gui_fontsize}, 0.5, 2, 0.1, 0.1],
242 tooltip => "The font size used by most GUI elements", 250 tooltip => "The font size used by most GUI elements",
243 connect_changed => sub { 251 connect_changed => sub { $CFG->{gui_fontsize} = $_[1] },
244 $CFG->{gui_fontsize} = 0.1 * int $_[1] * 10;
245# $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
246 }
247 ); 252 );
248 253
249 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Server Log Fontsize"); 254 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Server Log Fontsize");
250 $table->add (1, $row++, new CFClient::UI::Slider 255 $table->add (1, $row++, new CFClient::UI::Slider
251 range => [$CFG->{log_fontsize}, 0.5, 2, 0.1], 256 range => [$CFG->{log_fontsize}, 0.5, 2, 0.1, 0.1],
252 tooltip => "The font size used by the server log window only", 257 tooltip => "The font size used by the server log window only",
253 connect_changed => sub { 258 connect_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]) },
254 $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = 0.1 * int $_[1] * 10);
255 }
256 ); 259 );
257 260
258 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize"); 261 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
259 262
260 $table->add (1, $row++, new CFClient::UI::Slider 263 $table->add (1, $row++, new CFClient::UI::Slider
261 range => [$CFG->{stat_fontsize}, 0.5, 2, 0.1], 264 range => [$CFG->{stat_fontsize}, 0.5, 2, 0.1, 0.1],
262 tooltip => "The font size used by the statistics window only", 265 tooltip => "The font size used by the statistics window only",
263 connect_changed => sub { 266 connect_changed => sub {
264 $CFG->{stat_fontsize} = 0.1 * int $_[1] * 10; 267 $CFG->{stat_fontsize} = $_[1];
265 &set_stats_window_fontsize; 268 &set_stats_window_fontsize;
266 } 269 }
267 ); 270 );
268 271
269 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size"); 272 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size");
270 $table->add (1, $row++, new CFClient::UI::Slider 273 $table->add (1, $row++, new CFClient::UI::Slider
271 range => [$CFG->{gauge_size}, 0.2, 0.8, 0.02], 274 range => [$CFG->{gauge_size}, 0.2, 0.8, 0.02],
272 tooltip => "Adjust the size of the stats gauges at the bottom right", 275 tooltip => "Adjust the size of the stats gauges at the bottom right",
273 connect_changed => sub { 276 connect_changed => sub {
274 $CFG->{gauge_size} = $_[1]; 277 $CFG->{gauge_size} = $_[1];
275 my $h = int $HEIGHT * $CFG->{gauge_size}; 278 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
276 $GAUGES->{win}->set_size ($WIDTH, $h);
277 $GAUGES->{win}->move (0, $HEIGHT - $h);
278 } 279 }
279 ); 280 );
280 281
281 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 282 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
282 $table->add (1, $row++, new CFClient::UI::Slider 283 $table->add (1, $row++, new CFClient::UI::Slider
283 range => [$CFG->{gauge_fontsize}, 0.5, 2.0, 0.1], 284 range => [$CFG->{gauge_fontsize}, 0.5, 2.0, 0.1, 0.1],
284 tooltip => "Adjusts the fontsize of the gauges at the bottom right", 285 tooltip => "Adjusts the fontsize of the gauges at the bottom right",
285 connect_changed => sub { 286 connect_changed => sub {
286 $CFG->{gauge_fontsize} = 0.1 * int $_[1] * 10; 287 $CFG->{gauge_fontsize} = $_[1];
287 &set_gauge_window_fontsize; 288 &set_gauge_window_fontsize;
288 } 289 }
289 ); 290 );
290 291
291 $table->add (1, $row++, new CFClient::UI::Button 292 $table->add (1, $row++, new CFClient::UI::Button
… …
365# local $GAUGES->{win}{parent};#d# 366# local $GAUGES->{win}{parent};#d#
366# use PApp::Util; open D, ">:utf8", "d"; print D PApp::Util::dumpval $GAUGES->{win}; close D; 367# use PApp::Util; open D, ">:utf8", "d"; print D PApp::Util::dumpval $GAUGES->{win}; close D;
367} 368}
368 369
369sub make_gauge_window { 370sub make_gauge_window {
370 my $gh = int ($HEIGHT * $CFG->{gauge_size}); 371 my $gh = int $HEIGHT * $CFG->{gauge_size};
371# my $gw = int ($WIDTH * $CFG->{gauge_w_size});
372 372
373 my $win = new CFClient::UI::Frame ( 373 my $win = new CFClient::UI::Frame (
374 y => $HEIGHT - $gh, x => 0, user_w => $WIDTH, user_h => $gh 374 req_y => -1,
375 user_w => $WIDTH,
376 user_h => $gh,
375 ); 377 );
378
376 $win->add (my $hbox = new CFClient::UI::HBox 379 $win->add (my $hbox = new CFClient::UI::HBox
377 children => [ 380 children => [
378 (new CFClient::UI::HBox expand => 1), 381 (new CFClient::UI::HBox expand => 1),
379 ($FLOORBOX = new CFClient::UI::VBox), 382 (new CFClient::UI::VBox children => [
383 (new CFClient::UI::Empty expand => 1),
384 (new CFClient::UI::Frame bg => [0, 0, 0, 0.4], child => ($FLOORBOX = new CFClient::UI::VBox)),
385 ]),
380 (my $vbox = new CFClient::UI::VBox), 386 (my $vbox = new CFClient::UI::VBox),
381 ], 387 ],
382 ); 388 );
383 389
384 $vbox->add (new CFClient::UI::HBox 390 $vbox->add (new CFClient::UI::HBox
… …
661 $HOST->set_text ($CFG->{host} = $host); 667 $HOST->set_text ($CFG->{host} = $host);
662 }), 668 }),
663 (new CFClient::UI::Empty expand => 1), 669 (new CFClient::UI::Empty expand => 1),
664 ]); 670 ]);
665 671
666 $table->add ($_ + 1, $y, new CFClient::UI::Label align => $align[$_], text => $m->[$_], fontsize => 0.8) 672 $table->add ($_ + 1, $y, new CFClient::UI::Label
673 ellipsise => 0, align => $align[$_], text => $m->[$_], fontsize => 0.8)
667 for 0 .. $#$m; 674 for 0 .. $#$m;
668 } 675 }
669 } 676 }
670 }); 677 });
671} 678}
… …
727 ); 734 );
728 735
729 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size"); 736 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
730 $table->add (1, 7, new CFClient::UI::Slider 737 $table->add (1, 7, new CFClient::UI::Slider
731 req_w => 100, 738 req_w => 100,
732 range => [$CFG->{mapsize}, 10, 100 + 1, 1], 739 range => [$CFG->{mapsize}, 10, 100 + 1, 1, 1],
733 tooltip => "This is the size of the portion of the map update the server sends you. " 740 tooltip => "This is the size of the portion of the map update the server sends you. "
734 ."If you set this to a high value you will be able to see further for example.", 741 ."If you set this to a high value you will be able to see further for example.",
735 connect_changed => sub { 742 connect_changed => sub {
736 my ($self, $value) = @_; 743 my ($self, $value) = @_;
737 744
… …
805 812
806 $window 813 $window
807} 814}
808 815
809sub make_inventory_window { 816sub make_inventory_window {
810 my $invwin = new CFClient::UI::FancyFrame user_w => 300, user_h => 300, title => "Inventory"; 817 my $invwin = new CFClient::UI::FancyFrame
818 user_w => $WIDTH * (4/5), user_h => $HEIGHT * (4/5), title => "Inventory";
819
820 $invwin->add (my $hb = new CFClient::UI::HBox);
821
822 $hb->add (my $vb1 = new CFClient::UI::VBox expand => 1);
823 $vb1->add (my $lbl = new CFClient::UI::Label);
824 $lbl->set_text ("Player");
811 $invwin->add ($INV = new CFClient::UI::Inventory expand => 1); 825 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1);
826
827 $hb->add (my $vb2 = new CFClient::UI::VBox expand => 1);
828 $vb2->add ($INVR_LBL = new CFClient::UI::Label);
829 $INVR_LBL->set_text ("Floor");
830 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
831
812 $invwin 832 $invwin
813} 833}
814 834
815sub sdl_init { 835sub sdl_init {
816 CFClient::SDL_Init 836 CFClient::SDL_Init
… …
838 858
839 $CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d# 859 $CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
840 860
841 ############################################################################# 861 #############################################################################
842 862
843 if ($DEBUG_STATUS) { 863 unless ($DEBUG_STATUS) {
844 # reconfigure all widgets
845 $CFClient::UI::ROOT->reconfigure;
846
847 } else {
848 # create the widgets 864 # create the widgets
849 865
850 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100; 866 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, req_x => -1;
851 $DEBUG_STATUS->show; 867 $DEBUG_STATUS->show;
852 868
853 $STATUS_LINE = new CFClient::UI::Label 869 $STATUSBOX = new CFClient::UI::Statusbox;
854 padding => 0, 870 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]);
855 y => $HEIGHT - $FONTSIZE * 1.8;
856 $STATUS_LINE->show;
857 871
858 $ALT_ENTER_MESSAGE = new CFClient::UI::Label 872 (new CFClient::UI::Frame
859 padding => 0, 873 bg => [0, 0, 0, 0.4],
860 fontsize => 0.8, 874 req_y => -1,
861 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode"; 875 child => $STATUSBOX,
862 $ALT_ENTER_MESSAGE->show; 876 )->show;
863 $ALT_ENTER_MESSAGE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h});
864 877
865 CFClient::UI::FancyFrame->new ( 878 CFClient::UI::FancyFrame->new (
866 border_bg => [1, 1, 1, 192/255], 879 border_bg => [1, 1, 1, 192/255],
867 bg => [1, 1, 1, 0], 880 bg => [1, 1, 1, 0],
868 child => ($MAPMAP = new CFClient::MapWidget::MapMap), 881 child => ($MAPMAP = new CFClient::MapWidget::MapMap),
… …
900 status "Configuration Saved"; 913 status "Configuration Saved";
901 }); 914 });
902 915
903 $BUTTONBAR->show; 916 $BUTTONBAR->show;
904 917
918 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
919
920 # delay till geometry is constant
921 $CFClient::UI::ROOT->on_post_alloc (startup => sub {
905 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup 922 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
923 my $widget = $GAUGES->{win};
924 $widget->move (0, $HEIGHT - $widget->{h});#d# to in toplevel
925 });
926 force_refresh ();
906 } 927 }
907} 928}
908 929
909sub video_shutdown { 930sub video_shutdown {
910 undef $SDL_ACTIVE; 931 undef $SDL_ACTIVE;
… …
966} 987}
967 988
968my %animate_object; 989my %animate_object;
969my $animate_timer; 990my $animate_timer;
970 991
971my $want_refresh;
972my $can_refresh;
973
974my $fps = 9; 992my $fps = 9;
975 993
976sub force_refresh { 994sub force_refresh {
977 $fps = $fps * 0.95 + 1 / ($NOW - $LAST_REFRESH) * 0.05; 995 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
978 debug sprintf "%3.2f", $fps; 996 debug sprintf "%3.2f", $fps;
979 997
980 $want_refresh = 0;
981 $can_refresh = 0;
982
983 $CFClient::UI::ROOT->draw; 998 $CFClient::UI::ROOT->draw;
984
985 CFClient::SDL_GL_SwapBuffers; 999 CFClient::SDL_GL_SwapBuffers;
986 1000
1001 $WANT_REFRESH = 0;
1002 $CAN_REFRESH = 0;
987 $LAST_REFRESH = $NOW; 1003 $LAST_REFRESH = $NOW;
988} 1004}
989 1005
990my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub { 1006my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub {
991 $NOW = time; 1007 $NOW = time;
… …
993 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 1009 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
994 for CFClient::SDL_PollEvent; 1010 for CFClient::SDL_PollEvent;
995 1011
996 if (%animate_object) { 1012 if (%animate_object) {
997 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 1013 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
998 $want_refresh++; 1014 $WANT_REFRESH++;
999 } 1015 }
1000 1016
1001 if ($want_refresh) { 1017 if ($WANT_REFRESH) {
1002 force_refresh; 1018 force_refresh;
1003 } else { 1019 } else {
1004 $can_refresh = 1; 1020 $CAN_REFRESH = 1;
1005 } 1021 }
1006}); 1022});
1007
1008sub refresh {
1009 $want_refresh++;
1010}
1011 1023
1012sub animation_start { 1024sub animation_start {
1013 my ($widget) = @_; 1025 my ($widget) = @_;
1014 $animate_object{$widget} = $widget; 1026 $animate_object{$widget} = $widget;
1015} 1027}
… …
1021 1033
1022@conn::ISA = Crossfire::Protocol::; 1034@conn::ISA = Crossfire::Protocol::;
1023 1035
1024sub conn::stats_update { 1036sub conn::stats_update {
1025 my ($self, $stats) = @_; 1037 my ($self, $stats) = @_;
1038
1039 if (my $exp = $stats->{Crossfire::Protocol::CS_STAT_EXP64}) {
1040 my $diff = $exp - $self->{prev_exp};
1041 $STATUSBOX->add ("$diff experience gained", group => "experience $diff", fg => [0.5, 1, 0.5, 0.8], timeout => 5)
1042 if exists $self->{prev_exp} && $diff;
1043 $self->{prev_exp} = $exp;
1044 }
1026 1045
1027 update_stats_window ($stats); 1046 update_stats_window ($stats);
1028} 1047}
1029 1048
1030sub conn::user_send { 1049sub conn::user_send {
… …
1327 [0.55, 0.41, 0.13], 1346 [0.55, 0.41, 0.13],
1328 [0.99, 0.77, 0.26], 1347 [0.99, 0.77, 0.26],
1329 [0.74, 0.65, 0.41], 1348 [0.74, 0.65, 0.41],
1330 ); 1349 );
1331 1350
1351 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
1352
1353 $text = CFClient::UI::Label::escape $text;
1354 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
1355 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
1356
1332 $LOGVIEW->add_paragraph ($color[$color], $text); 1357 $LOGVIEW->add_paragraph ($color[$color],
1358 join "\n", map "$time $_", split /\n/, $text);
1359
1360 $STATUSBOX->add ($text,
1361 group => $text,
1362 fg => $color[$color],
1363 timeout => 60,
1364 tooltip_font => $::FONT_FIXED,
1365 );
1366}
1367
1368sub conn::drawextinfo {
1369 my ($self, $color, $type, $subtype, $message) = @_;
1370
1371 $self->drawinfo ($color, $message);
1333} 1372}
1334 1373
1335sub conn::spell_add { 1374sub conn::spell_add {
1336 my ($self, $spell) = @_; 1375 my ($self, $spell) = @_;
1337 1376
1338 # TODO 1377 # TODO
1339 # create a widget dynamically, using spell face (CF::Protocol downloads them) 1378 # create a widget dynamically, using spell face (CF::Protocol downloads them)
1340 $MAPWIDGET->add_command ("invoke $spell->{name}", $spell->{message}); 1379 $MAPWIDGET->add_command ("invoke $spell->{name}", CFClient::UI::Label::escape $spell->{message});
1341 $MAPWIDGET->add_command ("cast $spell->{name}", $spell->{message}); 1380 $MAPWIDGET->add_command ("cast $spell->{name}", CFClient::UI::Label::escape $spell->{message});
1342} 1381}
1343 1382
1344sub conn::spell_delete { 1383sub conn::spell_delete {
1345 my ($self, $spell) = @_; 1384 my ($self, $spell) = @_;
1346} 1385}
1347 1386
1348sub conn::addme_success { 1387sub conn::addme_success {
1349 my ($self) = @_; 1388 my ($self) = @_;
1350 1389
1390 $MAPWIDGET->clr_commands;
1391
1351 for my $skill (values %{$self->{skill_info}}) { 1392 for my $skill (values %{$self->{skill_info}}) {
1352 $MAPWIDGET->add_command ("ready_skill $skill", "Ready the skill '$skill'"); 1393 $MAPWIDGET->add_command ("ready_skill $skill", CFClient::UI::Label::escape "Ready the skill '$skill'");
1353 $MAPWIDGET->add_command ("use_skill $skill", "Immediately use the skill '$skill'"); 1394 $MAPWIDGET->add_command ("use_skill $skill", CFClient::UI::Label::escape "Immediately use the skill '$skill'");
1354 } 1395 }
1355 1396
1356 $MAPWIDGET->add_command ("pet\\_mode defend", "Tell pets to stay close to you and defend you"); 1397 $MAPWIDGET->add_command ("petmode defend", "Tell pets to stay close to you and defend you");
1357 $MAPWIDGET->add_command ("pet\\_mode arena", "Same as petmode attack, but also attack other players"); 1398 $MAPWIDGET->add_command ("petmode arena", "Same as petmode sad, but also attack other players");
1358 $MAPWIDGET->add_command ("pet\\_mode sad", "Search &amp; Destroy - tell pets to roam about and attack enemies"); 1399 $MAPWIDGET->add_command ("petmode sad", "Search &amp; Destroy - tell pets to roam about and attack enemies");
1359 $MAPWIDGET->add_command ("kill\\_pets", "kill your pets"); 1400 $MAPWIDGET->add_command ("killpets", "Kill your pets");
1401 $MAPWIDGET->add_command ("chat", "chat TEXT\nChat with all other players");
1402 $MAPWIDGET->add_command ("shout", "shout TEXT\nShout loudly, used for emergencies");
1403 $MAPWIDGET->add_command ("tell", "tell USERNAME TEXT\nPrivately tell a specific player");
1404
1405 my $parser = new Pod::POM;
1406 my $pod = $parser->parse_file (CFClient::find_rcfile "pod/command_help.pod");
1407
1408 for my $head2 ($pod->head2) {
1409 $head2->title =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
1410 or next;
1411
1412 my $cmd = $1;
1413 my @args = split /\|/, $2;
1414 @args = (".*") unless @args;
1415
1416 my $text = CFClient::pod_to_pango $head2;
1417
1418 for my $arg (@args) {
1419 $arg = $arg eq ".*" ? "" : " $arg";
1420
1421 $MAPWIDGET->add_command ("$cmd$arg", $text);
1422 }
1423 }
1360} 1424}
1361 1425
1362sub conn::eof { 1426sub conn::eof {
1427 $MAPWIDGET->clr_commands;
1428
1363 stop_game; 1429 stop_game;
1364} 1430}
1365 1431
1366sub update_floorbox { 1432sub update_floorbox {
1367 $CFClient::UI::ROOT->on_refresh ($FLOORBOX => sub { 1433 $CFClient::UI::ROOT->on_refresh ($FLOORBOX => sub {
1368 return unless $CONN; 1434 return unless $CONN;
1369 1435
1370 $FLOORBOX->clear; 1436 $FLOORBOX->clear;
1371 $FLOORBOX->add (new CFClient::UI::Empty expand => 1); 1437 $FLOORBOX->add (new CFClient::UI::Empty expand => 1);
1372 1438
1373 # we basically have to use the same sorting as everybody else 1439 my $count = 4;
1374 $FLOORBOX->add ( 1440 for (@{ $CONN->{container}{0} }) {
1441 if (--$count) {
1375 map +(new CFClient::UI::InventoryItem item => $_), 1442 $FLOORBOX->add (new CFClient::UI::InventoryItem item => $_);
1376 @{ $CONN->{container}{0} } 1443 } else {
1444 $FLOORBOX->add (new CFClient::UI::Label text => "More...");
1445 last;
1446 }
1377 ); 1447 }
1378 }); 1448 });
1379 refresh; 1449
1450 $WANT_REFRESH++;
1380} 1451}
1381 1452
1382sub conn::container_add { 1453sub conn::container_add {
1383 my ($self, $tag, $items) = @_; 1454 my ($self, $tag, $items) = @_;
1384 1455
1385 update_floorbox if $tag == 0; 1456 #d# print "container_add: container $tag ($self->{player}{tag})\n";
1386 1457
1458 if ($tag == 0) {
1459 update_floorbox;
1460 $OPENCONT = 0;
1461 $INVR_LBL->set_text ("Floor");
1462 $INVR->set_items ($self->{container}{0});
1463 } elsif ($tag == $self->{player}{tag}) {
1464 $INVR_LBL->set_text ("Player");
1387 $INV->set_items ($self->{container}{$self->{player}{tag}}) 1465 $INV->set_items ($self->{container}{$self->{player}{tag}})
1388 if $tag == $self->{player}{tag}; 1466 } else {
1467 $OPENCONT = $tag;
1468 $INVR_LBL->set_text (CFClient::UI::InventoryItem::_item_to_desc ($self->{item}->{$OPENCONT}));
1469 $INVR->set_items ($self->{container}{$tag});
1470 }
1389 1471
1390 # $self-<{player}{tag} => player inv 1472 # $self-<{player}{tag} => player inv
1391 #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}}; 1473 #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}};
1392} 1474}
1393 1475
1394sub conn::container_clear { 1476sub conn::container_clear {
1395 my ($self, $tag) = @_; 1477 my ($self, $tag) = @_;
1396 1478
1397 update_floorbox if $tag == 0; 1479 #d# print "container_clear: container $tag ($self->{player}{tag})\n";
1398 1480
1481 if ($tag == 0) {
1482 update_floorbox;
1483 $OPENCONT = 0;
1484 $INVR_LBL->set_text ("Floor");
1485 $INVR->set_items ($self->{container}{0});
1486 } elsif ($tag == $self->{player}{tag}) {
1487 $INVR_LBL->set_text ("Player");
1399 $INV->set_items ($self->{container}{$tag}) 1488 $INV->set_items ($self->{container}{$tag})
1400 if $tag == $self->{player}{tag}; 1489 } else {
1490 $OPENCONT = $tag;
1491 $INVR_LBL->set_text (CFClient::UI::InventoryItem::_item_to_desc ($self->{item}->{$OPENCONT}));
1492 $INVR->set_items ($self->{container}{$tag});
1493 }
1401 1494
1402# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0}; 1495# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0};
1403} 1496}
1404 1497
1405sub conn::item_delete { 1498sub conn::item_delete {
1406 my ($self, @items) = @_; 1499 my ($self, @items) = @_;
1407 1500
1408 for (@items) { 1501 for (@items) {
1409 update_floorbox if $_->{container} == 0; 1502 #d# print "item_delete: $_->{tag} from $_->{container} ($self->{player}{tag})\n";
1410 1503
1504 if ($_->{container} == 0) {
1505 update_floorbox;
1506 $OPENCONT = 0;
1507 $INVR_LBL->set_text ("Floor");
1508 $INVR->set_items ($self->{container}{0});
1509 } elsif ($_->{container} == $self->{player}{tag}) {
1510 $INVR_LBL->set_text ("Player");
1511 $INV->set_items ($self->{container}{$self->{player}{tag}})
1512 } else {
1513 $OPENCONT = $_->{container};
1514 $INVR_LBL->set_text (CFClient::UI::InventoryItem::_item_to_desc ($self->{item}->{$OPENCONT}));
1411 $INV->set_items ($self->{container}{$_->{container}}) 1515 $INVR->set_items ($self->{container}{$_->{container}});
1412 if $_->{container} == $self->{player}{tag}; 1516 }
1413 } 1517 }
1414} 1518}
1415 1519
1416sub conn::item_update { 1520sub conn::item_update {
1417 my ($self, $item) = @_; 1521 my ($self, $item) = @_;
1418 1522
1419 update_floorbox if $item->{container} == 0; 1523 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($OPENCONT)\n";
1420 1524
1525 if ($item->{tag} == $OPENCONT && not ($item->{flags} & Crossfire::Protocol::F_OPEN)) {
1526 $OPENCONT = 0;
1527 $INVR_LBL->set_text ("Floor");
1528 $INVR->set_items ($self->{container}{0});
1529
1530 $item->{widget}->update_item
1531 if $item->{widget};
1532 } else {
1533 if ($item->{container} == 0) {
1534 update_floorbox;
1535 $OPENCONT = 0;
1536 $INVR_LBL->set_text ("Floor");
1537 $INVR->set_items ($self->{container}{0});
1538 } elsif ($item->{container} == $self->{player}{tag}) {
1421 $INV->set_items ($self->{container}{$item->{container}}) 1539 $INV->set_items ($self->{container}{$item->{container}})
1422 if $item->{container} == $self->{player}{tag}; 1540 }
1541 }
1423} 1542}
1424 1543
1425%SDL_CB = ( 1544%SDL_CB = (
1426 CFClient::SDL_QUIT => sub { 1545 CFClient::SDL_QUIT => sub {
1427 Event::unloop -1; 1546 Event::unloop -1;
1428 }, 1547 },
1429 CFClient::SDL_VIDEORESIZE => sub { 1548 CFClient::SDL_VIDEORESIZE => sub {
1430 }, 1549 },
1431 CFClient::SDL_VIDEOEXPOSE => \&refresh, 1550 CFClient::SDL_VIDEOEXPOSE => sub {
1551 $WANT_REFRESH++;
1552 },
1432 CFClient::SDL_ACTIVEEVENT => sub { 1553 CFClient::SDL_ACTIVEEVENT => sub {
1433# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 1554# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
1434 }, 1555 },
1435 CFClient::SDL_KEYDOWN => sub { 1556 CFClient::SDL_KEYDOWN => sub {
1436 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) { 1557 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {
… …
1477 fow_enable => 1, 1598 fow_enable => 1,
1478 fow_intensity => 0.45, 1599 fow_intensity => 0.45,
1479 fow_smooth => 0, 1600 fow_smooth => 0,
1480 gui_fontsize => 1, 1601 gui_fontsize => 1,
1481 log_fontsize => 1, 1602 log_fontsize => 1,
1482 gauge_fontsize => 1, 1603 gauge_fontsize=> 1,
1483 gauge_size => 0.35, 1604 gauge_size => 0.35,
1484 stat_fontsize => 1, 1605 stat_fontsize => 1,
1485 mapsize => 100, 1606 mapsize => 100,
1486 host => "crossfire.schmorp.de", 1607 host => "crossfire.schmorp.de",
1487 say_command => 'say', 1608 say_command => 'say',
1488 audio_enable => 1, 1609 audio_enable => 1,
… …
1516 DejaVuSansMono-BoldOblique.ttf 1637 DejaVuSansMono-BoldOblique.ttf
1517 ); 1638 );
1518 1639
1519 CFClient::add_font $_ for @fonts; 1640 CFClient::add_font $_ for @fonts;
1520 1641
1642 CFClient::pango_init;
1643
1521 $FONT_PROP = new_from_file CFClient::Font $fonts[0]; 1644 $FONT_PROP = new_from_file CFClient::Font $fonts[0];
1522 $FONT_FIXED = new_from_file CFClient::Font $fonts[1]; 1645 $FONT_FIXED = new_from_file CFClient::Font $fonts[1];
1523 1646
1524 $FONT_PROP->make_default; 1647 $FONT_PROP->make_default;
1525 } 1648 }
1649
1650# compare mono (ft) vs. rgba (cairo)
1651# ft - 1.8s, cairo 3s, even in alpha-only mode
1652# for my $rgba (0..1) {
1653# my $t1 = Time::HiRes::time;
1654# for (1..1000) {
1655# my $layout = CFClient::Layout->new ($rgba);
1656# $layout->set_text ("hallo" x 100);
1657# $layout->render;
1658# }
1659# my $t2 = Time::HiRes::time;
1660# warn $t2-$t1;
1661# }
1526 1662
1527 video_init; 1663 video_init;
1528 audio_init; 1664 audio_init;
1529} 1665}
1530 1666

Diff Legend

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