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.195 by root, Sun Apr 30 11:17:09 2006 UTC vs.
Revision 1.235 by root, Mon May 22 02:23:10 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;
… …
76our $MAPWIDGET; 81our $MAPWIDGET;
77our $BUTTONBAR; 82our $BUTTONBAR;
78our $LOGVIEW; 83our $LOGVIEW;
79our $CONSOLE; 84our $CONSOLE;
80our $METASERVER; 85our $METASERVER;
86our $LOGIN_BUTTON;
81 87
82our $FLOORBOX; 88our $FLOORBOX;
83our $GAUGES; 89our $GAUGES;
84our $STATWIDS; 90our $STATWIDS;
85 91
… …
89our $SDL_MIXER; 95our $SDL_MIXER;
90our @SOUNDS; # event => file mapping 96our @SOUNDS; # event => file mapping
91our %AUDIO_CHUNKS; # audio files 97our %AUDIO_CHUNKS; # audio files
92 98
93our $ALT_ENTER_MESSAGE; 99our $ALT_ENTER_MESSAGE;
94our $STATUS_LINE; 100our $STATUSBOX;
95our $DEBUG_STATUS; 101our $DEBUG_STATUS;
96 102
97our $INVWIN; 103our $INVWIN;
98our $INV; 104our $INV;
105our $INVR;
106our $INVR_LBL;
107our $OPENCONT;
99 108
100sub status { 109sub status {
101 $STATUS_LINE->set_text ($_[0]); 110 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 20, fg => [1, 1, 0, 1]);
102 $STATUS_LINE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $STATUS_LINE->{h});
103} 111}
104 112
105sub debug { 113sub debug {
106 $DEBUG_STATUS->set_text ($_[0]); 114 $DEBUG_STATUS->set_text ($_[0]);
107 $DEBUG_STATUS->move ($WIDTH - $DEBUG_STATUS->{w}, 0, $DEBUG_STATUS->{w}, $DEBUG_STATUS->{h}); 115 my ($w, $h) = $DEBUG_STATUS->size_request;
116 $DEBUG_STATUS->move ($WIDTH - $w, 0);
108} 117}
109 118
110sub start_game { 119sub start_game {
111 status "logging in..."; 120 status "logging in...";
112 121
113 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 122 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
114 123
115 $MAPCACHE = CFClient::db_table "mapcache_$CFG->{host}"; 124 $MAPCACHE = CFClient::db_table "mapcache_$CFG->{host}";
116
117 $MAP = new CFClient::Map $mapsize, $mapsize; 125 $MAP = new CFClient::Map $mapsize, $mapsize;
118 126
119 my ($host, $port) = split /:/, $CFG->{host}; 127 my ($host, $port) = split /:/, $CFG->{host};
120 128
121 $CONN = eval { 129 $CONN = eval {
… …
128 maph => $mapsize, 136 maph => $mapsize,
129 ; 137 ;
130 }; 138 };
131 139
132 if ($CONN) { 140 if ($CONN) {
141 CFClient::lowdelay fileno $CONN->{fh};
142
143 $LOGIN_BUTTON->set_text ("Logout");
133 status "login successful"; 144 status "login successful";
134 145
135 CFClient::lowdelay fileno $CONN->{fh}; 146 $BUTTONBAR->{children}[1]->emit ("activate")
147 if $BUTTONBAR->{children}[1]->{state};
148
136 } else { 149 } else {
137 status "unable to connect"; 150 status "unable to connect";
151 stop_game();
138 } 152 }
139} 153}
140 154
141sub 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;
142 undef $CONN; 167 undef $MAP;
143} 168}
144 169
145sub client_setup { 170sub client_setup {
146 my $dialog = new CFClient::UI::FancyFrame 171 my $dialog = new CFClient::UI::FancyFrame
147 title => "Client Setup", 172 title => "Client Setup",
… …
149 $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]);
150 175
151 $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");
152 $table->add (1, 0, my $hbox = new CFClient::UI::HBox); 177 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
153 178
154 $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]);
155 $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");
156 181
157 $mode_slider->connect (changed => sub { 182 $mode_slider->connect (changed => sub {
158 my ($self, $value) = @_; 183 my ($self, $value) = @_;
159 184
… …
184 } 209 }
185 ); 210 );
186 211
187 $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");
188 $table->add (1, $row++, new CFClient::UI::Slider 213 $table->add (1, $row++, new CFClient::UI::Slider
189 range => [$CFG->{map_scale}, 0.25, 2, 0.05], 214 range => [$CFG->{map_scale}, 0.25, 2, 0.05, 0.05],
190 tooltip => "Enlarge or shrink the displayed map", 215 tooltip => "Enlarge or shrink the displayed map",
191 connect_changed => sub { 216 connect_changed => sub {
192 my ($self, $value) = @_; 217 my ($self, $value) = @_;
193 $CFG->{map_scale} = 0.05 * int $value / 0.05; 218 $CFG->{map_scale} = $value;
194 } 219 }
195 ); 220 );
196 221
197 $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");
198 $table->add (1, $row++, new CFClient::UI::CheckBox 223 $table->add (1, $row++, new CFClient::UI::CheckBox
… …
225 } 250 }
226 ); 251 );
227 252
228 $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");
229 $table->add (1, $row++, new CFClient::UI::Slider 254 $table->add (1, $row++, new CFClient::UI::Slider
230 range => [$CFG->{gui_fontsize}, 0.5, 2, 0.1], 255 range => [$CFG->{gui_fontsize}, 0.5, 2, 0.1, 0.1],
231 tooltip => "The font size used by most GUI elements", 256 tooltip => "The font size used by most GUI elements",
232 connect_changed => sub { 257 connect_changed => sub { $CFG->{gui_fontsize} = $_[1] },
233 $CFG->{gui_fontsize} = 0.1 * int $_[1] * 10;
234# $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
235 }
236 ); 258 );
237 259
238 $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");
239 $table->add (1, $row++, new CFClient::UI::Slider 261 $table->add (1, $row++, new CFClient::UI::Slider
240 range => [$CFG->{log_fontsize}, 0.5, 2, 0.1], 262 range => [$CFG->{log_fontsize}, 0.5, 2, 0.1, 0.1],
241 tooltip => "The font size used by the server log window only", 263 tooltip => "The font size used by the server log window only",
242 connect_changed => sub { 264 connect_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]) },
243 $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = 0.1 * int $_[1] * 10);
244 }
245 ); 265 );
246 266
247 $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");
248 268
249 $table->add (1, $row++, new CFClient::UI::Slider 269 $table->add (1, $row++, new CFClient::UI::Slider
250 range => [$CFG->{stat_fontsize}, 0.5, 2, 0.1], 270 range => [$CFG->{stat_fontsize}, 0.5, 2, 0.1, 0.1],
251 tooltip => "The font size used by the statistics window only", 271 tooltip => "The font size used by the statistics window only",
252 connect_changed => sub { 272 connect_changed => sub {
253 $CFG->{stat_fontsize} = 0.1 * int $_[1] * 10; 273 $CFG->{stat_fontsize} = $_[1];
254 &set_stats_window_fontsize; 274 &set_stats_window_fontsize;
255 } 275 }
256 ); 276 );
257 277
258 $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");
259 $table->add (1, $row++, new CFClient::UI::Slider 279 $table->add (1, $row++, new CFClient::UI::Slider
260 range => [$CFG->{gauge_size}, 0.2, 0.8, 0.02], 280 range => [$CFG->{gauge_size}, 0.2, 0.8, 0.02],
261 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",
262 connect_changed => sub { 282 connect_changed => sub {
263 $CFG->{gauge_size} = $_[1]; 283 $CFG->{gauge_size} = $_[1];
264 my $h = int $HEIGHT * $CFG->{gauge_size}; 284 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
265 $GAUGES->{win}->set_size ($WIDTH, $h);
266 $GAUGES->{win}->move (0, $HEIGHT - $h);
267 } 285 }
268 ); 286 );
269 287
270 $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");
271 $table->add (1, $row++, new CFClient::UI::Slider 289 $table->add (1, $row++, new CFClient::UI::Slider
272 range => [$CFG->{gauge_fontsize}, 0.5, 2.0, 0.1], 290 range => [$CFG->{gauge_fontsize}, 0.5, 2.0, 0.1, 0.1],
273 tooltip => "Adjusts the fontsize of the gauges at the bottom right", 291 tooltip => "Adjusts the fontsize of the gauges at the bottom right",
274 connect_changed => sub { 292 connect_changed => sub {
275 $CFG->{gauge_fontsize} = 0.1 * int $_[1] * 10; 293 $CFG->{gauge_fontsize} = $_[1];
276 &set_gauge_window_fontsize; 294 &set_gauge_window_fontsize;
277 } 295 }
278 ); 296 );
279 297
280 $table->add (1, $row++, new CFClient::UI::Button 298 $table->add (1, $row++, new CFClient::UI::Button
… …
354# local $GAUGES->{win}{parent};#d# 372# local $GAUGES->{win}{parent};#d#
355# 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;
356} 374}
357 375
358sub make_gauge_window { 376sub make_gauge_window {
359 my $gh = int ($HEIGHT * $CFG->{gauge_size}); 377 my $gh = int $HEIGHT * $CFG->{gauge_size};
360# my $gw = int ($WIDTH * $CFG->{gauge_w_size});
361 378
362 my $win = new CFClient::UI::Frame ( 379 my $win = new CFClient::UI::Frame (
363 y => $HEIGHT - $gh, x => 0, user_w => $WIDTH, user_h => $gh 380 req_y => -1,
381 user_w => $WIDTH,
382 user_h => $gh,
364 ); 383 );
384
365 $win->add (my $hbox = new CFClient::UI::HBox 385 $win->add (my $hbox = new CFClient::UI::HBox
366 children => [ 386 children => [
367 (new CFClient::UI::HBox expand => 1), 387 (new CFClient::UI::HBox expand => 1),
368 ($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 ]),
369 (my $vbox = new CFClient::UI::VBox), 392 (my $vbox = new CFClient::UI::VBox),
370 ], 393 ],
371 ); 394 );
372 395
373 $vbox->add (new CFClient::UI::HBox 396 $vbox->add (new CFClient::UI::HBox
… …
443 466
444 my $row = 0; 467 my $row = 0;
445 my $col = 0; 468 my $col = 0;
446 469
447 my %resist_names = ( 470 my %resist_names = (
448 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.)", 471 slow => "<b>Slow</b> (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.)",
449 holyw => "Holy Word (resistance you against getting the fear when someone whose god doesn't like you spells the holy word on you.)", 472 holyw => "<b>Holy Word</b> (resistance you against getting the fear when someone whose god doesn't like you spells the holy word on you.)",
450 conf => "Confusion (If you are hit by confusion you will move into random directions, and likely into monsters.)", 473 conf => "<b>Confusion</b> (If you are hit by confusion you will move into random directions, and likely into monsters.)",
451 fire => "Fire (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)", 474 fire => "<b>Fire</b> (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)",
452 depl => "Depletion (some monsters and other effects can cause stats depletion)", 475 depl => "<b>Depletion</b> (some monsters and other effects can cause stats depletion)",
453 magic => "Magic (resistance to magic spells like magic missile or similar)", 476 magic => "<b>Magic</b> (resistance to magic spells like magic missile or similar)",
454 drain => "Draining (some monsters (e.g. vampires) and other effects can steal experience)", 477 drain => "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)",
455 acid => "Acid (resistance to acid, acid hurts pretty much and also corrodes your weapons)", 478 acid => "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)",
456 pois => "Poison (resistance to getting poisoned)", 479 pois => "<b>Poison</b> (resistance to getting poisoned)",
457 para => "Paralysation (this resistance affects the chance you get paralysed)", 480 para => "<b>Paralysation</b> (this resistance affects the chance you get paralysed)",
458 deat => "Death (resistance against death spells)", 481 deat => "<b>Death</b> (resistance against death spells)",
459 phys => "Physical (this is the resistance against physical attacks, like when a monster hit you in melee combat)", 482 phys => "<b>Physical</b> (this is the resistance against physical attacks, like when a monster hit you in melee combat)",
460 blind => "Blind (blind resistance affects the chance of a successful blinding attack)", 483 blind => "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)",
461 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)", 484 fear => "<b>Fear</b> (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)",
462 tund => "Turn undead", 485 tund => "<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead...",
463 elec => "Electricity (resistance againt electricity, spells like large lightning, small lightning, ...)", 486 elec => "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)",
464 cold => "Cold (this is your resistance against cold spells like icestorm, snowstorm, ...)", 487 cold => "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)",
465 ghit => "Ghost hit (special attack used by ghosts and ghost-like beings)", 488 ghit => "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)",
466 ); 489 );
467 for (qw/slow holyw conf fire depl magic 490 for (qw/slow holyw conf fire depl magic
468 drain acid pois para deat phys 491 drain acid pois para deat phys
469 blind fear tund elec cold ghit/) 492 blind fear tund elec cold ghit/)
470 { 493 {
… …
571 594
572} 595}
573 596
574sub metaserver_dialog { 597sub metaserver_dialog {
575 my $dialog = new CFClient::UI::FancyFrame 598 my $dialog = new CFClient::UI::FancyFrame
576 title => "Metaserver", 599 title => "Server List",
577 child => (my $vbox = new CFClient::UI::VBox); 600 child => (my $vbox = new CFClient::UI::VBox);
578 601
579 $vbox->add ($dialog->{table} = new CFClient::UI::Table); 602 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
580 603
581 $dialog 604 $dialog
… …
650 $HOST->set_text ($CFG->{host} = $host); 673 $HOST->set_text ($CFG->{host} = $host);
651 }), 674 }),
652 (new CFClient::UI::Empty expand => 1), 675 (new CFClient::UI::Empty expand => 1),
653 ]); 676 ]);
654 677
655 $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)
656 for 0 .. $#$m; 680 for 0 .. $#$m;
657 } 681 }
658 } 682 }
659 }); 683 });
660} 684}
… …
683 707
684 $METASERVER = metaserver_dialog; 708 $METASERVER = metaserver_dialog;
685 709
686 $vbox->add (new CFClient::UI::Flopper 710 $vbox->add (new CFClient::UI::Flopper
687 expand => 1, 711 expand => 1,
688 text => "Metaserver", 712 text => "Server List",
689 other => $METASERVER, 713 other => $METASERVER,
690 tooltip => "Show a list of avaible crossfire servers", 714 tooltip => "Show a list of available crossfire servers",
691 connect_open => sub { 715 connect_open => sub {
692 update_metaserver $HOST; 716 update_metaserver $HOST;
693 } 717 }
694 ); 718 );
695 } 719 }
… …
716 ); 740 );
717 741
718 $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");
719 $table->add (1, 7, new CFClient::UI::Slider 743 $table->add (1, 7, new CFClient::UI::Slider
720 req_w => 100, 744 req_w => 100,
721 range => [$CFG->{mapsize}, 10, 100 + 1, 1], 745 range => [$CFG->{mapsize}, 10, 100 + 1, 1, 1],
722 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. "
723 ."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.",
724 connect_changed => sub { 748 connect_changed => sub {
725 my ($self, $value) = @_; 749 my ($self, $value) = @_;
726 750
727 $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 751 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
728 }, 752 },
729 ); 753 );
730 754
731 $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");
732 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] },
733 }); 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 );
734 778
735 $dialog 779 $dialog
736} 780}
737 781
738sub message_window { 782sub message_window {
… …
742 bg => [0, 0, 0, 0.5], 786 bg => [0, 0, 0, 0.5],
743 user_w => int $::WIDTH / 3, 787 user_w => int $::WIDTH / 3,
744 user_h => int $::HEIGHT / 5, 788 user_h => int $::HEIGHT / 5,
745 child => (my $vbox = new CFClient::UI::VBox); 789 child => (my $vbox = new CFClient::UI::VBox);
746 790
747 $vbox->add ($LOGVIEW = new CFClient::UI::TextView 791 $vbox->add ($LOGVIEW);
748 expand => 1,
749 font => $FONT_FIXED,
750 fontsize => $::CFG->{log_fontsize},
751 );
752 792
753 $vbox->add (my $input = new CFClient::UI::Entry 793 $vbox->add (my $input = new CFClient::UI::Entry
754 connect_focus_in => sub { 794 connect_focus_in => sub {
755 my ($input, $prev_focus) = @_; 795 my ($input, $prev_focus) = @_;
756 796
… …
788 828
789 $window 829 $window
790} 830}
791 831
792sub make_inventory_window { 832sub make_inventory_window {
793 my $invwin = new CFClient::UI::FancyFrame user_w => 300, user_h => 300, title => "Inventory"; 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");
794 $invwin->add ($INV = new CFClient::UI::Inventory expand => 1); 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
795 $invwin 848 $invwin
796} 849}
797 850
798sub sdl_init { 851sub sdl_init {
799 CFClient::SDL_Init 852 CFClient::SDL_Init
… …
801} 854}
802 855
803sub video_init { 856sub video_init {
804 sdl_init; 857 sdl_init;
805 858
859 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
860
806 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 861 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
807 $FULLSCREEN = $CFG->{fullscreen}; 862 $FULLSCREEN = $CFG->{fullscreen};
808 $FAST = $CFG->{fast}; 863 $FAST = $CFG->{fast};
809 864
810 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 865 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN
811 or die "SDL_SetVideoMode failed!\n"; 866 or die "SDL_SetVideoMode failed: " . (CFClient::SDL_GetError) . "\n";
812 867
813 $SDL_ACTIVE = 1; 868 $SDL_ACTIVE = 1;
814
815 $LAST_REFRESH = time - 0.01; 869 $LAST_REFRESH = time - 0.01;
816 870
817 CFClient::gl_init; 871 CFClient::gl_init;
818 872
819 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 873 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
820 874
875 $CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
876
821 ############################################################################# 877 #############################################################################
822 878
879 unless ($DEBUG_STATUS) {
880 # create the widgets
881
823 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100; 882 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, req_x => -1;
824 $DEBUG_STATUS->show; 883 $DEBUG_STATUS->show;
825 884
826 $STATUS_LINE = new CFClient::UI::Label 885 $STATUSBOX = new CFClient::UI::Statusbox;
827 padding => 0, 886 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]);
828 y => $HEIGHT - $FONTSIZE * 1.8;
829 $STATUS_LINE->show;
830 887
831 $ALT_ENTER_MESSAGE = new CFClient::UI::Label 888 (new CFClient::UI::Frame
832 padding => 0, 889 bg => [0, 0, 0, 0.4],
833 fontsize => 0.8, 890 req_y => -1,
834 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode"; 891 child => $STATUSBOX,
835 $ALT_ENTER_MESSAGE->show; 892 )->show;
836 $ALT_ENTER_MESSAGE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h});
837 893
838 CFClient::UI::FancyFrame->new ( 894 CFClient::UI::FancyFrame->new (
839 border_bg => [1, 1, 1, 192/255], 895 border_bg => [1, 1, 1, 192/255],
840 bg => [1, 1, 1, 0], 896 bg => [1, 1, 1, 0],
841 child => ($MAPMAP = new CFClient::MapWidget::MapMap), 897 child => ($MAPMAP = new CFClient::MapWidget::MapMap),
842 )->show; 898 )->show;
843 899
844 $MAPWIDGET = new CFClient::MapWidget; 900 $MAPWIDGET = new CFClient::MapWidget;
845 $MAPWIDGET->connect (activate_console => sub { 901 $MAPWIDGET->connect (activate_console => sub {
846 my ($mapwidget, $preset) = @_; 902 my ($mapwidget, $preset) = @_;
847 903
848 if ($CONSOLE) { 904 if ($CONSOLE) {
849 $CONSOLE->{input}->{auto_activated} = 1; 905 $CONSOLE->{input}->{auto_activated} = 1;
850 $CONSOLE->{input}->focus_in; 906 $CONSOLE->{input}->focus_in;
851 907
852 if ($preset && $CONSOLE->{input}->get_text eq '') { 908 if ($preset && $CONSOLE->{input}->get_text eq '') {
853 $CONSOLE->{input}->set_text ($preset); 909 $CONSOLE->{input}->set_text ($preset);
910 }
854 } 911 }
855 } 912 });
856 });
857 $MAPWIDGET->show; 913 $MAPWIDGET->show;
858 $MAPWIDGET->focus_in; 914 $MAPWIDGET->focus_in;
859 915
916 $LOGVIEW = new CFClient::UI::TextView
917 expand => 1,
918 font => $FONT_FIXED,
919 fontsize => $::CFG->{log_fontsize},
920 ;
921
860 $BUTTONBAR = new CFClient::UI::HBox; 922 $BUTTONBAR = new CFClient::UI::HBox;
861 923
862 $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);
863 $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);
864 $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);
865 927
866 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 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
867 929
868 $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);
869 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window); 931 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window);
870 932
871 $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 {
872 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 934 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
873 status "Configuration Saved"; 935 status "Configuration Saved";
874 }); 936 });
875 937
876 $BUTTONBAR->show; 938 $BUTTONBAR->show;
877 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 {
878 $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 }
879} 950}
880 951
881sub video_shutdown { 952sub video_shutdown {
882 $CFClient::UI::ROOT->{children} = [];
883 undef $CFClient::UI::GRAB;
884 undef $CFClient::UI::HOVER;
885 undef $SDL_ACTIVE; 953 undef $SDL_ACTIVE;
886} 954}
887 955
888my @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#
889my $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}
890 964
891sub audio_music_finished { 965sub audio_music_finished {
892 return unless $CFG->{bgm_enable}; 966 return unless $CFG->{bgm_enable};
893 967
894 # TODO: hack, do play loop and mood music 968 # TODO: hack, do play loop and mood music
… …
935} 1009}
936 1010
937my %animate_object; 1011my %animate_object;
938my $animate_timer; 1012my $animate_timer;
939 1013
940my $want_refresh;
941my $can_refresh;
942
943my $fps = 9; 1014my $fps = 9;
944 1015
1016my %demo;#d#
1017
945sub force_refresh { 1018sub force_refresh {
946 $fps = $fps * 0.95 + 1 / ($NOW - $LAST_REFRESH) * 0.05; 1019 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
947 debug sprintf "%3.2f", $fps; 1020 debug sprintf "%3.2f", $fps;
948 1021
949 $want_refresh = 0;
950 $can_refresh = 0;
951
952 $CFClient::UI::ROOT->draw; 1022 $CFClient::UI::ROOT->draw;
953 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
954 CFClient::SDL_GL_SwapBuffers; 1082 CFClient::SDL_GL_SwapBuffers;
955
956 $LAST_REFRESH = $NOW;
957} 1083}
958 1084
959my $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 {
960 $NOW = time; 1086 $NOW = time;
961 1087
962 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 1088 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
963 for CFClient::SDL_PollEvent; 1089 for CFClient::SDL_PollEvent;
964 1090
965 if (%animate_object) { 1091 if (%animate_object) {
966 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 1092 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
967 $want_refresh++; 1093 $WANT_REFRESH++;
968 } 1094 }
969 1095
970 if ($want_refresh) { 1096 if ($WANT_REFRESH) {
971 force_refresh; 1097 force_refresh;
972 } else { 1098 } else {
973 $can_refresh = 1; 1099 $CAN_REFRESH = 1;
974 } 1100 }
975}); 1101});
976
977sub refresh {
978 $want_refresh++;
979}
980 1102
981sub animation_start { 1103sub animation_start {
982 my ($widget) = @_; 1104 my ($widget) = @_;
983 $animate_object{$widget} = $widget; 1105 $animate_object{$widget} = $widget;
984} 1106}
… …
988 delete $animate_object{$widget}; 1110 delete $animate_object{$widget};
989} 1111}
990 1112
991@conn::ISA = Crossfire::Protocol::; 1113@conn::ISA = Crossfire::Protocol::;
992 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
993sub conn::stats_update { 1145sub conn::stats_update {
994 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 }
995 1154
996 update_stats_window ($stats); 1155 update_stats_window ($stats);
997} 1156}
998 1157
999sub conn::user_send { 1158sub conn::user_send {
… …
1054 $self->set_texture ($id => $data); 1213 $self->set_texture ($id => $data);
1055 } 1214 }
1056 } 1215 }
1057} 1216}
1058 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
1059# this method does a "flood fill" into every tile direction 1251# this method does a "flood fill" into every tile direction
1060# it assumes that tiles are arranged in a rectangular grid, 1252# it assumes that tiles are arranged in a rectangular grid,
1061# 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.
1062# failure to comply are harmless and result in display errors 1254# failure to comply are harmless and result in display errors
1063# at worst. 1255# at worst.
1064sub conn::flood_fill { 1256sub conn::flood_fill {
1065 my ($self, $gx, $gy, $path, $hash, $flags) = @_; 1257 my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_;
1066 1258
1067 # the server does not allow map paths > 6 1259 # the server does not allow map paths > 6
1068 return if 7 <= length $path; 1260 return if 7 <= length $path;
1069 1261
1070 my ($x0, $y0, $x1, $y1) = @{$self->{neigh_rect}}; 1262 my ($x0, $y0, $x1, $y1) = @{$self->{neigh_rect}};
1071 1263
1072 for ( 1264 for (
1073 [1, 0, -1], 1265 [1, 3, 0, -1],
1074 [2, 1, 0], 1266 [2, 4, 1, 0],
1075 [3, 0, 1], 1267 [3, 1, 0, 1],
1076 [4, -1, 0], 1268 [4, 2, -1, 0],
1077 ) { 1269 ) {
1078 my ($tile, $dx, $dy) = @$_; 1270 my ($tile, $tile2, $dx, $dy) = @$_;
1271
1272 next if $block & (1 << $tile);
1273 my $block = $block | (1 << $tile2);
1079 1274
1080 my $gx = $gx + $dx; 1275 my $gx = $gx + $dx;
1081 my $gy = $gy + $dy; 1276 my $gy = $gy + $dy;
1082 1277
1083 next unless $flags & (1 << ($tile - 1)); 1278 next unless $flags & (1 << ($tile - 1));
… …
1085 1280
1086 my $neigh = $self->{neigh_map}{$hash} ||= []; 1281 my $neigh = $self->{neigh_map}{$hash} ||= [];
1087 if (my $info = $neigh->[$tile]) { 1282 if (my $info = $neigh->[$tile]) {
1088 my ($flags, $x, $y, $w, $h, $hash) = @$info; 1283 my ($flags, $x, $y, $w, $h, $hash) = @$info;
1089 1284
1090 $self->flood_fill ($gx, $gy, "$path$tile", $hash, $flags) 1285 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
1091 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 1286 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
1092 1287
1093 } else { 1288 } else {
1094 $self->send_mapinfo ("spatial $path$tile", sub { 1289 $self->send_mapinfo ("spatial $path$tile", sub {
1095 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 1290 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
1096 1291
1097 return if $mode ne "spatial"; 1292 return if $mode ne "spatial";
1098 1293
1099 $x += $MAP->ox; 1294 $x += $MAP->ox;
1100 $y += $MAP->oy; 1295 $y += $MAP->oy;
1101 1296
1102 $self->load_map ($hash, $x, $y) 1297 $self->load_map ($hash, $x, $y)
1103 unless $self->{neigh_map}{$hash}[5]++;#d# 1298 unless $self->{neigh_map}{$hash}[5]++;#d#
1104 1299
1105 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash]; 1300 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash];
1106 1301
1107 $self->flood_fill ($gx, $gy, "$path$tile", $hash, $flags) 1302 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
1108 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 1303 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
1109 }); 1304 });
1110 } 1305 }
1111 } 1306 }
1112} 1307}
… …
1125 $ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5, 1320 $ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5,
1126 $ox + $mapmapw * 0.5 + $w, $oy + $mapmapw * 0.5 + $h, 1321 $ox + $mapmapw * 0.5 + $w, $oy + $mapmapw * 0.5 + $h,
1127 ]; 1322 ];
1128 1323
1129 delete $self->{neigh_grid}; 1324 delete $self->{neigh_grid};
1130 $self->flood_fill (0, 0, "", $hash, $flags);
1131 1325
1132 $x += $ox; 1326 $x += $ox;
1133 $y += $oy; 1327 $y += $oy;
1134 1328
1135 $self->{map_info} = [$hash, $x, $y, $w, $h]; 1329 $self->{map_info} = [$hash, $x, $y, $w, $h];
1136 1330
1137 my $map = $self->{map_info}[0];
1138 $map =~ s/^.*?\/([^\/]+)$/\1/; 1331 (my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/;
1139 $STATWIDS->{map}->set_text ("Map: " . $map); 1332 $STATWIDS->{map}->set_text ("Map: " . $map);
1140 1333
1141 $self->load_map ($hash, $x, $y); 1334 $self->load_map ($hash, $x, $y);
1335 $self->flood_fill (0, 0, 0, "", $hash, $flags);
1142} 1336}
1143 1337
1144sub conn::face_find { 1338sub conn::face_find {
1145 my ($self, $facenum, $face) = @_; 1339 my ($self, $facenum, $face) = @_;
1146 1340
… …
1296 [0.55, 0.41, 0.13], 1490 [0.55, 0.41, 0.13],
1297 [0.99, 0.77, 0.26], 1491 [0.99, 0.77, 0.26],
1298 [0.74, 0.65, 0.41], 1492 [0.74, 0.65, 0.41],
1299 ); 1493 );
1300 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
1301 $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);
1302} 1516}
1303 1517
1304sub conn::spell_add { 1518sub conn::spell_add {
1305 my ($self, $spell) = @_; 1519 my ($self, $spell) = @_;
1306 1520
1307 # TODO 1521 # TODO
1308 # create a widget dynamically, using spell face (CF::Protocol downloads them) 1522 # create a widget dynamically, using spell face (CF::Protocol downloads them)
1309 $MAPWIDGET->add_command ("invoke $spell->{name}", $spell->{message}); 1523 $MAPWIDGET->add_command ("invoke $spell->{name}", CFClient::UI::Label::escape $spell->{message});
1310 $MAPWIDGET->add_command ("cast $spell->{name}", $spell->{message}); 1524 $MAPWIDGET->add_command ("cast $spell->{name}", CFClient::UI::Label::escape $spell->{message});
1311} 1525}
1312 1526
1313sub conn::spell_delete { 1527sub conn::spell_delete {
1314 my ($self, $spell) = @_; 1528 my ($self, $spell) = @_;
1315} 1529}
1316 1530
1317sub conn::addme_success { 1531sub conn::addme_success {
1318 my ($self) = @_; 1532 my ($self) = @_;
1319 1533
1534 $self->send ("command output-sync $CFG->{output_sync}");
1535 $self->send ("command output-count $CFG->{output_count}");
1536
1537 my $parser = new Pod::POM;
1538 my $pod = $parser->parse_file (CFClient::find_rcfile "pod/skill_help.pod");
1539
1540 my %skill_tooltip;
1541
1542 for my $head2 ($pod->head2) {
1543 $skill_tooltip{$head2->title} = CFClient::pod_to_pango $head2->content;
1544 }
1545
1320 for my $skill (values %{$self->{skill_info}}) { 1546 for my $skill (values %{$self->{skill_info}}) {
1321 $MAPWIDGET->add_command ("ready_skill $skill", "Ready the skill '$skill'"); 1547 $MAPWIDGET->add_command ("ready_skill $skill",
1322 $MAPWIDGET->add_command ("use_skill $skill", "Immediately use the skill '$skill'"); 1548 (CFClient::UI::Label::escape "Ready the skill '$skill'\n\n")
1549 . $skill_tooltip{$skill});
1550 $MAPWIDGET->add_command ("use_skill $skill",
1551 (CFClient::UI::Label::escape "Immediately use the skill '$skill'\n\n")
1552 . $skill_tooltip{$skill});
1323 } 1553 }
1554}
1555
1556sub conn::eof {
1557 $MAPWIDGET->clr_commands;
1558
1559 stop_game;
1324} 1560}
1325 1561
1326sub update_floorbox { 1562sub update_floorbox {
1327 $CFClient::UI::ROOT->on_refresh ($FLOORBOX => sub { 1563 $CFClient::UI::ROOT->on_refresh ($FLOORBOX => sub {
1564 return unless $CONN;
1565
1328 $FLOORBOX->clear; 1566 $FLOORBOX->clear;
1329 $FLOORBOX->add (new CFClient::UI::Empty expand => 1); 1567 $FLOORBOX->add (new CFClient::UI::Empty expand => 1);
1330 1568
1331 # we basically have to use the same sorting as everybody else 1569 my $count = 4;
1332 for my $item (@{ $CONN->{container}{0} }) { 1570 for (@{ $CONN->{container}{0} }) {
1333 my $desc = $item->{nrof} < 2 1571 if (--$count) {
1334 ? $item->{name} 1572 $FLOORBOX->add (new CFClient::UI::InventoryItem item => $_);
1335 : "$item->{nrof} $item->{name_pl}"; 1573 } else {
1336 # todo: animation widget, face widget, weight(?) etc. 1574 $FLOORBOX->add (new CFClient::UI::Label text => "More...");
1337 $FLOORBOX->add (my $hbox = new CFClient::UI::HBox
1338 tooltip => (CFClient::UI::Label->escape ($desc)
1339 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
1340 can_hover => 1,
1341 can_events => 1,
1342 connect_button_down => sub {
1343 my ($self, $ev, $x, $y) = @_;
1344
1345 # todo: maybe put examine on 1? but should just be a tooltip :(
1346 if ($ev->{button} == 1) {
1347 $CONN->send ("move $CONN->{player}{tag} $item->{tag} 0");
1348 } elsif ($ev->{button} == 2) {
1349 $CONN->send ("apply $item->{tag}");
1350 } elsif ($ev->{button} == 3) {
1351 CFClient::UI::Menu->new (
1352 items => [
1353 ["examine", sub { $CONN->send ("examine $item->{tag}") }],
1354 [
1355 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
1356 sub { $CONN->send ("lock $item->{tag}") },
1357 ],
1358 ["mark", sub { $CONN->send ("mark $item->{tag}") }],
1359 ["apply", sub { $CONN->send ("apply $item->{tag}") }],
1360 ],
1361 )->popup ($ev);
1362 }
1363
1364 1
1365 }, 1575 last;
1366 );
1367
1368 $hbox->add (new CFClient::UI::Face
1369 can_events => 0,
1370 face => $item->{face},
1371 anim => $item->{anim},
1372 animspeed => $item->{animspeed},
1373 );
1374 1576 }
1375 $hbox->add (new CFClient::UI::Label
1376 can_events => 0,
1377 text => $desc,
1378 );
1379 } 1577 }
1380 }); 1578 });
1381 refresh; 1579
1580 $WANT_REFRESH++;
1382} 1581}
1383 1582
1384sub conn::container_add { 1583sub conn::container_add {
1385 my ($self, $id, $items) = @_; 1584 my ($self, $tag, $items) = @_;
1386 1585
1387 update_floorbox if $id == 0; 1586 #d# print "container_add: container $tag ($self->{player}{tag})\n";
1587
1588 if ($tag == 0) {
1589 update_floorbox;
1590 $OPENCONT = 0;
1591 $INVR_LBL->set_text ("Floor");
1592 $INVR->set_items ($self->{container}{0});
1388 if ($self->{player}{tag} == $id) { 1593 } elsif ($tag == $self->{player}{tag}) {
1594 $INVR_LBL->set_text ("Player");
1389 $INV->set_items ($self->{container}{$self->{player}{tag}}); 1595 $INV->set_items ($self->{container}{$self->{player}{tag}})
1596 } else {
1597 $OPENCONT = $tag;
1598 $INVR_LBL->set_text (CFClient::UI::InventoryItem::_item_to_desc ($self->{item}->{$OPENCONT}));
1599 $INVR->set_items ($self->{container}{$tag});
1390 } 1600 }
1601
1391 # $self-<{player}{tag} => player inv 1602 # $self-<{player}{tag} => player inv
1392 #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}}; 1603 #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}};
1393} 1604}
1394 1605
1395sub conn::container_clear { 1606sub conn::container_clear {
1396 my ($self, $id) = @_; 1607 my ($self, $tag) = @_;
1397 1608
1398 update_floorbox if $id == 0; 1609 #d# print "container_clear: container $tag ($self->{player}{tag})\n";
1399 if ($self->{player}{tag} == $id) { 1610
1611 if ($tag == 0) {
1612 update_floorbox;
1613 $OPENCONT = 0;
1614 $INVR_LBL->set_text ("Floor");
1400 $INV->set_items ($self->{container}{$id}); 1615 $INVR->set_items ($self->{container}{0});
1616 } elsif ($tag == $self->{player}{tag}) {
1617 $INVR_LBL->set_text ("Player");
1618 $INV->set_items ($self->{container}{$tag})
1619 } else {
1620 $OPENCONT = $tag;
1621 $INVR_LBL->set_text (CFClient::UI::InventoryItem::_item_to_desc ($self->{item}->{$OPENCONT}));
1622 $INVR->set_items ($self->{container}{$tag});
1401 } 1623 }
1402 1624
1403# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0}; 1625# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0};
1404} 1626}
1405 1627
1406sub conn::item_delete { 1628sub conn::item_delete {
1407 my ($self, @items) = @_; 1629 my ($self, @items) = @_;
1408 1630
1409 for (@items) { 1631 for (@items) {
1410 update_floorbox if $_->{container} == 0; 1632 #d# print "item_delete: $_->{tag} from $_->{container} ($self->{player}{tag})\n";
1411 if ($self->{player}{tag} == $_->{container}) { 1633
1634 if ($_->{container} == 0) {
1635 update_floorbox;
1636 $OPENCONT = 0;
1637 $INVR_LBL->set_text ("Floor");
1638 $INVR->set_items ($self->{container}{0});
1639 } elsif ($_->{container} == $self->{player}{tag}) {
1640 $INVR_LBL->set_text ("Player");
1641 $INV->set_items ($self->{container}{$self->{player}{tag}})
1642 } else {
1643 $OPENCONT = $_->{container};
1644 $INVR_LBL->set_text (CFClient::UI::InventoryItem::_item_to_desc ($self->{item}->{$OPENCONT}));
1412 $INV->set_items ($self->{container}{$_->{container}}); 1645 $INVR->set_items ($self->{container}{$_->{container}});
1413 } 1646 }
1414 } 1647 }
1415} 1648}
1416 1649
1417sub conn::item_update { 1650sub conn::item_update {
1418 my ($self, $item) = @_; 1651 my ($self, $item) = @_;
1419 1652
1420 update_floorbox if $item->{container} == 0; 1653 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($OPENCONT)\n";
1421 if ($self->{player}{tag} == $item->{container}) { 1654
1655 if ($item->{tag} == $OPENCONT && not ($item->{flags} & Crossfire::Protocol::F_OPEN)) {
1656 $OPENCONT = 0;
1657 $INVR_LBL->set_text ("Floor");
1658 $INVR->set_items ($self->{container}{0});
1659
1660 $item->{widget}->update_item
1661 if $item->{widget};
1662 } else {
1663 if ($item->{container} == 0) {
1664 update_floorbox;
1665 $OPENCONT = 0;
1666 $INVR_LBL->set_text ("Floor");
1667 $INVR->set_items ($self->{container}{0});
1668 } elsif ($item->{container} == $self->{player}{tag}) {
1422 $INV->set_items ($self->{container}{$item->{container}}); 1669 $INV->set_items ($self->{container}{$item->{container}})
1670 }
1423 } 1671 }
1424} 1672}
1425 1673
1426%SDL_CB = ( 1674%SDL_CB = (
1427 CFClient::SDL_QUIT => sub { 1675 CFClient::SDL_QUIT => sub {
1428 Event::unloop -1; 1676 Event::unloop -1;
1429 }, 1677 },
1430 CFClient::SDL_VIDEORESIZE => sub { 1678 CFClient::SDL_VIDEORESIZE => sub {
1431 }, 1679 },
1432 CFClient::SDL_VIDEOEXPOSE => \&refresh, 1680 CFClient::SDL_VIDEOEXPOSE => sub {
1681 $WANT_REFRESH++;
1682 },
1433 CFClient::SDL_ACTIVEEVENT => sub { 1683 CFClient::SDL_ACTIVEEVENT => sub {
1434# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 1684# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
1435 }, 1685 },
1436 CFClient::SDL_KEYDOWN => sub { 1686 CFClient::SDL_KEYDOWN => sub {
1437 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) { 1687 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {
… …
1441 video_init; 1691 video_init;
1442 } else { 1692 } else {
1443 CFClient::UI::feed_sdl_key_down_event ($_[0]); 1693 CFClient::UI::feed_sdl_key_down_event ($_[0]);
1444 } 1694 }
1445 }, 1695 },
1446 CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event, 1696 CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event,
1447 CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event, 1697 CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event,
1448 CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event, 1698 CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event,
1449 CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event, 1699 CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event,
1450 CFClient::SDL_USEREVENT => \&audio_music_finished, 1700 CFClient::SDL_USEREVENT => sub {
1701 if ($_[0]{code} == 1) {
1702 audio_channel_finished $_[0]{data1};
1703 } elsif ($_[0]{code} == 0) {
1704 audio_music_finished;
1705 }
1706 },
1451); 1707);
1452 1708
1453############################################################################# 1709#############################################################################
1454 1710
1455$SIG{INT} = $SIG{TERM} = sub { exit }; 1711$SIG{INT} = $SIG{TERM} = sub { exit };
1456 1712
1457CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
1458
1459$TILECACHE = CFClient::db_table "tilecache";
1460$FACEMAP = CFClient::db_table "facemap";
1461
1462my %DEF_CFG = (
1463 sdl_mode => 0,
1464 width => 640,
1465 height => 480,
1466 fullscreen => 0,
1467 fast => 0,
1468 map_scale => 0.5,
1469 fow_enable => 1,
1470 fow_intensity => 0.45,
1471 fow_smooth => 0,
1472 gui_fontsize => 1,
1473 log_fontsize => 1,
1474 gauge_fontsize => 1,
1475 gauge_size => 0.35,
1476 stat_fontsize => 1,
1477 mapsize => 100,
1478 host => "crossfire.schmorp.de",
1479 say_command => 'say',
1480 audio_enable => 1,
1481 bgm_enable => 1,
1482 bgm_volume => 0.25,
1483);
1484
1485while (my ($k, $v) = each %DEF_CFG) {
1486 $CFG->{$k} = $v unless exists $CFG->{$k};
1487}
1488
1489sdl_init;
1490
1491@SDL_MODES = reverse
1492 grep $_->[0] >= 640 && $_->[1] >= 480,
1493 CFClient::SDL_ListModes;
1494
1495@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
1496
1497$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1498
1499{ 1713{
1714 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] };
1715
1716 CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
1717
1718 $TILECACHE = CFClient::db_table "tilecache";
1719 $FACEMAP = CFClient::db_table "facemap";
1720
1721 my %DEF_CFG = (
1722 sdl_mode => 0,
1723 width => 640,
1724 height => 480,
1725 fullscreen => 0,
1726 fast => 0,
1727 map_scale => 1,
1728 fow_enable => 1,
1729 fow_intensity => 0.45,
1730 fow_smooth => 0,
1731 gui_fontsize => 1,
1732 log_fontsize => 1,
1733 gauge_fontsize=> 1,
1734 gauge_size => 0.35,
1735 stat_fontsize => 1,
1736 mapsize => 100,
1737 host => "crossfire.schmorp.de",
1738 say_command => 'say',
1739 audio_enable => 1,
1740 bgm_enable => 1,
1741 bgm_volume => 0.25,
1742 output_sync => 1,
1743 output_count => 1,
1744 );
1745
1746 while (my ($k, $v) = each %DEF_CFG) {
1747 $CFG->{$k} = $v unless exists $CFG->{$k};
1748 }
1749
1750 sdl_init;
1751
1752 @SDL_MODES = reverse
1753 grep $_->[0] >= 640 && $_->[1] >= 480,
1754 CFClient::SDL_ListModes;
1755
1756 @SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
1757
1758 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1759
1760 {
1500 my @fonts = map CFClient::find_rcfile "fonts/$_", qw( 1761 my @fonts = map CFClient::find_rcfile "fonts/$_", qw(
1501 DejaVuSans.ttf 1762 DejaVuSans.ttf
1502 DejaVuSansMono.ttf 1763 DejaVuSansMono.ttf
1503 DejaVuSans-Bold.ttf 1764 DejaVuSans-Bold.ttf
1504 DejaVuSansMono-Bold.ttf 1765 DejaVuSansMono-Bold.ttf
1505 DejaVuSans-Oblique.ttf 1766 DejaVuSans-Oblique.ttf
1506 DejaVuSansMono-Oblique.ttf 1767 DejaVuSansMono-Oblique.ttf
1507 DejaVuSans-BoldOblique.ttf 1768 DejaVuSans-BoldOblique.ttf
1508 DejaVuSansMono-BoldOblique.ttf 1769 DejaVuSansMono-BoldOblique.ttf
1509 ); 1770 );
1510 1771
1511 CFClient::add_font $_ for @fonts; 1772 CFClient::add_font $_ for @fonts;
1512 1773
1774 CFClient::pango_init;
1775
1513 $FONT_PROP = new_from_file CFClient::Font $fonts[0]; 1776 $FONT_PROP = new_from_file CFClient::Font $fonts[0];
1514 $FONT_FIXED = new_from_file CFClient::Font $fonts[1]; 1777 $FONT_FIXED = new_from_file CFClient::Font $fonts[1];
1515 1778
1516 $FONT_PROP->make_default; 1779 $FONT_PROP->make_default;
1517} 1780 }
1518 1781
1782# compare mono (ft) vs. rgba (cairo)
1783# ft - 1.8s, cairo 3s, even in alpha-only mode
1784# for my $rgba (0..1) {
1785# my $t1 = Time::HiRes::time;
1786# for (1..1000) {
1787# my $layout = CFClient::Layout->new ($rgba);
1788# $layout->set_text ("hallo" x 100);
1789# $layout->render;
1790# }
1791# my $t2 = Time::HiRes::time;
1792# warn $t2-$t1;
1793# }
1794
1519video_init; 1795 video_init;
1520audio_init; 1796 audio_init;
1797}
1521 1798
1522Event::loop; 1799Event::loop;
1523 1800
1524END { CFClient::SDL_Quit } 1801END { CFClient::SDL_Quit }
1525 1802
… …
1576 1853
1577Typing B<climb> will display a list of commands with I<climb> in their 1854Typing B<climb> will display a list of commands with I<climb> in their
1578name, such as I<ready_skill climbing> and I<use_skill climbing>. 1855name, such as I<ready_skill climbing> and I<use_skill climbing>.
1579 1856
1580You can abbreviate commands by typing only the first character of every 1857You can abbreviate commands by typing only the first character of every
1581word. For example, typing I<iwor> will likely select I<invoke word of 1858word (or even characters within the word - the client will try to make
1582recall>, while I<ccfo> will select I<cast create food>. Likewise, I<rscli> 1859a good guess, as long as the characters are in order). For example,
1583will likely select I<ready_skill climbing> and I<usl> will give you 1860typing I<iwor> will likely select I<invoke word of recall>, while I<ccfo>
1584I<use_skill levitation>. 1861will select I<cast create food>. Likewise, I<rscli> will likely select
1862I<ready_skill climbing> and I<usl> will give you I<use_skill levitation>.
1863
1864You can enter space and other text as arguemnt to the command. For
1865example, C<cfoo waybread> will expand to C<cast create food waybread>.
1585 1866
1586=head2 The map overview 1867=head2 The map overview
1587 1868
1588#TODO# 1869#TODO#
1589 1870

Diff Legend

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