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.233 by root, Mon May 22 01:28:41 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 (CFClient::UI::Label::escape $_[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
126 status "login successful"; 140 if ($CONN) {
127
128 CFClient::lowdelay fileno $CONN->{fh}; 141 CFClient::lowdelay fileno $CONN->{fh};
142
143 $LOGIN_BUTTON->set_text ("Logout");
144 status "login successful";
145
146 $BUTTONBAR->{children}[1]->emit ("activate")
147 if $BUTTONBAR->{children}[1]->{state};
148
149 } else {
150 status "unable to connect";
151 stop_game();
152 }
129} 153}
130 154
131sub stop_game { 155sub stop_game {
156 return unless $CONN;
157
158 status "connection closed";
159 $LOGIN_BUTTON->set_text ("Login");
160 $CONN->destroy;
161 $CONN = 0; # false, does not autovivify
162
163 $BUTTONBAR->{children}[1]->emit ("activate")
164 unless $BUTTONBAR->{children}[1]->{state};
165
166 undef $MAPCACHE;
132 undef $CONN; 167 undef $MAP;
133} 168}
134 169
135sub client_setup { 170sub client_setup {
136 my $dialog = new CFClient::UI::FancyFrame 171 my $dialog = new CFClient::UI::FancyFrame
137 title => "Client Setup", 172 title => "Client Setup",
… …
139 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 174 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
140 175
141 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode"); 176 $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); 177 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
143 178
144 $hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1]); 179 $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"); 180 $hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
146 181
147 $mode_slider->connect (changed => sub { 182 $mode_slider->connect (changed => sub {
148 my ($self, $value) = @_; 183 my ($self, $value) = @_;
149 184
… …
174 } 209 }
175 ); 210 );
176 211
177 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale"); 212 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale");
178 $table->add (1, $row++, new CFClient::UI::Slider 213 $table->add (1, $row++, new CFClient::UI::Slider
179 range => [$CFG->{map_scale}, 0.25, 2, 0.05], 214 range => [$CFG->{map_scale}, 0.25, 2, 0.05, 0.05],
180 tooltip => "Enlarge or shrink the displayed map", 215 tooltip => "Enlarge or shrink the displayed map",
181 connect_changed => sub { 216 connect_changed => sub {
182 my ($self, $value) = @_; 217 my ($self, $value) = @_;
183 $CFG->{map_scale} = 0.05 * int $value / 0.05; 218 $CFG->{map_scale} = $value;
184 } 219 }
185 ); 220 );
186 221
187 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War"); 222 $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 223 $table->add (1, $row++, new CFClient::UI::CheckBox
… …
215 } 250 }
216 ); 251 );
217 252
218 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); 253 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
219 $table->add (1, $row++, new CFClient::UI::Slider 254 $table->add (1, $row++, new CFClient::UI::Slider
220 range => [$CFG->{gui_fontsize}, 0.5, 2, 0.1], 255 range => [$CFG->{gui_fontsize}, 0.5, 2, 0.1, 0.1],
221 tooltip => "The font size used by most GUI elements", 256 tooltip => "The font size used by most GUI elements",
222 connect_changed => sub { 257 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 ); 258 );
227 259
228 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Server Log Fontsize"); 260 $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 261 $table->add (1, $row++, new CFClient::UI::Slider
230 range => [$CFG->{log_fontsize}, 0.5, 2, 0.1], 262 range => [$CFG->{log_fontsize}, 0.5, 2, 0.1, 0.1],
231 tooltip => "The font size used by the server log window only", 263 tooltip => "The font size used by the server log window only",
232 connect_changed => sub { 264 connect_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]) },
233 $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = 0.1 * int $_[1] * 10);
234 }
235 ); 265 );
236 266
237 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize"); 267 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
238 268
239 $table->add (1, $row++, new CFClient::UI::Slider 269 $table->add (1, $row++, new CFClient::UI::Slider
240 range => [$CFG->{stat_fontsize}, 0.5, 2, 0.1], 270 range => [$CFG->{stat_fontsize}, 0.5, 2, 0.1, 0.1],
241 tooltip => "The font size used by the statistics window only", 271 tooltip => "The font size used by the statistics window only",
242 connect_changed => sub { 272 connect_changed => sub {
243 $CFG->{stat_fontsize} = 0.1 * int $_[1] * 10; 273 $CFG->{stat_fontsize} = $_[1];
244 &set_stats_window_fontsize; 274 &set_stats_window_fontsize;
245 } 275 }
246 ); 276 );
247 277
248 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size"); 278 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size");
249 $table->add (1, $row++, new CFClient::UI::Slider 279 $table->add (1, $row++, new CFClient::UI::Slider
250 range => [$CFG->{gauge_size}, 0.2, 0.8, 0.02], 280 range => [$CFG->{gauge_size}, 0.2, 0.8, 0.02],
251 tooltip => "Adjust the size of the stats gauges at the bottom right", 281 tooltip => "Adjust the size of the stats gauges at the bottom right",
252 connect_changed => sub { 282 connect_changed => sub {
253 $CFG->{gauge_size} = $_[1]; 283 $CFG->{gauge_size} = $_[1];
254 my $h = int $HEIGHT * $CFG->{gauge_size}; 284 $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 } 285 }
258 ); 286 );
259 287
260 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 288 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
261 $table->add (1, $row++, new CFClient::UI::Slider 289 $table->add (1, $row++, new CFClient::UI::Slider
262 range => [$CFG->{gauge_fontsize}, 0.5, 2.0, 0.1], 290 range => [$CFG->{gauge_fontsize}, 0.5, 2.0, 0.1, 0.1],
263 tooltip => "Adjusts the fontsize of the gauges at the bottom right", 291 tooltip => "Adjusts the fontsize of the gauges at the bottom right",
264 connect_changed => sub { 292 connect_changed => sub {
265 $CFG->{gauge_fontsize} = 0.1 * int $_[1] * 10; 293 $CFG->{gauge_fontsize} = $_[1];
266 &set_gauge_window_fontsize; 294 &set_gauge_window_fontsize;
267 } 295 }
268 ); 296 );
269 297
270 $table->add (1, $row++, new CFClient::UI::Button 298 $table->add (1, $row++, new CFClient::UI::Button
… …
313 audio_shutdown (); 341 audio_shutdown ();
314 audio_init (); 342 audio_init ();
315 } 343 }
316 ); 344 );
317 345
346 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Communication cmd");
347 $table->add (1, $row++, my $saycmd = new CFClient::UI::Entry
348 text => $CFG->{say_command},
349 tooltip => "This is the command that will be used if you write a line in the message window entry. "
350 ."Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
351 ."But you could also set it to 'tell <playername>' to only chat with that user.",
352 connect_changed => sub {
353 my ($self, $value) = @_;
354 $CFG->{say_command} = $value;
355 }
356 );
357
318 $dialog 358 $dialog
319} 359}
320 360
321sub set_stats_window_fontsize { 361sub set_stats_window_fontsize {
322 for (values %{$STATWIDS}) { 362 for (values %{$STATWIDS}) {
… …
332# local $GAUGES->{win}{parent};#d# 372# local $GAUGES->{win}{parent};#d#
333# use PApp::Util; open D, ">:utf8", "d"; print D PApp::Util::dumpval $GAUGES->{win}; close D; 373# use PApp::Util; open D, ">:utf8", "d"; print D PApp::Util::dumpval $GAUGES->{win}; close D;
334} 374}
335 375
336sub make_gauge_window { 376sub make_gauge_window {
337 my $gh = int ($HEIGHT * $CFG->{gauge_size}); 377 my $gh = int $HEIGHT * $CFG->{gauge_size};
338# my $gw = int ($WIDTH * $CFG->{gauge_w_size});
339 378
340 my $win = new CFClient::UI::Frame ( 379 my $win = new CFClient::UI::Frame (
341 y => $HEIGHT - $gh, x => 0, user_w => $WIDTH, user_h => $gh 380 req_y => -1,
381 user_w => $WIDTH,
382 user_h => $gh,
342 ); 383 );
384
343 $win->add (my $hbox = new CFClient::UI::HBox 385 $win->add (my $hbox = new CFClient::UI::HBox
344 children => [ 386 children => [
345 (new CFClient::UI::HBox expand => 1), 387 (new CFClient::UI::HBox expand => 1),
346 ($FLOORBOX = new CFClient::UI::VBox), 388 (new CFClient::UI::VBox children => [
389 (new CFClient::UI::Empty expand => 1),
390 (new CFClient::UI::Frame bg => [0, 0, 0, 0.4], child => ($FLOORBOX = new CFClient::UI::VBox)),
391 ]),
347 (my $vbox = new CFClient::UI::VBox), 392 (my $vbox = new CFClient::UI::VBox),
348 ], 393 ],
349 ); 394 );
350 395
351 $vbox->add (new CFClient::UI::HBox 396 $vbox->add (new CFClient::UI::HBox
… …
421 466
422 my $row = 0; 467 my $row = 0;
423 my $col = 0; 468 my $col = 0;
424 469
425 my %resist_names = ( 470 my %resist_names = (
426 slow => "Slow", 471 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", 472 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", 473 conf => "Confusion (If you are hit by confusion you will move into random directions, and likely into monsters.)",
429 fire => "Fire", 474 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)", 475 depl => "Depletion (some monsters and other effects can cause stats depletion)",
431 magic => "Magic", 476 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)", 477 drain => "Draining (some monsters (e.g. vampires) and other effects can steal experience)",
433 acid => "Acid", 478 acid => "Acid (resistance to acid, acid hurts pretty much and also corrodes your weapons)",
434 pois => "Poison", 479 pois => "Poison (resistance to getting poisoned)",
435 para => "Paralysation", 480 para => "Paralysation (this resistance affects the chance you get paralysed)",
436 deat => "Death (resistance against death spells)", 481 deat => "Death (resistance against death spells)",
437 phys => "Physical", 482 phys => "Physical (this is the resistance against physical attacks, like when a monster hit you in melee combat)",
438 blind => "Blind", 483 blind => "Blind (blind resistance affects the chance of a successful blinding attack)",
439 fear => "Fear", 484 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", 485 tund => "Turn undead",
441 elec => "Electricity", 486 elec => "Electricity (resistance againt electricity, spells like large lightning, small lightning, ...)",
442 cold => "Cold", 487 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)", 488 ghit => "Ghost hit (special attack used by ghosts and ghost-like beings)",
444 ); 489 );
445 for (qw/slow holyw conf fire depl magic 490 for (qw/slow holyw conf fire depl magic
446 drain acid pois para deat phys 491 drain acid pois para deat phys
447 blind fear tund elec cold ghit/) 492 blind fear tund elec cold ghit/)
… …
549 594
550} 595}
551 596
552sub metaserver_dialog { 597sub metaserver_dialog {
553 my $dialog = new CFClient::UI::FancyFrame 598 my $dialog = new CFClient::UI::FancyFrame
554 title => "Metaserver", 599 title => "Server List",
555 child => (my $vbox = new CFClient::UI::VBox); 600 child => (my $vbox = new CFClient::UI::VBox);
556 601
557 $vbox->add ($dialog->{table} = new CFClient::UI::Table); 602 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
558 603
559 $dialog 604 $dialog
… …
628 $HOST->set_text ($CFG->{host} = $host); 673 $HOST->set_text ($CFG->{host} = $host);
629 }), 674 }),
630 (new CFClient::UI::Empty expand => 1), 675 (new CFClient::UI::Empty expand => 1),
631 ]); 676 ]);
632 677
633 $table->add ($_ + 1, $y, new CFClient::UI::Label align => $align[$_], text => $m->[$_], fontsize => 0.8) 678 $table->add ($_ + 1, $y, new CFClient::UI::Label
679 ellipsise => 0, align => $align[$_], text => $m->[$_], fontsize => 0.8)
634 for 0 .. $#$m; 680 for 0 .. $#$m;
635 } 681 }
636 } 682 }
637 }); 683 });
638} 684}
… …
661 707
662 $METASERVER = metaserver_dialog; 708 $METASERVER = metaserver_dialog;
663 709
664 $vbox->add (new CFClient::UI::Flopper 710 $vbox->add (new CFClient::UI::Flopper
665 expand => 1, 711 expand => 1,
666 text => "Metaserver", 712 text => "Server List",
667 other => $METASERVER, 713 other => $METASERVER,
668 tooltip => "Show a list of avaible crossfire servers", 714 tooltip => "Show a list of available crossfire servers",
669 connect_open => sub { 715 connect_open => sub {
670 update_metaserver $HOST; 716 update_metaserver $HOST;
671 } 717 }
672 ); 718 );
673 } 719 }
… …
691 my ($self, $value) = @_; 737 my ($self, $value) = @_;
692 $CFG->{password} = $value; 738 $CFG->{password} = $value;
693 } 739 }
694 ); 740 );
695 741
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"); 742 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
709 $table->add (1, 7, new CFClient::UI::Slider 743 $table->add (1, 7, new CFClient::UI::Slider
710 req_w => 100, 744 req_w => 100,
711 range => [$CFG->{mapsize}, 10, 100 + 1, 1], 745 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. " 746 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.", 747 ."If you set this to a high value you will be able to see further for example.",
714 connect_changed => sub { 748 connect_changed => sub {
715 my ($self, $value) = @_; 749 my ($self, $value) = @_;
716 750
717 $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 751 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
718 }, 752 },
719 ); 753 );
720 754
721 $table->add (1, 8, new CFClient::UI::Button expand => 1, align => 0, text => "Login", connect_activate => sub { 755 $table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count");
722 start_game; 756 $table->add (1, 8, new CFClient::UI::Entry
757 text => $CFG->{output_count},
758 tooltip => "Should be set to 1 unless you know what you are doing",
759 connect_changed => sub { $CFG->{output_count} = $_[1] },
723 }); 760 );
761
762 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync");
763 $table->add (1, 9, new CFClient::UI::Entry
764 text => $CFG->{output_sync},
765 tooltip => "Should be set to 1 unless you know what you are doing",
766 connect_changed => sub { $CFG->{output_sync} = $_[1] },
767 );
768
769 $table->add (1, 10, $LOGIN_BUTTON = new CFClient::UI::Button
770 expand => 1,
771 align => 0,
772 text => "Login",
773 connect_activate => sub {
774 $CONN ? stop_game
775 : start_game;
776 },
777 );
724 778
725 $dialog 779 $dialog
726} 780}
727 781
728sub message_window { 782sub message_window {
… …
732 bg => [0, 0, 0, 0.5], 786 bg => [0, 0, 0, 0.5],
733 user_w => int $::WIDTH / 3, 787 user_w => int $::WIDTH / 3,
734 user_h => int $::HEIGHT / 5, 788 user_h => int $::HEIGHT / 5,
735 child => (my $vbox = new CFClient::UI::VBox); 789 child => (my $vbox = new CFClient::UI::VBox);
736 790
737 $vbox->add ($LOGVIEW = new CFClient::UI::TextView 791 $vbox->add ($LOGVIEW);
738 expand => 1,
739 font => $FONT_FIXED,
740 fontsize => $::CFG->{log_fontsize},
741 );
742 792
743 $vbox->add (my $input = new CFClient::UI::Entry 793 $vbox->add (my $input = new CFClient::UI::Entry
744 connect_focus_in => sub { 794 connect_focus_in => sub {
745 my ($input, $prev_focus) = @_; 795 my ($input, $prev_focus) = @_;
746 796
… …
777 }; 827 };
778 828
779 $window 829 $window
780} 830}
781 831
832sub make_inventory_window {
833 my $invwin = new CFClient::UI::FancyFrame
834 user_w => $WIDTH * (4/5), user_h => $HEIGHT * (4/5), title => "Inventory";
835
836 $invwin->add (my $hb = new CFClient::UI::HBox expand => 1);
837
838 $hb->add (my $vb1 = new CFClient::UI::VBox expand => 1);
839 $vb1->add (my $lbl = new CFClient::UI::Label);
840 $lbl->set_text ("Player");
841 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1);
842
843 $hb->add (my $vb2 = new CFClient::UI::VBox expand => 1);
844 $vb2->add ($INVR_LBL = new CFClient::UI::Label);
845 $INVR_LBL->set_text ("Floor");
846 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
847
848 $invwin
849}
850
782sub sdl_init { 851sub sdl_init {
783 CFClient::SDL_Init 852 CFClient::SDL_Init
784 and die "SDL::Init failed!\n"; 853 and die "SDL::Init failed!\n";
785} 854}
786 855
787sub video_init { 856sub video_init {
788 sdl_init; 857 sdl_init;
789 858
859 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
860
790 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 861 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
791 $FULLSCREEN = $CFG->{fullscreen}; 862 $FULLSCREEN = $CFG->{fullscreen};
792 $FAST = $CFG->{fast}; 863 $FAST = $CFG->{fast};
793 864
794 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 865 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN
795 or die "SDL_SetVideoMode failed!\n"; 866 or die "SDL_SetVideoMode failed: " . (CFClient::SDL_GetError) . "\n";
796 867
797 $SDL_ACTIVE = 1; 868 $SDL_ACTIVE = 1;
798
799 $LAST_REFRESH = time - 0.01; 869 $LAST_REFRESH = time - 0.01;
800 870
801 CFClient::gl_init; 871 CFClient::gl_init;
802 872
803 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 873 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
804 874
875 $CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
876
805 ############################################################################# 877 #############################################################################
806 878
879 unless ($DEBUG_STATUS) {
880 # create the widgets
881
807 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100; 882 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, req_x => -1;
808 $DEBUG_STATUS->show; 883 $DEBUG_STATUS->show;
809 884
810 $STATUS_LINE = new CFClient::UI::Label 885 $STATUSBOX = new CFClient::UI::Statusbox;
811 padding => 0, 886 $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 887
815 $ALT_ENTER_MESSAGE = new CFClient::UI::Label 888 (new CFClient::UI::Frame
816 padding => 0, 889 bg => [0, 0, 0, 0.4],
817 fontsize => 0.8, 890 req_y => -1,
818 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode"; 891 child => $STATUSBOX,
819 $ALT_ENTER_MESSAGE->show; 892 )->show;
820 $ALT_ENTER_MESSAGE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h});
821 893
822 $CFClient::UI::ROOT->add ($MAPWIDGET = new CFClient::MapWidget); 894 CFClient::UI::FancyFrame->new (
823 $MAPWIDGET->focus_in; 895 border_bg => [1, 1, 1, 192/255],
896 bg => [1, 1, 1, 0],
897 child => ($MAPMAP = new CFClient::MapWidget::MapMap),
898 )->show;
899
900 $MAPWIDGET = new CFClient::MapWidget;
824 $MAPWIDGET->connect (activate_console => sub { 901 $MAPWIDGET->connect (activate_console => sub {
825 my ($mapwidget, $preset) = @_; 902 my ($mapwidget, $preset) = @_;
826 903
827 if ($CONSOLE) { 904 if ($CONSOLE) {
828 $CONSOLE->{input}->{auto_activated} = 1; 905 $CONSOLE->{input}->{auto_activated} = 1;
829 $CONSOLE->{input}->focus_in; 906 $CONSOLE->{input}->focus_in;
830 907
831 if ($preset && $CONSOLE->{input}->get_text eq '') { 908 if ($preset && $CONSOLE->{input}->get_text eq '') {
832 $CONSOLE->{input}->set_text ($preset); 909 $CONSOLE->{input}->set_text ($preset);
910 }
833 } 911 }
834 } 912 });
835 }); 913 $MAPWIDGET->show;
914 $MAPWIDGET->focus_in;
836 915
837 $CFClient::UI::ROOT->add ($BUTTONBAR = new CFClient::UI::HBox); 916 $LOGVIEW = new CFClient::UI::TextView
917 expand => 1,
918 font => $FONT_FIXED,
919 fontsize => $::CFG->{log_fontsize},
920 ;
838 921
922 $BUTTONBAR = new CFClient::UI::HBox;
923
839 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup); 924 $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); 925 $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); 926 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window);
842 927
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 928 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
929
844 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window); 930 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window);
931 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window);
845 932
846 $BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub { 933 $BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub {
847 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 934 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
848 status "Configuration Saved"; 935 status "Configuration Saved";
849 }); 936 });
850 937
938 $BUTTONBAR->show;
939
940 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
941
942 # delay till geometry is constant
943 $CFClient::UI::ROOT->on_post_alloc (startup => sub {
851 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup 944 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
945 my $widget = $GAUGES->{win};
946 $widget->move (0, $HEIGHT - $widget->{h});#d# to in toplevel
947 });
948 force_refresh ();
949 }
852} 950}
853 951
854sub video_shutdown { 952sub video_shutdown {
855 $CFClient::UI::ROOT->{children} = [];
856 undef $CFClient::UI::GRAB;
857 undef $CFClient::UI::HOVER;
858 undef $SDL_ACTIVE; 953 undef $SDL_ACTIVE;
859} 954}
860 955
861my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d# 956my @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# 957my $bgmusic;#TODO#hack#d#
958
959sub audio_channel_finished {
960 my ($channel) = @_;
961
962 #warn "channel $channel finished\n";#d#
963}
863 964
864sub audio_music_finished { 965sub audio_music_finished {
865 return unless $CFG->{bgm_enable}; 966 return unless $CFG->{bgm_enable};
866 967
867 # TODO: hack, do play loop and mood music 968 # TODO: hack, do play loop and mood music
… …
871 push @bgmusic, shift @bgmusic; 972 push @bgmusic, shift @bgmusic;
872} 973}
873 974
874sub audio_init { 975sub audio_init {
875 if ($CFG->{audio_enable}) { 976 if ($CFG->{audio_enable}) {
876 if (open my $fh, "<:utf8", CFClient::find_rcfile "sounds/config") { 977 if (open my $fh, "<", CFClient::find_rcfile "sounds/config") {
877 $SDL_MIXER = !CFClient::Mix_OpenAudio; 978 $SDL_MIXER = !CFClient::Mix_OpenAudio;
878 CFClient::Mix_AllocateChannels 8; 979 CFClient::Mix_AllocateChannels 8;
879 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128; 980 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128;
880 981
881 audio_music_finished; 982 audio_music_finished;
… …
908} 1009}
909 1010
910my %animate_object; 1011my %animate_object;
911my $animate_timer; 1012my $animate_timer;
912 1013
913my $want_refresh;
914my $can_refresh;
915
916my $fps = 9; 1014my $fps = 9;
917 1015
1016my %demo;#d#
1017
918sub force_refresh { 1018sub force_refresh {
919 $fps = $fps * 0.95 + 1 / ($NOW - $LAST_REFRESH) * 0.05; 1019 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
920 debug sprintf "%3.2f", $fps; 1020 debug sprintf "%3.2f", $fps;
921 1021
922 $want_refresh = 0;
923 $can_refresh = 0;
924
925 $CFClient::UI::ROOT->draw; 1022 $CFClient::UI::ROOT->draw;
926 1023
1024 $WANT_REFRESH = 0;
1025 $CAN_REFRESH = 0;
1026 $LAST_REFRESH = $NOW;
1027
10280 && do {
1029 # some weird model-drawing code, just a joke right now
1030 use CFClient::OpenGL;
1031
1032 $demo{t}{eye_auv} ||= new_from_file CFClient::Texture "eye2.png" or die;
1033 $demo{t}{body_auv} ||= new_from_file CFClient::Texture "body_auv3.png" or die;
1034 $demo{r} ||= do {
1035 my $mod = Compress::LZF::sthaw do { local $/; open my $fh, "<:raw:perlio", "dread.lz3"; <$fh> };
1036 $mod->{v} = pack "f*", @{$mod->{v}};
1037 $_ = [scalar @$_, pack "S!*", @$_]
1038 for values %{$mod->{g}};
1039 $mod
1040 };
1041
1042 my $r = $demo{r} or die;
1043
1044 glDepthMask 1;
1045 glClear GL_DEPTH_BUFFER_BIT;
1046 glEnable GL_TEXTURE_2D;
1047 glEnable GL_DEPTH_TEST;
1048 glEnable GL_CULL_FACE;
1049 glShadeModel $::FAST ? GL_FLAT : GL_SMOOTH;
1050
1051 glMatrixMode GL_PROJECTION;
1052 glLoadIdentity;
1053 glFrustum -1 * ($::WIDTH / $::HEIGHT), 1 * ($::WIDTH / $::HEIGHT), 1, -1, 1, 10000;
1054 #glOrtho 0, $::WIDTH, 0, $::HEIGHT, -10000, 10000;
1055 glMatrixMode GL_MODELVIEW;
1056 glLoadIdentity;
1057
1058 glPushMatrix;
1059 glTranslate 0, 0, -800;
1060 glScale 1, -1, 1;
1061 glRotate $NOW * 1000 % 36000 / 5, 0, 1, 0;
1062 glRotate $NOW * 1000 % 36000 / 6, 1, 0, 0;
1063 glRotate $NOW * 1000 % 36000 / 7, 0, 0, 1;
1064 glScale 50, 50, 50;
1065
1066 glInterleavedArrays GL_T2F_N3F_V3F, 0, $r->{v};
1067 while (my ($k, $v) = each %{$r->{g}}) {
1068 glBindTexture GL_TEXTURE_2D, ($demo{t}{$k}{name} or die);
1069 glDrawElements GL_TRIANGLES, $v->[0], GL_UNSIGNED_SHORT, $v->[1];
1070 }
1071
1072 glPopMatrix;
1073
1074 glShadeModel GL_FLAT;
1075 glDisable GL_DEPTH_TEST;
1076 glDisable GL_TEXTURE_2D;
1077 glDepthMask 0;
1078
1079 $WANT_REFRESH++;
1080};
1081
927 CFClient::SDL_GL_SwapBuffers; 1082 CFClient::SDL_GL_SwapBuffers;
928
929 $LAST_REFRESH = $NOW;
930} 1083}
931 1084
932my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub { 1085my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub {
933 $NOW = time; 1086 $NOW = time;
934 1087
935 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 1088 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
936 for CFClient::SDL_PollEvent; 1089 for CFClient::SDL_PollEvent;
937 1090
938 if (%animate_object) { 1091 if (%animate_object) {
939 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 1092 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
940 $want_refresh++; 1093 $WANT_REFRESH++;
941 } 1094 }
942 1095
943 if ($want_refresh) { 1096 if ($WANT_REFRESH) {
944 force_refresh; 1097 force_refresh;
945 } else { 1098 } else {
946 $can_refresh = 1; 1099 $CAN_REFRESH = 1;
947 } 1100 }
948}); 1101});
949
950sub refresh {
951 $want_refresh++;
952}
953 1102
954sub animation_start { 1103sub animation_start {
955 my ($widget) = @_; 1104 my ($widget) = @_;
956 $animate_object{$widget} = $widget; 1105 $animate_object{$widget} = $widget;
957} 1106}
… …
961 delete $animate_object{$widget}; 1110 delete $animate_object{$widget};
962} 1111}
963 1112
964@conn::ISA = Crossfire::Protocol::; 1113@conn::ISA = Crossfire::Protocol::;
965 1114
1115sub conn::new {
1116 my $class = shift;
1117
1118 my $self = $class->Crossfire::Protocol::new (@_);
1119
1120 $MAPWIDGET->clr_commands;
1121
1122 my $parser = new Pod::POM;
1123 my $pod = $parser->parse_file (CFClient::find_rcfile "pod/command_help.pod");
1124
1125 for my $head2 ($pod->head2) {
1126 $head2->title =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
1127 or next;
1128
1129 my $cmd = $1;
1130 my @args = split /\|/, $2;
1131 @args = (".*") unless @args;
1132
1133 my $text = CFClient::pod_to_pango $head2->content;
1134
1135 for my $arg (@args) {
1136 $arg = $arg eq ".*" ? "" : " $arg";
1137
1138 $MAPWIDGET->add_command ("$cmd$arg", $text);
1139 }
1140 }
1141
1142 $self
1143}
1144
966sub conn::stats_update { 1145sub conn::stats_update {
967 my ($self, $stats) = @_; 1146 my ($self, $stats) = @_;
1147
1148 if (my $exp = $stats->{Crossfire::Protocol::CS_STAT_EXP64}) {
1149 my $diff = $exp - $self->{prev_exp};
1150 $STATUSBOX->add ("$diff experience gained", group => "experience $diff", fg => [0.5, 1, 0.5, 0.8], timeout => 5)
1151 if exists $self->{prev_exp} && $diff;
1152 $self->{prev_exp} = $exp;
1153 }
968 1154
969 update_stats_window ($stats); 1155 update_stats_window ($stats);
970} 1156}
971 1157
972sub conn::user_send { 1158sub conn::user_send {
… …
1027 $self->set_texture ($id => $data); 1213 $self->set_texture ($id => $data);
1028 } 1214 }
1029 } 1215 }
1030} 1216}
1031 1217
1218# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
1219# (server resource,s latency, bandwidth), so this hack is warranted.
1220# the right fix is to make real tiled maps with an overview file
1221sub conn::send_mapinfo {
1222 my ($self, $data, $cb) = @_;
1223
1224 if ($self->{map_info}[0] =~ m%^/world/world_(\d\d\d)_(\d\d\d)$%) {
1225 my ($wx, $wy) = ($1, $2);
1226
1227 if ($data =~ /^spatial ([1-4]+)$/) {
1228 my @dx = (0, 0, 1, 0, -1);
1229 my @dy = (0, -1, 0, 1, 0);
1230 my ($dx, $dy);
1231
1232 for (split //, $1) {
1233 $dx += $dx[$_];
1234 $dy += $dy[$_];
1235 }
1236
1237 $cb->(spatial => 15,
1238 $self->{map_info}[1] - $MAP->ox + $dx * 50,
1239 $self->{map_info}[2] - $MAP->oy + $dy * 50,
1240 50, 50,
1241 sprintf "/world/world_%03d_%03d", $wx + $dx, $wy + $dy
1242 );
1243
1244 return;
1245 }
1246 }
1247
1248 $self->SUPER::send_mapinfo ($data, $cb);
1249}
1250
1032# this method does a "flood fill" into every tile direction 1251# this method does a "flood fill" into every tile direction
1033# it assumes that tiles are arranged in a rectangular grid, 1252# it assumes that tiles are arranged in a rectangular grid,
1034# i.e. a map is the same as the left of the right map etc. 1253# i.e. a map is the same as the left of the right map etc.
1035# failure to comply are harmless and result in display errors 1254# failure to comply are harmless and result in display errors
1036# at worst. 1255# at worst.
1037sub conn::flood_fill { 1256sub conn::flood_fill {
1038 my ($self, $gx, $gy, $path, $hash, $flags) = @_; 1257 my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_;
1039 1258
1040 # the server does not allow map paths > 6 1259 # the server does not allow map paths > 6
1041 return if 6 <= length $path; 1260 return if 7 <= length $path;
1042 1261
1043 my ($x0, $y0, $x1, $y1) = @{$self->{neigh_rect}}; 1262 my ($x0, $y0, $x1, $y1) = @{$self->{neigh_rect}};
1044 1263
1045 for ( 1264 for (
1046 [1, 0, -1], 1265 [1, 3, 0, -1],
1047 [2, 1, 0], 1266 [2, 4, 1, 0],
1048 [3, 0, 1], 1267 [3, 1, 0, 1],
1049 [4, -1, 0], 1268 [4, 2, -1, 0],
1050 ) { 1269 ) {
1051 my ($tile, $dx, $dy) = @$_; 1270 my ($tile, $tile2, $dx, $dy) = @$_;
1271
1272 next if $block & (1 << $tile);
1273 my $block = $block | (1 << $tile2);
1052 1274
1053 my $gx = $gx + $dx; 1275 my $gx = $gx + $dx;
1054 my $gy = $gy + $dy; 1276 my $gy = $gy + $dy;
1055 1277
1056 next unless $flags & (1 << ($tile - 1)); 1278 next unless $flags & (1 << ($tile - 1));
… …
1058 1280
1059 my $neigh = $self->{neigh_map}{$hash} ||= []; 1281 my $neigh = $self->{neigh_map}{$hash} ||= [];
1060 if (my $info = $neigh->[$tile]) { 1282 if (my $info = $neigh->[$tile]) {
1061 my ($flags, $x, $y, $w, $h, $hash) = @$info; 1283 my ($flags, $x, $y, $w, $h, $hash) = @$info;
1062 1284
1063 $self->flood_fill ($gx, $gy, "$path$tile", $hash, $flags) 1285 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
1064 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 1286 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
1065 1287
1066 } else { 1288 } else {
1067 $self->send_mapinfo ("spatial $path$tile", sub { 1289 $self->send_mapinfo ("spatial $path$tile", sub {
1068 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 1290 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
1069 1291
1070 return if $mode ne "spatial"; 1292 return if $mode ne "spatial";
1071 1293
1072 $x += $MAP->ox; 1294 $x += $MAP->ox;
1073 $y += $MAP->oy; 1295 $y += $MAP->oy;
1074 1296
1075 $self->load_map ($hash, $x, $y) 1297 $self->load_map ($hash, $x, $y)
1076 unless $self->{neigh_map}{$hash}[5]++;#d# 1298 unless $self->{neigh_map}{$hash}[5]++;#d#
1077 1299
1078 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash]; 1300 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash];
1079 1301
1080 $self->flood_fill ($gx, $gy, "$path$tile", $hash, $flags) 1302 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
1081 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 1303 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
1082 }); 1304 });
1083 } 1305 }
1084 } 1306 }
1085} 1307}
… …
1089 1311
1090 $self->flush_map; 1312 $self->flush_map;
1091 1313
1092 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 1314 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
1093 1315
1094 my $mapmapw = 250; 1316 my $mapmapw = $MAPMAP->{w};
1095 my $mapmaph = 250; 1317 my $mapmaph = $MAPMAP->{h};
1096 1318
1097 $self->{neigh_rect} = [ 1319 $self->{neigh_rect} = [
1098 $ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5, 1320 $ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5,
1099 $ox + $mapmapw * 0.5 + $w, $oy + $mapmapw * 0.5 + $h, 1321 $ox + $mapmapw * 0.5 + $w, $oy + $mapmapw * 0.5 + $h,
1100 ]; 1322 ];
1101 1323
1102 delete $self->{neigh_grid}; 1324 delete $self->{neigh_grid};
1103 $self->flood_fill (0, 0, "", $hash, $flags);
1104 1325
1105 $x += $ox; 1326 $x += $ox;
1106 $y += $oy; 1327 $y += $oy;
1107 1328
1108 $self->{map_info} = [$hash, $x, $y, $w, $h]; 1329 $self->{map_info} = [$hash, $x, $y, $w, $h];
1109 1330
1110 my $map = $self->{map_info}[0];
1111 $map =~ s/^.*?\/([^\/]+)$/\1/; 1331 (my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/;
1112 $STATWIDS->{map}->set_text ("Map: " . $map); 1332 $STATWIDS->{map}->set_text ("Map: " . $map);
1113 1333
1114 $self->load_map ($hash, $x, $y); 1334 $self->load_map ($hash, $x, $y);
1335 $self->flood_fill (0, 0, 0, "", $hash, $flags);
1115} 1336}
1116 1337
1117sub conn::face_find { 1338sub conn::face_find {
1118 my ($self, $facenum, $face) = @_; 1339 my ($self, $facenum, $face) = @_;
1119 1340
… …
1269 [0.55, 0.41, 0.13], 1490 [0.55, 0.41, 0.13],
1270 [0.99, 0.77, 0.26], 1491 [0.99, 0.77, 0.26],
1271 [0.74, 0.65, 0.41], 1492 [0.74, 0.65, 0.41],
1272 ); 1493 );
1273 1494
1495 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
1496
1497 $text = CFClient::UI::Label::escape $text;
1498 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
1499 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
1500
1274 $LOGVIEW->add_paragraph ($color[$color], $text); 1501 $LOGVIEW->add_paragraph ($color[$color],
1502 join "\n", map "$time $_", split /\n/, $text);
1503
1504 $STATUSBOX->add ($text,
1505 group => $text,
1506 fg => $color[$color],
1507 timeout => 60,
1508 tooltip_font => $::FONT_FIXED,
1509 );
1510}
1511
1512sub conn::drawextinfo {
1513 my ($self, $color, $type, $subtype, $message) = @_;
1514
1515 $self->drawinfo ($color, $message);
1275} 1516}
1276 1517
1277sub conn::spell_add { 1518sub conn::spell_add {
1278 my ($self, $spell) = @_; 1519 my ($self, $spell) = @_;
1279 1520
1280 # TODO 1521 # TODO
1281 # create a widget dynamically, using spell face (CF::Protocol downloads them) 1522 # create a widget dynamically, using spell face (CF::Protocol downloads them)
1282 $MAPWIDGET->add_command ("invoke $spell->{name}", $spell->{message}); 1523 $MAPWIDGET->add_command ("invoke $spell->{name}", CFClient::UI::Label::escape $spell->{message});
1283 $MAPWIDGET->add_command ("cast $spell->{name}", $spell->{message}); 1524 $MAPWIDGET->add_command ("cast $spell->{name}", CFClient::UI::Label::escape $spell->{message});
1284} 1525}
1285 1526
1286sub conn::spell_delete { 1527sub conn::spell_delete {
1287 my ($self, $spell) = @_; 1528 my ($self, $spell) = @_;
1288} 1529}
1289 1530
1290sub conn::addme_success { 1531sub conn::addme_success {
1291 my ($self) = @_; 1532 my ($self) = @_;
1292 1533
1534 $self->send ("command output-sync $CFG->{output_sync}");
1535 $self->send ("command output-count $CFG->{output_count}");
1536
1293 for my $skill (values %{$self->{skill_info}}) { 1537 for my $skill (values %{$self->{skill_info}}) {
1294 $MAPWIDGET->add_command ("ready_skill $skill", "Ready the skill '$skill'"); 1538 $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'"); 1539 $MAPWIDGET->add_command ("use_skill $skill", CFClient::UI::Label::escape "Immediately use the skill '$skill'");
1296 } 1540 }
1541}
1542
1543sub conn::eof {
1544 $MAPWIDGET->clr_commands;
1545
1546 stop_game;
1297} 1547}
1298 1548
1299sub update_floorbox { 1549sub update_floorbox {
1300 $CFClient::UI::ROOT->on_refresh ($FLOORBOX => sub { 1550 $CFClient::UI::ROOT->on_refresh ($FLOORBOX => sub {
1551 return unless $CONN;
1552
1301 $FLOORBOX->clear; 1553 $FLOORBOX->clear;
1302 $FLOORBOX->add (new CFClient::UI::Empty expand => 1); 1554 $FLOORBOX->add (new CFClient::UI::Empty expand => 1);
1303 1555
1304 my @items = values %{ $CONN->{container}{0} }; 1556 my $count = 4;
1305 1557 for (@{ $CONN->{container}{0} }) {
1306 # we basically have to use the same sorting as everybody else 1558 if (--$count) {
1307 @items = sort { $a->{type} <=> $b->{type} } @items; 1559 $FLOORBOX->add (new CFClient::UI::InventoryItem item => $_);
1308 1560 } else {
1309 for my $item (reverse @items) { 1561 $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 }, 1562 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 1563 }
1343 $hbox->add (new CFClient::UI::Label
1344 can_events => 0,
1345 text => $desc,
1346 );
1347 } 1564 }
1348 }); 1565 });
1349 refresh; 1566
1567 $WANT_REFRESH++;
1350} 1568}
1351 1569
1352sub conn::container_add { 1570sub conn::container_add {
1353 my ($self, $id, $items) = @_; 1571 my ($self, $tag, $items) = @_;
1354 1572
1355 update_floorbox if $id == 0; 1573 #d# print "container_add: container $tag ($self->{player}{tag})\n";
1574
1575 if ($tag == 0) {
1576 update_floorbox;
1577 $OPENCONT = 0;
1578 $INVR_LBL->set_text ("Floor");
1579 $INVR->set_items ($self->{container}{0});
1580 } elsif ($tag == $self->{player}{tag}) {
1581 $INVR_LBL->set_text ("Player");
1582 $INV->set_items ($self->{container}{$self->{player}{tag}})
1583 } else {
1584 $OPENCONT = $tag;
1585 $INVR_LBL->set_text (CFClient::UI::InventoryItem::_item_to_desc ($self->{item}->{$OPENCONT}));
1586 $INVR->set_items ($self->{container}{$tag});
1587 }
1588
1356 # $self-<{player}{tag} => player inv 1589 # $self-<{player}{tag} => player inv
1357 #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}}; 1590 #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}};
1358} 1591}
1359 1592
1360sub conn::container_clear { 1593sub conn::container_clear {
1361 my ($self, $id) = @_; 1594 my ($self, $tag) = @_;
1362 1595
1363 update_floorbox if $id == 0; 1596 #d# print "container_clear: container $tag ($self->{player}{tag})\n";
1597
1598 if ($tag == 0) {
1599 update_floorbox;
1600 $OPENCONT = 0;
1601 $INVR_LBL->set_text ("Floor");
1602 $INVR->set_items ($self->{container}{0});
1603 } elsif ($tag == $self->{player}{tag}) {
1604 $INVR_LBL->set_text ("Player");
1605 $INV->set_items ($self->{container}{$tag})
1606 } else {
1607 $OPENCONT = $tag;
1608 $INVR_LBL->set_text (CFClient::UI::InventoryItem::_item_to_desc ($self->{item}->{$OPENCONT}));
1609 $INVR->set_items ($self->{container}{$tag});
1610 }
1611
1364# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0}; 1612# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0};
1365} 1613}
1366 1614
1367sub conn::item_delete { 1615sub conn::item_delete {
1368 my ($self, @items) = @_; 1616 my ($self, @items) = @_;
1369 1617
1370 for (@items) { 1618 for (@items) {
1371 update_floorbox if $_->{container} == 0; 1619 #d# print "item_delete: $_->{tag} from $_->{container} ($self->{player}{tag})\n";
1620
1621 if ($_->{container} == 0) {
1622 update_floorbox;
1623 $OPENCONT = 0;
1624 $INVR_LBL->set_text ("Floor");
1625 $INVR->set_items ($self->{container}{0});
1626 } elsif ($_->{container} == $self->{player}{tag}) {
1627 $INVR_LBL->set_text ("Player");
1628 $INV->set_items ($self->{container}{$self->{player}{tag}})
1629 } else {
1630 $OPENCONT = $_->{container};
1631 $INVR_LBL->set_text (CFClient::UI::InventoryItem::_item_to_desc ($self->{item}->{$OPENCONT}));
1632 $INVR->set_items ($self->{container}{$_->{container}});
1633 }
1372 } 1634 }
1373} 1635}
1374 1636
1375sub conn::item_update { 1637sub conn::item_update {
1376 my ($self, $item) = @_; 1638 my ($self, $item) = @_;
1377 1639
1378 update_floorbox if $item->{container} == 0; 1640 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($OPENCONT)\n";
1641
1642 if ($item->{tag} == $OPENCONT && not ($item->{flags} & Crossfire::Protocol::F_OPEN)) {
1643 $OPENCONT = 0;
1644 $INVR_LBL->set_text ("Floor");
1645 $INVR->set_items ($self->{container}{0});
1646
1647 $item->{widget}->update_item
1648 if $item->{widget};
1649 } else {
1650 if ($item->{container} == 0) {
1651 update_floorbox;
1652 $OPENCONT = 0;
1653 $INVR_LBL->set_text ("Floor");
1654 $INVR->set_items ($self->{container}{0});
1655 } elsif ($item->{container} == $self->{player}{tag}) {
1656 $INV->set_items ($self->{container}{$item->{container}})
1657 }
1658 }
1379} 1659}
1380 1660
1381%SDL_CB = ( 1661%SDL_CB = (
1382 CFClient::SDL_QUIT => sub { 1662 CFClient::SDL_QUIT => sub {
1383 Event::unloop -1; 1663 Event::unloop -1;
1384 }, 1664 },
1385 CFClient::SDL_VIDEORESIZE => sub { 1665 CFClient::SDL_VIDEORESIZE => sub {
1386 }, 1666 },
1387 CFClient::SDL_VIDEOEXPOSE => \&refresh, 1667 CFClient::SDL_VIDEOEXPOSE => sub {
1668 $WANT_REFRESH++;
1669 },
1388 CFClient::SDL_ACTIVEEVENT => sub { 1670 CFClient::SDL_ACTIVEEVENT => sub {
1389# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 1671# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
1390 }, 1672 },
1391 CFClient::SDL_KEYDOWN => sub { 1673 CFClient::SDL_KEYDOWN => sub {
1392 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) { 1674 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {
… …
1396 video_init; 1678 video_init;
1397 } else { 1679 } else {
1398 CFClient::UI::feed_sdl_key_down_event ($_[0]); 1680 CFClient::UI::feed_sdl_key_down_event ($_[0]);
1399 } 1681 }
1400 }, 1682 },
1401 CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event, 1683 CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event,
1402 CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event, 1684 CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event,
1403 CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event, 1685 CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event,
1404 CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event, 1686 CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event,
1405 CFClient::SDL_USEREVENT => \&audio_music_finished, 1687 CFClient::SDL_USEREVENT => sub {
1688 if ($_[0]{code} == 1) {
1689 audio_channel_finished $_[0]{data1};
1690 } elsif ($_[0]{code} == 0) {
1691 audio_music_finished;
1692 }
1693 },
1406); 1694);
1407 1695
1408############################################################################# 1696#############################################################################
1409 1697
1410$SIG{INT} = $SIG{TERM} = sub { exit }; 1698$SIG{INT} = $SIG{TERM} = sub { exit };
1411 1699
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{ 1700{
1701 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] };
1702
1703 CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
1704
1705 $TILECACHE = CFClient::db_table "tilecache";
1706 $FACEMAP = CFClient::db_table "facemap";
1707
1708 my %DEF_CFG = (
1709 sdl_mode => 0,
1710 width => 640,
1711 height => 480,
1712 fullscreen => 0,
1713 fast => 0,
1714 map_scale => 1,
1715 fow_enable => 1,
1716 fow_intensity => 0.45,
1717 fow_smooth => 0,
1718 gui_fontsize => 1,
1719 log_fontsize => 1,
1720 gauge_fontsize=> 1,
1721 gauge_size => 0.35,
1722 stat_fontsize => 1,
1723 mapsize => 100,
1724 host => "crossfire.schmorp.de",
1725 say_command => 'say',
1726 audio_enable => 1,
1727 bgm_enable => 1,
1728 bgm_volume => 0.25,
1729 output_sync => 1,
1730 output_count => 1,
1731 );
1732
1733 while (my ($k, $v) = each %DEF_CFG) {
1734 $CFG->{$k} = $v unless exists $CFG->{$k};
1735 }
1736
1737 sdl_init;
1738
1739 @SDL_MODES = reverse
1740 grep $_->[0] >= 640 && $_->[1] >= 480,
1741 CFClient::SDL_ListModes;
1742
1743 @SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
1744
1745 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1746
1747 {
1455 my @fonts = map CFClient::find_rcfile "fonts/$_", qw( 1748 my @fonts = map CFClient::find_rcfile "fonts/$_", qw(
1456 DejaVuSans.ttf 1749 DejaVuSans.ttf
1457 DejaVuSansMono.ttf 1750 DejaVuSansMono.ttf
1458 DejaVuSans-Bold.ttf 1751 DejaVuSans-Bold.ttf
1459 DejaVuSansMono-Bold.ttf 1752 DejaVuSansMono-Bold.ttf
1460 DejaVuSans-Oblique.ttf 1753 DejaVuSans-Oblique.ttf
1461 DejaVuSansMono-Oblique.ttf 1754 DejaVuSansMono-Oblique.ttf
1462 DejaVuSans-BoldOblique.ttf 1755 DejaVuSans-BoldOblique.ttf
1463 DejaVuSansMono-BoldOblique.ttf 1756 DejaVuSansMono-BoldOblique.ttf
1464 ); 1757 );
1465 1758
1466 CFClient::add_font $_ for @fonts; 1759 CFClient::add_font $_ for @fonts;
1467 1760
1761 CFClient::pango_init;
1762
1468 $FONT_PROP = new_from_file CFClient::Font $fonts[0]; 1763 $FONT_PROP = new_from_file CFClient::Font $fonts[0];
1469 $FONT_FIXED = new_from_file CFClient::Font $fonts[1]; 1764 $FONT_FIXED = new_from_file CFClient::Font $fonts[1];
1470 1765
1471 $FONT_PROP->make_default; 1766 $FONT_PROP->make_default;
1472} 1767 }
1473 1768
1769# compare mono (ft) vs. rgba (cairo)
1770# ft - 1.8s, cairo 3s, even in alpha-only mode
1771# for my $rgba (0..1) {
1772# my $t1 = Time::HiRes::time;
1773# for (1..1000) {
1774# my $layout = CFClient::Layout->new ($rgba);
1775# $layout->set_text ("hallo" x 100);
1776# $layout->render;
1777# }
1778# my $t2 = Time::HiRes::time;
1779# warn $t2-$t1;
1780# }
1781
1474video_init; 1782 video_init;
1475audio_init; 1783 audio_init;
1784}
1476 1785
1477Event::loop; 1786Event::loop;
1478 1787
1479END { CFClient::SDL_Quit } 1788END { CFClient::SDL_Quit }
1480 1789
… …
1531 1840
1532Typing B<climb> will display a list of commands with I<climb> in their 1841Typing B<climb> will display a list of commands with I<climb> in their
1533name, such as I<ready_skill climbing> and I<use_skill climbing>. 1842name, such as I<ready_skill climbing> and I<use_skill climbing>.
1534 1843
1535You can abbreviate commands by typing only the first character of every 1844You can abbreviate commands by typing only the first character of every
1536word. For example, typing I<iwor> will likely select I<invoke word of 1845word (or even characters within the word - the client will try to make
1537recall>, while I<ccfo> will select I<cast create food>. Likewise, I<rscli> 1846a good guess, as long as the characters are in order). For example,
1538will likely select I<ready_skill climbing> and I<usl> will give you 1847typing I<iwor> will likely select I<invoke word of recall>, while I<ccfo>
1539I<use_skill levitation>. 1848will select I<cast create food>. Likewise, I<rscli> will likely select
1849I<ready_skill climbing> and I<usl> will give you I<use_skill levitation>.
1850
1851You can enter space and other text as arguemnt to the command. For
1852example, C<cfoo waybread> will expand to C<cast create food waybread>.
1540 1853
1541=head2 The map overview 1854=head2 The map overview
1542 1855
1543#TODO# 1856#TODO#
1544 1857

Diff Legend

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