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.186 by root, Tue Apr 25 12:10:58 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;
… …
70 75
71our $FONT_PROP; 76our $FONT_PROP;
72our $FONT_FIXED; 77our $FONT_FIXED;
73 78
74our $MAP; 79our $MAP;
80our $MAPMAP;
75our $MAPWIDGET; 81our $MAPWIDGET;
76our $BUTTONBAR; 82our $BUTTONBAR;
77our $LOGVIEW; 83our $LOGVIEW;
78our $CONSOLE; 84our $CONSOLE;
79our $METASERVER; 85our $METASERVER;
86our $LOGIN_BUTTON;
80 87
81our $FLOORBOX; 88our $FLOORBOX;
82our $GAUGES; 89our $GAUGES;
83our $STATWIDS; 90our $STATWIDS;
84 91
… …
88our $SDL_MIXER; 95our $SDL_MIXER;
89our @SOUNDS; # event => file mapping 96our @SOUNDS; # event => file mapping
90our %AUDIO_CHUNKS; # audio files 97our %AUDIO_CHUNKS; # audio files
91 98
92our $ALT_ENTER_MESSAGE; 99our $ALT_ENTER_MESSAGE;
93our $STATUS_LINE; 100our $STATUSBOX;
94our $DEBUG_STATUS; 101our $DEBUG_STATUS;
95 102
103our $INVWIN;
104our $INV;
105our $INVR;
106our $INVR_LBL;
107our $OPENCONT;
108
96sub status { 109sub status {
97 $STATUS_LINE->set_text ($_[0]); 110 $STATUSBOX->add ($_[0], pri => -10, group => "status", timeout => 20, fg => [1, 1, 0, 1]);
98 $STATUS_LINE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $STATUS_LINE->{h});
99} 111}
100 112
101sub debug { 113sub debug {
102 $DEBUG_STATUS->set_text ($_[0]); 114 $DEBUG_STATUS->set_text ($_[0]);
103 $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);
104} 117}
105 118
106sub start_game { 119sub start_game {
107 status "logging in..."; 120 status "logging in...";
108 121
109 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;
110 123
111 $MAPCACHE = CFClient::db_table "mapcache_$CFG->{host}"; 124 $MAPCACHE = CFClient::db_table "mapcache_$CFG->{host}";
112
113 $MAP = new CFClient::Map $mapsize, $mapsize; 125 $MAP = new CFClient::Map $mapsize, $mapsize;
114 126
115 my ($host, $port) = split /:/, $CFG->{host}; 127 my ($host, $port) = split /:/, $CFG->{host};
116 128
117 $CONN = new conn 129 $CONN = eval {
130 new conn
118 host => $host, 131 host => $host,
119 port => $port || 13327, 132 port => $port || 13327,
120 user => $CFG->{user}, 133 user => $CFG->{user},
121 pass => $CFG->{password}, 134 pass => $CFG->{password},
122 mapw => $mapsize, 135 mapw => $mapsize,
123 maph => $mapsize, 136 maph => $mapsize,
137 ;
124 ; 138 };
125 139
140 if ($CONN) {
141 $LOGIN_BUTTON->set_text ("Logout");
142
126 status "login successful"; 143 status "login successful";
127 144
128 CFClient::lowdelay fileno $CONN->{fh}; 145 CFClient::lowdelay fileno $CONN->{fh};
146 } else {
147 status "unable to connect";
148 stop_game();
149 }
129} 150}
130 151
131sub 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;
132 undef $CONN; 161 undef $MAP;
133} 162}
134 163
135sub client_setup { 164sub client_setup {
136 my $dialog = new CFClient::UI::FancyFrame 165 my $dialog = new CFClient::UI::FancyFrame
137 title => "Client Setup", 166 title => "Client Setup",
… …
139 $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]);
140 169
141 $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");
142 $table->add (1, 0, my $hbox = new CFClient::UI::HBox); 171 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
143 172
144 $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]);
145 $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");
146 175
147 $mode_slider->connect (changed => sub { 176 $mode_slider->connect (changed => sub {
148 my ($self, $value) = @_; 177 my ($self, $value) = @_;
149 178
… …
174 } 203 }
175 ); 204 );
176 205
177 $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");
178 $table->add (1, $row++, new CFClient::UI::Slider 207 $table->add (1, $row++, new CFClient::UI::Slider
179 range => [$CFG->{map_scale}, 0.25, 2, 0.05], 208 range => [$CFG->{map_scale}, 0.25, 2, 0.05, 0.05],
180 tooltip => "Enlarge or shrink the displayed map", 209 tooltip => "Enlarge or shrink the displayed map",
181 connect_changed => sub { 210 connect_changed => sub {
182 my ($self, $value) = @_; 211 my ($self, $value) = @_;
183 $CFG->{map_scale} = 0.05 * int $value / 0.05; 212 $CFG->{map_scale} = $value;
184 } 213 }
185 ); 214 );
186 215
187 $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");
188 $table->add (1, $row++, new CFClient::UI::CheckBox 217 $table->add (1, $row++, new CFClient::UI::CheckBox
… …
215 } 244 }
216 ); 245 );
217 246
218 $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");
219 $table->add (1, $row++, new CFClient::UI::Slider 248 $table->add (1, $row++, new CFClient::UI::Slider
220 range => [$CFG->{gui_fontsize}, 0.5, 2, 0.1], 249 range => [$CFG->{gui_fontsize}, 0.5, 2, 0.1, 0.1],
221 tooltip => "The font size used by most GUI elements", 250 tooltip => "The font size used by most GUI elements",
222 connect_changed => sub { 251 connect_changed => sub { $CFG->{gui_fontsize} = $_[1] },
223 $CFG->{gui_fontsize} = 0.1 * int $_[1] * 10;
224# $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
225 }
226 ); 252 );
227 253
228 $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");
229 $table->add (1, $row++, new CFClient::UI::Slider 255 $table->add (1, $row++, new CFClient::UI::Slider
230 range => [$CFG->{log_fontsize}, 0.5, 2, 0.1], 256 range => [$CFG->{log_fontsize}, 0.5, 2, 0.1, 0.1],
231 tooltip => "The font size used by the server log window only", 257 tooltip => "The font size used by the server log window only",
232 connect_changed => sub { 258 connect_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]) },
233 $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = 0.1 * int $_[1] * 10);
234 }
235 ); 259 );
236 260
237 $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");
238 262
239 $table->add (1, $row++, new CFClient::UI::Slider 263 $table->add (1, $row++, new CFClient::UI::Slider
240 range => [$CFG->{stat_fontsize}, 0.5, 2, 0.1], 264 range => [$CFG->{stat_fontsize}, 0.5, 2, 0.1, 0.1],
241 tooltip => "The font size used by the statistics window only", 265 tooltip => "The font size used by the statistics window only",
242 connect_changed => sub { 266 connect_changed => sub {
243 $CFG->{stat_fontsize} = 0.1 * int $_[1] * 10; 267 $CFG->{stat_fontsize} = $_[1];
244 &set_stats_window_fontsize; 268 &set_stats_window_fontsize;
245 } 269 }
246 ); 270 );
247 271
248 $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");
249 $table->add (1, $row++, new CFClient::UI::Slider 273 $table->add (1, $row++, new CFClient::UI::Slider
250 range => [$CFG->{gauge_size}, 0.2, 0.8, 0.02], 274 range => [$CFG->{gauge_size}, 0.2, 0.8, 0.02],
251 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",
252 connect_changed => sub { 276 connect_changed => sub {
253 $CFG->{gauge_size} = $_[1]; 277 $CFG->{gauge_size} = $_[1];
254 my $h = int $HEIGHT * $CFG->{gauge_size}; 278 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
255 $GAUGES->{win}->set_size ($WIDTH, $h);
256 $GAUGES->{win}->move (0, $HEIGHT - $h);
257 } 279 }
258 ); 280 );
259 281
260 $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");
261 $table->add (1, $row++, new CFClient::UI::Slider 283 $table->add (1, $row++, new CFClient::UI::Slider
262 range => [$CFG->{gauge_fontsize}, 0.5, 2.0, 0.1], 284 range => [$CFG->{gauge_fontsize}, 0.5, 2.0, 0.1, 0.1],
263 tooltip => "Adjusts the fontsize of the gauges at the bottom right", 285 tooltip => "Adjusts the fontsize of the gauges at the bottom right",
264 connect_changed => sub { 286 connect_changed => sub {
265 $CFG->{gauge_fontsize} = 0.1 * int $_[1] * 10; 287 $CFG->{gauge_fontsize} = $_[1];
266 &set_gauge_window_fontsize; 288 &set_gauge_window_fontsize;
267 } 289 }
268 ); 290 );
269 291
270 $table->add (1, $row++, new CFClient::UI::Button 292 $table->add (1, $row++, new CFClient::UI::Button
… …
313 audio_shutdown (); 335 audio_shutdown ();
314 audio_init (); 336 audio_init ();
315 } 337 }
316 ); 338 );
317 339
340 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Communication cmd");
341 $table->add (1, $row++, my $saycmd = new CFClient::UI::Entry
342 text => $CFG->{say_command},
343 tooltip => "This is the command that will be used if you write a line in the message window entry. "
344 ."Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
345 ."But you could also set it to 'tell <playername>' to only chat with that user.",
346 connect_changed => sub {
347 my ($self, $value) = @_;
348 $CFG->{say_command} = $value;
349 }
350 );
351
318 $dialog 352 $dialog
319} 353}
320 354
321sub set_stats_window_fontsize { 355sub set_stats_window_fontsize {
322 for (values %{$STATWIDS}) { 356 for (values %{$STATWIDS}) {
… …
332# local $GAUGES->{win}{parent};#d# 366# local $GAUGES->{win}{parent};#d#
333# 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;
334} 368}
335 369
336sub make_gauge_window { 370sub make_gauge_window {
337 my $gh = int ($HEIGHT * $CFG->{gauge_size}); 371 my $gh = int $HEIGHT * $CFG->{gauge_size};
338# my $gw = int ($WIDTH * $CFG->{gauge_w_size});
339 372
340 my $win = new CFClient::UI::Frame ( 373 my $win = new CFClient::UI::Frame (
341 y => $HEIGHT - $gh, x => 0, user_w => $WIDTH, user_h => $gh 374 req_y => -1,
375 user_w => $WIDTH,
376 user_h => $gh,
342 ); 377 );
378
343 $win->add (my $hbox = new CFClient::UI::HBox 379 $win->add (my $hbox = new CFClient::UI::HBox
344 children => [ 380 children => [
345 (new CFClient::UI::HBox expand => 1), 381 (new CFClient::UI::HBox expand => 1),
346 ($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 ]),
347 (my $vbox = new CFClient::UI::VBox), 386 (my $vbox = new CFClient::UI::VBox),
348 ], 387 ],
349 ); 388 );
350 389
351 $vbox->add (new CFClient::UI::HBox 390 $vbox->add (new CFClient::UI::HBox
… …
421 460
422 my $row = 0; 461 my $row = 0;
423 my $col = 0; 462 my $col = 0;
424 463
425 my %resist_names = ( 464 my %resist_names = (
426 slow => "Slow", 465 slow => "Slow (slows you down when you are hit by the spell. Monsters will have an opportunity to come near you faster and hit you more often.)",
427 holyw => "Holy Word", 466 holyw => "Holy Word (resistance you against getting the fear when someone whose god doesn't like you spells the holy word on you.)",
428 conf => "Confusion", 467 conf => "Confusion (If you are hit by confusion you will move into random directions, and likely into monsters.)",
429 fire => "Fire", 468 fire => "Fire (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)",
430 depl => "Depletion (some monsters and other effects can cause stats depletion)", 469 depl => "Depletion (some monsters and other effects can cause stats depletion)",
431 magic => "Magic", 470 magic => "Magic (resistance to magic spells like magic missile or similar)",
432 drain => "Draining (some monsters (e.g. vampires) and other effects can steal experience)", 471 drain => "Draining (some monsters (e.g. vampires) and other effects can steal experience)",
433 acid => "Acid", 472 acid => "Acid (resistance to acid, acid hurts pretty much and also corrodes your weapons)",
434 pois => "Poison", 473 pois => "Poison (resistance to getting poisoned)",
435 para => "Paralysation", 474 para => "Paralysation (this resistance affects the chance you get paralysed)",
436 deat => "Death (resistance against death spells)", 475 deat => "Death (resistance against death spells)",
437 phys => "Physical", 476 phys => "Physical (this is the resistance against physical attacks, like when a monster hit you in melee combat)",
438 blind => "Blind", 477 blind => "Blind (blind resistance affects the chance of a successful blinding attack)",
439 fear => "Fear", 478 fear => "Fear (this attack will drive you away from monsters who cast this and hit you successfully, being resistant to this helps a lot when fighting those monsters)",
440 tund => "Turn undead", 479 tund => "Turn undead",
441 elec => "Electricity", 480 elec => "Electricity (resistance againt electricity, spells like large lightning, small lightning, ...)",
442 cold => "Cold", 481 cold => "Cold (this is your resistance against cold spells like icestorm, snowstorm, ...)",
443 ghit => "Ghost hit (special attack used by ghosts and ghost-like beings)", 482 ghit => "Ghost hit (special attack used by ghosts and ghost-like beings)",
444 ); 483 );
445 for (qw/slow holyw conf fire depl magic 484 for (qw/slow holyw conf fire depl magic
446 drain acid pois para deat phys 485 drain acid pois para deat phys
447 blind fear tund elec cold ghit/) 486 blind fear tund elec cold ghit/)
… …
549 588
550} 589}
551 590
552sub metaserver_dialog { 591sub metaserver_dialog {
553 my $dialog = new CFClient::UI::FancyFrame 592 my $dialog = new CFClient::UI::FancyFrame
554 title => "Metaserver", 593 title => "Server List",
555 child => (my $vbox = new CFClient::UI::VBox); 594 child => (my $vbox = new CFClient::UI::VBox);
556 595
557 $vbox->add ($dialog->{table} = new CFClient::UI::Table); 596 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
558 597
559 $dialog 598 $dialog
… …
628 $HOST->set_text ($CFG->{host} = $host); 667 $HOST->set_text ($CFG->{host} = $host);
629 }), 668 }),
630 (new CFClient::UI::Empty expand => 1), 669 (new CFClient::UI::Empty expand => 1),
631 ]); 670 ]);
632 671
633 $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)
634 for 0 .. $#$m; 674 for 0 .. $#$m;
635 } 675 }
636 } 676 }
637 }); 677 });
638} 678}
… …
661 701
662 $METASERVER = metaserver_dialog; 702 $METASERVER = metaserver_dialog;
663 703
664 $vbox->add (new CFClient::UI::Flopper 704 $vbox->add (new CFClient::UI::Flopper
665 expand => 1, 705 expand => 1,
666 text => "Metaserver", 706 text => "Server List",
667 other => $METASERVER, 707 other => $METASERVER,
668 tooltip => "Show a list of avaible crossfire servers", 708 tooltip => "Show a list of available crossfire servers",
669 connect_open => sub { 709 connect_open => sub {
670 update_metaserver $HOST; 710 update_metaserver $HOST;
671 } 711 }
672 ); 712 );
673 } 713 }
… …
691 my ($self, $value) = @_; 731 my ($self, $value) = @_;
692 $CFG->{password} = $value; 732 $CFG->{password} = $value;
693 } 733 }
694 ); 734 );
695 735
696 $table->add (0, 6, new CFClient::UI::Label valign => 0, align => 1, text => "Def. say cmd");
697 $table->add (1, 6, my $saycmd = new CFClient::UI::Entry
698 text => $CFG->{say_command},
699 tooltip => "This is the command that will be used if you write a line in the message window entry. "
700 ."Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
701 ."But you could also set it to 'tell <playername>' to only chat with that user.",
702 connect_changed => sub {
703 my ($self, $value) = @_;
704 $CFG->{say_command} = $value;
705 }
706 );
707
708 $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");
709 $table->add (1, 7, new CFClient::UI::Slider 737 $table->add (1, 7, new CFClient::UI::Slider
710 req_w => 100, 738 req_w => 100,
711 range => [$CFG->{mapsize}, 10, 100 + 1, 1], 739 range => [$CFG->{mapsize}, 10, 100 + 1, 1, 1],
712 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. "
713 ."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.",
714 connect_changed => sub { 742 connect_changed => sub {
715 my ($self, $value) = @_; 743 my ($self, $value) = @_;
716 744
717 $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 745 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
718 }, 746 },
719 ); 747 );
720 748
721 $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
722 start_game; 755 : start_game;
756 },
723 }); 757 );
724 758
725 $dialog 759 $dialog
726} 760}
727 761
728sub message_window { 762sub message_window {
… …
777 }; 811 };
778 812
779 $window 813 $window
780} 814}
781 815
816sub make_inventory_window {
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");
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
832 $invwin
833}
834
782sub sdl_init { 835sub sdl_init {
783 CFClient::SDL_Init 836 CFClient::SDL_Init
784 and die "SDL::Init failed!\n"; 837 and die "SDL::Init failed!\n";
785} 838}
786 839
787sub video_init { 840sub video_init {
788 sdl_init; 841 sdl_init;
789 842
843 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
844
790 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 845 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
791 $FULLSCREEN = $CFG->{fullscreen}; 846 $FULLSCREEN = $CFG->{fullscreen};
792 $FAST = $CFG->{fast}; 847 $FAST = $CFG->{fast};
793 848
794 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 849 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN
795 or die "SDL_SetVideoMode failed!\n"; 850 or die "SDL_SetVideoMode failed!\n";
796 851
797 $SDL_ACTIVE = 1; 852 $SDL_ACTIVE = 1;
798
799 $LAST_REFRESH = time - 0.01; 853 $LAST_REFRESH = time - 0.01;
800 854
801 CFClient::gl_init; 855 CFClient::gl_init;
802 856
803 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 857 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
804 858
859 $CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
860
805 ############################################################################# 861 #############################################################################
806 862
863 unless ($DEBUG_STATUS) {
864 # create the widgets
865
807 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100; 866 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, req_x => -1;
808 $DEBUG_STATUS->show; 867 $DEBUG_STATUS->show;
809 868
810 $STATUS_LINE = new CFClient::UI::Label 869 $STATUSBOX = new CFClient::UI::Statusbox;
811 padding => 0, 870 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]);
812 y => $HEIGHT - $FONTSIZE * 1.8;
813 $STATUS_LINE->show;
814 871
815 $ALT_ENTER_MESSAGE = new CFClient::UI::Label 872 (new CFClient::UI::Frame
816 padding => 0, 873 bg => [0, 0, 0, 0.4],
817 fontsize => 0.8, 874 req_y => -1,
818 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode"; 875 child => $STATUSBOX,
819 $ALT_ENTER_MESSAGE->show; 876 )->show;
820 $ALT_ENTER_MESSAGE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h});
821 877
822 $CFClient::UI::ROOT->add ($MAPWIDGET = new CFClient::MapWidget); 878 CFClient::UI::FancyFrame->new (
823 $MAPWIDGET->focus_in; 879 border_bg => [1, 1, 1, 192/255],
880 bg => [1, 1, 1, 0],
881 child => ($MAPMAP = new CFClient::MapWidget::MapMap),
882 )->show;
883
884 $MAPWIDGET = new CFClient::MapWidget;
824 $MAPWIDGET->connect (activate_console => sub { 885 $MAPWIDGET->connect (activate_console => sub {
825 my ($mapwidget, $preset) = @_; 886 my ($mapwidget, $preset) = @_;
826 887
827 if ($CONSOLE) { 888 if ($CONSOLE) {
828 $CONSOLE->{input}->{auto_activated} = 1; 889 $CONSOLE->{input}->{auto_activated} = 1;
829 $CONSOLE->{input}->focus_in; 890 $CONSOLE->{input}->focus_in;
830 891
831 if ($preset && $CONSOLE->{input}->get_text eq '') { 892 if ($preset && $CONSOLE->{input}->get_text eq '') {
832 $CONSOLE->{input}->set_text ($preset); 893 $CONSOLE->{input}->set_text ($preset);
894 }
833 } 895 }
834 } 896 });
835 }); 897 $MAPWIDGET->show;
898 $MAPWIDGET->focus_in;
836 899
837 $CFClient::UI::ROOT->add ($BUTTONBAR = new CFClient::UI::HBox); 900 $BUTTONBAR = new CFClient::UI::HBox;
838 901
839 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup); 902 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup);
840 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup); 903 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup);
841 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window); 904 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window);
842 905
843 $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 906 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
907
844 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window); 908 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window);
909 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window);
845 910
846 $BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub { 911 $BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub {
847 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 912 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
848 status "Configuration Saved"; 913 status "Configuration Saved";
849 }); 914 });
850 915
916 $BUTTONBAR->show;
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 {
851 $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 ();
927 }
852} 928}
853 929
854sub video_shutdown { 930sub video_shutdown {
855 $CFClient::UI::ROOT->{children} = [];
856 undef $CFClient::UI::GRAB;
857 undef $CFClient::UI::HOVER;
858 undef $SDL_ACTIVE; 931 undef $SDL_ACTIVE;
859} 932}
860 933
861my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d# 934my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
862my $bgmusic;#TODO#hack#d# 935my $bgmusic;#TODO#hack#d#
936
937sub audio_channel_finished {
938 my ($channel) = @_;
939
940 warn "channel $channel finished\n";#d#
941}
863 942
864sub audio_music_finished { 943sub audio_music_finished {
865 return unless $CFG->{bgm_enable}; 944 return unless $CFG->{bgm_enable};
866 945
867 # TODO: hack, do play loop and mood music 946 # TODO: hack, do play loop and mood music
… …
871 push @bgmusic, shift @bgmusic; 950 push @bgmusic, shift @bgmusic;
872} 951}
873 952
874sub audio_init { 953sub audio_init {
875 if ($CFG->{audio_enable}) { 954 if ($CFG->{audio_enable}) {
876 if (open my $fh, "<:utf8", CFClient::find_rcfile "sounds/config") { 955 if (open my $fh, "<", CFClient::find_rcfile "sounds/config") {
877 $SDL_MIXER = !CFClient::Mix_OpenAudio; 956 $SDL_MIXER = !CFClient::Mix_OpenAudio;
878 CFClient::Mix_AllocateChannels 8; 957 CFClient::Mix_AllocateChannels 8;
879 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128; 958 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128;
880 959
881 audio_music_finished; 960 audio_music_finished;
… …
908} 987}
909 988
910my %animate_object; 989my %animate_object;
911my $animate_timer; 990my $animate_timer;
912 991
913my $want_refresh;
914my $can_refresh;
915
916my $fps = 9; 992my $fps = 9;
917 993
918sub force_refresh { 994sub force_refresh {
919 $fps = $fps * 0.95 + 1 / ($NOW - $LAST_REFRESH) * 0.05; 995 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
920 debug sprintf "%3.2f", $fps; 996 debug sprintf "%3.2f", $fps;
921 997
922 $want_refresh = 0;
923 $can_refresh = 0;
924
925 $CFClient::UI::ROOT->draw; 998 $CFClient::UI::ROOT->draw;
926
927 CFClient::SDL_GL_SwapBuffers; 999 CFClient::SDL_GL_SwapBuffers;
928 1000
1001 $WANT_REFRESH = 0;
1002 $CAN_REFRESH = 0;
929 $LAST_REFRESH = $NOW; 1003 $LAST_REFRESH = $NOW;
930} 1004}
931 1005
932my $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 {
933 $NOW = time; 1007 $NOW = time;
… …
935 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 1009 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
936 for CFClient::SDL_PollEvent; 1010 for CFClient::SDL_PollEvent;
937 1011
938 if (%animate_object) { 1012 if (%animate_object) {
939 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 1013 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
940 $want_refresh++; 1014 $WANT_REFRESH++;
941 } 1015 }
942 1016
943 if ($want_refresh) { 1017 if ($WANT_REFRESH) {
944 force_refresh; 1018 force_refresh;
945 } else { 1019 } else {
946 $can_refresh = 1; 1020 $CAN_REFRESH = 1;
947 } 1021 }
948}); 1022});
949
950sub refresh {
951 $want_refresh++;
952}
953 1023
954sub animation_start { 1024sub animation_start {
955 my ($widget) = @_; 1025 my ($widget) = @_;
956 $animate_object{$widget} = $widget; 1026 $animate_object{$widget} = $widget;
957} 1027}
… …
963 1033
964@conn::ISA = Crossfire::Protocol::; 1034@conn::ISA = Crossfire::Protocol::;
965 1035
966sub conn::stats_update { 1036sub conn::stats_update {
967 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 }
968 1045
969 update_stats_window ($stats); 1046 update_stats_window ($stats);
970} 1047}
971 1048
972sub conn::user_send { 1049sub conn::user_send {
… …
1036# at worst. 1113# at worst.
1037sub conn::flood_fill { 1114sub conn::flood_fill {
1038 my ($self, $gx, $gy, $path, $hash, $flags) = @_; 1115 my ($self, $gx, $gy, $path, $hash, $flags) = @_;
1039 1116
1040 # the server does not allow map paths > 6 1117 # the server does not allow map paths > 6
1041 return if 6 <= length $path; 1118 return if 7 <= length $path;
1042 1119
1043 my ($x0, $y0, $x1, $y1) = @{$self->{neigh_rect}}; 1120 my ($x0, $y0, $x1, $y1) = @{$self->{neigh_rect}};
1044 1121
1045 for ( 1122 for (
1046 [1, 0, -1], 1123 [1, 0, -1],
… …
1089 1166
1090 $self->flush_map; 1167 $self->flush_map;
1091 1168
1092 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 1169 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
1093 1170
1094 my $mapmapw = 250; 1171 my $mapmapw = $MAPMAP->{w};
1095 my $mapmaph = 250; 1172 my $mapmaph = $MAPMAP->{h};
1096 1173
1097 $self->{neigh_rect} = [ 1174 $self->{neigh_rect} = [
1098 $ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5, 1175 $ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5,
1099 $ox + $mapmapw * 0.5 + $w, $oy + $mapmapw * 0.5 + $h, 1176 $ox + $mapmapw * 0.5 + $w, $oy + $mapmapw * 0.5 + $h,
1100 ]; 1177 ];
… …
1269 [0.55, 0.41, 0.13], 1346 [0.55, 0.41, 0.13],
1270 [0.99, 0.77, 0.26], 1347 [0.99, 0.77, 0.26],
1271 [0.74, 0.65, 0.41], 1348 [0.74, 0.65, 0.41],
1272 ); 1349 );
1273 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
1274 $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);
1275} 1372}
1276 1373
1277sub conn::spell_add { 1374sub conn::spell_add {
1278 my ($self, $spell) = @_; 1375 my ($self, $spell) = @_;
1279 1376
1280 # TODO 1377 # TODO
1281 # create a widget dynamically, using spell face (CF::Protocol downloads them) 1378 # create a widget dynamically, using spell face (CF::Protocol downloads them)
1282 $MAPWIDGET->add_command ("invoke $spell->{name}", $spell->{message}); 1379 $MAPWIDGET->add_command ("invoke $spell->{name}", CFClient::UI::Label::escape $spell->{message});
1283 $MAPWIDGET->add_command ("cast $spell->{name}", $spell->{message}); 1380 $MAPWIDGET->add_command ("cast $spell->{name}", CFClient::UI::Label::escape $spell->{message});
1284} 1381}
1285 1382
1286sub conn::spell_delete { 1383sub conn::spell_delete {
1287 my ($self, $spell) = @_; 1384 my ($self, $spell) = @_;
1288} 1385}
1289 1386
1290sub conn::addme_success { 1387sub conn::addme_success {
1291 my ($self) = @_; 1388 my ($self) = @_;
1292 1389
1390 $MAPWIDGET->clr_commands;
1391
1293 for my $skill (values %{$self->{skill_info}}) { 1392 for my $skill (values %{$self->{skill_info}}) {
1294 $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'");
1295 $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'");
1296 } 1395 }
1396
1397 $MAPWIDGET->add_command ("petmode defend", "Tell pets to stay close to you and defend you");
1398 $MAPWIDGET->add_command ("petmode arena", "Same as petmode sad, but also attack other players");
1399 $MAPWIDGET->add_command ("petmode sad", "Search &amp; Destroy - tell pets to roam about and attack enemies");
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 }
1424}
1425
1426sub conn::eof {
1427 $MAPWIDGET->clr_commands;
1428
1429 stop_game;
1297} 1430}
1298 1431
1299sub update_floorbox { 1432sub update_floorbox {
1300 $CFClient::UI::ROOT->on_refresh ($FLOORBOX => sub { 1433 $CFClient::UI::ROOT->on_refresh ($FLOORBOX => sub {
1434 return unless $CONN;
1435
1301 $FLOORBOX->clear; 1436 $FLOORBOX->clear;
1302 $FLOORBOX->add (new CFClient::UI::Empty expand => 1); 1437 $FLOORBOX->add (new CFClient::UI::Empty expand => 1);
1303 1438
1304 my @items = values %{ $CONN->{container}{0} }; 1439 my $count = 4;
1305 1440 for (@{ $CONN->{container}{0} }) {
1306 # we basically have to use the same sorting as everybody else 1441 if (--$count) {
1307 @items = sort { $a->{type} <=> $b->{type} } @items; 1442 $FLOORBOX->add (new CFClient::UI::InventoryItem item => $_);
1308 1443 } else {
1309 for my $item (reverse @items) { 1444 $FLOORBOX->add (new CFClient::UI::Label text => "More...");
1310 my $desc = $item->{nrof} < 2
1311 ? $item->{name}
1312 : "$item->{nrof} $item->{name_pl}";
1313 # todo: animation widget, face widget, weight(?) etc.
1314 $FLOORBOX->add (my $hbox = new CFClient::UI::HBox
1315 tooltip => (CFClient::UI::Label->escape ($desc)
1316 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
1317 can_hover => 1,
1318 can_events => 1,
1319 connect_button_down => sub {
1320 my ($self, $ev, $x, $y) = @_;
1321
1322 # todo: maybe put examine on 1? but should just be a tooltip :(
1323 if ($ev->{button} == 1) {
1324 $CONN->send ("move $CONN->{player}{tag} $item->{tag} 0");
1325 } elsif ($ev->{button} == 2) {
1326 $CONN->send ("apply $item->{tag}");
1327 } elsif ($ev->{button} == 3) {
1328 # examine, lock, mark, maybe other things
1329 warn "MENU not implemented yet\n";
1330 }
1331
1332 1
1333 }, 1445 last;
1334 );
1335
1336 $hbox->add (new CFClient::UI::Face
1337 can_events => 0,
1338 face => $item->{face},
1339 anim => $item->{anim},
1340 animspeed => $item->{animspeed},
1341 );
1342 1446 }
1343 $hbox->add (new CFClient::UI::Label
1344 can_events => 0,
1345 text => $desc,
1346 );
1347 } 1447 }
1348 }); 1448 });
1349 refresh; 1449
1450 $WANT_REFRESH++;
1350} 1451}
1351 1452
1352sub conn::container_add { 1453sub conn::container_add {
1353 my ($self, $id, $items) = @_; 1454 my ($self, $tag, $items) = @_;
1354 1455
1355 update_floorbox if $id == 0; 1456 #d# print "container_add: container $tag ($self->{player}{tag})\n";
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");
1465 $INV->set_items ($self->{container}{$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 }
1471
1356 # $self-<{player}{tag} => player inv 1472 # $self-<{player}{tag} => player inv
1357 #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}};
1358} 1474}
1359 1475
1360sub conn::container_clear { 1476sub conn::container_clear {
1361 my ($self, $id) = @_; 1477 my ($self, $tag) = @_;
1362 1478
1363 update_floorbox if $id == 0; 1479 #d# print "container_clear: container $tag ($self->{player}{tag})\n";
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");
1488 $INV->set_items ($self->{container}{$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 }
1494
1364# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0}; 1495# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0};
1365} 1496}
1366 1497
1367sub conn::item_delete { 1498sub conn::item_delete {
1368 my ($self, @items) = @_; 1499 my ($self, @items) = @_;
1369 1500
1370 for (@items) { 1501 for (@items) {
1371 update_floorbox if $_->{container} == 0; 1502 #d# print "item_delete: $_->{tag} from $_->{container} ($self->{player}{tag})\n";
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}));
1515 $INVR->set_items ($self->{container}{$_->{container}});
1516 }
1372 } 1517 }
1373} 1518}
1374 1519
1375sub conn::item_update { 1520sub conn::item_update {
1376 my ($self, $item) = @_; 1521 my ($self, $item) = @_;
1377 1522
1378 update_floorbox if $item->{container} == 0; 1523 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($OPENCONT)\n";
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}) {
1539 $INV->set_items ($self->{container}{$item->{container}})
1540 }
1541 }
1379} 1542}
1380 1543
1381%SDL_CB = ( 1544%SDL_CB = (
1382 CFClient::SDL_QUIT => sub { 1545 CFClient::SDL_QUIT => sub {
1383 Event::unloop -1; 1546 Event::unloop -1;
1384 }, 1547 },
1385 CFClient::SDL_VIDEORESIZE => sub { 1548 CFClient::SDL_VIDEORESIZE => sub {
1386 }, 1549 },
1387 CFClient::SDL_VIDEOEXPOSE => \&refresh, 1550 CFClient::SDL_VIDEOEXPOSE => sub {
1551 $WANT_REFRESH++;
1552 },
1388 CFClient::SDL_ACTIVEEVENT => sub { 1553 CFClient::SDL_ACTIVEEVENT => sub {
1389# 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#
1390 }, 1555 },
1391 CFClient::SDL_KEYDOWN => sub { 1556 CFClient::SDL_KEYDOWN => sub {
1392 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) { 1557 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {
… …
1396 video_init; 1561 video_init;
1397 } else { 1562 } else {
1398 CFClient::UI::feed_sdl_key_down_event ($_[0]); 1563 CFClient::UI::feed_sdl_key_down_event ($_[0]);
1399 } 1564 }
1400 }, 1565 },
1401 CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event, 1566 CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event,
1402 CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event, 1567 CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event,
1403 CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event, 1568 CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event,
1404 CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event, 1569 CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event,
1405 CFClient::SDL_USEREVENT => \&audio_music_finished, 1570 CFClient::SDL_USEREVENT => sub {
1571 if ($_[0]{code} == 1) {
1572 audio_channel_finished $_[0]{data1};
1573 } elsif ($_[0]{code} == 0) {
1574 audio_music_finished;
1575 }
1576 },
1406); 1577);
1407 1578
1408############################################################################# 1579#############################################################################
1409 1580
1410$SIG{INT} = $SIG{TERM} = sub { exit }; 1581$SIG{INT} = $SIG{TERM} = sub { exit };
1411 1582
1412$TILECACHE = CFClient::db_table "tilecache";
1413$FACEMAP = CFClient::db_table "facemap";
1414
1415CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
1416
1417my %DEF_CFG = (
1418 sdl_mode => 0,
1419 width => 640,
1420 height => 480,
1421 fullscreen => 0,
1422 fast => 0,
1423 map_scale => 0.5,
1424 fow_enable => 1,
1425 fow_intensity => 0.45,
1426 fow_smooth => 0,
1427 gui_fontsize => 1,
1428 log_fontsize => 1,
1429 gauge_fontsize => 1,
1430 gauge_size => 0.35,
1431 stat_fontsize => 1,
1432 mapsize => 100,
1433 host => "crossfire.schmorp.de",
1434 say_command => 'say',
1435 audio_enable => 1,
1436 bgm_enable => 1,
1437 bgm_volume => 0.25,
1438);
1439
1440while (my ($k, $v) = each %DEF_CFG) {
1441 $CFG->{$k} = $v unless exists $CFG->{$k};
1442}
1443
1444sdl_init;
1445
1446@SDL_MODES = reverse
1447 grep $_->[0] >= 640 && $_->[1] >= 480,
1448 CFClient::SDL_ListModes;
1449
1450@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
1451
1452$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1453
1454{ 1583{
1584 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] };
1585
1586 CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
1587
1588 $TILECACHE = CFClient::db_table "tilecache";
1589 $FACEMAP = CFClient::db_table "facemap";
1590
1591 my %DEF_CFG = (
1592 sdl_mode => 0,
1593 width => 640,
1594 height => 480,
1595 fullscreen => 0,
1596 fast => 0,
1597 map_scale => 0.5,
1598 fow_enable => 1,
1599 fow_intensity => 0.45,
1600 fow_smooth => 0,
1601 gui_fontsize => 1,
1602 log_fontsize => 1,
1603 gauge_fontsize=> 1,
1604 gauge_size => 0.35,
1605 stat_fontsize => 1,
1606 mapsize => 100,
1607 host => "crossfire.schmorp.de",
1608 say_command => 'say',
1609 audio_enable => 1,
1610 bgm_enable => 1,
1611 bgm_volume => 0.25,
1612 );
1613
1614 while (my ($k, $v) = each %DEF_CFG) {
1615 $CFG->{$k} = $v unless exists $CFG->{$k};
1616 }
1617
1618 sdl_init;
1619
1620 @SDL_MODES = reverse
1621 grep $_->[0] >= 640 && $_->[1] >= 480,
1622 CFClient::SDL_ListModes;
1623
1624 @SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
1625
1626 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1627
1628 {
1455 my @fonts = map CFClient::find_rcfile "fonts/$_", qw( 1629 my @fonts = map CFClient::find_rcfile "fonts/$_", qw(
1456 DejaVuSans.ttf 1630 DejaVuSans.ttf
1457 DejaVuSansMono.ttf 1631 DejaVuSansMono.ttf
1458 DejaVuSans-Bold.ttf 1632 DejaVuSans-Bold.ttf
1459 DejaVuSansMono-Bold.ttf 1633 DejaVuSansMono-Bold.ttf
1460 DejaVuSans-Oblique.ttf 1634 DejaVuSans-Oblique.ttf
1461 DejaVuSansMono-Oblique.ttf 1635 DejaVuSansMono-Oblique.ttf
1462 DejaVuSans-BoldOblique.ttf 1636 DejaVuSans-BoldOblique.ttf
1463 DejaVuSansMono-BoldOblique.ttf 1637 DejaVuSansMono-BoldOblique.ttf
1464 ); 1638 );
1465 1639
1466 CFClient::add_font $_ for @fonts; 1640 CFClient::add_font $_ for @fonts;
1467 1641
1642 CFClient::pango_init;
1643
1468 $FONT_PROP = new_from_file CFClient::Font $fonts[0]; 1644 $FONT_PROP = new_from_file CFClient::Font $fonts[0];
1469 $FONT_FIXED = new_from_file CFClient::Font $fonts[1]; 1645 $FONT_FIXED = new_from_file CFClient::Font $fonts[1];
1470 1646
1471 $FONT_PROP->make_default; 1647 $FONT_PROP->make_default;
1472} 1648 }
1473 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# }
1662
1474video_init; 1663 video_init;
1475audio_init; 1664 audio_init;
1665}
1476 1666
1477Event::loop; 1667Event::loop;
1478 1668
1479END { CFClient::SDL_Quit } 1669END { CFClient::SDL_Quit }
1480 1670

Diff Legend

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