ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/bin/cfplus
(Generate patch)

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.80 by root, Mon Jun 26 21:59:04 2006 UTC vs.
Revision 1.186 by elmex, Wed Jul 25 15:06:21 2007 UTC

1#!/opt/bin/perl 1#!/opt/bin/perl
2
3my $startup_done = sub { };
4our $PANGO = "1.5.0";
5
6# do splash-screen thingy on win32
7BEGIN {
8 if (%PAR::LibCache && $^O eq "MSWin32") {
9 while (my ($filename, $zip) = each %PAR::LibCache) {
10 $zip->extractMember ("SPLASH.bmp", "$ENV{PAR_TEMP}/SPLASH.bmp");
11 }
12
13 require Win32::GUI::SplashScreen;
14
15 Win32::GUI::SplashScreen::Show (
16 -file => "$ENV{PAR_TEMP}/SPLASH.bmp",
17 );
18
19 $startup_done = sub {
20 Win32::GUI::SplashScreen::Done (1);
21 };
22 }
23}
2 24
3use strict; 25use strict;
4use utf8; 26use utf8;
27
28use Carp 'verbose';
5 29
6# do things only needed for single-binary version (par) 30# do things only needed for single-binary version (par)
7BEGIN { 31BEGIN {
8 if (%PAR::LibCache) { 32 if (%PAR::LibCache) {
9 @INC = grep ref, @INC; # weed out all paths except pars loader refs 33 @INC = grep ref, @INC; # weed out all paths except pars loader refs
10 34
35 my $tmp = $ENV{PAR_TEMP};
36
11 while (my ($filename, $zip) = each %PAR::LibCache) { 37 while (my ($filename, $zip) = each %PAR::LibCache) {
12 for ($zip->memberNames) { 38 for ($zip->memberNames) {
13 next unless /^\/root\/(.*)/; 39 next unless /^root\/(.*)/;
14 $zip->extractMember ($_, "$ENV{PAR_TEMP}/$1") 40 $zip->extractMember ($_, "$tmp/$1")
15 unless -e "$ENV{PAR_TEMP}/$1"; 41 unless -e "$tmp/$1";
16 } 42 }
17 } 43 }
18 44
19 # TODO: pango-rc file, anybody? 45 if ($^O eq "MSWin32") {
46 # relocatable
47 } else {
48 # unix, need to patch pango rc file
49 open my $fh, "<:perlio", "$tmp/usr/lib/pango/$PANGO/module-files.d/libpango1.0-0.modules"
50 or die "$tmp/usr/lib/$PANGO/module-files.d/libpango1.0-0.modules: $!";
51 local $/;
52 my $rc = <$fh>;
53 $rc =~ s/^\//$tmp\//gm; # replace abs paths by relative ones
20 54
21 unshift @INC, $ENV{PAR_TEMP}; 55 mkdir "$tmp/pango-modules";
56 open my $fh, ">:perlio", "$tmp/pango-modules/pango.modules"
57 or die "$tmp/pango-modules/pango.modules: $!";
58 print $fh $rc;
59
60 $ENV{PANGO_RC_FILE} = "$tmp/pango.rc";
61 open my $fh, ">:perlio", $ENV{PANGO_RC_FILE}
62 or die "$ENV{PANGO_RC_FILE}: $!";
63 print $fh "[Pango]\nModuleFiles = $tmp/pango-modules\n";
64 }
65
66 unshift @INC, $tmp;
22 } 67 }
23} 68}
24 69
25# need to do it again because that pile of garbage called PAR nukes it before main 70# need to do it again because that pile of garbage called PAR nukes it before main
26unshift @INC, $ENV{PAR_TEMP} 71unshift @INC, $ENV{PAR_TEMP}
… …
32use Crossfire; 77use Crossfire;
33use Crossfire::Protocol::Constants; 78use Crossfire::Protocol::Constants;
34 79
35use Compress::LZF; 80use Compress::LZF;
36 81
37use CFClient; 82use CFPlus;
38use CFClient::OpenGL (); 83use CFPlus::OpenGL ();
39use CFClient::Protocol; 84use CFPlus::Protocol;
85use CFPlus::DB;
40use CFClient::UI; 86use CFPlus::UI;
41use CFClient::BindingEditor; 87use CFPlus::UI::Canvas;
88use CFPlus::UI::Inventory;
89use CFPlus::UI::SpellList;
90use CFPlus::UI::MessageWindow;
91use CFPlus::Pod;
42use CFClient::MapWidget; 92use CFPlus::MapWidget;
93use CFPlus::Macro;
43 94
44$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 95$SIG{QUIT} = sub { Carp::cluck "QUIT" };
96$SIG{PIPE} = 'IGNORE';
45 97
98$Event::Eval = 1;
46$Event::DIED = sub { 99$Event::DIED = sub {
47 # TODO: display dialog box or so 100 CFPlus::fatal Carp::longmess $_[1]
48 Carp::confess $_[1];#d#TODO: remove when stable
49 CFClient::error $_[1];
50}; 101};
51
52#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d#
53
54our $VERSION = '0.1';
55 102
56my $MAX_FPS = 60; 103my $MAX_FPS = 60;
57my $MIN_FPS = 5; # unused as of yet 104my $MIN_FPS = 5; # unused as of yet
58 105
59our $META_SERVER = "crossfire.real-time.com:13326"; 106our $META_SERVER = "http://metaserver.schmorp.de/current.json";
60 107
61our $LAST_REFRESH; 108our $LAST_REFRESH;
62our $NOW; 109our $NOW;
63 110
64our $CFG; 111our $CFG;
65our $CONN; 112our $CONN;
113our $PROFILE; # current profile
66our $FAST; # fast, low-quality mode, possibly useful for software-rendering 114our $FAST; # fast, low-quality mode, possibly useful for software-rendering
67 115
68our $WANT_REFRESH; 116our $WANT_REFRESH;
69our $CAN_REFRESH; 117our $CAN_REFRESH;
70 118
… …
79 127
80our $MAP; 128our $MAP;
81our $MAPMAP; 129our $MAPMAP;
82our $MAPWIDGET; 130our $MAPWIDGET;
83our $BUTTONBAR; 131our $BUTTONBAR;
84our $LOGVIEW;
85our $CONSOLE;
86our $METASERVER; 132our $METASERVER;
87our $LOGIN_BUTTON; 133our $LOGIN_BUTTON;
88our $QUIT_DIALOG; 134our $QUIT_DIALOG;
89our $HOST_ENTRY; 135our $HOST_ENTRY;
136our $FULLSCREEN_ENABLE;
137our $PICKUP_ENABLE;
90our $SERVER_INFO; 138our $SERVER_INFO;
91 139
92our $SETUP_DIALOG; 140our $SETUP_DIALOG;
93our $SETUP_NOTEBOOK; 141our $SETUP_NOTEBOOK;
94our $SETUP_SERVER; 142our $SETUP_SERVER;
95our $SETUP_KEYBOARD; 143our $SETUP_KEYBOARD;
96our $SETUP_SPELLS;
97 144
145our $PL_NOTEBOOK;
98our $STATS_WINDOW; 146our $PL_WINDOW;
147
148our $INVENTORY_PAGE;
149our $STATS_PAGE;
150our $SKILL_PAGE;
151our $SPELL_PAGE;
152our $SPELL_LIST;
153
154our $HELP_WINDOW;
99our $MESSAGE_WINDOW; 155our $MESSAGE_WINDOW;
100our $FLOORBOX; 156our $FLOORBOX;
101our $GAUGES; 157our $GAUGES;
102our $STATWIDS; 158our $STATWIDS;
103 159
104our $SDL_ACTIVE; 160our $SDL_ACTIVE;
105our %SDL_CB; 161our %SDL_CB;
106 162
107our $SDL_MIXER; 163our $SDL_MIXER;
164our $MUSIC_DEFAULT = "in_a_heartbeat.ogg";
165our @MUSIC_WANT;
166our $MUSIC_START;
167our $MUSIC_PLAYING;
168our $MUSIC_PLAYER;
169our $MUSIC_RESUME = 30; # resume music when players less than these many seconds before
108our @SOUNDS; # event => file mapping 170our @SOUNDS; # event => file mapping
109our %AUDIO_CHUNKS; # audio files 171our %AUDIO_CHUNKS; # audio files
110 172
111our $ALT_ENTER_MESSAGE; 173our $ALT_ENTER_MESSAGE;
112our $STATUSBOX; 174our $STATUSBOX;
113our $DEBUG_STATUS; 175our $DEBUG_STATUS;
114 176
115our $INV_WINDOW;
116our $INV; 177our $INV;
117our $INVR; 178our $INVR;
118our $INV_RIGHT_HB; 179our $INV_RIGHT_HB;
119 180
120our $BIND_EDITOR;
121our $BIND_UPD_CB;
122
123our $PICKUP_CFG; 181our $PICKUP_CFG;
124 182
183our $IN_BUILD_MODE;
184our $BUILD_BUTTON;
185
125sub status { 186sub status {
126 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 187 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
127} 188}
128 189
129sub debug { 190sub debug {
130 $DEBUG_STATUS->set_text ($_[0]); 191 $DEBUG_STATUS->set_text ($_[0]);
192}
193
194sub message {
195 my ($para) = @_;
196 $MESSAGE_WINDOW->message ($para);
131} 197}
132 198
133sub destroy_query_dialog { 199sub destroy_query_dialog {
134 (delete $_[0]{query_dialog})->destroy 200 (delete $_[0]{query_dialog})->destroy
135 if $_[0]{query_dialog}; 201 if $_[0]{query_dialog};
136} 202}
137 203
204# FIXME: a very ugly hack to wait for stat update look below! #d#
205our $QUERY_TIMER; #d#
206
138# server query dialog 207# server query dialog
139sub server_query { 208sub server_query {
140 my ($conn, $flags, $prompt) = @_; 209 my ($conn, $flags, $prompt) = @_;
141 210
211 # FIXME: a very ugly hack to wait for stat update #d#
212 if ($prompt =~ /roll new stats/ and not $conn->{stat_change_with}) {
213 unless ($QUERY_TIMER) {
214 $QUERY_TIMER =
215 Event->timer (
216 after => 1,
217 cb => sub {
218 server_query ($conn, $flags, $prompt, 1);
219 $QUERY_TIMER = undef
220 }
221 );
222 return;
223 }
224 }
225
142 $conn->{query_dialog} = my $dialog = new CFClient::UI::FancyFrame 226 $conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel
143 x => "center", 227 x => "center",
144 y => "center", 228 y => "center",
145 title => "Server Query", 229 title => "Server Query",
146 child => my $vbox = new CFClient::UI::VBox, 230 child => my $vbox = new CFPlus::UI::VBox,
147 ; 231 ;
148 232
149 my @dialog = my $label = new CFClient::UI::Label 233 my @dialog = my $label = new CFPlus::UI::Label
150 max_w => $::WIDTH * 0.4, 234 max_w => $::WIDTH * 0.8,
151 ellipsise => 0, 235 ellipsise => 0,
152 text => $prompt; 236 text => $prompt;
153 237
154 if ($flags & CS_QUERY_YESNO) { 238 if ($flags & CS_QUERY_YESNO) {
155 push @dialog, my $hbox = new CFClient::UI::HBox; 239 push @dialog, my $hbox = new CFPlus::UI::HBox;
156 240
157 $hbox->add (new CFClient::UI::Button 241 $hbox->add (new CFPlus::UI::Button
158 text => "No", 242 text => "No",
159 on_activate => sub { 243 on_activate => sub {
160 $conn->send ("reply n"); 244 $conn->send ("reply n");
161 $dialog->destroy; 245 $dialog->destroy;
162 0 246 0
163 } 247 }
164 ); 248 );
165 $hbox->add (new CFClient::UI::Button 249 $hbox->add (new CFPlus::UI::Button
166 text => "Yes", 250 text => "Yes",
167 on_activate => sub { 251 on_activate => sub {
168 $conn->send ("reply y"); 252 $conn->send ("reply y");
169 destroy_query_dialog $conn; 253 destroy_query_dialog $conn;
170 0 254 0
… …
172 ); 256 );
173 257
174 $dialog->grab_focus; 258 $dialog->grab_focus;
175 259
176 } elsif ($flags & CS_QUERY_SINGLECHAR) { 260 } elsif ($flags & CS_QUERY_SINGLECHAR) {
177 $dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)";
178
179 if ($prompt =~ /Now choose a character|Press any key for the next race/i) { 261 if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
180 $MESSAGE_WINDOW->show; 262 $dialog->{tooltip} = "#charcreation_focus";
181 263
182 unshift @dialog, new CFClient::UI::Label 264 unshift @dialog, new CFPlus::UI::Label
183 max_w => $::WIDTH * 0.4, 265 max_w => $::WIDTH * 0.8,
184 ellipsise => 0, 266 ellipsise => 0,
185 markup => "\nOr use your keyboard:\n"; 267 markup => "\nOr use your keyboard and the text entry below:\n";
186 268
187 unshift @dialog, my $table = new CFClient::UI::Table; 269 unshift @dialog, my $table = new CFPlus::UI::Table;
188 270
189 $table->add (0, 0, new CFClient::UI::Button 271 $table->add_at (0, 0, new CFPlus::UI::Button
190 text => "Next Race", 272 text => "Next Race",
191 on_activate => sub { 273 on_activate => sub {
192 $conn->send ("reply n"); 274 $conn->send ("reply n");
193 destroy_query_dialog $conn; 275 destroy_query_dialog $conn;
194 0 276 0
195 }, 277 },
196 ); 278 );
197 $table->add (2, 0, new CFClient::UI::Button 279 $table->add_at (2, 0, new CFPlus::UI::Button
198 text => "Accept", 280 text => "Accept",
199 on_activate => sub { 281 on_activate => sub {
200 $conn->send ("reply d"); 282 $conn->send ("reply d");
201 destroy_query_dialog $conn; 283 destroy_query_dialog $conn;
202 0 284 0
203 }, 285 },
204 ); 286 );
205 287
288 if ($conn->{chargen_race_description}) {
289 unshift @dialog, new CFPlus::UI::Label
290 max_w => $::WIDTH * 0.8,
291 ellipsise => 0,
292 markup => "<span foreground='#ccccff'>$conn->{chargen_race_description}</span>",
293 ;
294 }
295
296 unshift @dialog, new CFPlus::UI::Face
297 face => $conn->{player}{face},
298 bg => [.2, .2, .2, 1],
299 min_w => 64,
300 min_h => 64,
301 ;
302
303 if ($conn->{chargen_race_title}) {
304 unshift @dialog, new CFPlus::UI::Label
305 allign => 1,
306 ellipsise => 0,
307 markup => "<span foreground='#ccccff' size='large'>Race: $conn->{chargen_race_title}</span>",
308 ;
309 }
310
206 unshift @dialog, new CFClient::UI::Label 311 unshift @dialog, new CFPlus::UI::Label
207 max_w => $::WIDTH * 0.4, 312 max_w => $::WIDTH * 0.4,
208 ellipsise => 0, 313 ellipsise => 0,
209 markup => 314 markup => (CFPlus::Pod::section_label ui => "chargen_race"),
210 "<big><b>Character Creation: Race</b></big>\n\n"
211 . "Look at the <b>Messages</b> window to see a description of this race "
212 . "(<small>or hover with your mouse over the bottommost entry in the status area in the lower left area of the screen</small>) "
213 . "and the center of the screen to see how this race looks like "
214 . "(<small>this is below this dialog window, you may need to click on the display area to make it visible</small>).\n\n"
215 . "You can look at another race, or accept this race (you will come back to this race eventually, "
216 . "so you can take your time making this important choice."
217 ; 315 ;
218 316
219 } elsif ($prompt =~ /roll new stats/) { 317 } elsif ($prompt =~ /roll new stats/) {
220 if (my $stat = delete $conn->{stat_change_with}) { 318 if (my $stat = delete $conn->{stat_change_with}) {
221 $conn->send ("reply $stat"); 319 $conn->send ("reply $stat");
222 destroy_query_dialog $conn; 320 destroy_query_dialog $conn;
223 return; 321 return;
224 } 322 }
225 323
226 $STATS_WINDOW->show;
227 $MESSAGE_WINDOW->hide;
228
229 unshift @dialog, new CFClient::UI::Label 324 unshift @dialog, new CFPlus::UI::Label
230 max_w => $::WIDTH * 0.4, 325 max_w => $::WIDTH * 0.4,
231 ellipsise => 0, 326 ellipsise => 0,
232 markup => "\nOr use your keyboard:\n"; 327 markup => "\nOr use your keyboard and the text entry below:\n";
233 328
234 unshift @dialog, my $table = new CFClient::UI::Table; 329 unshift @dialog, my $table = new CFPlus::UI::Table;
235 330
236 # left: re-roll 331 # left: re-roll
237 $table->add (0, 0, new CFClient::UI::Button 332 $table->add_at (0, 0, new CFPlus::UI::Button
238 text => "Roll Again", 333 text => "Roll Again",
239 on_activate => sub { 334 on_activate => sub {
240 $conn->send ("reply y"); 335 $conn->send ("reply y");
241 destroy_query_dialog $conn; 336 destroy_query_dialog $conn;
242 0 337 0
243 }, 338 },
244 ); 339 );
245 340
246 # center: swap stats 341 # center: swap stats
247 my ($sw1, $sw2) = map +(new CFClient::UI::Combobox 342 my ($sw1, $sw2) = map +(new CFPlus::UI::Selector
343 expand => 1,
248 value => $_, 344 value => $_,
249 options => [ 345 options => [
250 [1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"], 346 [1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"],
251 [2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"], 347 [2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],
252 [3 => "Con", "Constitution ($conn->{stat}{+CS_STAT_CON})"], 348 [3 => "Con", "Constitution ($conn->{stat}{+CS_STAT_CON})"],
… …
255 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"], 351 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
256 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"], 352 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
257 ], 353 ],
258 ), 1 .. 2; 354 ), 1 .. 2;
259 355
260 $table->add (2, 0, new CFClient::UI::Button 356 $table->add_at (2, 0, new CFPlus::UI::Button
261 text => "Swap Stats", 357 text => "Swap Stats",
262 on_activate => sub { 358 on_activate => sub {
263 $conn->{stat_change_with} = $sw2->{value}; 359 $conn->{stat_change_with} = $sw2->{value};
264 $conn->send ("reply $sw1->{value}"); 360 $conn->send ("reply $sw1->{value}");
265 destroy_query_dialog $conn; 361 destroy_query_dialog $conn;
266 0 362 0
267 }, 363 },
268 ); 364 );
269 $table->add (2, 1, new CFClient::UI::HBox children => [$sw1, $sw2]); 365 $table->add_at (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]);
270 366
271 # right: accept 367 # right: accept
272 $table->add (4, 0, new CFClient::UI::Button 368 $table->add_at (4, 0, new CFPlus::UI::Button
273 text => "Accept", 369 text => "Accept",
274 on_activate => sub { 370 on_activate => sub {
275 $conn->send ("reply n"); 371 $conn->send ("reply n");
276 $STATS_WINDOW->hide; 372 $STATS_PAGE->hide;
277 destroy_query_dialog $conn; 373 destroy_query_dialog $conn;
278 0 374 0
279 }, 375 },
280 ); 376 );
281 377
378 unshift @dialog, my $hbox = new CFPlus::UI::HBox;
379 for (
380 [Str => CS_STAT_STR],
381 [Dex => CS_STAT_DEX],
382 [Con => CS_STAT_CON],
383 [Int => CS_STAT_INT],
384 [Wis => CS_STAT_WIS],
385 [Pow => CS_STAT_POW],
386 [Cha => CS_STAT_CHA],
387 ) {
388 my ($name, $id) = @$_;
389 $hbox->add (new CFPlus::UI::Label
390 markup => "$conn->{stat}{$id} <span foreground='yellow'>$name</span>",
391 align => 0,
392 expand => 1,
393 can_events => 1,
394 can_hover => 1,
395 tooltip => "#stat_$name",
396 );
397 }
398
282 unshift @dialog, new CFClient::UI::Label 399 unshift @dialog, new CFPlus::UI::Label
283 max_w => $::WIDTH * 0.4, 400 max_w => $::WIDTH * 0.4,
284 ellipsise => 0, 401 ellipsise => 0,
285 markup => 402 markup => (CFPlus::Pod::section_label ui => "chargen_stats"),
286 "<big><b>Character Creation: Stats</b></big>\n\n"
287 . "Look at the <b>Stats</b> window to see your basic stats "
288 . "(first column: 1 strength, 2 dexterity, 3 constitution, 4 intelligence, 5 wisdom, 6 power and 7 charisma).\n\n"
289 . "You can create another set of stats, swap two stat values with each other or accept the stats as they are now and continue. "
290 . "Race selection will influence those values later on."
291 ; 403 ;
292 } 404 }
293 405
294 push @dialog, my $entry = new CFClient::UI::Entry 406 push @dialog, my $entry = new CFPlus::UI::Entry
295 on_changed => sub { 407 on_changed => sub {
296 $conn->send ("reply $_[1]"); 408 $conn->send ("reply $_[1]");
297 destroy_query_dialog $conn; 409 destroy_query_dialog $conn;
298 0 410 0
299 }, 411 },
… …
302 $entry->grab_focus; 414 $entry->grab_focus;
303 415
304 } else { 416 } else {
305 $dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)"; 417 $dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";
306 418
307 push @dialog, my $entry = new CFClient::UI::Entry 419 push @dialog, my $entry = new CFPlus::UI::Entry
308 $flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (), 420 $flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (),
309 on_activate => sub { 421 on_activate => sub {
310 $conn->send ("reply $_[1]"); 422 $conn->send ("reply $_[1]");
311 destroy_query_dialog $conn; 423 destroy_query_dialog $conn;
312 0 424 0
… …
326 $LOGIN_BUTTON->set_text ("Logout"); 438 $LOGIN_BUTTON->set_text ("Logout");
327 $SETUP_DIALOG->hide; 439 $SETUP_DIALOG->hide;
328 440
329 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 441 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
330 442
331 my ($host, $port) = split /:/, $CFG->{profile}{default}{host}; 443 my ($host, $port) = split /:/, $PROFILE->{host};
332 444
333 $MAP = new CFClient::Map $mapsize, $mapsize; 445 $MAP = new CFPlus::Map;
334 446
335 $CONN = eval { 447 $CONN = eval {
336 new CFClient::Protocol 448 new CFPlus::Protocol
337 host => $host, 449 host => $host,
338 port => $port || 13327, 450 port => $port || 13327,
339 user => $CFG->{profile}{default}{user}, 451 user => $PROFILE->{user},
340 pass => $CFG->{profile}{default}{password}, 452 pass => $PROFILE->{password},
341 mapw => $mapsize, 453 mapw => $mapsize,
342 maph => $mapsize, 454 maph => $mapsize,
343 455
456 client => "cfplus $CFPlus::VERSION $] $^O",
457
344 map_widget => $MAPWIDGET, 458 map_widget => $MAPWIDGET,
345 logview => $LOGVIEW,
346 statusbox => $STATUSBOX, 459 statusbox => $STATUSBOX,
347 map => $MAP, 460 map => $MAP,
348 mapmap => $MAPMAP, 461 mapmap => $MAPMAP,
349 query => \&server_query, 462 query => \&server_query,
350 463
464 setup_req => {
465 smoothing => $CFG->{map_smoothing}*1,
466 },
467
351 sound_play => sub { 468 sound_play => sub {
352 my ($x, $y, $soundnum, $type) = @_; 469 my ($x, $y, $soundnum, $type) = @_;
353 470
354 $SDL_MIXER 471 $SDL_MIXER
355 or return; 472 or return;
… …
360 $chunk->play; 477 $chunk->play;
361 }, 478 },
362 }; 479 };
363 480
364 if ($CONN) { 481 if ($CONN) {
365 CFClient::lowdelay fileno $CONN->{fh}; 482 CFPlus::lowdelay fileno $CONN->{fh};
366 483
367 status "login successful"; 484 status "login successful";
368 } else { 485 } else {
369 status "unable to connect"; 486 status "unable to connect";
370 stop_game(); 487 stop_game();
… …
373 490
374sub stop_game { 491sub stop_game {
375 $LOGIN_BUTTON->set_text ("Login"); 492 $LOGIN_BUTTON->set_text ("Login");
376 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 493 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
377 $SETUP_DIALOG->show; 494 $SETUP_DIALOG->show;
378 $INV_WINDOW->hide; 495 $PL_WINDOW->hide;
379 $SETUP_SPELLS->clear_spells; 496 $SPELL_LIST->clear_spells;
497 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
498
499 &audio_music_set ([]);
380 500
381 return unless $CONN; 501 return unless $CONN;
382 502
383 status "connection closed"; 503 status "connection closed";
384 504
… …
388 508
389 undef $MAP; 509 undef $MAP;
390} 510}
391 511
392sub graphics_setup { 512sub graphics_setup {
393 my $vbox = new CFClient::UI::VBox; 513 my $vbox = new CFPlus::UI::VBox;
394 514
395 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 515 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
396 516
517 my $row = 0;
518
519 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info");
520 $table->add_at (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version,
521 can_events => 1,
522 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>");
523
524 my $vidmode_tooltip =
525 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
526 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
527
397 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode"); 528 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode");
398 $table->add (1, 0, my $hbox = new CFClient::UI::HBox); 529 $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
399 530
531 $hbox->add (my $mode_slider = new CFPlus::UI::Slider
400 $hbox->add (my $mode_slider = new CFClient::UI::Slider force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]); 532 force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1],
401 $hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999"); 533 tooltip => $vidmode_tooltip);
534 $hbox->add (my $mode_label = new CFPlus::UI::Label
535 align => 0, valign => 0, height => 0.8, template => "9999x9999@9+9",
536 can_events => 1, tooltip => $vidmode_tooltip);
402 537
403 $mode_slider->connect (changed => sub { 538 $mode_slider->connect (changed => sub {
404 my ($self, $value) = @_; 539 my ($self, $value) = @_;
405 540
406 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 541 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
407 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 542 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
408 }); 543 });
409 $mode_slider->emit (changed => $mode_slider->{range}[0]); 544 $mode_slider->emit (changed => $mode_slider->{range}[0]);
410 545
411 my $row = 1;
412
413 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen"); 546 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen");
414 $table->add (1, $row++, new CFClient::UI::CheckBox 547 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
415 state => $CFG->{fullscreen}, 548 state => $CFG->{fullscreen},
416 tooltip => "Bring the client into fullscreen mode.", 549 tooltip => "Bring the client into fullscreen mode.",
417 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 550 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
418 ); 551 );
419 552
420 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 553 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
421 $table->add (1, $row++, new CFClient::UI::CheckBox 554 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
422 state => $CFG->{fast}, 555 state => $CFG->{fast},
423 tooltip => "Lower the visual quality considerably to speed up rendering.", 556 tooltip => "Lower the visual quality considerably to speed up rendering.",
424 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 557 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
425 ); 558 );
426 559
560 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
561 $table->add_at (1, $row++, new CFPlus::UI::Slider
562 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
563 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
564 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
565 );
566
567 $table->add_at (1, $row++, new CFPlus::UI::Button
568 expand => 1, align => 0, text => "Apply",
569 tooltip => "Apply the video settings above.",
570 on_activate => sub {
571 video_shutdown ();
572 video_init ();
573 0
574 }
575 );
576
427 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale"); 577 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale");
428 $table->add (1, $row++, new CFClient::UI::Slider 578 $table->add_at (1, $row++, new CFPlus::UI::Slider
429 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 579 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
430 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 580 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
431 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 581 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
432 ); 582 );
433 583
584 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Smoothing");
585 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
586 state => $CFG->{map_smoothing},
587 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
588 . "This increases load on the graphics subsystem and works only with 2.x servers. "
589 . "Changes take effect at next connection only.",
590 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
591 );
592
434 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War"); 593 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War");
435 $table->add (1, $row++, new CFClient::UI::CheckBox 594 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
436 state => $CFG->{fow_enable}, 595 state => $CFG->{fow_enable},
437 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 596 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
438 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 597 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
439 ); 598 );
440 599
441 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 600 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity");
442 $table->add (1, $row++, new CFClient::UI::Slider 601 $table->add_at (1, $row++, new CFPlus::UI::Slider
443 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 602 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
444 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 603 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
445 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 604 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
446 ); 605 );
447 606
448 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth");
449 $table->add (1, $row++, new CFClient::UI::CheckBox
450 state => $CFG->{fow_smooth},
451 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
452 on_changed => sub {
453 my ($self, $value) = @_;
454 $CFG->{fow_smooth} = $value;
455 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::OpenGL::GL_VERSION < 1.2;
456 0
457 }
458 );
459
460 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
461 $table->add (1, $row++, new CFClient::UI::Slider
462 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
463 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
464 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
465 );
466
467 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 607 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
468 $table->add (1, $row++, new CFClient::UI::Slider 608 $table->add_at (1, $row++, new CFPlus::UI::Slider
469 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 609 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
470 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.", 610 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",
471 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 611 on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
472 ); 612 );
473 613
474 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
475
476 $table->add (1, $row++, new CFClient::UI::Slider
477 range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1],
478 tooltip => "The font size used by the <b>statistics window</b> only. Changes are instant.",
479 on_changed => sub {
480 $CFG->{stat_fontsize} = $_[1];
481 &set_stats_window_fontsize;
482 0
483 }
484 );
485
486 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 614 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
487 $table->add (1, $row++, new CFClient::UI::Slider 615 $table->add_at (1, $row++, new CFPlus::UI::Slider
488 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 616 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
489 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 617 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
490 on_changed => sub { 618 on_changed => sub {
491 $CFG->{gauge_fontsize} = $_[1]; 619 $CFG->{gauge_fontsize} = $_[1];
492 &set_gauge_window_fontsize; 620 &set_gauge_window_fontsize;
493 0 621 0
494 } 622 }
495 ); 623 );
496 624
497 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size"); 625 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size");
498 $table->add (1, $row++, new CFClient::UI::Slider 626 $table->add_at (1, $row++, new CFPlus::UI::Slider
499 range => [$CFG->{gauge_size}, 0.2, 0.8], 627 range => [$CFG->{gauge_size}, 0.2, 0.8],
500 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 628 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
501 on_changed => sub { 629 on_changed => sub {
502 $CFG->{gauge_size} = $_[1]; 630 $CFG->{gauge_size} = $_[1];
503 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 631 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
504 0 632 0
505 } 633 }
506 ); 634 );
507 635
508 $table->add (1, $row++, new CFClient::UI::Button
509 expand => 1, align => 0, text => "Apply",
510 tooltip => "Apply the video settings",
511 on_activate => sub {
512 video_shutdown ();
513 video_init ();
514 0
515 }
516 );
517
518 $vbox 636 $vbox
519} 637}
520 638
521sub audio_setup { 639sub audio_setup {
522 my $vbox = new CFClient::UI::VBox; 640 my $vbox = new CFPlus::UI::VBox;
523 641
524 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 642 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
525 643
526 my $row = 0; 644 my $row = 0;
527 645
528 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable"); 646 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable");
529 $table->add (1, $row++, new CFClient::UI::CheckBox 647 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
530 state => $CFG->{audio_enable}, 648 state => $CFG->{audio_enable},
531 tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.", 649 tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.",
532 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 } 650 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
533 ); 651 );
534# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume"); 652# $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume");
535# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub { 653# $table->add_at (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
536# $CFG->{effects_volume} = $_[1]; 654# $CFG->{effects_volume} = $_[1];
537# }); 655# });
538 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music"); 656 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music");
539 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox); 657 $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
540 $hbox->add (new CFClient::UI::CheckBox 658 $hbox->add (new CFPlus::UI::CheckBox
541 expand => 1, state => $CFG->{bgm_enable}, 659 expand => 1, state => $CFG->{bgm_enable},
542 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 660 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
543 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 } 661 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
544 ); 662 );
545 $hbox->add (new CFClient::UI::Slider 663 $hbox->add (new CFPlus::UI::Slider
546 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 664 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
547 tooltip => "The volume of the background music. Changes are instant.", 665 tooltip => "The volume of the background music. Changes are instant.",
548 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFClient::MixMusic::volume $_[1] * 128; 0 } 666 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFPlus::MixMusic::volume $_[1] * 128; 0 }
549 ); 667 );
550 668
551 $table->add (1, $row++, new CFClient::UI::Button 669 $table->add_at (1, $row++, new CFPlus::UI::Button
552 expand => 1, align => 0, text => "Apply", 670 expand => 1, align => 0, text => "Apply",
553 tooltip => "Apply the audio settings", 671 tooltip => "Apply the audio settings",
554 on_activate => sub { 672 on_activate => sub {
555 audio_shutdown (); 673 audio_shutdown ();
556 audio_init (); 674 audio_init ();
… …
559 ); 677 );
560 678
561 $vbox 679 $vbox
562} 680}
563 681
564sub set_stats_window_fontsize {
565 for (values %{$STATWIDS}) {
566 $_->set_fontsize ($::CFG->{stat_fontsize});
567 }
568}
569
570sub set_gauge_window_fontsize { 682sub set_gauge_window_fontsize {
571 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) { 683 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) {
572 $_->set_fontsize ($::CFG->{gauge_fontsize}); 684 $_->set_fontsize ($::CFG->{gauge_fontsize});
573 } 685 }
574} 686}
575 687
576sub make_gauge_window { 688sub make_gauge_window {
577 my $gh = int $HEIGHT * $CFG->{gauge_size}; 689 my $gh = int $HEIGHT * $CFG->{gauge_size};
578 690
579 my $win = new CFClient::UI::Frame ( 691 my $win = new CFPlus::UI::Frame (
580 force_x => 0, 692 force_x => 0,
581 force_y => "max", 693 force_y => "max",
582 force_w => $WIDTH, 694 force_w => $WIDTH,
583 force_h => $gh, 695 force_h => $gh,
584 ); 696 );
585 697
586 $win->add (my $hbox = new CFClient::UI::HBox 698 $win->add (my $hbox = new CFPlus::UI::HBox
587 children => [ 699 children => [
588 (new CFClient::UI::HBox expand => 1), 700 (new CFPlus::UI::HBox expand => 1),
589 (new CFClient::UI::VBox children => [ 701 (new CFPlus::UI::VBox children => [
590 (new CFClient::UI::Empty expand => 1), 702 (new CFPlus::UI::Empty expand => 1),
591 (new CFClient::UI::Frame bg => [0, 0, 0, 0.4], child => ($FLOORBOX = new CFClient::UI::Table)), 703 (new CFPlus::UI::Frame bg => [0, 0, 0, 0.4], child => ($FLOORBOX = new CFPlus::UI::Table)),
592 ]), 704 ]),
593 (my $vbox = new CFClient::UI::VBox), 705 (my $vbox = new CFPlus::UI::VBox),
594 ], 706 ],
595 ); 707 );
596 708
597 $vbox->add (new CFClient::UI::HBox 709 $vbox->add (new CFPlus::UI::HBox
598 expand => 1, 710 expand => 1,
599 children => [ 711 children => [
600 (new CFClient::UI::Empty expand => 1), 712 (new CFPlus::UI::Empty expand => 1),
601 (my $hb = new CFClient::UI::HBox), 713 (my $hb = new CFPlus::UI::HBox),
602 ], 714 ],
603 ); 715 );
604 716
605 $hb->add (my $hg = new CFClient::UI::Gauge type => 'hp', 717 $hb->add (my $hg = new CFPlus::UI::Gauge type => 'hp', tooltip => "#stat_health");
606 tooltip => "<b>Health points</b>. Measures of how much damage you can take before dying. Hit points are determined from your level and are influenced by the value of your Con. Hp value may range between 1 to beyond 500 and higher values indicate a greater ability to withstand punishment.");
607 $hb->add (my $mg = new CFClient::UI::Gauge type => 'mana', 718 $hb->add (my $mg = new CFPlus::UI::Gauge type => 'mana', tooltip => "#stat_mana");
608 tooltip => "<b>Spell points</b>. Measures of how much \"fuel\" you have for casting spells and incantations. Mana is calculated from your level and your Pow. Mana values can range between 1 to beyond 500 (glowing crystals can increase the current spell points beyond your normal maximum). Higher values indicate greater amounts of mana.");
609 $hb->add (my $gg = new CFClient::UI::Gauge type => 'grace', 719 $hb->add (my $gg = new CFPlus::UI::Gauge type => 'grace', tooltip => "#stat_grace");
610 tooltip => "<b>Grace points</b> - how favored you are by your god. In game terms, how much divine magic you can cast. Your level, Wis and Pow effect what the value of grace is. Prayong on an altar of your god can increase this value beyond your normal maximum. Grace can take on large positive and negative values. Positive values indicate favor by the gods.");
611 $hb->add (my $fg = new CFClient::UI::Gauge type => 'food', 720 $hb->add (my $fg = new CFPlus::UI::Gauge type => 'food', tooltip => "#stat_food");
612 tooltip => "<b>Food</b>. Ranges between 0 (starving) and 999 (satiated). At a value of 0 the character begins to die. Some magic can speed up or slow down the character digestion. Healing wounds will speed up digestion too.");
613 721
614 $vbox->add (my $exp = new CFClient::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, 722 $vbox->add (my $exp = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
615 tooltip => "<b>Experience points and overall level</b> - experience is increased as a reward for appropriate action (such as killing monsters) and may decrease as a result of a magical attack or dying. Level is directly derived from the experience value. As the level of the character increases, the character becomes able to succeed at more difficult tasks. A character's level starts at a value of 0 and may range up beyond 100.");
616 $vbox->add (my $rng = new CFClient::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, 723 $vbox->add (my $rng = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
617 tooltip => "<b>Ranged attack</b> - how you attack when you press shift-cursor (spell, skill, weapon etc.)");
618 724
619 $GAUGES = { 725 $GAUGES = {
620 exp => $exp, win => $win, range => $rng, 726 exp => $exp, win => $win, range => $rng,
621 food => $fg, mana => $mg, hp => $hg, grace => $gg 727 food => $fg, mana => $mg, hp => $hg, grace => $gg
622 }; 728 };
… …
625 731
626 $win 732 $win
627} 733}
628 734
629sub debug_setup { 735sub debug_setup {
630 my $table = new CFClient::UI::Table; 736 my $table = new CFPlus::UI::Table;
631 737
632 $table->add (0, 0, new CFClient::UI::Label text => "Widget Borders"); 738 $table->add_at (0, 0, new CFPlus::UI::Label text => "Widget Borders");
633 $table->add (1, 0, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 }); 739 $table->add_at (1, 0, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });
634 $table->add (0, 1, new CFClient::UI::Label text => "Tooltip Widget Info"); 740 $table->add_at (0, 1, new CFPlus::UI::Label text => "Tooltip Widget Info");
635 $table->add (1, 1, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 }); 741 $table->add_at (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
636 $table->add (0, 2, new CFClient::UI::Label text => "Show FPS"); 742 $table->add_at (0, 2, new CFPlus::UI::Label text => "Show FPS");
637 $table->add (1, 2, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 }); 743 $table->add_at (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
638 $table->add (0, 3, new CFClient::UI::Label text => "Suppress Tooltips"); 744 $table->add_at (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
639 $table->add (1, 3, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 }); 745 $table->add_at (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
746 $table->add_at (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
640 747
641 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05); 748 $table->add_at (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
642 749
643 for my $x (0..2) { 750 $table->add_at (7,7, my $t = new CFPlus::UI::Table expand => 0);
644 for my $y (0 .. 2) { 751 $t->add_at (0,0, new CFPlus::UI::Label text => "a a a a", rowspan => 1, colspan => 2);
645 $table->add ($x + 3, $y, 752 $t->add_at (2,0, new CFPlus::UI::Label text => "b\nb", rowspan => 2, colspan => 1);
646 new CFClient::UI::Entry 753 $t->add_at (1,2, new CFPlus::UI::Label text => "c c c c", rowspan => 1, colspan => 2);
647 text => $default_smooth[$x * 3 + $y], 754 $t->add_at (0,1, new CFPlus::UI::Label text => "d\nd", rowspan => 2, colspan => 1);
648 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 }, 755 $t->add_at (1,1, new CFPlus::UI::Label text => "e");
649 ); 756
650 } 757 $table->add_at (7, 6, my $c = new CFPlus::UI::Canvas);
758
759 $c->add_items ({
760 type => "line_loop",
761 color => [0, 1, 0],
762 width => 9,
763 coord_mode => "abs",
764 coord => [[10, 5], [5, 50], [20, 5], [5, 60]],
651 } 765 });
652 766
767 $c->add_items ({
768 type => "lines",
769 color => [1, 1, 0],
770 width => 2,
771 coord_mode => "rel",
772 coord => [[0,0], [1,1], [1,0], [0,1]],
773 });
774
775 $c->add_items ({
776 type => "polygon",
777 color => [0, 0.43, 0],
778 width => 2,
779 coord_mode => "rel",
780 coord => [[0,0.2], [1,.4], [1,.6], [0,.8]],
781 });
653 782
654 $table 783 $table
655} 784}
656 785
657sub stats_window { 786sub stats_window {
658 my $tgw = new CFClient::UI::FancyFrame 787 my $r = new CFPlus::UI::ScrolledWindow (
659 y => $HEIGHT * (2/8), 788 expand => 1,
660 x => "max", 789 scroll_y => 1
661 title => "Stats", 790 );
662 name => "stats_window", 791 $r->add (my $vb = new CFPlus::UI::VBox);
663 has_close_button => 1;
664 792
665 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox); 793 $vb->add (new CFPlus::UI::FancyFrame
794 label => "Player",
795 child => (my $pi = new CFPlus::UI::VBox),
796 );
797
666 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1, 798 $pi->add ($STATWIDS->{title} = new CFPlus::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
667 can_hover => 1, can_events => 1, 799 can_hover => 1, can_events => 1,
668 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server."); 800 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
669 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1, 801 $pi->add ($STATWIDS->{map} = new CFPlus::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
670 can_hover => 1, can_events => 1, 802 can_hover => 1, can_events => 1,
671 tooltip => "The map you are currently on (if supported by the server)."); 803 tooltip => "The map you are currently on (if supported by the server).");
672 804
673 $vb->add (my $hb0 = new CFClient::UI::HBox); 805 $pi->add (my $hb0 = new CFPlus::UI::HBox);
674 $hb0->add ($STATWIDS->{weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1, 806 $hb0->add ($STATWIDS->{weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1,
675 can_hover => 1, can_events => 1, 807 can_hover => 1, can_events => 1,
676 tooltip => "The weight of the player including all inventory items."); 808 tooltip => "The weight of the player including all inventory items.");
677 $hb0->add ($STATWIDS->{m_weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1, 809 $hb0->add ($STATWIDS->{m_weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1,
678 can_hover => 1, can_events => 1, 810 can_hover => 1, can_events => 1,
679 tooltip => "The weight limit: you cannot carry more than this."); 811 tooltip => "The weight limit: you cannot carry more than this.");
680 812
681 813 $vb->add (new CFPlus::UI::FancyFrame
814 label => "Primary/Secondary Statistics",
682 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 815 child => (my $hb = new CFPlus::UI::HBox expand => 1),
816 );
683 $hb->add (my $tbl = new CFClient::UI::Table expand => 1); 817 $hb->add (my $tbl = new CFPlus::UI::Table expand => 1);
684 818
685 my $color2 = [1, 1, 0]; 819 my $color2 = [1, 1, 0];
686 820
687 for ( 821 for (
688 [0, 0, st_str => "Str", 30, "<b>Physical Strength</b>, determines damage dealt with weapons, how much you can carry, and how often you can attack"], 822 [0, 0, st_str => "Str", 30],
689 [0, 1, st_dex => "Dex", 30, "<b>Dexterity</b>, your physical agility. Determines chance of being hit and affects armor class and speed"], 823 [0, 1, st_dex => "Dex", 30],
690 [0, 2, st_con => "Con", 30, "<b>Constitution</b>, physical health and toughness. Determines how many healthpoints you can have"], 824 [0, 2, st_con => "Con", 30],
691 [0, 3, st_int => "Int", 30, "<b>Intelligence</b>, your ability to learn and use skills and incantations (both prayers and magic) and determines how much spell points you can have"], 825 [0, 3, st_int => "Int", 30],
692 [0, 4, st_wis => "Wis", 30, "<b>Wisdom</b>, the ability to learn and use divine magic (prayers). Determines how many grace points you can have"], 826 [0, 4, st_wis => "Wis", 30],
693 [0, 5, st_pow => "Pow", 30, "<b>Power</b>, your magical potential. Influences the strength of spell effects, and also how much your spell and grace points increase when leveling up"], 827 [0, 5, st_pow => "Pow", 30],
694 [0, 6, st_cha => "Cha", 30, "<b>Charisma</b>, how well you are received by NPCs. Affects buying and selling prices in shops."], 828 [0, 6, st_cha => "Cha", 30],
695 829
696 [2, 0, st_wc => "Wc", -120, "<b>Weapon Class</b>, effectiveness of melee/missile attacks. Lower is more potent. Current weapon, level and Str are some things which effect the value of Wc. The value of Wc may range between 25 and -72."], 830 [2, 0, st_wc => "Wc", -120],
697 [2, 1, st_ac => "Ac", -120, "<b>Armour Class</b>, how protected you are from being hit by any attack. Lower values are better. Ac is based on your race and is modified by the Dex and current armour worn. For characters that cannot wear armour, Ac improves as their level increases."], 831 [2, 1, st_ac => "Ac", -120],
698 [2, 2, st_dam => "Dam", 120, "<b>Damage</b>, how much damage your melee/missile attack inflicts. Higher values indicate a greater amount of damage will be inflicted with each attack."], 832 [2, 2, st_dam => "Dam", 120],
699 [2, 3, st_arm => "Arm", 120, "<b>Armour</b>, how much damage (from physical attacks) will be subtracted from successful hits made upon you. This value ranges between 0 to 99%. Current armour worn primarily determines Arm value."], 833 [2, 3, st_arm => "Arm", 120],
700 [2, 4, st_spd => "Spd", 10.54, "<b>Speed</b>, how fast you can move. The value of speed may range between nearly 0 (\"very slow\") to higher than 5 (\"lightning fast\"). Base speed is determined from the Dex and modified downward proportionally by the amount of weight carried which exceeds the Max Carry limit. The armour worn also sets the upper limit on speed."], 834 [2, 4, st_spd => "Spd", 10.54],
701 [2, 5, st_wspd => "WSp", 10.54, "<b>Weapon Speed</b>, how many attacks you may make per unit of time (0.120s). Higher values indicate faster attack speed. Current weapon and Dex effect the value of weapon speed."], 835 [2, 5, st_wspd => "WSp", 10.54],
702 ) { 836 ) {
703 my ($col, $row, $id, $label, $template, $tooltip) = @$_; 837 my ($col, $row, $id, $label, $template) = @$_;
704 838
705 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label 839 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
706 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, align => +1, template => $template, tooltip => $tooltip); 840 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
841 align => +1, template => $template, tooltip => "#stat_$label");
707 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFClient::UI::Label 842 $tbl->add_at ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label
708 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, align => -1, text => $label, tooltip => $tooltip); 843 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
844 align => -1, text => $label, tooltip => "#stat_$label");
709 } 845 }
710 846
847 $vb->add (new CFPlus::UI::FancyFrame
848 label => "Resistancies",
711 $hb->add (my $tbl2 = new CFClient::UI::Table expand => 1); 849 child => (my $tbl2 = new CFPlus::UI::Table expand => 1),
850 );
712 851
713 my $row = 0; 852 my $row = 0;
714 my $col = 0; 853 my $col = 0;
715 854
716 my %resist_names = ( 855 my %resist_names = (
856 slow => ["Slow",
717 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.)", 857 "<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.)"],
858 holyw => ["Holy Word",
718 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.)", 859 "<b>Holy Word</b> (resistance you against getting the fear when someone whose god doesn't like you spells the holy word on you.)"],
860 conf => ["Confusion",
719 conf => "<b>Confusion</b> (If you are hit by confusion you will move into random directions, and likely into monsters.)", 861 "<b>Confusion</b> (If you are hit by confusion you will move into random directions, and likely into monsters.)"],
862 fire => ["Fire",
720 fire => "<b>Fire</b> (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)", 863 "<b>Fire</b> (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)"],
864 depl => ["Depletion",
721 depl => "<b>Depletion</b> (some monsters and other effects can cause stats depletion)", 865 "<b>Depletion</b> (some monsters and other effects can cause stats depletion)"],
866 magic => ["Magic",
722 magic => "<b>Magic</b> (resistance to magic spells like magic missile or similar)", 867 "<b>Magic</b> (resistance to magic spells like magic missile or similar)"],
868 drain => ["Draining",
723 drain => "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)", 869 "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)"],
870 acid => ["Acid",
724 acid => "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)", 871 "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)"],
872 pois => ["Poison",
725 pois => "<b>Poison</b> (resistance to getting poisoned)", 873 "<b>Poison</b> (resistance to getting poisoned)"],
874 para => ["Paralysation",
726 para => "<b>Paralysation</b> (this resistance affects the chance you get paralysed)", 875 "<b>Paralysation</b> (this resistance affects the chance you get paralysed)"],
876 deat => ["Death",
727 deat => "<b>Death</b> (resistance against death spells)", 877 "<b>Death</b> (resistance against death spells)"],
728 phys => "<b>Physical</b> (this is the resistance against physical attacks, like when a monster hit you in melee combat)", 878 phys => ["Physical",
879 "<b>Physical</b> (this is the resistance against physical attacks, like when a monster hit you in melee combat. The value displayed here is also displayed in the 'Arm' field on the left.)"],
880 blind => ["Blind",
729 blind => "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)", 881 "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)"],
882 fear => ["Fear",
730 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)", 883 "<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)"],
884 tund => ["Turn undead",
731 tund => "<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead...", 885 "<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead..."],
886 elec => ["Electricity",
732 elec => "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)", 887 "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)"],
888 cold => ["Cold",
733 cold => "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)", 889 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"],
890 ghit => ["Ghost hit",
734 ghit => "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)", 891 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"],
735 ); 892 );
893
736 for (qw/slow holyw conf fire depl magic 894 for (qw/slow holyw conf fire depl magic
737 drain acid pois para deat phys 895 drain acid pois para deat phys
738 blind fear tund elec cold ghit/) 896 blind fear tund elec cold ghit/)
739 { 897 {
740 $tbl2->add ($col, $row, 898 $tbl2->add_at ($col, $row,
741 $STATWIDS->{"res_$_"} = 899 $STATWIDS->{"res_$_"} =
742 new CFClient::UI::Label 900 new CFPlus::UI::Label
743 font => $FONT_FIXED, 901 font => $FONT_FIXED,
744 template => "-100%", 902 template => "-100%",
745 align => +1, 903 align => +1,
746 valign => 0, 904 valign => 0,
747 can_events => 1, 905 can_events => 1,
748 can_hover => 1, 906 can_hover => 1,
749 tooltip => $resist_names{$_}, 907 tooltip => $resist_names{$_}->[1],
750 ); 908 );
751 $tbl2->add ($col + 1, $row, new CFClient::UI::Image 909 $tbl2->add_at ($col + 1, $row, new CFPlus::UI::Image
752 font => $FONT_FIXED, 910 font => $FONT_FIXED,
753 can_hover => 1, 911 can_hover => 1,
754 can_events => 1, 912 can_events => 1,
755 path => "ui/resist/resist_$_.png", 913 path => "ui/resist/resist_$_.png",
756 tooltip => $resist_names{$_}, 914 tooltip => $resist_names{$_}->[1],
915 );
916 $tbl2->add_at ($col + 2, $row, new CFPlus::UI::Label
917 text => $resist_names{$_}->[0],
918 font => $FONT_FIXED,
919 can_hover => 1,
920 can_events => 1,
921 tooltip => $resist_names{$_}->[1],
757 ); 922 );
758 923
759 $row++; 924 $row++;
760 if ($row % 6 == 0) { 925 if ($row % 6 == 0) {
761 $col += 2; 926 $col += 3;
762 $row = 0; 927 $row = 0;
763 } 928 }
764 } 929 }
765 930
766 &set_stats_window_fontsize;
767 update_stats_window ({}); 931 #update_stats_window ({});
768 932
933 $r
934}
935
936sub skill_window {
937 my $sw = new CFPlus::UI::ScrolledWindow (expand => 1);
938 $sw->add ($STATWIDS->{skill_tbl} = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1, 0, 0, 1]);
769 $tgw 939 $sw
770} 940}
771 941
772sub formsep($) { 942sub formsep($) {
773 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1 943 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
774} 944}
775 945
776sub update_stats_window {
777 my ($stats) = @_;
778
779 # I love text protocols...
780
781 my $hp = $stats->{+CS_STAT_HP} * 1;
782 my $hp_m = $stats->{+CS_STAT_MAXHP} * 1;
783 my $sp = $stats->{+CS_STAT_SP} * 1;
784 my $sp_m = $stats->{+CS_STAT_MAXSP} * 1;
785 my $fo = $stats->{+CS_STAT_FOOD} * 1;
786 my $fo_m = 999;
787 my $gr = $stats->{+CS_STAT_GRACE} * 1;
788 my $gr_m = $stats->{+CS_STAT_MAXGRACE} * 1;
789
790 $GAUGES->{hp} ->set_value ($hp, $hp_m);
791 $GAUGES->{mana} ->set_value ($sp, $sp_m);
792 $GAUGES->{food} ->set_value ($fo, $fo_m);
793 $GAUGES->{grace} ->set_value ($gr, $gr_m);
794 $GAUGES->{exp} ->set_text ("Exp: " . (formsep $stats->{+CS_STAT_EXP64})
795 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
796 my $rng = $stats->{+CS_STAT_RANGE};
797 $rng =~ s/^Range: //; # thank you so much dear server
798 $GAUGES->{range} ->set_text ("Rng: " . $rng);
799 my $title = $stats->{+CS_STAT_TITLE};
800 $title =~ s/^Player: //;
801 $STATWIDS->{title} ->set_text ("Title: " . $title);
802
803 $STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
804 $STATWIDS->{st_dex} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DEX});
805 $STATWIDS->{st_con} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CON});
806 $STATWIDS->{st_int} ->set_text (sprintf "%d" , $stats->{+CS_STAT_INT});
807 $STATWIDS->{st_wis} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WIS});
808 $STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
809 $STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
810 $STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
811 $STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
812 $STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
813 $STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_ARMOUR});
814 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
815 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
816
817 $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000);
818
819 my %tbl = (
820 phys => CS_STAT_RES_PHYS,
821 magic => CS_STAT_RES_MAG,
822 fire => CS_STAT_RES_FIRE,
823 elec => CS_STAT_RES_ELEC,
824 cold => CS_STAT_RES_COLD,
825 conf => CS_STAT_RES_CONF,
826 acid => CS_STAT_RES_ACID,
827 drain => CS_STAT_RES_DRAIN,
828 ghit => CS_STAT_RES_GHOSTHIT,
829 pois => CS_STAT_RES_POISON,
830 slow => CS_STAT_RES_SLOW,
831 para => CS_STAT_RES_PARA,
832 tund => CS_STAT_TURN_UNDEAD,
833 fear => CS_STAT_RES_FEAR,
834 depl => CS_STAT_RES_DEPLETE,
835 deat => CS_STAT_RES_DEATH,
836 holyw => CS_STAT_RES_HOLYWORD,
837 blind => CS_STAT_RES_BLIND,
838 );
839
840 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
841 for keys %tbl;
842}
843
844my $METASERVER_ATIME; 946my $METASERVER_ATIME;
845 947
846sub update_metaserver { 948sub update_metaserver {
949 my ($metaserver_dialog) = @_;
950
951 $METASERVER = $metaserver_dialog
952 if defined $metaserver_dialog;
953
847 return if $METASERVER_ATIME > time; 954 return if $METASERVER_ATIME > time;
848 $METASERVER_ATIME = time + 60; 955 $METASERVER_ATIME = time + 60;
849 956
850 my $table = $METASERVER->{table}; 957 my $table = $METASERVER->{table};
851 $table->clear; 958 $table->clear;
852 $table->add (0, 0, my $label = new CFClient::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list..."); 959 $table->add_at (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
853 960
854 my $buf; 961 my $ok = 0;
855 962
856 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0; 963 CFPlus::background {
964 my $ua = CFPlus::lwp_useragent;
857 965
858 unless ($fh) { 966 CFPlus::background_msg CFPlus::from_json +(CFPlus::lwp_check $ua->get ($META_SERVER))->decoded_content;
859 $label->set_text ("unable to contact metaserver: $!"); 967 } sub {
860 return; 968 my ($msg) = @_;
861 } 969 if ($msg) {
862
863 Event->io (fd => $fh, poll => 'r', cb => sub {
864 my $res = sysread $fh, $buf, 8192, length $buf;
865
866 if (!defined $res) {
867 $_[0]->w->cancel;
868 $label->set_text ("error while retrieving server list: $!");
869 } elsif ($res == 0) {
870 $_[0]->w->cancel;
871 status "server list retrieved";
872
873 utf8::decode $buf if utf8::valid $buf;
874
875 $table->clear; 970 $table->clear;
876 971
877 my @tip = ( 972 my @tip = (
878 "The current number of users logged in on the server.", 973 "The current number of users logged in on the server.",
879 "The hostname of the server.", 974 "The hostname of the server.",
880 "The time this server has been running without being restarted.", 975 "The time this server has been running without being restarted.",
881 "The server software version - a '+' indicates a Crossfire+ server.", 976 "The server software version - a '+' indicates a Crossfire+ server.",
882 "Short information about this server provided by its admins.", 977 "Short information about this server provided by its admins.",
883 ); 978 );
884 my @col = qw(#Users Host Uptime Version Description); 979 my @col = qw(#Users Host Uptime Version Description);
885 $table->add ($_, 0, new CFClient::UI::Label 980 $table->add_at ($_, 0, new CFPlus::UI::Label
886 can_hover => 1, can_events => 1, 981 can_hover => 1, can_events => 1,
887 align => 0, fg => [1, 1, 0], 982 align => 0, fg => [1, 1, 0],
888 text => $col[$_], tooltip => $tip[$_]) 983 text => $col[$_], tooltip => $tip[$_])
889 for 0 .. $#col; 984 for 0 .. $#col;
890 985
891 my @align = qw(1 0 1 1 -1); 986 my @align = qw(1 0 1 1 -1);
892 987
893 my $y = 0; 988 my $y = 0;
894 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) { 989 for my $m (@{ $msg->{servers} }) {
895 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = @$m; 990 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) =
991 @$m{qw(ip age hostname users version description ibytes obytes uptime highlight)};
896 992
897 for ($desc) { 993 for ($desc) {
898 s/<br>/\n/gi; 994 s/<br>/\n/gi;
899 s/<li>/\n· /gi; 995 s/<li>/\n· /gi;
900 s/<.*?>//sgi; 996 s/<.*?>//sgi;
901 s/&/&amp;/g; 997 s/&amp;/&/g;
902 s/</&lt;/g; 998 s/&lt;/</g;
903 s/>/&gt;/g; 999 s/&gt;/>/g;
904 } 1000 }
905 1001
906 $uptime = sprintf "%dd %02d:%02d:%02d", 1002 $uptime = sprintf "%dd %02d:%02d:%02d",
907 (int $m->[8] / 86400), 1003 (int $uptime / 86400),
908 (int $m->[8] / 3600) % 24, 1004 (int $uptime / 3600) % 24,
909 (int $m->[8] / 60) % 60, 1005 (int $uptime / 60) % 60,
910 $m->[8] % 60; 1006 $uptime % 60;
911 1007
912 $m = [$users, $host, $uptime, $version, $desc]; 1008 $m = [$users, $host, $uptime, $version, $desc];
913 1009
914 $y++; 1010 $y++;
915 1011
916 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [ 1012 $table->add_at (scalar @$m, $y, new CFPlus::UI::VBox children => [
917 (new CFClient::UI::Button 1013 (new CFPlus::UI::Button
918 text => "Use", 1014 text => "Use",
919 tooltip => "Put this server into the <b>Host:Port</b> field", 1015 tooltip => "Put this server into the <b>Host:Port</b> field",
920 on_activate => sub { 1016 on_activate => sub {
921 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host); 1017 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
922 $METASERVER->hide; 1018 $METASERVER->hide;
923 0 1019 0
924 }, 1020 },
925 ), 1021 ),
926 (new CFClient::UI::Empty expand => 1), 1022 (new CFPlus::UI::Empty expand => 1),
927 ]); 1023 ]);
928 1024
929 $table->add ($_, $y, new CFClient::UI::Label 1025 $table->add_at ($_, $y, new CFPlus::UI::Label
1026 max_w => $::WIDTH * 0.4,
930 ellipsise => 0, 1027 ellipsise => 0,
931 align => $align[$_], 1028 align => $align[$_],
932 text => $m->[$_], 1029 text => $m->[$_],
933 tooltip => $tip[$_], 1030 tooltip => $tip[$_],
1031 fg => ($highlight ? [1, 1, 1] : [.7, .7, .7]),
934 can_hover => 1, 1032 can_hover => 1,
935 can_events => 1, 1033 can_events => 1,
936 fontsize => 0.8) 1034 fontsize => 0.8)
937 for 0 .. $#$m; 1035 for 0 .. $#$m;
938 } 1036 }
1037 } else {
1038 $ok or $label->set_text ("error while contacting metaserver");
939 } 1039 }
940 }); 1040 };
1041
941} 1042}
942 1043
943sub metaserver_dialog { 1044sub metaserver_dialog {
944 my $dialog = new CFClient::UI::FancyFrame 1045 my $vbox = new CFPlus::UI::VBox;
1046 my $table = new CFPlus::UI::Table;
1047 $vbox->add (new CFPlus::UI::ScrolledWindow expand => 1, child => $table);
1048
1049 my $dialog = new CFPlus::UI::Toplevel
945 title => "Server List", 1050 title => "Server List",
946 name => 'metaserver_dialog', 1051 name => 'metaserver_dialog',
947 x => 'center', 1052 x => 'center',
948 y => 'center', 1053 y => 'center',
949 z => 3, 1054 z => 3,
1055 force_w => $::WIDTH * 0.9,
950 force_h => $::HEIGHT * 0.4, 1056 force_h => $::HEIGHT * 0.7,
951 child => (my $vbox = new CFClient::UI::VBox), 1057 child => $vbox,
952 has_close_button => 1, 1058 has_close_button => 1,
1059 table => $table,
953 on_visibility_change => sub { 1060 on_visibility_change => sub {
954 update_metaserver if $_[1]; 1061 update_metaserver ($_[0]) if $_[1];
955 0 1062 0
956 }, 1063 },
957 ; 1064 ;
958 1065
959 $dialog->{table} = new CFClient::UI::Table;
960
961 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $dialog->{table});
962
963 $dialog 1066 $dialog
964} 1067}
965 1068
966sub server_setup { 1069sub server_setup {
967 my $vbox = new CFClient::UI::VBox; 1070 my $vbox = new CFPlus::UI::VBox;
968 1071
1072 $vbox->add (new CFPlus::UI::FancyFrame
1073 label => "Connection Settings",
969 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 1074 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
1075 );
970 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port"); 1076 $table->add_at (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");
971 1077
972 { 1078 {
973 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 1079 $table->add_at (1, 2, my $vbox = new CFPlus::UI::VBox);
974 1080
975 $vbox->add ( 1081 $vbox->add (
976 $HOST_ENTRY = new CFClient::UI::Entry 1082 $HOST_ENTRY = new CFPlus::UI::Entry
977 expand => 1, 1083 expand => 1,
978 text => $CFG->{profile}{default}{host}, 1084 text => $CFG->{profile}{default}{host},
979 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 1085 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
980 on_changed => sub { 1086 on_changed => sub {
981 my ($self, $value) = @_; 1087 my ($self, $value) = @_;
982 $CFG->{profile}{default}{host} = $value; 1088 $CFG->{profile}{default}{host} = $value;
983 0 1089 0
984 } 1090 }
985 ); 1091 );
986 1092
987 $METASERVER = metaserver_dialog;
988
989 $vbox->add (new CFClient::UI::Button 1093 $vbox->add (new CFPlus::UI::Button
990 expand => 1, 1094 expand => 1,
991 text => "Server List", 1095 text => "Server List",
992 other => $METASERVER, 1096 other => $METASERVER,
993 tooltip => "Show a list of available crossfire servers", 1097 tooltip => "Show a list of available crossfire servers",
994 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1098 on_activate => sub { $METASERVER->toggle_visibility; 0 },
995 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 }, 1099 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
996 ); 1100 );
997 } 1101 }
998 1102
999 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username"); 1103 $table->add_at (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username");
1000 $table->add (1, 4, new CFClient::UI::Entry 1104 $table->add_at (1, 4, new CFPlus::UI::Entry
1001 text => $CFG->{profile}{default}{user}, 1105 text => $CFG->{profile}{default}{user},
1002 tooltip => "The name of your character on the server", 1106 tooltip => "The name of your character on the server",
1003 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value } 1107 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
1004 ); 1108 );
1005 1109
1006 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password"); 1110 $table->add_at (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password");
1007 $table->add (1, 5, new CFClient::UI::Entry 1111 $table->add_at (1, 5, new CFPlus::UI::Entry
1008 text => $CFG->{profile}{default}{password}, 1112 text => $CFG->{profile}{default}{password},
1009 hidden => 1, 1113 hidden => 1,
1010 tooltip => "The password for your character", 1114 tooltip => "The password for your character",
1011 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value } 1115 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
1012 ); 1116 );
1013 1117
1014 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size"); 1118 $table->add_at (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size");
1015 $table->add (1, 7, new CFClient::UI::Slider 1119 $table->add_at (1, 7, new CFPlus::UI::Slider
1016 force_w => 100, 1120 force_w => 100,
1017 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1121 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1018 tooltip => "This is the size of the portion of the map update the server sends you. " 1122 tooltip => "This is the size of the portion of the map update the server sends you. "
1019 . "If you set this to a high value you will be able to see further, " 1123 . "If you set this to a high value you will be able to see further, "
1020 . "but you also increase bandwidth requirements and latency. " 1124 . "but you also increase bandwidth requirements and latency. "
1021 . "This option is only used once at log-in.", 1125 . "This option is only used once at log-in.",
1022 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 }, 1126 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },
1023 ); 1127 );
1024 1128
1025 $table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Face Prefetch"); 1129 $table->add_at (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Face Prefetch");
1026 $table->add (1, 8, new CFClient::UI::CheckBox 1130 $table->add_at (1, 8, new CFPlus::UI::CheckBox
1027 state => $CFG->{face_prefetch}, 1131 state => $CFG->{face_prefetch},
1028 tooltip => "<b>Background Image Prefetch</b>\n\n" 1132 tooltip => "<b>Background Image Prefetch</b>\n\n"
1029 . "If enabled, the client automatically pre-fetches images from the server. " 1133 . "If enabled, the client automatically pre-fetches images from the server. "
1030 . "This might increase or create lag, but increases the chances " 1134 . "This might increase or create lag, but increases the chances "
1031 . "of faces being ready for display when you encounter them. " 1135 . "of faces being ready for display when you encounter them. "
… …
1033 . "so only set it if you really need to prefetch images. " 1137 . "so only set it if you really need to prefetch images. "
1034 . "This option can be set and unset any time.", 1138 . "This option can be set and unset any time.",
1035 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 }, 1139 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1036 ); 1140 );
1037 1141
1142 $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");
1143 $table->add_at (1, 9, new CFPlus::UI::Entry
1144 text => $CFG->{output_rate},
1145 tooltip => "The approximate bandwidth in bytes per second that the server should not exceed "
1146 . "when sending images, to ensure interactiveness. When 0 or unset, the server "
1147 . "default will be used, which is usually around 100kb/s.",
1148 on_changed => sub { $CFG->{output_rate} = $_[1]; 0 },
1149 );
1150
1038 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count"); 1151 $table->add_at (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1039 $table->add (1, 9, new CFClient::UI::Entry 1152 $table->add_at (1, 10, new CFPlus::UI::Entry
1040 text => $CFG->{output_count}, 1153 text => $CFG->{output_count},
1041 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1154 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1042 on_changed => sub { $CFG->{output_count} = $_[1]; 0 }, 1155 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
1043 ); 1156 );
1044 1157
1045 $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1158 $table->add_at (0, 11, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
1046 $table->add (1, 10, new CFClient::UI::Entry 1159 $table->add_at (1, 11, new CFPlus::UI::Entry
1047 text => $CFG->{output_sync}, 1160 text => $CFG->{output_sync},
1048 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1161 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1049 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 }, 1162 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
1050 ); 1163 );
1051 1164
1052 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button 1165 $table->add_at (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button
1053 expand => 1, 1166 expand => 1,
1054 align => 0, 1167 align => 0,
1055 text => "Login", 1168 text => "Login",
1056 on_activate => sub { 1169 on_activate => sub {
1057 $CONN ? stop_game 1170 $CONN ? stop_game
1058 : start_game; 1171 : start_game;
1059 0 1172 0
1060 }, 1173 },
1061 ); 1174 );
1062 1175
1176 $vbox->add (new CFPlus::UI::FancyFrame
1177 label => "Server Info",
1178 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
1179 );
1180
1181 $vbox
1182}
1183
1184sub client_setup {
1185 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1];
1186
1187 my $row = 0;
1188
1063 $table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command"); 1189 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
1064 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry 1190 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
1065 text => $CFG->{say_command}, 1191 state => $CFG->{show_tips},
1066 tooltip => "This is the command that will be used if you write a line in the message window entry or press <b>\"</b> in the map window. " 1192 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1067 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1068 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1069 on_changed => sub { 1193 on_changed => sub {
1070 my ($self, $value) = @_; 1194 my ($self, $value) = @_;
1071 $CFG->{say_command} = $value; 1195 $CFG->{show_tips} = $value;
1072 0 1196 0
1073 } 1197 }
1074 ); 1198 );
1075 1199
1076 $vbox->add (new CFClient::UI::Label 1200 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size");
1077 text => "Server Info", 1201 $table->add_at (1, $row++, my $saycmd = new CFPlus::UI::Entry
1078 fontsize => 1.2, 1202 text => $CFG->{logview_max_par},
1079 padding_y => 8, 1203 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server "
1080 fg => [1, 1, 0, 1], 1204 . "sends more messages than this number, older messages get removed to save memory and "
1081 ); 1205 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1082
1083 $vbox->add ($SERVER_INFO = new CFClient::UI::Label ellipsise => 0);
1084
1085 $vbox
1086}
1087
1088sub message_window {
1089 my $window = new CFClient::UI::FancyFrame
1090 name => "message_window",
1091 title => "Messages",
1092 border_bg => [1, 1, 1, 1],
1093 bg => [0, 0, 0, 0.75],
1094 x => "max",
1095 y => 0,
1096 force_w => $::WIDTH * 0.4,
1097 force_h => $::HEIGHT * 0.5,
1098 child => (my $vbox = new CFClient::UI::VBox),
1099 has_close_button => 1;
1100
1101 $vbox->add ($LOGVIEW);
1102
1103 $vbox->add (my $input = new CFClient::UI::Entry
1104 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
1105 . "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "
1106 . "If you prepend a slash (/), you will submit a command instead (similar to IRC). "
1107 . "A better way to submit commands (and the occasional chat command) is often the map command completer.",
1108 on_focus_in => sub { 1206 on_changed => sub {
1109 my ($input, $prev_focus) = @_; 1207 my ($self, $value) = @_;
1110 1208 $MESSAGE_WINDOW->set_max_para ($CFG->{logview_max_par} = $value*1);
1111 delete $input->{refocus_map};
1112
1113 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
1114 $input->{refocus_map} = 1;
1115 }
1116 delete $input->{auto_activated};
1117
1118 0 1209 0
1119 }, 1210 },
1120 on_activate => sub {
1121 my ($input, $text) = @_;
1122 $input->set_text ('');
1123
1124 if ($text =~ /^\/(.*)/) {
1125 $::CONN->user_send ($1);
1126 } else {
1127 my $say_cmd = $::CFG->{say_command} || 'say';
1128 $::CONN->user_send ("$say_cmd $text");
1129 }
1130 if ($input->{refocus_map}) {
1131 delete $input->{refocus_map};
1132 $MAPWIDGET->focus_in
1133 }
1134
1135 0
1136 },
1137 on_escape => sub {
1138 $MAPWIDGET->grab_focus;
1139
1140 0
1141 },
1142 );
1143
1144 $CONSOLE = {
1145 window => $window,
1146 input => $input,
1147 }; 1211 );
1148 1212
1149 $window 1213 $table
1150}
1151
1152sub open_quit_dialog {
1153 unless ($QUIT_DIALOG) {
1154 $QUIT_DIALOG = new CFClient::UI::FancyFrame
1155 x => "center",
1156 y => "center",
1157 z => 50,
1158 title => "Really Quit?",
1159 ;
1160
1161 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
1162
1163 $vb->add (new CFClient::UI::Label
1164 text => "You should find a savebed and apply it first!",
1165 max_w => $WIDTH * 0.25,
1166 ellipsize => 0,
1167 );
1168 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
1169 $hb->add (new CFClient::UI::Button
1170 text => "Ok",
1171 expand => 1,
1172 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1173 );
1174 $hb->add (new CFClient::UI::Button
1175 text => "Quit anyway",
1176 expand => 1,
1177 on_activate => sub { exit },
1178 );
1179 }
1180
1181 $QUIT_DIALOG->show;
1182} 1214}
1183 1215
1184sub autopickup_setup { 1216sub autopickup_setup {
1217 my $r = new CFPlus::UI::ScrolledWindow (
1218 expand => 1,
1219 scroll_y => 1
1220 );
1185 my $table = new CFClient::UI::Table; 1221 $r->add (my $table = new CFPlus::UI::Table
1222 row_expand => [0],
1223 col_expand => [0, 1, 0, 1],
1224 );
1186 1225
1187 for ( 1226 for (
1188 ["General", 0, 0, 1227 ["General", 0, 0,
1189 ["Enable autopickup" => PICKUP_NEWMODE], 1228 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1190 ["Inhibit autopickup" => PICKUP_INHIBIT], 1229 ["Inhibit autopickup" => PICKUP_INHIBIT],
1191 ["Stop before pickup" => PICKUP_STOP], 1230 ["Stop before pickup" => PICKUP_STOP],
1192 ["Debug autopickup" => PICKUP_DEBUG], 1231 ["Debug autopickup" => PICKUP_DEBUG],
1193 ], 1232 ],
1194 ["Weapons", 0, 6, 1233 ["Weapons", 0, 6,
… …
1204 ["Boots" => PICKUP_BOOTS], 1243 ["Boots" => PICKUP_BOOTS],
1205 ["Gloves" => PICKUP_GLOVES], 1244 ["Gloves" => PICKUP_GLOVES],
1206 ["Cloaks" => PICKUP_CLOAK], 1245 ["Cloaks" => PICKUP_CLOAK],
1207 ], 1246 ],
1208 1247
1209 ["Readables", 2, 2, 1248 ["Readables", 2, 0,
1210 ["Spellbooks" => PICKUP_SPELLBOOK], 1249 ["Spellbooks" => PICKUP_SPELLBOOK],
1211 ["Skillscrolls" => PICKUP_SKILLSCROLL], 1250 ["Skillscrolls" => PICKUP_SKILLSCROLL],
1212 ["Normal Books/Scrolls" => PICKUP_READABLES], 1251 ["Normal Books/Scrolls" => PICKUP_READABLES],
1213 ], 1252 ],
1214 ["Misc", 2, 7, 1253 ["Misc", 2, 5,
1215 ["Food" => PICKUP_FOOD], 1254 ["Food" => PICKUP_FOOD],
1216 ["Drinks" => PICKUP_DRINK], 1255 ["Drinks" => PICKUP_DRINK],
1217 ["Valuables (Money, Gems)" => PICKUP_VALUABLES], 1256 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
1218 ["Keys" => PICKUP_KEY], 1257 ["Keys" => PICKUP_KEY],
1219 ["Magical Items" => PICKUP_MAGICAL], 1258 ["Magical Items" => PICKUP_MAGICAL],
1220 ["Potions" => PICKUP_POTION], 1259 ["Potions" => PICKUP_POTION],
1221 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1260 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1222 ["Ignore cursed" => PICKUP_NOT_CURSED], 1261 ["Ignore cursed" => PICKUP_NOT_CURSED],
1223 ["Jewelery" => PICKUP_JEWELS], 1262 ["Jewelery" => PICKUP_JEWELS],
1263 ["Flesh" => PICKUP_FLESH],
1224 ], 1264 ],
1225 ["Weight/Value ratio", 2, 17] 1265 ["Weight/Value ratio", 2, 17]
1226 ) 1266 )
1227 { 1267 {
1228 my ($title, $x, $y, @bits) = @$_; 1268 my ($title, $x, $y, @bits) = @$_;
1229 $table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1269 $table->add_at ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1230 1270
1231 for (@bits) { 1271 for (@bits) {
1232 ++$y; 1272 ++$y;
1233 1273
1234 my $mask = $_->[1]; 1274 my $mask = $_->[1];
1235 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1); 1275 $table->add_at ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1);
1236 $table->add ($x+1, $y, new CFClient::UI::CheckBox 1276 $table->add_at ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1237 state => $CFG->{pickup} & $mask, 1277 state => $::CFG->{pickup} & $mask,
1238 on_changed => sub { 1278 on_changed => sub {
1239 my ($box, $value) = @_; 1279 my ($box, $value) = @_;
1240 1280
1241 if ($value) { 1281 if ($value) {
1242 $::CFG->{pickup} |= $mask; 1282 $::CFG->{pickup} |= $mask;
… …
1247 $::CONN->send_command ("pickup $::CFG->{pickup}") 1287 $::CONN->send_command ("pickup $::CFG->{pickup}")
1248 if defined $::CONN; 1288 if defined $::CONN;
1249 1289
1250 0 1290 0
1251 }); 1291 });
1292
1293 ${$_->[2]} = $checkbox if $_->[2];
1252 } 1294 }
1253 } 1295 }
1254 1296
1255 $table->add (2, 18, new CFClient::UI::ValSlider 1297 $table->add_at (2, 18, new CFPlus::UI::ValSlider
1256 range => [0, 0, 16, 1, 1], 1298 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1299 template => ">= 99",
1257 to_value => sub { ">= " . 5 * $_[0] }, 1300 to_value => sub { ">= " . 5 * $_[0] },
1258 on_changed => sub { 1301 on_changed => sub {
1259 my ($slider, $value) = @_; 1302 my ($slider, $value) = @_;
1260 1303
1261 $::CFG->{pickup} &= ~0x7; 1304 $::CFG->{pickup} &= ~0xF;
1262 $::CFG->{pickup} |= int $value 1305 $::CFG->{pickup} |= int $value
1263 if $value; 1306 if $value;
1264 1; 1307 1;
1265 }); 1308 });
1309
1266 $table->add (3, 18, new CFClient::UI::Button 1310 $table->add_at (3, 18, new CFPlus::UI::Button
1267 text => "set", 1311 text => "set",
1268 on_activate => sub { 1312 on_activate => sub {
1269 $::CONN->send_command ("pickup $::CFG->{pickup}") 1313 $::CONN->send_command ("pickup $::CFG->{pickup}")
1270 if defined $::CONN; 1314 if defined $::CONN;
1271 0 1315 0
1272 }); 1316 });
1273 1317
1274 $table 1318 $r
1275} 1319}
1276 1320
1321my %SORT_ORDER = (
1322 type => undef,
1323 mtime => sub {
1324 my $NOW = time;
1325 sort {
1326 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
1327 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
1328
1329 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1330 or $btime <=> $atime
1331 or $a->{type} <=> $b->{type}
1332 } @_
1333 },
1334 weight => sub { sort {
1335 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1336 or $a->{type} <=> $b->{type}
1337 } @_ },
1338);
1339
1277sub inventory_window { 1340sub inventory_widget {
1278 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame 1341 my $hb = new CFPlus::UI::HBox homogeneous => 1;
1342
1343 $hb->add (my $vb1 = new CFPlus::UI::VBox);
1344 $vb1->add (new CFPlus::UI::Label align => 0, text => "Player");
1345
1346 $vb1->add (my $hb1 = new CFPlus::UI::HBox);
1347
1348 use sort 'stable';
1349
1350 $hb1->add (new CFPlus::UI::Selector
1351 value => $::CFG->{inv_sort},
1352 options => [
1353 [type => "Type/Name"],
1354 [mtime => "Recent/Normal/Locked"],
1355 [weight => "Weight/Type"],
1356 ],
1357 on_changed => sub {
1358 $::CFG->{inv_sort} = $_[1];
1359 $INV->set_sort_order ($SORT_ORDER{$_[1]});
1360 },
1361 );
1362 $hb1->add (new CFPlus::UI::Label text => "Weight: ", align => 1, expand => 1);
1363 #TODO# update to weigh/maxweight
1364 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1);
1365
1366 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1367 $sw1->add ($INV = new CFPlus::UI::Inventory);
1368 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1369
1370 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1371
1372 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox);
1373
1374 $vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1375 $sw2->add ($INVR = new CFPlus::UI::Inventory);
1376
1377 # XXX: Call after $INVR = ... because set_opencont sets the items
1378 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
1379
1380 $hb
1381}
1382
1383sub toggle_player_page {
1384 my ($widget) = @_;
1385
1386 if ($PL_WINDOW->{visible} && $PL_NOTEBOOK->get_current_page == $widget) {
1387 $PL_WINDOW->hide;
1388 } else {
1389 $PL_NOTEBOOK->set_current_page ($widget);
1390 $PL_WINDOW->show;
1391 }
1392}
1393
1394sub player_window {
1395 my $plwin = $PL_WINDOW = new CFPlus::UI::Toplevel
1279 x => "center", 1396 x => "center",
1280 y => "center", 1397 y => "center",
1281 force_w => $WIDTH * 9/10, 1398 force_w => $WIDTH * 9/10,
1282 force_h => $HEIGHT * 9/10, 1399 force_h => $HEIGHT * 9/10,
1283 title => "Inventory", 1400 title => "Player",
1401 name => "playerbook",
1284 has_close_button => 1, 1402 has_close_button => 1
1285 ; 1403 ;
1286 1404
1287 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1); 1405 my $ntb =
1406 $PL_NOTEBOOK =
1407 new CFPlus::UI::Notebook expand => 1;
1288 1408
1289 $hb->add (my $vb1 = new CFClient::UI::VBox); 1409 $ntb->add_tab (
1290 $vb1->add (new CFClient::UI::Label align => 0, text => "Player"); 1410 "Statistics (F2)" => $STATS_PAGE = stats_window,
1291 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1); 1411 "Shows statistics, where all your Stats and Resistances are shown."
1412 );
1413 $ntb->add_tab (
1414 "Skills (F3)" => $SKILL_PAGE = skill_window,
1415 "Shows all your Skills."
1416 );
1292 1417
1293 $hb->add (my $vb2 = new CFClient::UI::VBox); 1418 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1419 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1420 $ntb->add_tab (
1421 "Spellbook (F4)" => $spellsw,
1422 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1423 );
1424 $ntb->add_tab (
1425 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1426 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1427 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1428 );
1429 $ntb->add_tab (Pickup => autopickup_setup,
1430 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1294 1431
1295 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox); 1432 $ntb->set_current_page ($INVENTORY_PAGE);
1296 1433
1297 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1); 1434 $plwin->add ($ntb);
1298 1435 $plwin
1299 # XXX: Call after $INVR = ... because set_opencont sets the items
1300 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1301
1302 $invwin
1303}
1304
1305sub spell_setup {
1306 new CFClient::UI::SpellList
1307}
1308
1309sub update_bindings {
1310 $BIND_UPD_CB->() if $BIND_UPD_CB;
1311} 1436}
1312 1437
1313sub keyboard_setup { 1438sub keyboard_setup {
1314 my $binding_list = new CFClient::UI::VBox; 1439 CFPlus::Macro::keyboard_setup
1315
1316 my $refresh;
1317 $refresh = $BIND_UPD_CB = sub {
1318 $binding_list->clear ();
1319
1320 for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) {
1321 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
1322 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1323 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1324
1325 my $lbl = join "; ", @$cmds;
1326 my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym);
1327 $binding_list->add (my $hb = new CFClient::UI::HBox);
1328 $hb->add (new CFClient::UI::Button
1329 text => "delete",
1330 tooltip => "Deletes the binding",
1331 on_activate => sub {
1332 $binding_list->remove ($hb);
1333 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1334 0
1335 });
1336
1337 $hb->add (new CFClient::UI::Button
1338 text => "edit",
1339 tooltip => "Edits the binding",
1340 on_activate => sub {
1341 $::BIND_EDITOR->set_binding (
1342 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},
1343 sub {
1344 my ($nmod, $nsym, $ncmds) = @_;
1345 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
1346 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1347 $refresh->();
1348 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1349 $SETUP_DIALOG->show;
1350 },
1351 sub {
1352 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1353 $SETUP_DIALOG->show;
1354 });
1355 $::BIND_EDITOR->show;
1356 $SETUP_DIALOG->hide;
1357 0
1358 });
1359
1360 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
1361 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
1362 }
1363 }
1364 };
1365
1366 my $vb = new CFClient::UI::VBox;
1367 $vb->add (my $hb = new CFClient::UI::HBox);
1368 $hb->add (new CFClient::UI::Label text => "only shift-up stops fire");
1369 $hb->add (new CFClient::UI::CheckBox
1370 expand => 1,
1371 state => $CFG->{shift_fire_stop},
1372 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
1373 on_changed => sub {
1374 my ($cbox, $value) = @_;
1375 $CFG->{shift_fire_stop} = $value;
1376 0
1377 });
1378
1379 $vb->add ($binding_list);
1380 $vb->add (my $hb = new CFClient::UI::HBox);
1381
1382 $hb->add (new CFClient::UI::Button
1383 text => "record new",
1384 expand => 1,
1385 tooltip => "This button opens the binding editor with an empty binding.",
1386 on_activate => sub {
1387 $::BIND_EDITOR->set_binding (undef, undef, [],
1388 sub {
1389 my ($mod, $sym, $cmds) = @_;
1390 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1391 $refresh->();
1392 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1393 $SETUP_DIALOG->show;
1394 },
1395 sub {
1396 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1397 $SETUP_DIALOG->show;
1398 },
1399 );
1400 $SETUP_DIALOG->hide;
1401 $::BIND_EDITOR->show;
1402 0
1403 },
1404 );
1405
1406 $hb->add (new CFClient::UI::Button
1407 text => "close",
1408 tooltip => "Closes the binding window",
1409 expand => 1,
1410 on_activate => sub {
1411 $SETUP_DIALOG->hide;
1412 0
1413 }
1414 );
1415
1416 $refresh->();
1417
1418 $vb
1419} 1440}
1420 1441
1421sub help_window { 1442sub help_window {
1422 my $win = new CFClient::UI::FancyFrame 1443 my $win = new CFPlus::UI::Toplevel
1423 x => 'center', 1444 x => 'center',
1424 y => 'center', 1445 y => 'center',
1425 z => 2, 1446 z => 4,
1426 name => 'doc_browser', 1447 name => 'doc_browser',
1427 force_w => int $WIDTH * 7/8, 1448 force_w => int $WIDTH * 7/8,
1428 force_h => int $HEIGHT * 7/8, 1449 force_h => int $HEIGHT * 7/8,
1429 title => "Documentation"; 1450 title => "Help Browser",
1451 has_close_button => 1;
1430 1452
1431 $win->add (my $vbox = new CFClient::UI::VBox); 1453 $win->add (my $vbox = new CFPlus::UI::VBox);
1432 1454
1433 $vbox->add (my $buttons = new CFClient::UI::HBox); 1455 $vbox->add (new CFPlus::UI::FancyFrame
1456 label => "Navigation",
1457 child => (my $buttons = new CFPlus::UI::HBox),
1458 );
1434 $vbox->add (my $viewer = new CFClient::UI::TextScroller 1459 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1435 expand => 1, fontsize => 0.8, padding_x => 4); 1460 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1436 1461
1437 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: "); 1462 my @history;
1438 $buttons->add (my $combo = new CFClient::UI::Combobox 1463 my @future;
1439 value => undef, 1464 my $curnode;
1440 options => [ 1465
1441 [intro => "Introduction"], 1466 my $load_node; $load_node = sub {
1442 [manual => "Main Manual"], 1467 my ($node, $para) = @_;
1443 [skill_help => "Skill Reference"], 1468
1444 [command_help => "Command Reference"], 1469 $buttons->clear;
1445 [dmcommand_help => "DM Commands"], 1470
1446 [COPYING => "License Terms"], 1471 $buttons->add (new CFPlus::UI::Button
1447 ], 1472 text => "⇤",
1473 tooltip => "back to the starting page",
1448 on_changed => sub { 1474 on_activate => sub {
1449 my ($self, $pod) = @_; 1475 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1450 1476 unshift @future, @history;
1451 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod", 1477 @history = ();
1452 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] }; 1478 $load_node->(@{shift @future});
1453
1454 $viewer->clear;
1455
1456# $viewer->add_paragraph ([1, 1, 1, 1], ["<big>Test</big>\n\n \x{fffc} \x{fffc}\n",
1457# (new CFClient::UI::Image path => "x.png", can_hover => 1, can_events => 1),
1458# (new CFClient::UI::Label text => "üüüü", can_hover => 1, can_events => 1, tooltip => "??"),
1459# ]);#d#
1460 1479 },
1461 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0]) 1480 );
1462 for @$pom;
1463 1481
1464 $viewer->set_offset (0); 1482 if (@history) {
1465 1483 $buttons->add (new CFPlus::UI::Button
1484 text => "⋘",
1485 tooltip => "back to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $history[-1][0]) . "</i>",
1486 on_activate => sub {
1487 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1488 $load_node->(@{pop @history});
1489 },
1466 0 1490 );
1467 }, 1491 }
1468 on_visibility_change => sub { 1492
1469 my ($self, $visible) = @_; 1493 if (@future) {
1470 return unless $visible; 1494 $buttons->add (new CFPlus::UI::Button
1471 return if $self->{value}; 1495 text => "â‹™",
1472 $self->set_value ("intro"); 1496 tooltip => "forward to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $future[0][0]) . "</i>",
1497 on_activate => sub {
1498 push @history, [$curnode, $viewer->current_paragraph];
1499 $load_node->(@{shift @future});
1500 },
1473 0 1501 );
1474 }, 1502 }
1503
1504 $buttons->add (new CFPlus::UI::Label text => " ");
1505
1506 my @path = CFPlus::Pod::full_path_of $node;
1507 pop @path; # drop current node
1508
1509 for my $node (@path) {
1510 $buttons->add (new CFPlus::UI::Button
1511 text => $node->{kw}[0],
1512 tooltip => "go to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $node) . "</i>",
1513 on_activate => sub {
1514 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1515 $load_node->($node);
1516 },
1517 );
1518 $buttons->add (new CFPlus::UI::Label text => "/");
1519 }
1520
1521 $buttons->add (new CFPlus::UI::Label text => $node->{kw}[0], padding_x => 4, padding_y => 4);
1522
1523 $curnode = $node;
1524
1525 $viewer->clear;
1526 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $curnode);
1527 $viewer->scroll_to ($para);
1475 ); 1528 };
1529
1530 $load_node->(CFPlus::Pod::find pod => "mainpage");
1531
1532 $CFPlus::Pod::goto_document = sub {
1533 my (@path) = @_;
1534
1535 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1536
1537 $load_node->((CFPlus::Pod::find @path)[0]);
1538 $win->show;
1539 };
1476 1540
1477 $win 1541 $win
1478} 1542}
1479 1543
1544sub open_string_query {
1545 my ($title, $cb, $txt, $tooltip) = @_;
1546 my $dialog = new CFPlus::UI::Toplevel
1547 x => "center",
1548 y => "center",
1549 z => 50,
1550 force_w => $WIDTH * 4/5,
1551 title => $title;
1552
1553 $dialog->add (
1554 my $e = new CFPlus::UI::Entry
1555 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
1556 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
1557 tooltip => $tooltip
1558 );
1559
1560 $e->grab_focus;
1561 $e->set_text ($txt) if $txt;
1562 $dialog->show;
1563}
1564
1565sub open_quit_dialog {
1566 unless ($QUIT_DIALOG) {
1567 $QUIT_DIALOG = new CFPlus::UI::Toplevel
1568 x => "center",
1569 y => "center",
1570 z => 50,
1571 title => "Really Quit?",
1572 on_key_down => sub {
1573 my ($dialog, $ev) = @_;
1574 $ev->{sym} == 27 and $dialog->hide;
1575 }
1576 ;
1577
1578 $QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
1579
1580 $vb->add (new CFPlus::UI::Label
1581 text => "You should find a savebed and apply it first!",
1582 max_w => $WIDTH * 0.25,
1583 ellipsize => 0,
1584 );
1585 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1586 $hb->add (new CFPlus::UI::Button
1587 text => "Ok",
1588 expand => 1,
1589 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1590 );
1591 $hb->add (new CFPlus::UI::Button
1592 text => "Quit anyway",
1593 expand => 1,
1594 on_activate => sub { exit },
1595 );
1596 }
1597
1598 $QUIT_DIALOG->show;
1599 $QUIT_DIALOG->grab_focus;
1600}
1601
1602sub show_tip_of_the_day {
1603 # find all tips
1604 my @tod = CFPlus::Pod::find tip_of_the_day => "*";
1605
1606 CFPlus::DB::get state => "tip_of_the_day", sub {
1607 my ($todindex) = @_;
1608 $todindex = 0 if $todindex >= @tod;
1609 CFPlus::DB::put state => tip_of_the_day => $todindex + 1, sub { };
1610
1611 # create dialog
1612 my $dialog;
1613
1614 my $close = sub {
1615 $dialog->destroy;
1616 };
1617
1618 $dialog = new CFPlus::UI::Toplevel
1619 x => "center",
1620 y => "center",
1621 z => 3,
1622 name => 'tip_of_the_day',
1623 force_w => int $WIDTH * 4/9,
1624 force_h => int $WIDTH * 2/9,
1625 title => "Tip of the day #" . (1 + $todindex),
1626 child => my $vbox = new CFPlus::UI::VBox,
1627 has_close_button => 1,
1628 on_delete => $close,
1629 ;
1630
1631 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1632 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1633 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1634
1635 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1636
1637 $table->add_at (0, 0, new CFPlus::UI::Button
1638 text => "Close",
1639 tooltip => "Close the tip of the day window. To never see it again, disable the tip of the day in the <b>Server Setup</b>.",
1640 on_activate => $close,
1641 );
1642
1643 $table->add_at (2, 0, new CFPlus::UI::Button
1644 text => "Next",
1645 tooltip => "Show the next <b>Tip of the day</b>.",
1646 on_activate => sub {
1647 $close->();
1648 &show_tip_of_the_day;
1649 },
1650 );
1651
1652 $dialog->show;
1653 };
1654}
1655
1480sub sdl_init { 1656sub sdl_init {
1481 CFClient::SDL_Init 1657 CFPlus::SDL_Init
1482 and die "SDL::Init failed!\n"; 1658 and die "SDL::Init failed!\n";
1483} 1659}
1484 1660
1485sub video_init { 1661sub video_init {
1486 sdl_init;
1487
1488 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 1662 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
1489 1663
1490 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 1664 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
1491 1665
1492 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 1666 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1493 $FULLSCREEN = $CFG->{fullscreen}; 1667 $FULLSCREEN = $CFG->{fullscreen};
1494 $FAST = $CFG->{fast}; 1668 $FAST = $CFG->{fast};
1495 1669
1496 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 1670 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
1497 or die "SDL_SetVideoMode failed: " . (CFClient::SDL_GetError) . "\n"; 1671 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1498 1672
1499 $SDL_ACTIVE = 1; 1673 $SDL_ACTIVE = 1;
1500 $LAST_REFRESH = time - 0.01; 1674 $LAST_REFRESH = time - 0.01;
1501 1675
1502 CFClient::OpenGL::init; 1676 CFPlus::OpenGL::init;
1503 1677
1504 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 1678 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
1505 1679
1506 $CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d# 1680 $CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
1507 1681
1508 ############################################################################# 1682 #############################################################################
1509 1683
1510 if ($DEBUG_STATUS) { 1684 if ($DEBUG_STATUS) {
1511 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 1685 CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1512 } else { 1686 } else {
1513 # create the widgets 1687 # create the widgets
1514 1688
1515 $DEBUG_STATUS = new CFClient::UI::Label 1689 $DEBUG_STATUS = new CFPlus::UI::Label
1516 padding => 0, 1690 padding => 0,
1517 z => 100, 1691 z => 100,
1518 force_x => "max", 1692 force_x => "max",
1519 force_y => 0; 1693 force_y => 0;
1520 $DEBUG_STATUS->show; 1694 $DEBUG_STATUS->show;
1521 1695
1522 $BIND_EDITOR = new CFClient::BindingEditor (x => "max", y => 0);
1523
1524 $STATUSBOX = new CFClient::UI::Statusbox; 1696 $STATUSBOX = new CFPlus::UI::Statusbox;
1525 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]); 1697 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1526 1698
1527 (new CFClient::UI::Frame 1699 (new CFPlus::UI::Frame
1528 bg => [0, 0, 0, 0.4], 1700 bg => [0, 0, 0, 0.4],
1529 force_x => 0, 1701 force_x => 0,
1530 force_y => "max", 1702 force_y => "max",
1531 child => $STATUSBOX, 1703 child => $STATUSBOX,
1532 )->show; 1704 )->show;
1533 1705
1534 CFClient::UI::FancyFrame->new ( 1706 CFPlus::UI::Toplevel->new (
1535 title => "Map", 1707 title => "Map",
1536 name => "mapmap", 1708 name => "mapmap",
1537 x => 0, 1709 x => 0,
1538 y => $FONTSIZE + 8, 1710 y => $FONTSIZE + 8,
1539 border_bg => [1, 1, 1, 192/255], 1711 border_bg => [1, 1, 1, 192/255],
1540 bg => [1, 1, 1, 0], 1712 bg => [1, 1, 1, 0],
1541 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1713 child => ($MAPMAP = new CFPlus::MapWidget::MapMap
1542 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.", 1714 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
1543 ), 1715 ),
1544 )->show; 1716 )->show;
1545 1717
1546 $MAPWIDGET = new CFClient::MapWidget; 1718 $MAPWIDGET = new CFPlus::MapWidget;
1547 $MAPWIDGET->connect (activate_console => sub { 1719 $MAPWIDGET->connect (activate_console => sub {
1548 my ($mapwidget, $preset) = @_; 1720 my ($mapwidget, $preset) = @_;
1549 1721
1550 if ($CONSOLE) { 1722 $MESSAGE_WINDOW->activate_console ($preset)
1551 $CONSOLE->{input}->{auto_activated} = 1; 1723 if $MESSAGE_WINDOW;
1552 $CONSOLE->{input}->grab_focus;
1553
1554 if ($preset && $CONSOLE->{input}->get_text eq '') {
1555 $CONSOLE->{input}->set_text ($preset);
1556 }
1557 }
1558 }); 1724 });
1559 $MAPWIDGET->show; 1725 $MAPWIDGET->show;
1560 $MAPWIDGET->grab_focus; 1726 $MAPWIDGET->grab_focus;
1561 1727
1562 $LOGVIEW = new CFClient::UI::TextScroller
1563 expand => 1,
1564 font => $FONT_FIXED,
1565 fontsize => $::CFG->{log_fontsize},
1566 indent => -4,
1567 can_hover => 1,
1568 can_events => 1,
1569 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1570 ;
1571
1572 $SETUP_DIALOG = new CFClient::UI::FancyFrame 1728 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1573 title => "Setup", 1729 title => "Setup",
1574 name => "setup_dialog", 1730 name => "setup_dialog",
1575 x => 'center', 1731 x => 'center',
1576 y => 'center', 1732 y => 'center',
1577 z => 2, 1733 z => 2,
1578 force_w => $::WIDTH * 0.6, 1734 force_w => $::WIDTH * 0.6,
1579 force_h => $::HEIGHT * 0.6, 1735 force_h => $::HEIGHT * 0.6,
1580 has_close_button => 1, 1736 has_close_button => 1,
1581 ; 1737 ;
1582 1738
1739 $METASERVER = metaserver_dialog;
1740 $MESSAGE_WINDOW = new CFPlus::UI::MessageWindow;
1741
1583 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1, 1742 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1584 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1); 1743 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1585 1744
1586 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1745 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
1587 "Configure the server to play on, your username, password and other server-related options."); 1746 "Configure the server to play on, your username, password and other server-related options.");
1588 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup, 1747 $SETUP_NOTEBOOK->add_tab (Client => client_setup,
1589 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them."); 1748 "Configure various client-specific settings.");
1590 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 1749 $SETUP_NOTEBOOK->add_tab (Graphics => graphics_setup,
1591 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 1750 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1592 $SETUP_NOTEBOOK->add (Audio => audio_setup, 1751 $SETUP_NOTEBOOK->add_tab (Audio => audio_setup,
1593 "Configure the use of audio, sound effects and background music."); 1752 "Configure the use of audio, sound effects and background music.");
1594 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 1753 $SETUP_NOTEBOOK->add_tab (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1595 "Lets you define, edit and delete key bindings." 1754 "Lets you define, edit and delete key bindings."
1596 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor " 1755 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "
1597 . "with nothing set and the recording started. After doing the actions you " 1756 . "with nothing set and the recording started. After doing the actions you "
1598 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. " 1757 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1599 . "After pressing the combo the binding will be saved automatically and the " 1758 . "After pressing the combo the binding will be saved automatically and the "
1600 . "binding editor closes"); 1759 . "binding editor closes");
1601 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup,
1602 "Displays all spells you have and lets you edit keyboard shortcuts for them.");
1603 $SETUP_NOTEBOOK->add (Debug => debug_setup, 1760 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
1604 "Some debuggin' options. Do not ask."); 1761 "Some debuggin' options. Do not ask.");
1605 1762
1606 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 1763 $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1607 1764
1608 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 1765 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1609 tooltip => "Toggles a dialog where you can configure all aspects of this client."); 1766 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1610 1767
1611 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window, 1768 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
1612 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 1769 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1613 1770
1614 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 1771 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
1615 1772
1616 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => $STATS_WINDOW = stats_window,
1617 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1618 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => inventory_window, 1773 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
1619 tooltip => "Toggles the inventory window, where you can manage your loot (or treasures :). " 1774 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
1620 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1621 1775
1622 $BUTTONBAR->add (new CFClient::UI::Button 1776 $BUTTONBAR->add (new CFPlus::UI::Button
1623 text => "Save Config", 1777 text => "Save Config",
1624 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 1778 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1625 on_activate => sub { 1779 on_activate => sub {
1626 $::CFG->{layout} = CFClient::UI::get_layout; 1780 $::CFG->{layout} = CFPlus::UI::get_layout;
1627 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc"; 1781 CFPlus::write_cfg "$Crossfire::VARDIR/cfplusrc";
1628 status "Configuration Saved"; 1782 status "Configuration Saved";
1629 0 1783 0
1630 }, 1784 },
1631 ); 1785 );
1632 1786
1633 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => help_window, 1787 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1634 tooltip => "View Documentation"); 1788 tooltip => "View Documentation");
1635 1789
1790
1636 $BUTTONBAR->add (new CFClient::UI::Button 1791 $BUTTONBAR->add (new CFPlus::UI::Button
1637 text => "Quit", 1792 text => "Quit",
1638 tooltip => "Terminates the program", 1793 tooltip => "Terminates the program",
1639 on_activate => sub { 1794 on_activate => sub {
1640 if ($CONN) { 1795 if ($CONN) {
1641 open_quit_dialog; 1796 open_quit_dialog;
… …
1651 } 1806 }
1652 1807
1653 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1808 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1654} 1809}
1655 1810
1811sub setup_build_button {
1812 my ($enabled) = @_;
1813 if ($enabled) {
1814 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1815 $BUILD_BUTTON ||= new CFPlus::UI::Button
1816 text => "Build",
1817 tooltip => "Opens the ingame builder",
1818 on_activate => sub {
1819 if ($CONN) {
1820 $CONN->send_ext_req (builder_player_items => sub {
1821 open_ingame_editor ($_[0]) if exists $_[0]->{items};
1822 });
1823 }
1824 0
1825 };
1826 $BUTTONBAR->add ($BUILD_BUTTON);
1827 } else {
1828 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1829 }
1830}
1831
1832sub open_ingame_editor {
1833 my ($msg) = @_;
1834
1835 my $win = new CFPlus::UI::Toplevel
1836 x => 0,
1837 y => 'center',
1838 z => 4,
1839 name => 'builder_window',
1840 force_w => int $WIDTH * 1/4,
1841 force_h => int $HEIGHT * 3/4,
1842 title => "In game builder",
1843 has_close_button => 1;
1844
1845 my $r = new CFPlus::UI::ScrolledWindow (
1846 expand => 1,
1847 scroll_y => 1
1848 );
1849 $r->add (my $vb = new CFPlus::UI::VBox);
1850 $win->add ($r);
1851
1852
1853 $vb->add (
1854 new CFPlus::UI::Button
1855 text => "Disable build mode",
1856 on_activate => sub { $::IN_BUILD_MODE = undef }
1857 );
1858 $vb->add (
1859 new CFPlus::UI::Button
1860 text => "ERASE",
1861 on_activate => sub { $::IN_BUILD_MODE = { do_erase => 1 } }
1862 );
1863
1864 for my $itemarchname (
1865 sort {
1866 $msg->{items}->{$a}->{build_arch_name}
1867 cmp $msg->{items}->{$b}->{build_arch_name}
1868 } keys %{$msg->{items}}
1869 ) {
1870 my $info = $msg->{items}->{$itemarchname};
1871 $vb->add (
1872 new CFPlus::UI::Button text => $info->{build_arch_name},
1873 on_activate => sub {
1874 $::IN_BUILD_MODE = { item => $itemarchname, info => $info };
1875
1876 if (grep { $msg->{items}->{$itemarchname}->{$_} } qw/has_connection has_name has_text/) {
1877 build_mode_query_arch_info ();
1878 }
1879 }
1880 );
1881 }
1882
1883 $win->show;
1884}
1885
1886sub build_mode_query_arch_info {
1887 my ($iteminfo) = $::IN_BUILD_MODE;
1888 my $itemarchname = $iteminfo->{item};
1889 my $info = $iteminfo->{info};
1890
1891 my $dialog = new CFPlus::UI::Toplevel
1892 x => "center",
1893 y => "center",
1894 z => 50,
1895 force_w => int $WIDTH * 1/2,
1896 title => "Enter information for placement of '$itemarchname'",
1897 has_close_button => 1;
1898
1899 $dialog->add (my $vb = new CFPlus::UI::VBox expand => 1);
1900
1901 $vb->add (my $table = new CFPlus::UI::Table expand => 1);
1902 my $row = 0;
1903 if ($info->{has_name}) {
1904 $table->add_at (0, $row, new CFPlus::UI::Label text => "Name:");
1905 $table->add_at (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{name} = $_[1]; 0 });
1906 }
1907 if ($info->{has_text}) {
1908 $table->add_at (0, $row, new CFPlus::UI::Label text => "Text:");
1909 $table->add_at (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{text} = $_[1]; 0 });
1910 }
1911 if ($info->{has_connection}) {
1912 $table->add_at (0, $row, new CFPlus::UI::Label text => "Connection ID:");
1913 $table->add_at (1, $row++,
1914 new CFPlus::UI::Entry
1915 expand => 1,
1916 on_changed => sub { $::IN_BUILD_MODE->{connection} = $_[1]; 0 },
1917 tooltip => "Enter the connection ID here. The connection ID connects actors like a lever to a gate or a magic ear to a gate"
1918 );
1919 }
1920
1921 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1922 $hb->add (new CFPlus::UI::Button
1923 text => "Close",
1924 expand => 1,
1925 on_activate => sub { $dialog->hide; 0 },
1926 );
1927 $dialog->show;
1928}
1929
1656sub video_shutdown { 1930sub video_shutdown {
1657 CFClient::OpenGL::shutdown; 1931 CFPlus::OpenGL::shutdown;
1658 1932
1659 undef $SDL_ACTIVE; 1933 undef $SDL_ACTIVE;
1660} 1934}
1661 1935
1662my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
1663my $bgmusic;#TODO#hack#d#
1664
1665sub audio_channel_finished { 1936sub audio_channel_finished {
1666 my ($channel) = @_; 1937 my ($channel) = @_;
1667 1938
1668 #warn "channel $channel finished\n";#d# 1939 #warn "channel $channel finished\n";#d#
1669} 1940}
1670 1941
1942sub audio_music_set {
1943 my ($songs) = @_;
1944
1945 my @want =
1946 grep $_,
1947 map $CONN->{music_meta}{$_},
1948 @$songs;
1949
1950 if (@want) {
1951 @MUSIC_WANT = @want;
1952 &audio_music_changed ();
1953 }
1954}
1955
1956sub audio_music_start {
1957 my $path = $MUSIC_PLAYING->{path}
1958 or return;
1959
1960 CFPlus::DB::prefetch_file $path, 1024_000, sub {
1961 return unless $SDL_MIXER;
1962
1963 # music might have changed...
1964 $path eq $MUSIC_PLAYING->{path}
1965 or return &audio_music_start ();
1966
1967 $MUSIC_PLAYER = new_from_file CFPlus::MixMusic $path;
1968
1969 my $NOW = time;
1970
1971 if ($MUSIC_PLAYING->{stop_time} > $NOW - $MUSIC_RESUME) {
1972 my $pos = $MUSIC_PLAYING->{stop_pos};
1973 $MUSIC_PLAYER->fade_in_pos (0, 1000, $pos);
1974 $MUSIC_START = time - $pos;
1975 } else {
1976 $MUSIC_PLAYER->play (0);
1977 $MUSIC_START = time;
1978 }
1979
1980 delete $MUSIC_PLAYING->{stop_time};
1981 delete $MUSIC_PLAYING->{stop_pos};
1982 }
1983}
1984
1985sub audio_music_changed {
1986 return unless $CFG->{bgm_enable};
1987 return unless $SDL_MIXER;
1988
1989 # default MUSIC_WANT == MUSIC_DEFAULT
1990 @MUSIC_WANT = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_WANT;
1991
1992 # if the currently playing song is acceptable, let it continue
1993 return if $MUSIC_PLAYING
1994 && grep $MUSIC_PLAYING->{path} eq $_->{path}, @MUSIC_WANT;
1995
1996 my $NOW = time;
1997
1998 if ($MUSIC_PLAYING) {
1999 $MUSIC_PLAYING->{stop_time} = $NOW;
2000 $MUSIC_PLAYING->{stop_pos} = $NOW - $MUSIC_START;
2001 CFPlus::MixMusic::fade_out 1000;
2002 } else {
2003 # sort by stop time, oldest first
2004 @MUSIC_WANT = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_WANT;
2005
2006 # if the most recently-played piece played very recently,
2007 # resume it, else choose the oldest piece for rotation.
2008 $MUSIC_PLAYING =
2009 $MUSIC_WANT[-1]{stop_time} > $NOW - $MUSIC_RESUME
2010 ? $MUSIC_WANT[-1]
2011 : $MUSIC_WANT[0];
2012
2013 audio_music_start;
2014 }
2015}
2016
1671sub audio_music_finished { 2017sub audio_music_finished {
1672 return unless $CFG->{bgm_enable}; 2018 $MUSIC_PLAYING = undef;
2019 undef $MUSIC_PLAYER;
1673 2020
1674 # TODO: hack, do play loop and mood music 2021 audio_music_changed;
1675 $bgmusic = new_from_file CFClient::MixMusic CFClient::find_rcfile "music/$bgmusic[0]";
1676 $bgmusic->play (0);
1677
1678 push @bgmusic, shift @bgmusic;
1679} 2022}
1680 2023
1681sub audio_init { 2024sub audio_init {
1682 if ($CFG->{audio_enable}) { 2025 if ($CFG->{audio_enable}) {
1683 if (open my $fh, "<", CFClient::find_rcfile "sounds/config") { 2026 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
1684 $SDL_MIXER = !CFClient::Mix_OpenAudio; 2027 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
1685 2028
1686 unless ($SDL_MIXER) { 2029 unless ($SDL_MIXER) {
1687 status "Unable to open sound device: there will be no sound"; 2030 status "Unable to open sound device: there will be no sound";
1688 return; 2031 return;
1689 } 2032 }
1690 2033
1691 CFClient::Mix_AllocateChannels 8; 2034 CFPlus::Mix_AllocateChannels 8;
1692 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128; 2035 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1693 2036
1694 audio_music_finished; 2037 audio_music_finished;
1695 2038
2039 local $_;
1696 while (<$fh>) { 2040 while (<$fh>) {
1697 next if /^\s*#/; 2041 next if /^\s*#/;
1698 next if /^\s*$/; 2042 next if /^\s*$/;
1699 2043
1700 my ($file, $volume, $event) = split /\s+/, $_, 3; 2044 my ($file, $volume, $event) = split /\s+/, $_, 3;
1701 2045
1702 push @SOUNDS, "$volume,$file"; 2046 push @SOUNDS, "$volume,$file";
1703 2047
1704 $AUDIO_CHUNKS{"$volume,$file"} ||= do { 2048 $AUDIO_CHUNKS{"$volume,$file"} ||= do {
1705 my $chunk = new_from_file CFClient::MixChunk CFClient::find_rcfile "sounds/$file"; 2049 my $chunk = new_from_file CFPlus::MixChunk CFPlus::find_rcfile "sounds/$file";
1706 $chunk->volume ($volume * 128 / 100); 2050 $chunk->volume ($volume * 128 / 100);
1707 $chunk 2051 $chunk
1708 }; 2052 };
1709 } 2053 }
1710 } else { 2054 } else {
1711 status "unable to open sound config: $!"; 2055 status "unable to open sound config: $!";
1712 } 2056 }
2057 } else {
2058 undef $SDL_MIXER;
1713 } 2059 }
1714} 2060}
1715 2061
1716sub audio_shutdown { 2062sub audio_shutdown {
1717 CFClient::Mix_CloseAudio if $SDL_MIXER; 2063 CFPlus::Mix_CloseAudio if $SDL_MIXER;
1718 undef $SDL_MIXER; 2064 undef $SDL_MIXER;
1719 @SOUNDS = (); 2065 @SOUNDS = ();
1720 %AUDIO_CHUNKS = (); 2066 %AUDIO_CHUNKS = ();
1721} 2067}
1722 2068
… …
1729 2075
1730sub force_refresh { 2076sub force_refresh {
1731 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 2077 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
1732 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 2078 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1733 2079
1734 $CFClient::UI::ROOT->draw; 2080 $CFPlus::UI::ROOT->draw;
1735 2081
1736 $WANT_REFRESH = 0; 2082 $WANT_REFRESH = 0;
1737 $CAN_REFRESH = 0; 2083 $CAN_REFRESH = 0;
1738 $LAST_REFRESH = $NOW; 2084 $LAST_REFRESH = $NOW;
1739 2085
17400 && do {
1741 # some weird model-drawing code, just a joke right now
1742 use CFClient::OpenGL;
1743
1744 $demo{t}{eye_auv} ||= new_from_file CFClient::Texture "eye2.png" or die;
1745 $demo{t}{body_auv} ||= new_from_file CFClient::Texture "body_auv3.png" or die;
1746 $demo{r} ||= do {
1747 my $mod = Compress::LZF::sthaw do { local $/; open my $fh, "<:raw:perlio", "dread.lz3"; <$fh> };
1748 $mod->{v} = pack "f*", @{$mod->{v}};
1749 $_ = [scalar @$_, pack "S!*", @$_]
1750 for values %{$mod->{g}};
1751 $mod
1752 };
1753
1754 my $r = $demo{r} or die;
1755
1756 glDepthMask 1;
1757 glClear GL_DEPTH_BUFFER_BIT;
1758 glEnable GL_TEXTURE_2D;
1759 glEnable GL_DEPTH_TEST;
1760 glEnable GL_CULL_FACE;
1761 glShadeModel $::FAST ? GL_FLAT : GL_SMOOTH;
1762
1763 glMatrixMode GL_PROJECTION;
1764 glLoadIdentity;
1765 glFrustum -1 * ($::WIDTH / $::HEIGHT), 1 * ($::WIDTH / $::HEIGHT), 1, -1, 1, 10000;
1766 #glOrtho 0, $::WIDTH, 0, $::HEIGHT, -10000, 10000;
1767 glMatrixMode GL_MODELVIEW;
1768 glLoadIdentity;
1769
1770 glPushMatrix;
1771 glTranslate 0, 0, -800;
1772 glScale 1, -1, 1;
1773 glRotate $NOW * 1000 % 36000 / 5, 0, 1, 0;
1774 glRotate $NOW * 1000 % 36000 / 6, 1, 0, 0;
1775 glRotate $NOW * 1000 % 36000 / 7, 0, 0, 1;
1776 glScale 50, 50, 50;
1777
1778 glInterleavedArrays GL_T2F_N3F_V3F, 0, $r->{v};
1779 while (my ($k, $v) = each %{$r->{g}}) {
1780 glBindTexture GL_TEXTURE_2D, ($demo{t}{$k}{name} or die);
1781 glDrawElements GL_TRIANGLES, $v->[0], GL_UNSIGNED_SHORT, $v->[1];
1782 }
1783
1784 glPopMatrix;
1785
1786 glShadeModel GL_FLAT;
1787 glDisable GL_DEPTH_TEST;
1788 glDisable GL_TEXTURE_2D;
1789 glDepthMask 0;
1790
1791 $WANT_REFRESH++;
1792};
1793
1794 CFClient::SDL_GL_SwapBuffers; 2086 CFPlus::SDL_GL_SwapBuffers;
1795} 2087}
1796 2088
1797my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub { 2089my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1798 $NOW = time; 2090 $NOW = time;
1799 2091
1800 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2092 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1801 for CFClient::SDL_PollEvent; 2093 for CFPlus::poll_events;
1802 2094
1803 if (%animate_object) { 2095 if (%animate_object) {
1804 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2096 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
1805 $WANT_REFRESH++; 2097 ++$WANT_REFRESH;
1806 } 2098 }
1807 2099
1808 if ($WANT_REFRESH) { 2100 if ($WANT_REFRESH) {
1809 force_refresh; 2101 force_refresh;
1810 } else { 2102 } else {
… …
1830 $CONN->face_prefetch 2122 $CONN->face_prefetch
1831 if $CONN; 2123 if $CONN;
1832}); 2124});
1833 2125
1834%SDL_CB = ( 2126%SDL_CB = (
1835 CFClient::SDL_QUIT => sub { 2127 CFPlus::SDL_QUIT => sub {
1836 Event::unloop -1; 2128 exit;
1837 }, 2129 },
1838 CFClient::SDL_VIDEORESIZE => sub { 2130 CFPlus::SDL_VIDEORESIZE => sub {
1839 }, 2131 },
1840 CFClient::SDL_VIDEOEXPOSE => sub { 2132 CFPlus::SDL_VIDEOEXPOSE => sub {
1841 CFClient::UI::full_refresh; 2133 CFPlus::UI::full_refresh;
1842 }, 2134 },
1843 CFClient::SDL_ACTIVEEVENT => sub { 2135 CFPlus::SDL_ACTIVEEVENT => sub {
1844# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 2136# not useful, as APPACTIVE include sonly iconified state, not unmapped
2137# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, CFPlus::SDL_GetAppState;#d#
2138# printf "a %x\n", CFPlus::SDL_GetAppState & CFPlus::SDL_APPACTIVE;#d#
2139# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2140# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2141# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
1845 }, 2142 },
1846 CFClient::SDL_KEYDOWN => sub { 2143 CFPlus::SDL_KEYDOWN => sub {
1847 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) { 2144 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
1848 # alt-enter 2145 # alt-enter
2146 $FULLSCREEN_ENABLE->toggle;
1849 video_shutdown; 2147 video_shutdown;
1850 $CFG->{fullscreen} = !$CFG->{fullscreen};
1851 video_init; 2148 video_init;
1852 } else { 2149 } else {
1853 CFClient::UI::feed_sdl_key_down_event ($_[0]); 2150 CFPlus::UI::feed_sdl_key_down_event ($_[0]);
1854 } 2151 }
1855 }, 2152 },
1856 CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event, 2153 CFPlus::SDL_KEYUP => \&CFPlus::UI::feed_sdl_key_up_event,
1857 CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event, 2154 CFPlus::SDL_MOUSEMOTION => \&CFPlus::UI::feed_sdl_motion_event,
1858 CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event, 2155 CFPlus::SDL_MOUSEBUTTONDOWN => \&CFPlus::UI::feed_sdl_button_down_event,
1859 CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event, 2156 CFPlus::SDL_MOUSEBUTTONUP => \&CFPlus::UI::feed_sdl_button_up_event,
1860 CFClient::SDL_USEREVENT => sub { 2157 CFPlus::SDL_USEREVENT => sub {
1861 if ($_[0]{code} == 1) { 2158 if ($_[0]{code} == 1) {
1862 audio_channel_finished $_[0]{data1}; 2159 audio_channel_finished $_[0]{data1};
1863 } elsif ($_[0]{code} == 0) { 2160 } elsif ($_[0]{code} == 0) {
1864 audio_music_finished; 2161 audio_music_finished;
1865 } 2162 }
… …
1869############################################################################# 2166#############################################################################
1870 2167
1871$SIG{INT} = $SIG{TERM} = sub { exit }; 2168$SIG{INT} = $SIG{TERM} = sub { exit };
1872 2169
1873{ 2170{
1874 local $SIG{__DIE__} = sub {
1875 return unless defined $^S && !$^S;
1876 Carp::confess $_[1];#d#TODO: remove when stable
1877 CFClient::fatal $_[0];
1878 };
1879
1880 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc"; 2171 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
2172 CFPlus::DB::Server::run;
2173
1881 CFClient::UI::set_layout ($::CFG->{layout}); 2174 CFPlus::UI::set_layout ($::CFG->{layout});
1882 2175
1883 my %DEF_CFG = ( 2176 my %DEF_CFG = (
1884 sdl_mode => 0, 2177 sdl_mode => 0,
1885 width => 640, 2178 width => 640,
1886 height => 480, 2179 height => 480,
1887 fullscreen => 0, 2180 fullscreen => 0,
1888 fast => 0, 2181 fast => 0,
1889 map_scale => 1, 2182 map_scale => 1,
1890 fow_enable => 1, 2183 fow_enable => 1,
1891 fow_intensity => 0.45, 2184 fow_intensity => 0,
1892 fow_smooth => 0, 2185 map_smoothing => 1,
1893 gui_fontsize => 1, 2186 gui_fontsize => 1,
1894 log_fontsize => 0.7, 2187 log_fontsize => 0.7,
1895 gauge_fontsize => 1, 2188 gauge_fontsize => 1,
1896 gauge_size => 0.35, 2189 gauge_size => 0.35,
1897 stat_fontsize => 0.7, 2190 stat_fontsize => 0.7,
1898 mapsize => 100, 2191 mapsize => 100,
1899 say_command => 'say',
1900 audio_enable => 1, 2192 audio_enable => 1,
1901 bgm_enable => 1, 2193 bgm_enable => 1,
1902 bgm_volume => 0.25, 2194 bgm_volume => 0.25,
1903 face_prefetch => 0, 2195 face_prefetch => 0,
1904 output_sync => 1, 2196 output_sync => 1,
1905 output_count => 1, 2197 output_count => 1,
2198 output_rate => "",
1906 pickup => 0, 2199 pickup => 0,
2200 inv_sort => "mtime",
1907 default => "profile", # default profile 2201 default => "profile", # default profile
2202 show_tips => 1,
2203 logview_max_par => 1000,
1908 ); 2204 );
1909 2205
1910 while (my ($k, $v) = each %DEF_CFG) { 2206 while (my ($k, $v) = each %DEF_CFG) {
1911 $CFG->{$k} = $v unless exists $CFG->{$k}; 2207 $CFG->{$k} = $v unless exists $CFG->{$k};
1912 } 2208 }
1913 2209
1914 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de"; 2210 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
2211 $PROFILE = $CFG->{profile}{default};
2212
2213 # convert old bindings (only default profile matters)
2214 if (my $bindings = delete $PROFILE->{bindings}) {
2215 while (my ($mod, $syms) = each %$bindings) {
2216 while (my ($sym, $cmds) = each %$syms) {
2217 push @{ $PROFILE->{macro} }, {
2218 accelkey => [$mod*1, $sym*1],
2219 action => $cmds,
2220 };
2221 }
2222 }
2223 }
1915 2224
1916 sdl_init; 2225 sdl_init;
1917 2226
1918 @SDL_MODES = reverse 2227 @SDL_MODES = CFPlus::SDL_ListModes 8, 8;
1919 grep $_->[0] >= 640 && $_->[1] >= 480, 2228 @SDL_MODES = CFPlus::SDL_ListModes 5, 0 unless @SDL_MODES;
1920 CFClient::SDL_ListModes;
1921
1922 @SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; 2229 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2230
2231 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
1923 2232
1924 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 2233 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1925 2234
1926 { 2235 {
1927 my @fonts = map CFClient::find_rcfile "fonts/$_", qw( 2236 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
1928 DejaVuSans.ttf 2237 DejaVuSans.ttf
1929 DejaVuSansMono.ttf 2238 DejaVuSansMono.ttf
1930 DejaVuSans-Bold.ttf 2239 DejaVuSans-Bold.ttf
1931 DejaVuSansMono-Bold.ttf 2240 DejaVuSansMono-Bold.ttf
1932 DejaVuSans-Oblique.ttf 2241 DejaVuSans-Oblique.ttf
1933 DejaVuSansMono-Oblique.ttf 2242 DejaVuSansMono-Oblique.ttf
1934 DejaVuSans-BoldOblique.ttf 2243 DejaVuSans-BoldOblique.ttf
1935 DejaVuSansMono-BoldOblique.ttf 2244 DejaVuSansMono-BoldOblique.ttf
1936 ); 2245 );
1937 2246
1938 CFClient::add_font $_ for @fonts; 2247 CFPlus::add_font $_ for @fonts;
1939 2248
1940 CFClient::pango_init; 2249 CFPlus::pango_init;
1941 2250
1942 $FONT_PROP = new_from_file CFClient::Font $fonts[0]; 2251 $FONT_PROP = new_from_file CFPlus::Font $fonts[0];
1943 $FONT_FIXED = new_from_file CFClient::Font $fonts[1]; 2252 $FONT_FIXED = new_from_file CFPlus::Font $fonts[1];
1944 2253
1945 $FONT_PROP->make_default; 2254 $FONT_PROP->make_default;
1946 } 2255 }
1947 2256
1948# compare mono (ft) vs. rgba (cairo) 2257# compare mono (ft) vs. rgba (cairo)
1949# ft - 1.8s, cairo 3s, even in alpha-only mode 2258# ft - 1.8s, cairo 3s, even in alpha-only mode
1950# for my $rgba (0..1) { 2259# for my $rgba (0..1) {
1951# my $t1 = Time::HiRes::time; 2260# my $t1 = Time::HiRes::time;
1952# for (1..1000) { 2261# for (1..1000) {
1953# my $layout = CFClient::Layout->new ($rgba); 2262# my $layout = CFPlus::Layout->new ($rgba);
1954# $layout->set_text ("hallo" x 100); 2263# $layout->set_text ("hallo" x 100);
1955# $layout->render; 2264# $layout->render;
1956# } 2265# }
1957# my $t2 = Time::HiRes::time; 2266# my $t2 = Time::HiRes::time;
1958# warn $t2-$t1; 2267# warn $t2-$t1;
1959# } 2268# }
1960 2269
2270 $startup_done->();
2271
1961 video_init; 2272 video_init;
1962 audio_init; 2273 audio_init;
1963} 2274}
1964 2275
2276show_tip_of_the_day if $CFG->{show_tips};
2277
1965Event::loop; 2278Event::loop;
1966#CFClient::SDL_Quit; 2279#CFPlus::SDL_Quit;
1967#CFClient::_exit 0; 2280#CFPlus::_exit 0;
1968 2281
1969END { CFClient::SDL_Quit } 2282END {
2283 CFPlus::SDL_Quit;
2284 CFPlus::DB::Server::stop;
2285}
1970 2286
1971=head1 NAME 2287=head1 NAME
1972 2288
1973cfplus - A Crossfire+ and Crossfire game client 2289cfplus - A Crossfire+ and Crossfire game client
1974 2290

Diff Legend

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