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.213 by root, Sun May 14 20:51:20 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
… …
99our $STATUSBOX; 100our $STATUSBOX;
100our $DEBUG_STATUS; 101our $DEBUG_STATUS;
101 102
102our $INVWIN; 103our $INVWIN;
103our $INV; 104our $INV;
105our $INVR;
106our $INVR_LBL;
107our $OPENCONT;
104 108
105sub status { 109sub status {
106 $STATUSBOX->add ($_[0], pri => -10, group => "status", timeout => 20, color => [1, 1, 0, 1]); 110 $STATUSBOX->add ($_[0], pri => -10, group => "status", timeout => 20, fg => [1, 1, 0, 1]);
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 });
111} 111}
112 112
113sub debug { 113sub debug {
114 $DEBUG_STATUS->set_text ($_[0]); 114 $DEBUG_STATUS->set_text ($_[0]);
115 my ($w, $h) = $DEBUG_STATUS->size_request; 115 my ($w, $h) = $DEBUG_STATUS->size_request;
… …
168 $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]);
169 169
170 $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");
171 $table->add (1, 0, my $hbox = new CFClient::UI::HBox); 171 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
172 172
173 $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]);
174 $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");
175 175
176 $mode_slider->connect (changed => sub { 176 $mode_slider->connect (changed => sub {
177 my ($self, $value) = @_; 177 my ($self, $value) = @_;
178 178
… …
203 } 203 }
204 ); 204 );
205 205
206 $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");
207 $table->add (1, $row++, new CFClient::UI::Slider 207 $table->add (1, $row++, new CFClient::UI::Slider
208 range => [$CFG->{map_scale}, 0.25, 2, 0.05], 208 range => [$CFG->{map_scale}, 0.25, 2, 0.05, 0.05],
209 tooltip => "Enlarge or shrink the displayed map", 209 tooltip => "Enlarge or shrink the displayed map",
210 connect_changed => sub { 210 connect_changed => sub {
211 my ($self, $value) = @_; 211 my ($self, $value) = @_;
212 $CFG->{map_scale} = 0.05 * int $value / 0.05; 212 $CFG->{map_scale} = $value;
213 } 213 }
214 ); 214 );
215 215
216 $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");
217 $table->add (1, $row++, new CFClient::UI::CheckBox 217 $table->add (1, $row++, new CFClient::UI::CheckBox
… …
244 } 244 }
245 ); 245 );
246 246
247 $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");
248 $table->add (1, $row++, new CFClient::UI::Slider 248 $table->add (1, $row++, new CFClient::UI::Slider
249 range => [$CFG->{gui_fontsize}, 0.5, 2, 0.1], 249 range => [$CFG->{gui_fontsize}, 0.5, 2, 0.1, 0.1],
250 tooltip => "The font size used by most GUI elements", 250 tooltip => "The font size used by most GUI elements",
251 connect_changed => sub { 251 connect_changed => sub { $CFG->{gui_fontsize} = $_[1] },
252 $CFG->{gui_fontsize} = 0.1 * int $_[1] * 10;
253# $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
254 }
255 ); 252 );
256 253
257 $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");
258 $table->add (1, $row++, new CFClient::UI::Slider 255 $table->add (1, $row++, new CFClient::UI::Slider
259 range => [$CFG->{log_fontsize}, 0.5, 2, 0.1], 256 range => [$CFG->{log_fontsize}, 0.5, 2, 0.1, 0.1],
260 tooltip => "The font size used by the server log window only", 257 tooltip => "The font size used by the server log window only",
261 connect_changed => sub { 258 connect_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]) },
262 $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = 0.1 * int $_[1] * 10);
263 }
264 ); 259 );
265 260
266 $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");
267 262
268 $table->add (1, $row++, new CFClient::UI::Slider 263 $table->add (1, $row++, new CFClient::UI::Slider
269 range => [$CFG->{stat_fontsize}, 0.5, 2, 0.1], 264 range => [$CFG->{stat_fontsize}, 0.5, 2, 0.1, 0.1],
270 tooltip => "The font size used by the statistics window only", 265 tooltip => "The font size used by the statistics window only",
271 connect_changed => sub { 266 connect_changed => sub {
272 $CFG->{stat_fontsize} = 0.1 * int $_[1] * 10; 267 $CFG->{stat_fontsize} = $_[1];
273 &set_stats_window_fontsize; 268 &set_stats_window_fontsize;
274 } 269 }
275 ); 270 );
276 271
277 $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");
278 $table->add (1, $row++, new CFClient::UI::Slider 273 $table->add (1, $row++, new CFClient::UI::Slider
279 range => [$CFG->{gauge_size}, 0.2, 0.8, 0.02], 274 range => [$CFG->{gauge_size}, 0.2, 0.8, 0.02],
280 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",
281 connect_changed => sub { 276 connect_changed => sub {
282 $CFG->{gauge_size} = $_[1]; 277 $CFG->{gauge_size} = $_[1];
283 my $h = int $HEIGHT * $CFG->{gauge_size}; 278 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
284 $GAUGES->{win}->set_size ($WIDTH, $h);
285 $GAUGES->{win}->move (0, $HEIGHT - $h);
286 } 279 }
287 ); 280 );
288 281
289 $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");
290 $table->add (1, $row++, new CFClient::UI::Slider 283 $table->add (1, $row++, new CFClient::UI::Slider
291 range => [$CFG->{gauge_fontsize}, 0.5, 2.0, 0.1], 284 range => [$CFG->{gauge_fontsize}, 0.5, 2.0, 0.1, 0.1],
292 tooltip => "Adjusts the fontsize of the gauges at the bottom right", 285 tooltip => "Adjusts the fontsize of the gauges at the bottom right",
293 connect_changed => sub { 286 connect_changed => sub {
294 $CFG->{gauge_fontsize} = 0.1 * int $_[1] * 10; 287 $CFG->{gauge_fontsize} = $_[1];
295 &set_gauge_window_fontsize; 288 &set_gauge_window_fontsize;
296 } 289 }
297 ); 290 );
298 291
299 $table->add (1, $row++, new CFClient::UI::Button 292 $table->add (1, $row++, new CFClient::UI::Button
… …
373# local $GAUGES->{win}{parent};#d# 366# local $GAUGES->{win}{parent};#d#
374# 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;
375} 368}
376 369
377sub make_gauge_window { 370sub make_gauge_window {
378 my $gh = int ($HEIGHT * $CFG->{gauge_size}); 371 my $gh = int $HEIGHT * $CFG->{gauge_size};
379# my $gw = int ($WIDTH * $CFG->{gauge_w_size});
380 372
381 my $win = new CFClient::UI::Frame ( 373 my $win = new CFClient::UI::Frame (
382 y => $HEIGHT - $gh, x => 0, user_w => $WIDTH, user_h => $gh 374 req_y => -1,
375 user_w => $WIDTH,
376 user_h => $gh,
383 ); 377 );
378
384 $win->add (my $hbox = new CFClient::UI::HBox 379 $win->add (my $hbox = new CFClient::UI::HBox
385 children => [ 380 children => [
386 (new CFClient::UI::HBox expand => 1), 381 (new CFClient::UI::HBox expand => 1),
387 (new CFClient::UI::VBox children => [ 382 (new CFClient::UI::VBox children => [
388 (new CFClient::UI::Empty expand => 1), 383 (new CFClient::UI::Empty expand => 1),
… …
672 $HOST->set_text ($CFG->{host} = $host); 667 $HOST->set_text ($CFG->{host} = $host);
673 }), 668 }),
674 (new CFClient::UI::Empty expand => 1), 669 (new CFClient::UI::Empty expand => 1),
675 ]); 670 ]);
676 671
677 $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)
678 for 0 .. $#$m; 674 for 0 .. $#$m;
679 } 675 }
680 } 676 }
681 }); 677 });
682} 678}
… …
738 ); 734 );
739 735
740 $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");
741 $table->add (1, 7, new CFClient::UI::Slider 737 $table->add (1, 7, new CFClient::UI::Slider
742 req_w => 100, 738 req_w => 100,
743 range => [$CFG->{mapsize}, 10, 100 + 1, 1], 739 range => [$CFG->{mapsize}, 10, 100 + 1, 1, 1],
744 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. "
745 ."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.",
746 connect_changed => sub { 742 connect_changed => sub {
747 my ($self, $value) = @_; 743 my ($self, $value) = @_;
748 744
… …
816 812
817 $window 813 $window
818} 814}
819 815
820sub make_inventory_window { 816sub make_inventory_window {
821 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");
822 $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
823 $invwin 832 $invwin
824} 833}
825 834
826sub sdl_init { 835sub sdl_init {
827 CFClient::SDL_Init 836 CFClient::SDL_Init
… …
852 ############################################################################# 861 #############################################################################
853 862
854 unless ($DEBUG_STATUS) { 863 unless ($DEBUG_STATUS) {
855 # create the widgets 864 # create the widgets
856 865
857 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100; 866 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, req_x => -1;
858 $DEBUG_STATUS->show; 867 $DEBUG_STATUS->show;
859 868
860 $STATUSBOX = new CFClient::UI::Statusbox; 869 $STATUSBOX = new CFClient::UI::Statusbox;
861 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, size => 0.8, color => [1, 1, 1, 0.8]); 870 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]);
862 871
863 (new CFClient::UI::Frame 872 (new CFClient::UI::Frame
864 bg => [0, 0, 0, 0.4], 873 bg => [0, 0, 0, 0.4],
874 req_y => -1,
865 child => $STATUSBOX, 875 child => $STATUSBOX,
866 )->show; 876 )->show;
867 877
868 CFClient::UI::FancyFrame->new ( 878 CFClient::UI::FancyFrame->new (
869 border_bg => [1, 1, 1, 192/255], 879 border_bg => [1, 1, 1, 192/255],
870 bg => [1, 1, 1, 0], 880 bg => [1, 1, 1, 0],
… …
903 status "Configuration Saved"; 913 status "Configuration Saved";
904 }); 914 });
905 915
906 $BUTTONBAR->show; 916 $BUTTONBAR->show;
907 917
918 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
919
908 # delay till geometry is constant 920 # delay till geometry is constant
909 $CFClient::UI::ROOT->on_post_alloc (startup => sub { 921 $CFClient::UI::ROOT->on_post_alloc (startup => sub {
910 $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
911 }); 925 });
912 force_refresh (); 926 force_refresh ();
913 } 927 }
914} 928}
915 929
… …
976my $animate_timer; 990my $animate_timer;
977 991
978my $fps = 9; 992my $fps = 9;
979 993
980sub force_refresh { 994sub force_refresh {
981 $fps = $fps * 0.95 + 1 / ($NOW - $LAST_REFRESH) * 0.05; 995 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
982 debug sprintf "%3.2f", $fps; 996 debug sprintf "%3.2f", $fps;
983 997
984 $CFClient::UI::ROOT->draw; 998 $CFClient::UI::ROOT->draw;
985 CFClient::SDL_GL_SwapBuffers; 999 CFClient::SDL_GL_SwapBuffers;
986 1000
… …
1019 1033
1020@conn::ISA = Crossfire::Protocol::; 1034@conn::ISA = Crossfire::Protocol::;
1021 1035
1022sub conn::stats_update { 1036sub conn::stats_update {
1023 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 }
1024 1045
1025 update_stats_window ($stats); 1046 update_stats_window ($stats);
1026} 1047}
1027 1048
1028sub conn::user_send { 1049sub conn::user_send {
… …
1327 [0.74, 0.65, 0.41], 1348 [0.74, 0.65, 0.41],
1328 ); 1349 );
1329 1350
1330 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0]; 1351 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
1331 1352
1332 $text =~ s/&/&amp;/g; $text =~ s/</&lt;/g; 1353 $text = CFClient::UI::Label::escape $text;
1333 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; 1354 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
1334 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g; 1355 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
1335 1356
1336 $LOGVIEW->add_paragraph ($color[$color], 1357 $LOGVIEW->add_paragraph ($color[$color],
1337 join "\n", map "$time $_", split /\n/, $text); 1358 join "\n", map "$time $_", split /\n/, $text);
1338 1359
1339 $STATUSBOX->add ($text, 1360 $STATUSBOX->add ($text,
1340 group => $text, 1361 group => $text,
1341 color => $color[$color], 1362 fg => $color[$color],
1342 timeout => 60, 1363 timeout => 60,
1343 tooltip_font => $::FONT_FIXED, 1364 tooltip_font => $::FONT_FIXED,
1344 ); 1365 );
1345} 1366}
1346 1367
… …
1353sub conn::spell_add { 1374sub conn::spell_add {
1354 my ($self, $spell) = @_; 1375 my ($self, $spell) = @_;
1355 1376
1356 # TODO 1377 # TODO
1357 # create a widget dynamically, using spell face (CF::Protocol downloads them) 1378 # create a widget dynamically, using spell face (CF::Protocol downloads them)
1358 $MAPWIDGET->add_command ("invoke $spell->{name}", $spell->{message}); 1379 $MAPWIDGET->add_command ("invoke $spell->{name}", CFClient::UI::Label::escape $spell->{message});
1359 $MAPWIDGET->add_command ("cast $spell->{name}", $spell->{message}); 1380 $MAPWIDGET->add_command ("cast $spell->{name}", CFClient::UI::Label::escape $spell->{message});
1360} 1381}
1361 1382
1362sub conn::spell_delete { 1383sub conn::spell_delete {
1363 my ($self, $spell) = @_; 1384 my ($self, $spell) = @_;
1364} 1385}
1365 1386
1366sub conn::addme_success { 1387sub conn::addme_success {
1367 my ($self) = @_; 1388 my ($self) = @_;
1368 1389
1390 $MAPWIDGET->clr_commands;
1391
1369 for my $skill (values %{$self->{skill_info}}) { 1392 for my $skill (values %{$self->{skill_info}}) {
1370 $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'");
1371 $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'");
1372 } 1395 }
1373 1396
1374 $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");
1375 $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");
1376 $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");
1377 $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 }
1378} 1424}
1379 1425
1380sub conn::eof { 1426sub conn::eof {
1427 $MAPWIDGET->clr_commands;
1428
1381 stop_game; 1429 stop_game;
1382} 1430}
1383 1431
1384sub update_floorbox { 1432sub update_floorbox {
1385 $CFClient::UI::ROOT->on_refresh ($FLOORBOX => sub { 1433 $CFClient::UI::ROOT->on_refresh ($FLOORBOX => sub {
… …
1403} 1451}
1404 1452
1405sub conn::container_add { 1453sub conn::container_add {
1406 my ($self, $tag, $items) = @_; 1454 my ($self, $tag, $items) = @_;
1407 1455
1408 update_floorbox if $tag == 0; 1456 #d# print "container_add: container $tag ($self->{player}{tag})\n";
1409 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");
1410 $INV->set_items ($self->{container}{$self->{player}{tag}}) 1465 $INV->set_items ($self->{container}{$self->{player}{tag}})
1411 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 }
1412 1471
1413 # $self-<{player}{tag} => player inv 1472 # $self-<{player}{tag} => player inv
1414 #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}};
1415} 1474}
1416 1475
1417sub conn::container_clear { 1476sub conn::container_clear {
1418 my ($self, $tag) = @_; 1477 my ($self, $tag) = @_;
1419 1478
1420 update_floorbox if $tag == 0; 1479 #d# print "container_clear: container $tag ($self->{player}{tag})\n";
1421 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");
1422 $INV->set_items ($self->{container}{$tag}) 1488 $INV->set_items ($self->{container}{$tag})
1423 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 }
1424 1494
1425# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0}; 1495# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0};
1426} 1496}
1427 1497
1428sub conn::item_delete { 1498sub conn::item_delete {
1429 my ($self, @items) = @_; 1499 my ($self, @items) = @_;
1430 1500
1431 for (@items) { 1501 for (@items) {
1432 update_floorbox if $_->{container} == 0; 1502 #d# print "item_delete: $_->{tag} from $_->{container} ($self->{player}{tag})\n";
1433 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}));
1434 $INV->set_items ($self->{container}{$_->{container}}) 1515 $INVR->set_items ($self->{container}{$_->{container}});
1435 if $_->{container} == $self->{player}{tag}; 1516 }
1436 } 1517 }
1437} 1518}
1438 1519
1439sub conn::item_update { 1520sub conn::item_update {
1440 my ($self, $item) = @_; 1521 my ($self, $item) = @_;
1441 1522
1442 update_floorbox if $item->{container} == 0; 1523 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($OPENCONT)\n";
1443 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}) {
1444 $INV->set_items ($self->{container}{$item->{container}}) 1539 $INV->set_items ($self->{container}{$item->{container}})
1445 if $item->{container} == $self->{player}{tag}; 1540 }
1541 }
1446} 1542}
1447 1543
1448%SDL_CB = ( 1544%SDL_CB = (
1449 CFClient::SDL_QUIT => sub { 1545 CFClient::SDL_QUIT => sub {
1450 Event::unloop -1; 1546 Event::unloop -1;
… …
1541 DejaVuSansMono-BoldOblique.ttf 1637 DejaVuSansMono-BoldOblique.ttf
1542 ); 1638 );
1543 1639
1544 CFClient::add_font $_ for @fonts; 1640 CFClient::add_font $_ for @fonts;
1545 1641
1642 CFClient::pango_init;
1643
1546 $FONT_PROP = new_from_file CFClient::Font $fonts[0]; 1644 $FONT_PROP = new_from_file CFClient::Font $fonts[0];
1547 $FONT_FIXED = new_from_file CFClient::Font $fonts[1]; 1645 $FONT_FIXED = new_from_file CFClient::Font $fonts[1];
1548 1646
1549 $FONT_PROP->make_default; 1647 $FONT_PROP->make_default;
1550 } 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# }
1551 1662
1552 video_init; 1663 video_init;
1553 audio_init; 1664 audio_init;
1554} 1665}
1555 1666

Diff Legend

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