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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines