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.88 by root, Mon Jul 3 22:04:25 2006 UTC vs.
Revision 1.174 by root, Tue Jul 17 18:34:24 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 => "Map 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 Smoothing");
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;
462 0 624 0
463 } 625 }
464 ); 626 );
465 627
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"); 628 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
474 $table->add (1, $row++, new CFClient::UI::Slider 629 $table->add (1, $row++, new CFPlus::UI::Slider
475 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 630 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.", 631 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 }, 632 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
478 ); 633 );
479 634
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"); 635 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
493 $table->add (1, $row++, new CFClient::UI::Slider 636 $table->add (1, $row++, new CFPlus::UI::Slider
494 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 637 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.", 638 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
496 on_changed => sub { 639 on_changed => sub {
497 $CFG->{gauge_fontsize} = $_[1]; 640 $CFG->{gauge_fontsize} = $_[1];
498 &set_gauge_window_fontsize; 641 &set_gauge_window_fontsize;
499 0 642 0
500 } 643 }
501 ); 644 );
502 645
503 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size"); 646 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size");
504 $table->add (1, $row++, new CFClient::UI::Slider 647 $table->add (1, $row++, new CFPlus::UI::Slider
505 range => [$CFG->{gauge_size}, 0.2, 0.8], 648 range => [$CFG->{gauge_size}, 0.2, 0.8],
506 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 649 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
507 on_changed => sub { 650 on_changed => sub {
508 $CFG->{gauge_size} = $_[1]; 651 $CFG->{gauge_size} = $_[1];
509 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 652 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
510 0 653 0
511 } 654 }
512 ); 655 );
513 656
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 657 $vbox
525} 658}
526 659
527sub audio_setup { 660sub audio_setup {
528 my $vbox = new CFClient::UI::VBox; 661 my $vbox = new CFPlus::UI::VBox;
529 662
530 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 663 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
531 664
532 my $row = 0; 665 my $row = 0;
533 666
534 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable"); 667 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable");
535 $table->add (1, $row++, new CFClient::UI::CheckBox 668 $table->add (1, $row++, new CFPlus::UI::CheckBox
536 state => $CFG->{audio_enable}, 669 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.", 670 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 } 671 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
539 ); 672 );
540# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume"); 673# $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 { 674# $table->add (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
542# $CFG->{effects_volume} = $_[1]; 675# $CFG->{effects_volume} = $_[1];
543# }); 676# });
544 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music"); 677 $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); 678 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
546 $hbox->add (new CFClient::UI::CheckBox 679 $hbox->add (new CFPlus::UI::CheckBox
547 expand => 1, state => $CFG->{bgm_enable}, 680 expand => 1, state => $CFG->{bgm_enable},
548 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 681 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 } 682 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
550 ); 683 );
551 $hbox->add (new CFClient::UI::Slider 684 $hbox->add (new CFPlus::UI::Slider
552 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 685 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
553 tooltip => "The volume of the background music. Changes are instant.", 686 tooltip => "The volume of the background music. Changes are instant.",
554 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFClient::MixMusic::volume $_[1] * 128; 0 } 687 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFPlus::MixMusic::volume $_[1] * 128; 0 }
555 ); 688 );
556 689
557 $table->add (1, $row++, new CFClient::UI::Button 690 $table->add (1, $row++, new CFPlus::UI::Button
558 expand => 1, align => 0, text => "Apply", 691 expand => 1, align => 0, text => "Apply",
559 tooltip => "Apply the audio settings", 692 tooltip => "Apply the audio settings",
560 on_activate => sub { 693 on_activate => sub {
561 audio_shutdown (); 694 audio_shutdown ();
562 audio_init (); 695 audio_init ();
565 ); 698 );
566 699
567 $vbox 700 $vbox
568} 701}
569 702
570sub set_stats_window_fontsize {
571 for (values %{$STATWIDS}) {
572 $_->set_fontsize ($::CFG->{stat_fontsize});
573 }
574}
575
576sub set_gauge_window_fontsize { 703sub set_gauge_window_fontsize {
577 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) { 704 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) {
578 $_->set_fontsize ($::CFG->{gauge_fontsize}); 705 $_->set_fontsize ($::CFG->{gauge_fontsize});
579 } 706 }
580} 707}
581 708
582sub make_gauge_window { 709sub make_gauge_window {
583 my $gh = int $HEIGHT * $CFG->{gauge_size}; 710 my $gh = int $HEIGHT * $CFG->{gauge_size};
584 711
585 my $win = new CFClient::UI::Frame ( 712 my $win = new CFPlus::UI::Frame (
586 force_x => 0, 713 force_x => 0,
587 force_y => "max", 714 force_y => "max",
588 force_w => $WIDTH, 715 force_w => $WIDTH,
589 force_h => $gh, 716 force_h => $gh,
590 ); 717 );
591 718
592 $win->add (my $hbox = new CFClient::UI::HBox 719 $win->add (my $hbox = new CFPlus::UI::HBox
593 children => [ 720 children => [
594 (new CFClient::UI::HBox expand => 1), 721 (new CFPlus::UI::HBox expand => 1),
595 (new CFClient::UI::VBox children => [ 722 (new CFPlus::UI::VBox children => [
596 (new CFClient::UI::Empty expand => 1), 723 (new CFPlus::UI::Empty expand => 1),
597 (new CFClient::UI::Frame bg => [0, 0, 0, 0.4], child => ($FLOORBOX = new CFClient::UI::Table)), 724 (new CFPlus::UI::Frame bg => [0, 0, 0, 0.4], child => ($FLOORBOX = new CFPlus::UI::Table)),
598 ]), 725 ]),
599 (my $vbox = new CFClient::UI::VBox), 726 (my $vbox = new CFPlus::UI::VBox),
600 ], 727 ],
601 ); 728 );
602 729
603 $vbox->add (new CFClient::UI::HBox 730 $vbox->add (new CFPlus::UI::HBox
604 expand => 1, 731 expand => 1,
605 children => [ 732 children => [
606 (new CFClient::UI::Empty expand => 1), 733 (new CFPlus::UI::Empty expand => 1),
607 (my $hb = new CFClient::UI::HBox), 734 (my $hb = new CFPlus::UI::HBox),
608 ], 735 ],
609 ); 736 );
610 737
611 $hb->add (my $hg = new CFClient::UI::Gauge type => 'hp', 738 $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', 739 $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', 740 $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', 741 $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 742
620 $vbox->add (my $exp = new CFClient::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, 743 $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, 744 $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 745
625 $GAUGES = { 746 $GAUGES = {
626 exp => $exp, win => $win, range => $rng, 747 exp => $exp, win => $win, range => $rng,
627 food => $fg, mana => $mg, hp => $hg, grace => $gg 748 food => $fg, mana => $mg, hp => $hg, grace => $gg
628 }; 749 };
631 752
632 $win 753 $win
633} 754}
634 755
635sub debug_setup { 756sub debug_setup {
636 my $table = new CFClient::UI::Table; 757 my $table = new CFPlus::UI::Table;
637 758
638 $table->add (0, 0, new CFClient::UI::Label text => "Widget Borders"); 759 $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 }); 760 $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"); 761 $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 }); 762 $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"); 763 $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 }); 764 $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"); 765 $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 }); 766 $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
767 $table->add (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
646 768
647 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05); 769 $table->add (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
648
649 for my $x (0..2) {
650 for my $y (0 .. 2) {
651 $table->add ($x + 3, $y,
652 new CFClient::UI::Entry
653 text => $default_smooth[$x * 3 + $y],
654 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
655 );
656 }
657 }
658
659 770
660 $table 771 $table
661} 772}
662 773
663sub stats_window { 774sub stats_window {
664 my $tgw = 775 my $r = new CFPlus::UI::ScrolledWindow (
665 new CFClient::UI::Window 776 expand => 1,
777 scroll_y => 1
778 );
779 $r->add (my $vb = new CFPlus::UI::VBox);
780
781 $vb->add (new CFPlus::UI::FancyFrame
782 label => "Player",
666 child => my $vb = new CFClient::UI::VBox; 783 child => (my $pi = new CFPlus::UI::VBox),
784 );
667 785
668 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1, 786 $pi->add ($STATWIDS->{title} = new CFPlus::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
669 can_hover => 1, can_events => 1, 787 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."); 788 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, 789 $pi->add ($STATWIDS->{map} = new CFPlus::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
672 can_hover => 1, can_events => 1, 790 can_hover => 1, can_events => 1,
673 tooltip => "The map you are currently on (if supported by the server)."); 791 tooltip => "The map you are currently on (if supported by the server).");
674 792
675 $vb->add (my $hb0 = new CFClient::UI::HBox); 793 $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, 794 $hb0->add ($STATWIDS->{weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1,
677 can_hover => 1, can_events => 1, 795 can_hover => 1, can_events => 1,
678 tooltip => "The weight of the player including all inventory items."); 796 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, 797 $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, 798 can_hover => 1, can_events => 1,
681 tooltip => "The weight limit: you cannot carry more than this."); 799 tooltip => "The weight limit: you cannot carry more than this.");
682 800
683 801 $vb->add (new CFPlus::UI::FancyFrame
802 label => "Primary/Secondary Statistics",
684 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 803 child => (my $hb = new CFPlus::UI::HBox expand => 1),
804 );
685 $hb->add (my $tbl = new CFClient::UI::Table expand => 1); 805 $hb->add (my $tbl = new CFPlus::UI::Table expand => 1);
686 806
687 my $color2 = [1, 1, 0]; 807 my $color2 = [1, 1, 0];
688 808
689 for ( 809 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"], 810 [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"], 811 [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"], 812 [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"], 813 [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"], 814 [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"], 815 [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."], 816 [0, 6, st_cha => "Cha", 30],
697 817
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."], 818 [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."], 819 [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."], 820 [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."], 821 [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."], 822 [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."], 823 [2, 5, st_wspd => "WSp", 10.54],
704 ) { 824 ) {
705 my ($col, $row, $id, $label, $template, $tooltip) = @$_; 825 my ($col, $row, $id, $label, $template) = @$_;
706 826
707 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label 827 $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); 828 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
829 align => +1, template => $template, tooltip => "#stat_$label");
709 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFClient::UI::Label 830 $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); 831 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
832 align => -1, text => $label, tooltip => "#stat_$label");
711 } 833 }
712 834
835 $vb->add (new CFPlus::UI::FancyFrame
836 label => "Resistancies",
713 $hb->add (my $tbl2 = new CFClient::UI::Table expand => 1); 837 child => (my $tbl2 = new CFPlus::UI::Table expand => 1),
838 );
714 839
715 my $row = 0; 840 my $row = 0;
716 my $col = 0; 841 my $col = 0;
717 842
718 my %resist_names = ( 843 my %resist_names = (
844 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.)", 845 "<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.)"],
846 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.)", 847 "<b>Holy Word</b> (resistance you against getting the fear when someone whose god doesn't like you spells the holy word on you.)"],
848 conf => ["Confusion",
721 conf => "<b>Confusion</b> (If you are hit by confusion you will move into random directions, and likely into monsters.)", 849 "<b>Confusion</b> (If you are hit by confusion you will move into random directions, and likely into monsters.)"],
850 fire => ["Fire",
722 fire => "<b>Fire</b> (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)", 851 "<b>Fire</b> (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)"],
852 depl => ["Depletion",
723 depl => "<b>Depletion</b> (some monsters and other effects can cause stats depletion)", 853 "<b>Depletion</b> (some monsters and other effects can cause stats depletion)"],
854 magic => ["Magic",
724 magic => "<b>Magic</b> (resistance to magic spells like magic missile or similar)", 855 "<b>Magic</b> (resistance to magic spells like magic missile or similar)"],
856 drain => ["Draining",
725 drain => "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)", 857 "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)"],
858 acid => ["Acid",
726 acid => "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)", 859 "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)"],
860 pois => ["Poison",
727 pois => "<b>Poison</b> (resistance to getting poisoned)", 861 "<b>Poison</b> (resistance to getting poisoned)"],
862 para => ["Paralysation",
728 para => "<b>Paralysation</b> (this resistance affects the chance you get paralysed)", 863 "<b>Paralysation</b> (this resistance affects the chance you get paralysed)"],
864 deat => ["Death",
729 deat => "<b>Death</b> (resistance against death spells)", 865 "<b>Death</b> (resistance against death spells)"],
866 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.)", 867 "<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.)"],
868 blind => ["Blind",
731 blind => "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)", 869 "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)"],
870 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)", 871 "<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)"],
872 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...", 873 "<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead..."],
874 elec => ["Electricity",
734 elec => "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)", 875 "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)"],
876 cold => ["Cold",
735 cold => "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)", 877 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"],
878 ghit => ["Ghost hit",
736 ghit => "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)", 879 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"],
737 ); 880 );
738 for (qw/slow holyw conf fire depl magic 881 for (qw/slow holyw conf fire depl magic
739 drain acid pois para deat phys 882 drain acid pois para deat phys
740 blind fear tund elec cold ghit/) 883 blind fear tund elec cold ghit/)
741 { 884 {
742 $tbl2->add ($col, $row, 885 $tbl2->add ($col, $row,
743 $STATWIDS->{"res_$_"} = 886 $STATWIDS->{"res_$_"} =
744 new CFClient::UI::Label 887 new CFPlus::UI::Label
745 font => $FONT_FIXED, 888 font => $FONT_FIXED,
746 template => "-100%", 889 template => "-100%",
747 align => +1, 890 align => +1,
748 valign => 0, 891 valign => 0,
749 can_events => 1, 892 can_events => 1,
750 can_hover => 1, 893 can_hover => 1,
751 tooltip => $resist_names{$_}, 894 tooltip => $resist_names{$_}->[1],
752 ); 895 );
753 $tbl2->add ($col + 1, $row, new CFClient::UI::Image 896 $tbl2->add ($col + 1, $row, new CFPlus::UI::Image
754 font => $FONT_FIXED, 897 font => $FONT_FIXED,
755 can_hover => 1, 898 can_hover => 1,
756 can_events => 1, 899 can_events => 1,
757 path => "ui/resist/resist_$_.png", 900 path => "ui/resist/resist_$_.png",
758 tooltip => $resist_names{$_}, 901 tooltip => $resist_names{$_}->[1],
902 );
903 $tbl2->add ($col + 2, $row, new CFPlus::UI::Label
904 text => $resist_names{$_}->[0],
905 font => $FONT_FIXED,
906 can_hover => 1,
907 can_events => 1,
908 tooltip => $resist_names{$_}->[1],
759 ); 909 );
760 910
761 $row++; 911 $row++;
762 if ($row % 6 == 0) { 912 if ($row % 6 == 0) {
763 $col += 2; 913 $col += 3;
764 $row = 0; 914 $row = 0;
765 } 915 }
766 } 916 }
767 917
768 &set_stats_window_fontsize;
769 update_stats_window ({}); 918 #update_stats_window ({});
770 919
920 $r
921}
922
923sub skill_window {
924 my $sw = new CFPlus::UI::ScrolledWindow (expand => 1);
925 $sw->add ($STATWIDS->{skill_tbl} = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1, 0, 0, 1]);
771 $tgw 926 $sw
772} 927}
773 928
774sub formsep($) { 929sub formsep($) {
775 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1 930 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
776} 931}
777 932
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; 933my $METASERVER_ATIME;
847 934
848sub update_metaserver { 935sub update_metaserver {
849 my ($metaserver_dialog) = @_; 936 my ($metaserver_dialog) = @_;
850 937
854 return if $METASERVER_ATIME > time; 941 return if $METASERVER_ATIME > time;
855 $METASERVER_ATIME = time + 60; 942 $METASERVER_ATIME = time + 60;
856 943
857 my $table = $METASERVER->{table}; 944 my $table = $METASERVER->{table};
858 $table->clear; 945 $table->clear;
859 $table->add (0, 0, my $label = new CFClient::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list..."); 946 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
860 947
861 my $buf; 948 my $ok = 0;
862 949
863 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0; 950 CFPlus::background {
951 my $ua = CFPlus::lwp_useragent;
864 952
865 unless ($fh) { 953 CFPlus::background_msg CFPlus::from_json +(CFPlus::lwp_check $ua->get ($META_SERVER))->decoded_content;
866 $label->set_text ("unable to contact metaserver: $!"); 954 } sub {
867 return; 955 my ($msg) = @_;
868 } 956 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; 957 $table->clear;
883 958
884 my @tip = ( 959 my @tip = (
885 "The current number of users logged in on the server.", 960 "The current number of users logged in on the server.",
886 "The hostname of the server.", 961 "The hostname of the server.",
887 "The time this server has been running without being restarted.", 962 "The time this server has been running without being restarted.",
888 "The server software version - a '+' indicates a Crossfire+ server.", 963 "The server software version - a '+' indicates a Crossfire+ server.",
889 "Short information about this server provided by its admins.", 964 "Short information about this server provided by its admins.",
890 ); 965 );
891 my @col = qw(#Users Host Uptime Version Description); 966 my @col = qw(#Users Host Uptime Version Description);
892 $table->add ($_, 0, new CFClient::UI::Label 967 $table->add ($_, 0, new CFPlus::UI::Label
893 can_hover => 1, can_events => 1, 968 can_hover => 1, can_events => 1,
894 align => 0, fg => [1, 1, 0], 969 align => 0, fg => [1, 1, 0],
895 text => $col[$_], tooltip => $tip[$_]) 970 text => $col[$_], tooltip => $tip[$_])
896 for 0 .. $#col; 971 for 0 .. $#col;
897 972
898 my @align = qw(1 0 1 1 -1); 973 my @align = qw(1 0 1 1 -1);
899 974
900 my $y = 0; 975 my $y = 0;
901 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) { 976 for my $m (@{ $msg->{servers} }) {
902 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = @$m; 977 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) =
978 @$m{qw(ip age hostname users version description ibytes obytes uptime highlight)};
903 979
904 for ($desc) { 980 for ($desc) {
905 s/<br>/\n/gi; 981 s/<br>/\n/gi;
906 s/<li>/\n· /gi; 982 s/<li>/\n· /gi;
907 s/<.*?>//sgi; 983 s/<.*?>//sgi;
908 s/&/&amp;/g; 984 s/&amp;/&/g;
909 s/</&lt;/g; 985 s/&lt;/</g;
910 s/>/&gt;/g; 986 s/&gt;/>/g;
911 } 987 }
912 988
913 $uptime = sprintf "%dd %02d:%02d:%02d", 989 $uptime = sprintf "%dd %02d:%02d:%02d",
914 (int $m->[8] / 86400), 990 (int $uptime / 86400),
915 (int $m->[8] / 3600) % 24, 991 (int $uptime / 3600) % 24,
916 (int $m->[8] / 60) % 60, 992 (int $uptime / 60) % 60,
917 $m->[8] % 60; 993 $uptime % 60;
918 994
919 $m = [$users, $host, $uptime, $version, $desc]; 995 $m = [$users, $host, $uptime, $version, $desc];
920 996
921 $y++; 997 $y++;
922 998
923 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [ 999 $table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [
924 (new CFClient::UI::Button 1000 (new CFPlus::UI::Button
925 text => "Use", 1001 text => "Use",
926 tooltip => "Put this server into the <b>Host:Port</b> field", 1002 tooltip => "Put this server into the <b>Host:Port</b> field",
927 on_activate => sub { 1003 on_activate => sub {
928 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host); 1004 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
929 $METASERVER->hide; 1005 $METASERVER->hide;
930 0 1006 0
931 }, 1007 },
932 ), 1008 ),
933 (new CFClient::UI::Empty expand => 1), 1009 (new CFPlus::UI::Empty expand => 1),
934 ]); 1010 ]);
935 1011
936 $table->add ($_, $y, new CFClient::UI::Label 1012 $table->add ($_, $y, new CFPlus::UI::Label
1013 max_w => $::WIDTH * 0.4,
937 ellipsise => 0, 1014 ellipsise => 0,
938 align => $align[$_], 1015 align => $align[$_],
939 text => $m->[$_], 1016 text => $m->[$_],
940 tooltip => $tip[$_], 1017 tooltip => $tip[$_],
1018 fg => ($highlight ? [1, 1, 1] : [.7, .7, .7]),
941 can_hover => 1, 1019 can_hover => 1,
942 can_events => 1, 1020 can_events => 1,
943 fontsize => 0.8) 1021 fontsize => 0.8)
944 for 0 .. $#$m; 1022 for 0 .. $#$m;
945 } 1023 }
1024 } else {
1025 $ok or $label->set_text ("error while contacting metaserver");
946 } 1026 }
947 }); 1027 };
1028
948} 1029}
949 1030
950sub metaserver_dialog { 1031sub metaserver_dialog {
951 my $vbox = new CFClient::UI::VBox; 1032 my $vbox = new CFPlus::UI::VBox;
952 my $table = new CFClient::UI::Table; 1033 my $table = new CFPlus::UI::Table;
953 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $table); 1034 $vbox->add (new CFPlus::UI::ScrolledWindow expand => 1, child => $table);
954 1035
955 my $dialog = new CFClient::UI::FancyFrame 1036 my $dialog = new CFPlus::UI::Toplevel
956 title => "Server List", 1037 title => "Server List",
957 name => 'metaserver_dialog', 1038 name => 'metaserver_dialog',
958 x => 'center', 1039 x => 'center',
959 y => 'center', 1040 y => 'center',
960 z => 3, 1041 z => 3,
1042 force_w => $::WIDTH * 0.9,
961 force_h => $::HEIGHT * 0.4, 1043 force_h => $::HEIGHT * 0.7,
962 child => $vbox, 1044 child => $vbox,
963 has_close_button => 1, 1045 has_close_button => 1,
964 table => $table, 1046 table => $table,
965 on_visibility_change => sub { 1047 on_visibility_change => sub {
966 update_metaserver ($_[0]) if $_[1]; 1048 update_metaserver ($_[0]) if $_[1];
970 1052
971 $dialog 1053 $dialog
972} 1054}
973 1055
974sub server_setup { 1056sub server_setup {
975 my $vbox = new CFClient::UI::VBox; 1057 my $vbox = new CFPlus::UI::VBox;
976 1058
1059 $vbox->add (new CFPlus::UI::FancyFrame
1060 label => "Connection Settings",
977 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 1061 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
1062 );
978 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port"); 1063 $table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");
979 1064
980 { 1065 {
981 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 1066 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox);
982 1067
983 $vbox->add ( 1068 $vbox->add (
984 $HOST_ENTRY = new CFClient::UI::Entry 1069 $HOST_ENTRY = new CFPlus::UI::Entry
985 expand => 1, 1070 expand => 1,
986 text => $CFG->{profile}{default}{host}, 1071 text => $CFG->{profile}{default}{host},
987 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 1072 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
988 on_changed => sub { 1073 on_changed => sub {
989 my ($self, $value) = @_; 1074 my ($self, $value) = @_;
990 $CFG->{profile}{default}{host} = $value; 1075 $CFG->{profile}{default}{host} = $value;
991 0 1076 0
992 } 1077 }
993 ); 1078 );
994 1079
995 $vbox->add (new CFClient::UI::Button 1080 $vbox->add (new CFPlus::UI::Button
996 expand => 1, 1081 expand => 1,
997 text => "Server List", 1082 text => "Server List",
998 other => $METASERVER, 1083 other => $METASERVER,
999 tooltip => "Show a list of available crossfire servers", 1084 tooltip => "Show a list of available crossfire servers",
1000 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1085 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1001 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 }, 1086 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
1002 ); 1087 );
1003 } 1088 }
1004 1089
1005 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username"); 1090 $table->add (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username");
1006 $table->add (1, 4, new CFClient::UI::Entry 1091 $table->add (1, 4, new CFPlus::UI::Entry
1007 text => $CFG->{profile}{default}{user}, 1092 text => $CFG->{profile}{default}{user},
1008 tooltip => "The name of your character on the server", 1093 tooltip => "The name of your character on the server",
1009 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value } 1094 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
1010 ); 1095 );
1011 1096
1012 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password"); 1097 $table->add (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password");
1013 $table->add (1, 5, new CFClient::UI::Entry 1098 $table->add (1, 5, new CFPlus::UI::Entry
1014 text => $CFG->{profile}{default}{password}, 1099 text => $CFG->{profile}{default}{password},
1015 hidden => 1, 1100 hidden => 1,
1016 tooltip => "The password for your character", 1101 tooltip => "The password for your character",
1017 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value } 1102 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
1018 ); 1103 );
1019 1104
1020 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size"); 1105 $table->add (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size");
1021 $table->add (1, 7, new CFClient::UI::Slider 1106 $table->add (1, 7, new CFPlus::UI::Slider
1022 force_w => 100, 1107 force_w => 100,
1023 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1108 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1024 tooltip => "This is the size of the portion of the map update the server sends you. " 1109 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, " 1110 . "If you set this to a high value you will be able to see further, "
1026 . "but you also increase bandwidth requirements and latency. " 1111 . "but you also increase bandwidth requirements and latency. "
1027 . "This option is only used once at log-in.", 1112 . "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 }, 1113 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },
1029 ); 1114 );
1030 1115
1031 $table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Face Prefetch"); 1116 $table->add (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Face Prefetch");
1032 $table->add (1, 8, new CFClient::UI::CheckBox 1117 $table->add (1, 8, new CFPlus::UI::CheckBox
1033 state => $CFG->{face_prefetch}, 1118 state => $CFG->{face_prefetch},
1034 tooltip => "<b>Background Image Prefetch</b>\n\n" 1119 tooltip => "<b>Background Image Prefetch</b>\n\n"
1035 . "If enabled, the client automatically pre-fetches images from the server. " 1120 . "If enabled, the client automatically pre-fetches images from the server. "
1036 . "This might increase or create lag, but increases the chances " 1121 . "This might increase or create lag, but increases the chances "
1037 . "of faces being ready for display when you encounter them. " 1122 . "of faces being ready for display when you encounter them. "
1039 . "so only set it if you really need to prefetch images. " 1124 . "so only set it if you really need to prefetch images. "
1040 . "This option can be set and unset any time.", 1125 . "This option can be set and unset any time.",
1041 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 }, 1126 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1042 ); 1127 );
1043 1128
1129 $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");
1130 $table->add (1, 9, new CFPlus::UI::Entry
1131 text => $CFG->{output_rate},
1132 tooltip => "The approximate bandwidth in bytes per second that the server should not exceed "
1133 . "when sending images, to ensure interactiveness. When 0 or unset, the server "
1134 . "default will be used, which is usually around 100kb/s.",
1135 on_changed => sub { $CFG->{output_rate} = $_[1]; 0 },
1136 );
1137
1044 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count"); 1138 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1045 $table->add (1, 9, new CFClient::UI::Entry 1139 $table->add (1, 10, new CFPlus::UI::Entry
1046 text => $CFG->{output_count}, 1140 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.", 1141 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 }, 1142 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
1049 ); 1143 );
1050 1144
1051 $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1145 $table->add (0, 11, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
1052 $table->add (1, 10, new CFClient::UI::Entry 1146 $table->add (1, 11, new CFPlus::UI::Entry
1053 text => $CFG->{output_sync}, 1147 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.", 1148 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 }, 1149 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
1056 ); 1150 );
1057 1151
1058 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button 1152 $table->add (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button
1059 expand => 1, 1153 expand => 1,
1060 align => 0, 1154 align => 0,
1061 text => "Login", 1155 text => "Login",
1062 on_activate => sub { 1156 on_activate => sub {
1063 $CONN ? stop_game 1157 $CONN ? stop_game
1064 : start_game; 1158 : start_game;
1065 0 1159 0
1066 }, 1160 },
1067 ); 1161 );
1068 1162
1163 $vbox->add (new CFPlus::UI::FancyFrame
1164 label => "Server Info",
1165 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
1166 );
1167
1168 $vbox
1169}
1170
1171sub client_setup {
1172 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1];
1173
1174 my $row = 0;
1175
1069 $table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command"); 1176 $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 1177 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry
1071 text => $CFG->{say_command}, 1178 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. " 1179 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. " 1180 . "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.", 1181 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1075 on_changed => sub { 1182 on_changed => sub {
1076 my ($self, $value) = @_; 1183 my ($self, $value) = @_;
1077 $CFG->{say_command} = $value; 1184 $CFG->{say_command} = $value;
1078 0 1185 0
1079 } 1186 }
1080 ); 1187 );
1081 1188
1082 $vbox->add (new CFClient::UI::Label 1189 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
1083 text => "Server Info", 1190 $table->add (1, $row++, new CFPlus::UI::CheckBox
1084 fontsize => 1.2, 1191 state => $CFG->{show_tips},
1085 padding_y => 8, 1192 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1086 fg => [1, 1, 0, 1], 1193 on_changed => sub {
1194 my ($self, $value) = @_;
1195 $CFG->{show_tips} = $value;
1196 0
1197 }
1087 ); 1198 );
1088 1199
1089 $vbox->add ($SERVER_INFO = new CFClient::UI::Label ellipsise => 0); 1200 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size");
1201 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry
1202 text => $CFG->{logview_max_par},
1203 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server "
1204 . "sends more messages than this number, older messages get removed to save memory and "
1205 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1206 on_changed => sub {
1207 my ($self, $value) = @_;
1208 $LOGVIEW->{max_par} = $CFG->{logview_max_par} = $value*1;
1209 0
1210 },
1211 );
1090 1212
1091 $vbox 1213 $table
1092} 1214}
1093 1215
1094sub message_window { 1216sub message_window {
1095 my $window = new CFClient::UI::FancyFrame 1217 my $window = new CFPlus::UI::Toplevel
1096 name => "message_window", 1218 name => "message_window",
1097 title => "Messages", 1219 title => "Messages",
1098 border_bg => [1, 1, 1, 1], 1220 border_bg => [1, 1, 1, 1],
1099 bg => [0, 0, 0, 0.75],
1100 x => "max", 1221 x => "max",
1101 y => 0, 1222 y => 0,
1102 force_w => $::WIDTH * 0.4, 1223 force_w => $::WIDTH * 0.4,
1103 force_h => $::HEIGHT * 0.5, 1224 force_h => $::HEIGHT * 0.5,
1104 child => (my $vbox = new CFClient::UI::VBox), 1225 child => (my $vbox = new CFPlus::UI::VBox),
1105 has_close_button => 1; 1226 has_close_button => 1;
1106 1227
1107 $vbox->add ($LOGVIEW); 1228 $vbox->add ($LOGVIEW);
1108 1229
1109 $vbox->add (my $input = new CFClient::UI::Entry 1230 $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> " 1231 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>...). " 1232 . "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). " 1233 . "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.", 1234 . "A better way to submit commands (and the occasional chat command) is often the map command completer.",
1114 on_focus_in => sub { 1235 on_focus_in => sub {
1153 }; 1274 };
1154 1275
1155 $window 1276 $window
1156} 1277}
1157 1278
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 { 1279sub autopickup_setup {
1280 my $r = new CFPlus::UI::ScrolledWindow (
1281 expand => 1,
1282 scroll_y => 1
1283 );
1191 my $table = new CFClient::UI::Table; 1284 $r->add (my $table = new CFPlus::UI::Table
1285 row_expand => [0],
1286 col_expand => [0, 1, 0, 1],
1287 );
1192 1288
1193 for ( 1289 for (
1194 ["General", 0, 0, 1290 ["General", 0, 0,
1195 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE], 1291 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1196 ["Inhibit autopickup" => PICKUP_INHIBIT], 1292 ["Inhibit autopickup" => PICKUP_INHIBIT],
1210 ["Boots" => PICKUP_BOOTS], 1306 ["Boots" => PICKUP_BOOTS],
1211 ["Gloves" => PICKUP_GLOVES], 1307 ["Gloves" => PICKUP_GLOVES],
1212 ["Cloaks" => PICKUP_CLOAK], 1308 ["Cloaks" => PICKUP_CLOAK],
1213 ], 1309 ],
1214 1310
1215 ["Readables", 2, 2, 1311 ["Readables", 2, 0,
1216 ["Spellbooks" => PICKUP_SPELLBOOK], 1312 ["Spellbooks" => PICKUP_SPELLBOOK],
1217 ["Skillscrolls" => PICKUP_SKILLSCROLL], 1313 ["Skillscrolls" => PICKUP_SKILLSCROLL],
1218 ["Normal Books/Scrolls" => PICKUP_READABLES], 1314 ["Normal Books/Scrolls" => PICKUP_READABLES],
1219 ], 1315 ],
1220 ["Misc", 2, 7, 1316 ["Misc", 2, 5,
1221 ["Food" => PICKUP_FOOD], 1317 ["Food" => PICKUP_FOOD],
1222 ["Drinks" => PICKUP_DRINK], 1318 ["Drinks" => PICKUP_DRINK],
1223 ["Valuables (Money, Gems)" => PICKUP_VALUABLES], 1319 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
1224 ["Keys" => PICKUP_KEY], 1320 ["Keys" => PICKUP_KEY],
1225 ["Magical Items" => PICKUP_MAGICAL], 1321 ["Magical Items" => PICKUP_MAGICAL],
1226 ["Potions" => PICKUP_POTION], 1322 ["Potions" => PICKUP_POTION],
1227 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1323 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1228 ["Ignore cursed" => PICKUP_NOT_CURSED], 1324 ["Ignore cursed" => PICKUP_NOT_CURSED],
1229 ["Jewelery" => PICKUP_JEWELS], 1325 ["Jewelery" => PICKUP_JEWELS],
1326 ["Flesh" => PICKUP_FLESH],
1230 ], 1327 ],
1231 ["Weight/Value ratio", 2, 17] 1328 ["Weight/Value ratio", 2, 17]
1232 ) 1329 )
1233 { 1330 {
1234 my ($title, $x, $y, @bits) = @$_; 1331 my ($title, $x, $y, @bits) = @$_;
1235 $table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1332 $table->add ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1236 1333
1237 for (@bits) { 1334 for (@bits) {
1238 ++$y; 1335 ++$y;
1239 1336
1240 my $mask = $_->[1]; 1337 my $mask = $_->[1];
1241 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1); 1338 $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 1339 $table->add ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1243 state => $::CFG->{pickup} & $mask, 1340 state => $::CFG->{pickup} & $mask,
1244 on_changed => sub { 1341 on_changed => sub {
1245 my ($box, $value) = @_; 1342 my ($box, $value) = @_;
1246 1343
1247 if ($value) { 1344 if ($value) {
1258 1355
1259 ${$_->[2]} = $checkbox if $_->[2]; 1356 ${$_->[2]} = $checkbox if $_->[2];
1260 } 1357 }
1261 } 1358 }
1262 1359
1263 $table->add (2, 18, new CFClient::UI::ValSlider 1360 $table->add (2, 18, new CFPlus::UI::ValSlider
1264 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1361 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1265 template => ">= 99", 1362 template => ">= 99",
1266 to_value => sub { ">= " . 5 * $_[0] }, 1363 to_value => sub { ">= " . 5 * $_[0] },
1267 on_changed => sub { 1364 on_changed => sub {
1268 my ($slider, $value) = @_; 1365 my ($slider, $value) = @_;
1271 $::CFG->{pickup} |= int $value 1368 $::CFG->{pickup} |= int $value
1272 if $value; 1369 if $value;
1273 1; 1370 1;
1274 }); 1371 });
1275 1372
1276 $table->add (3, 18, new CFClient::UI::Button 1373 $table->add (3, 18, new CFPlus::UI::Button
1277 text => "set", 1374 text => "set",
1278 on_activate => sub { 1375 on_activate => sub {
1279 $::CONN->send_command ("pickup $::CFG->{pickup}") 1376 $::CONN->send_command ("pickup $::CFG->{pickup}")
1280 if defined $::CONN; 1377 if defined $::CONN;
1281 0 1378 0
1282 }); 1379 });
1283 1380
1284 $table 1381 $r
1285} 1382}
1383
1384my %SORT_ORDER = (
1385 type => undef,
1386 mtime => sub {
1387 my $NOW = time;
1388 sort {
1389 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
1390 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
1391
1392 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1393 or $btime <=> $atime
1394 or $a->{type} <=> $b->{type}
1395 } @_
1396 },
1397 weight => sub { sort {
1398 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1399 or $a->{type} <=> $b->{type}
1400 } @_ },
1401);
1286 1402
1287sub inventory_widget { 1403sub inventory_widget {
1288 my $hb = new CFClient::UI::HBox homogeneous => 1; 1404 my $hb = new CFPlus::UI::HBox homogeneous => 1;
1289 1405
1290 $hb->add (my $vb1 = new CFClient::UI::VBox); 1406 $hb->add (my $vb1 = new CFPlus::UI::VBox);
1291 $vb1->add (new CFClient::UI::Label align => 0, text => "Player"); 1407 $vb1->add (new CFPlus::UI::Label align => 0, text => "Player");
1408
1409 $vb1->add (my $hb1 = new CFPlus::UI::HBox);
1410
1411 use sort 'stable';
1412
1413 $hb1->add (new CFPlus::UI::Selector
1414 value => $::CFG->{inv_sort},
1415 options => [
1416 [type => "Type/Name"],
1417 [mtime => "Recent/Normal/Locked"],
1418 [weight => "Weight/Type"],
1419 ],
1420 on_changed => sub {
1421 $::CFG->{inv_sort} = $_[1];
1422 $INV->set_sort_order ($SORT_ORDER{$_[1]});
1423 },
1424 );
1425 $hb1->add (new CFPlus::UI::Label text => "Weight: ", align => 1, expand => 1);
1426 #TODO# update to weigh/maxweight
1427 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1);
1428
1429 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1292 $vb1->add ($INV = new CFClient::UI::Inventory); 1430 $sw1->add ($INV = new CFPlus::UI::Inventory);
1431 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1293 1432
1294 $hb->add (my $vb2 = new CFClient::UI::VBox); 1433 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1295 1434
1296 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox); 1435 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox);
1297 1436
1437 $vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1298 $vb2->add ($INVR = new CFClient::UI::Inventory); 1438 $sw2->add ($INVR = new CFPlus::UI::Inventory);
1299 1439
1300 # XXX: Call after $INVR = ... because set_opencont sets the items 1440 # XXX: Call after $INVR = ... because set_opencont sets the items
1301 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor"); 1441 CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
1302 1442
1303 $hb 1443 $hb
1304} 1444}
1305 1445
1306sub toggle_player_page { 1446sub toggle_player_page {
1313 $PL_WINDOW->show; 1453 $PL_WINDOW->show;
1314 } 1454 }
1315} 1455}
1316 1456
1317sub player_window { 1457sub player_window {
1318 my $plwin = $PL_WINDOW = new CFClient::UI::FancyFrame 1458 my $plwin = $PL_WINDOW = new CFPlus::UI::Toplevel
1319 x => "center", 1459 x => "center",
1320 y => "center", 1460 y => "center",
1321 force_w => $WIDTH * 9/10, 1461 force_w => $WIDTH * 9/10,
1322 force_h => $HEIGHT * 9/10, 1462 force_h => $HEIGHT * 9/10,
1323 title => "Player", 1463 title => "Player",
1464 name => "playerbook",
1324 has_close_button => 1 1465 has_close_button => 1
1325 ; 1466 ;
1326 1467
1327 my $ntb = 1468 my $ntb =
1328 $PL_NOTEBOOK = 1469 $PL_NOTEBOOK =
1329 new CFClient::UI::Notebook 1470 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 1471
1335 $ntb->add ( 1472 $ntb->add (
1336 "Stats &amp; Skills" => $STATS_PAGE = stats_window, 1473 "Statistics (F2)" => $STATS_PAGE = stats_window,
1337 "Shows statistics and skill window, where all your Stats, Resistances and Skills are shown." 1474 "Shows statistics, where all your Stats and Resistances are shown."
1338 ); 1475 );
1339 $ntb->add ( 1476 $ntb->add (
1340 Spellbook => $SPELL_PAGE = new CFClient::UI::SpellList, 1477 "Skills (F3)" => $SKILL_PAGE = skill_window,
1478 "Shows all your Skills."
1479 );
1480
1481 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1482 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1483 $ntb->add (
1484 "Spellbook (F4)" => $spellsw,
1341 "Displays all spells you have and lets you edit keyboard shortcuts for them." 1485 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1342 ); 1486 );
1343 $ntb->add ( 1487 $ntb->add (
1344 Inventory => $INVENTORY_PAGE = inventory_widget, 1488 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1345 "Toggles the inventory window, where you can manage your loot (or treasures :). " 1489 "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." 1490 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1347 ); 1491 );
1492 $ntb->add (Pickup => autopickup_setup,
1493 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1348 1494
1349 $ntb->set_current_page ($INVENTORY_PAGE); 1495 $ntb->set_current_page ($INVENTORY_PAGE);
1350 1496
1351 $plwin->add ($ntb); 1497 $plwin->add ($ntb);
1352 $plwin 1498 $plwin
1353} 1499}
1354 1500
1355sub update_bindings {
1356 $BIND_UPD_CB->() if $BIND_UPD_CB;
1357}
1358
1359sub keyboard_setup { 1501sub keyboard_setup {
1360 my $binding_list = new CFClient::UI::VBox; 1502 CFPlus::Macro::keyboard_setup
1361
1362 my $refresh;
1363 $refresh = $BIND_UPD_CB = sub {
1364 $binding_list->clear ();
1365
1366 for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) {
1367 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
1368 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1369 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1370
1371 my $lbl = join "; ", @$cmds;
1372 my $nam = CFClient::BindingEditor::keycombo_to_name ($mod, $sym);
1373 $binding_list->add (my $hb = new CFClient::UI::HBox);
1374 $hb->add (new CFClient::UI::Button
1375 text => "delete",
1376 tooltip => "Deletes the binding",
1377 on_activate => sub {
1378 $binding_list->remove ($hb);
1379 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1380 0
1381 });
1382
1383 $hb->add (new CFClient::UI::Button
1384 text => "edit",
1385 tooltip => "Edits the binding",
1386 on_activate => sub {
1387 $::BIND_EDITOR->set_binding (
1388 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},
1389 sub {
1390 my ($nmod, $nsym, $ncmds) = @_;
1391 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
1392 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1393 $refresh->();
1394 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1395 $SETUP_DIALOG->show;
1396 },
1397 sub {
1398 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1399 $SETUP_DIALOG->show;
1400 });
1401 $::BIND_EDITOR->show;
1402 $SETUP_DIALOG->hide;
1403 0
1404 });
1405
1406 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
1407 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
1408 }
1409 }
1410 };
1411
1412 my $vb = new CFClient::UI::VBox;
1413 $vb->add (my $hb = new CFClient::UI::HBox);
1414 $hb->add (new CFClient::UI::Label text => "only shift-up stops fire");
1415 $hb->add (new CFClient::UI::CheckBox
1416 expand => 1,
1417 state => $CFG->{shift_fire_stop},
1418 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
1419 on_changed => sub {
1420 my ($cbox, $value) = @_;
1421 $CFG->{shift_fire_stop} = $value;
1422 0
1423 });
1424
1425 $vb->add ($binding_list);
1426 $vb->add (my $hb = new CFClient::UI::HBox);
1427
1428 $hb->add (new CFClient::UI::Button
1429 text => "record new",
1430 expand => 1,
1431 tooltip => "This button opens the binding editor with an empty binding.",
1432 on_activate => sub {
1433 $::BIND_EDITOR->set_binding (undef, undef, [],
1434 sub {
1435 my ($mod, $sym, $cmds) = @_;
1436 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1437 $refresh->();
1438 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1439 $SETUP_DIALOG->show;
1440 },
1441 sub {
1442 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1443 $SETUP_DIALOG->show;
1444 },
1445 );
1446 $SETUP_DIALOG->hide;
1447 $::BIND_EDITOR->show;
1448 0
1449 },
1450 );
1451
1452 $hb->add (new CFClient::UI::Button
1453 text => "close",
1454 tooltip => "Closes the binding window",
1455 expand => 1,
1456 on_activate => sub {
1457 $SETUP_DIALOG->hide;
1458 0
1459 }
1460 );
1461
1462 $refresh->();
1463
1464 $vb
1465} 1503}
1466 1504
1467sub help_window { 1505sub help_window {
1468 my $win = new CFClient::UI::FancyFrame 1506 my $win = new CFPlus::UI::Toplevel
1469 x => 'center', 1507 x => 'center',
1470 y => 'center', 1508 y => 'center',
1471 z => 2, 1509 z => 4,
1472 name => 'doc_browser', 1510 name => 'doc_browser',
1473 force_w => int $WIDTH * 7/8, 1511 force_w => int $WIDTH * 7/8,
1474 force_h => int $HEIGHT * 7/8, 1512 force_h => int $HEIGHT * 7/8,
1475 title => "Help Browser", 1513 title => "Help Browser",
1476 has_close_button => 1; 1514 has_close_button => 1;
1477 1515
1478 $win->add (my $vbox = new CFClient::UI::VBox); 1516 $win->add (my $vbox = new CFPlus::UI::VBox);
1479 1517
1480 $vbox->add (my $buttons = new CFClient::UI::HBox); 1518 $vbox->add (new CFPlus::UI::FancyFrame
1519 label => "Navigation",
1520 child => (my $buttons = new CFPlus::UI::HBox),
1521 );
1481 $vbox->add (my $viewer = new CFClient::UI::TextScroller 1522 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1482 expand => 1, fontsize => 0.8, padding_x => 4); 1523 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1483 1524
1484 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: "); 1525 my @history;
1485 $buttons->add (my $combo = new CFClient::UI::Combobox 1526 my @future;
1486 value => undef, 1527 my $curnode;
1487 options => [ 1528
1488 [intro => "Introduction"], 1529 my $load_node; $load_node = sub {
1489 [manual => "Main Manual"], 1530 my ($node, $para) = @_;
1490 [skill_help => "Skill Reference"], 1531
1491 [command_help => "Command Reference"], 1532 $buttons->clear;
1492 [dmcommand_help => "DM Commands"], 1533
1493 [COPYING => "License Terms"], 1534 $buttons->add (new CFPlus::UI::Button
1494 ], 1535 text => "⇤",
1536 tooltip => "back to the starting page",
1495 on_changed => sub { 1537 on_activate => sub {
1496 my ($self, $pod) = @_; 1538 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1497 1539 unshift @future, @history;
1498 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod", 1540 @history = ();
1499 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] }; 1541 $load_node->(@{shift @future});
1500
1501 $viewer->clear;
1502
1503# $viewer->add_paragraph ([1, 1, 1, 1], ["<big>Test</big>\n\n \x{fffc} \x{fffc}\n",
1504# (new CFClient::UI::Image path => "x.png", can_hover => 1, can_events => 1),
1505# (new CFClient::UI::Label text => "üüüü", can_hover => 1, can_events => 1, tooltip => "??"),
1506# ]);#d#
1507 1542 },
1508 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0]) 1543 );
1509 for @$pom;
1510 1544
1511 $viewer->set_offset (0); 1545 if (@history) {
1512 1546 $buttons->add (new CFPlus::UI::Button
1547 text => "⋘",
1548 tooltip => "back to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $history[-1][0]) . "</i>",
1549 on_activate => sub {
1550 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1551 $load_node->(@{pop @history});
1552 },
1513 0 1553 );
1514 }, 1554 }
1515 on_visibility_change => sub { 1555
1516 my ($self, $visible) = @_; 1556 if (@future) {
1517 return unless $visible; 1557 $buttons->add (new CFPlus::UI::Button
1518 return if $self->{value}; 1558 text => "â‹™",
1519 $self->set_value ("intro"); 1559 tooltip => "forward to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $future[0][0]) . "</i>",
1560 on_activate => sub {
1561 push @history, [$curnode, $viewer->current_paragraph];
1562 $load_node->(@{shift @future});
1563 },
1520 0 1564 );
1521 }, 1565 }
1566
1567 $buttons->add (new CFPlus::UI::Label text => " ");
1568
1569 my @path = CFPlus::Pod::full_path_of $node;
1570 pop @path; # drop current node
1571
1572 for my $node (@path) {
1573 $buttons->add (new CFPlus::UI::Button
1574 text => $node->{kw}[0],
1575 tooltip => "go to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $node) . "</i>",
1576 on_activate => sub {
1577 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1578 $load_node->($node);
1579 },
1580 );
1581 $buttons->add (new CFPlus::UI::Label text => "/");
1582 }
1583
1584 $buttons->add (new CFPlus::UI::Label text => $node->{kw}[0], padding_x => 4, padding_y => 4);
1585
1586 $curnode = $node;
1587
1588 $viewer->clear;
1589 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $curnode);
1590 $viewer->scroll_to ($para);
1522 ); 1591 };
1592
1593 $load_node->(CFPlus::Pod::find pod => "mainpage");
1594
1595 $CFPlus::Pod::goto_document = sub {
1596 my (@path) = @_;
1597
1598 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1599
1600 $load_node->((CFPlus::Pod::find @path)[0]);
1601 $win->show;
1602 };
1523 1603
1524 $win 1604 $win
1525} 1605}
1526 1606
1607sub open_string_query {
1608 my ($title, $cb, $txt, $tooltip) = @_;
1609 my $dialog = new CFPlus::UI::Toplevel
1610 x => "center",
1611 y => "center",
1612 z => 50,
1613 force_w => $WIDTH * 4/5,
1614 title => $title;
1615
1616 $dialog->add (
1617 my $e = new CFPlus::UI::Entry
1618 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
1619 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
1620 tooltip => $tooltip
1621 );
1622
1623 $e->grab_focus;
1624 $e->set_text ($txt) if $txt;
1625 $dialog->show;
1626}
1627
1628sub open_quit_dialog {
1629 unless ($QUIT_DIALOG) {
1630 $QUIT_DIALOG = new CFPlus::UI::Toplevel
1631 x => "center",
1632 y => "center",
1633 z => 50,
1634 title => "Really Quit?",
1635 on_key_down => sub {
1636 my ($dialog, $ev) = @_;
1637 $ev->{sym} == 27 and $dialog->hide;
1638 }
1639 ;
1640
1641 $QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
1642
1643 $vb->add (new CFPlus::UI::Label
1644 text => "You should find a savebed and apply it first!",
1645 max_w => $WIDTH * 0.25,
1646 ellipsize => 0,
1647 );
1648 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1649 $hb->add (new CFPlus::UI::Button
1650 text => "Ok",
1651 expand => 1,
1652 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1653 );
1654 $hb->add (new CFPlus::UI::Button
1655 text => "Quit anyway",
1656 expand => 1,
1657 on_activate => sub { exit },
1658 );
1659 }
1660
1661 $QUIT_DIALOG->show;
1662 $QUIT_DIALOG->grab_focus;
1663}
1664
1665sub show_tip_of_the_day {
1666 # find all tips
1667 my @tod = CFPlus::Pod::find tip_of_the_day => "*";
1668
1669 CFPlus::DB::get state => "tip_of_the_day", sub {
1670 my ($todindex) = @_;
1671 $todindex = 0 if $todindex >= @tod;
1672 CFPlus::DB::put state => tip_of_the_day => $todindex + 1, sub { };
1673
1674 # create dialog
1675 my $dialog;
1676
1677 my $close = sub {
1678 $dialog->destroy;
1679 };
1680
1681 $dialog = new CFPlus::UI::Toplevel
1682 x => "center",
1683 y => "center",
1684 z => 3,
1685 name => 'tip_of_the_day',
1686 force_w => int $WIDTH * 4/9,
1687 force_h => int $WIDTH * 2/9,
1688 title => "Tip of the day #" . (1 + $todindex),
1689 child => my $vbox = new CFPlus::UI::VBox,
1690 has_close_button => 1,
1691 on_delete => $close,
1692 ;
1693
1694 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1695 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1696 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1697
1698 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1699
1700 $table->add (0, 0, new CFPlus::UI::Button
1701 text => "Close",
1702 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>.",
1703 on_activate => $close,
1704 );
1705
1706 $table->add (2, 0, new CFPlus::UI::Button
1707 text => "Next",
1708 tooltip => "Show the next <b>Tip of the day</b>.",
1709 on_activate => sub {
1710 $close->();
1711 &show_tip_of_the_day;
1712 },
1713 );
1714
1715 $dialog->show;
1716 };
1717}
1718
1527sub sdl_init { 1719sub sdl_init {
1528 CFClient::SDL_Init 1720 CFPlus::SDL_Init
1529 and die "SDL::Init failed!\n"; 1721 and die "SDL::Init failed!\n";
1530} 1722}
1531 1723
1532sub video_init { 1724sub video_init {
1533 sdl_init;
1534
1535 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 1725 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
1536 1726
1537 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 1727 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
1538 1728
1539 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 1729 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1540 $FULLSCREEN = $CFG->{fullscreen}; 1730 $FULLSCREEN = $CFG->{fullscreen};
1541 $FAST = $CFG->{fast}; 1731 $FAST = $CFG->{fast};
1542 1732
1543 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 1733 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
1544 or die "SDL_SetVideoMode failed: " . (CFClient::SDL_GetError) . "\n"; 1734 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1545 1735
1546 $SDL_ACTIVE = 1; 1736 $SDL_ACTIVE = 1;
1547 $LAST_REFRESH = time - 0.01; 1737 $LAST_REFRESH = time - 0.01;
1548 1738
1549 CFClient::OpenGL::init; 1739 CFPlus::OpenGL::init;
1550 1740
1551 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 1741 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
1552 1742
1553 $CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d# 1743 $CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
1554 1744
1555 ############################################################################# 1745 #############################################################################
1556 1746
1557 if ($DEBUG_STATUS) { 1747 if ($DEBUG_STATUS) {
1558 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 1748 CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1559 } else { 1749 } else {
1560 # create the widgets 1750 # create the widgets
1561 1751
1562 $DEBUG_STATUS = new CFClient::UI::Label 1752 $DEBUG_STATUS = new CFPlus::UI::Label
1563 padding => 0, 1753 padding => 0,
1564 z => 100, 1754 z => 100,
1565 force_x => "max", 1755 force_x => "max",
1566 force_y => 0; 1756 force_y => 0;
1567 $DEBUG_STATUS->show; 1757 $DEBUG_STATUS->show;
1568 1758
1569 $BIND_EDITOR = new CFClient::BindingEditor (x => "max", y => 0);
1570
1571 $STATUSBOX = new CFClient::UI::Statusbox; 1759 $STATUSBOX = new CFPlus::UI::Statusbox;
1572 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]); 1760 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1573 1761
1574 (new CFClient::UI::Frame 1762 (new CFPlus::UI::Frame
1575 bg => [0, 0, 0, 0.4], 1763 bg => [0, 0, 0, 0.4],
1576 force_x => 0, 1764 force_x => 0,
1577 force_y => "max", 1765 force_y => "max",
1578 child => $STATUSBOX, 1766 child => $STATUSBOX,
1579 )->show; 1767 )->show;
1580 1768
1581 CFClient::UI::FancyFrame->new ( 1769 CFPlus::UI::Toplevel->new (
1582 title => "Map", 1770 title => "Map",
1583 name => "mapmap", 1771 name => "mapmap",
1584 x => 0, 1772 x => 0,
1585 y => $FONTSIZE + 8, 1773 y => $FONTSIZE + 8,
1586 border_bg => [1, 1, 1, 192/255], 1774 border_bg => [1, 1, 1, 192/255],
1587 bg => [1, 1, 1, 0], 1775 bg => [1, 1, 1, 0],
1588 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1776 child => ($MAPMAP = new CFPlus::MapWidget::MapMap
1589 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.", 1777 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
1590 ), 1778 ),
1591 )->show; 1779 )->show;
1592 1780
1593 $MAPWIDGET = new CFClient::MapWidget; 1781 $MAPWIDGET = new CFPlus::MapWidget;
1594 $MAPWIDGET->connect (activate_console => sub { 1782 $MAPWIDGET->connect (activate_console => sub {
1595 my ($mapwidget, $preset) = @_; 1783 my ($mapwidget, $preset) = @_;
1596 1784
1597 if ($CONSOLE) { 1785 if ($CONSOLE) {
1598 $CONSOLE->{input}->{auto_activated} = 1; 1786 $CONSOLE->{input}->{auto_activated} = 1;
1604 } 1792 }
1605 }); 1793 });
1606 $MAPWIDGET->show; 1794 $MAPWIDGET->show;
1607 $MAPWIDGET->grab_focus; 1795 $MAPWIDGET->grab_focus;
1608 1796
1609 $LOGVIEW = new CFClient::UI::TextScroller 1797 $LOGVIEW = new CFPlus::UI::TextScroller
1610 expand => 1, 1798 expand => 1,
1611 font => $FONT_FIXED, 1799 font => $FONT_FIXED,
1612 fontsize => $::CFG->{log_fontsize}, 1800 fontsize => $::CFG->{log_fontsize},
1613 indent => -4, 1801 indent => -4,
1614 can_hover => 1, 1802 can_hover => 1,
1615 can_events => 1, 1803 can_events => 1,
1804 max_par => $CFG->{logview_max_par},
1616 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1805 tooltip => "<b>Server Log</b>. This text viewer contains all recent messages sent by the server.",
1617 ; 1806 ;
1618 1807
1619 $SETUP_DIALOG = new CFClient::UI::FancyFrame 1808 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1620 title => "Setup", 1809 title => "Setup",
1621 name => "setup_dialog", 1810 name => "setup_dialog",
1622 x => 'center', 1811 x => 'center',
1623 y => 'center', 1812 y => 'center',
1624 z => 2, 1813 z => 2,
1627 has_close_button => 1, 1816 has_close_button => 1,
1628 ; 1817 ;
1629 1818
1630 $METASERVER = metaserver_dialog; 1819 $METASERVER = metaserver_dialog;
1631 1820
1632 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1, 1821 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1633 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1); 1822 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1634 1823
1635 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1824 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1636 "Configure the server to play on, your username, password and other server-related options."); 1825 "Configure the server to play on, your username, password and other server-related options.");
1637 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup, 1826 $SETUP_NOTEBOOK->add (Client => client_setup,
1638 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them."); 1827 "Configure various client-specific settings.");
1639 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 1828 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1640 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 1829 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1641 $SETUP_NOTEBOOK->add (Audio => audio_setup, 1830 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1642 "Configure the use of audio, sound effects and background music."); 1831 "Configure the use of audio, sound effects and background music.");
1643 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 1832 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1648 . "After pressing the combo the binding will be saved automatically and the " 1837 . "After pressing the combo the binding will be saved automatically and the "
1649 . "binding editor closes"); 1838 . "binding editor closes");
1650 $SETUP_NOTEBOOK->add (Debug => debug_setup, 1839 $SETUP_NOTEBOOK->add (Debug => debug_setup,
1651 "Some debuggin' options. Do not ask."); 1840 "Some debuggin' options. Do not ask.");
1652 1841
1653 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 1842 $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1654 1843
1655 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 1844 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1656 tooltip => "Toggles a dialog where you can configure all aspects of this client."); 1845 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1657 1846
1658 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window, 1847 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,
1659 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 1848 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1660 1849
1661 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 1850 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
1662 1851
1663 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Playerbook", other => player_window, 1852 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
1664 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats."); 1853 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
1665 1854
1666 $BUTTONBAR->add (new CFClient::UI::Button 1855 $BUTTONBAR->add (new CFPlus::UI::Button
1667 text => "Save Config", 1856 text => "Save Config",
1668 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 1857 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1669 on_activate => sub { 1858 on_activate => sub {
1670 $::CFG->{layout} = CFClient::UI::get_layout; 1859 $::CFG->{layout} = CFPlus::UI::get_layout;
1671 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc"; 1860 CFPlus::write_cfg "$Crossfire::VARDIR/cfplusrc";
1672 status "Configuration Saved"; 1861 status "Configuration Saved";
1673 0 1862 0
1674 }, 1863 },
1675 ); 1864 );
1676 1865
1677 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window, 1866 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1678 tooltip => "View Documentation"); 1867 tooltip => "View Documentation");
1679 1868
1869
1680 $BUTTONBAR->add (new CFClient::UI::Button 1870 $BUTTONBAR->add (new CFPlus::UI::Button
1681 text => "Quit", 1871 text => "Quit",
1682 tooltip => "Terminates the program", 1872 tooltip => "Terminates the program",
1683 on_activate => sub { 1873 on_activate => sub {
1684 if ($CONN) { 1874 if ($CONN) {
1685 open_quit_dialog; 1875 open_quit_dialog;
1695 } 1885 }
1696 1886
1697 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1887 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1698} 1888}
1699 1889
1890sub setup_build_button {
1891 my ($enabled) = @_;
1892 if ($enabled) {
1893 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1894 $BUILD_BUTTON ||= new CFPlus::UI::Button
1895 text => "Build",
1896 tooltip => "Opens the ingame builder",
1897 on_activate => sub {
1898 if ($CONN) {
1899 $CONN->send_ext_req (builder_player_items => sub {
1900 open_ingame_editor ($_[0]) if exists $_[0]->{items};
1901 });
1902 }
1903 0
1904 };
1905 $BUTTONBAR->add ($BUILD_BUTTON);
1906 } else {
1907 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1908 }
1909}
1910
1911sub open_ingame_editor {
1912 my ($msg) = @_;
1913
1914 my $win = new CFPlus::UI::Toplevel
1915 x => 0,
1916 y => 'center',
1917 z => 4,
1918 name => 'builder_window',
1919 force_w => int $WIDTH * 1/4,
1920 force_h => int $HEIGHT * 3/4,
1921 title => "In game builder",
1922 has_close_button => 1;
1923
1924 my $r = new CFPlus::UI::ScrolledWindow (
1925 expand => 1,
1926 scroll_y => 1
1927 );
1928 $r->add (my $vb = new CFPlus::UI::VBox);
1929 $win->add ($r);
1930
1931
1932 $vb->add (
1933 new CFPlus::UI::Button
1934 text => "Disable build mode",
1935 on_activate => sub { $::IN_BUILD_MODE = undef }
1936 );
1937 $vb->add (
1938 new CFPlus::UI::Button
1939 text => "ERASE",
1940 on_activate => sub { $::IN_BUILD_MODE = { do_erase => 1 } }
1941 );
1942
1943 for my $itemarchname (
1944 sort {
1945 $msg->{items}->{$a}->{build_arch_name}
1946 cmp $msg->{items}->{$b}->{build_arch_name}
1947 } keys %{$msg->{items}}
1948 ) {
1949 my $info = $msg->{items}->{$itemarchname};
1950 $vb->add (
1951 new CFPlus::UI::Button text => $info->{build_arch_name},
1952 on_activate => sub {
1953 $::IN_BUILD_MODE = { item => $itemarchname, info => $info };
1954
1955 if (grep { $msg->{items}->{$itemarchname}->{$_} } qw/has_connection has_name has_text/) {
1956 build_mode_query_arch_info ();
1957 }
1958 }
1959 );
1960 }
1961
1962 $win->show;
1963}
1964
1965sub build_mode_query_arch_info {
1966 my ($iteminfo) = $::IN_BUILD_MODE;
1967 my $itemarchname = $iteminfo->{item};
1968 my $info = $iteminfo->{info};
1969
1970 my $dialog = new CFPlus::UI::Toplevel
1971 x => "center",
1972 y => "center",
1973 z => 50,
1974 force_w => int $WIDTH * 1/2,
1975 title => "Enter information for placement of '$itemarchname'",
1976 has_close_button => 1;
1977
1978 $dialog->add (my $vb = new CFPlus::UI::VBox expand => 1);
1979
1980 $vb->add (my $table = new CFPlus::UI::Table expand => 1);
1981 my $row = 0;
1982 if ($info->{has_name}) {
1983 $table->add (0, $row, new CFPlus::UI::Label text => "Name:");
1984 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{name} = $_[1]; 0 });
1985 }
1986 if ($info->{has_text}) {
1987 $table->add (0, $row, new CFPlus::UI::Label text => "Text:");
1988 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{text} = $_[1]; 0 });
1989 }
1990 if ($info->{has_connection}) {
1991 $table->add (0, $row, new CFPlus::UI::Label text => "Connection ID:");
1992 $table->add (1, $row++,
1993 new CFPlus::UI::Entry
1994 expand => 1,
1995 on_changed => sub { $::IN_BUILD_MODE->{connection} = $_[1]; 0 },
1996 tooltip => "Enter the connection ID here. The connection ID connects actors like a lever to a gate or a magic ear to a gate"
1997 );
1998 }
1999
2000 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
2001 $hb->add (new CFPlus::UI::Button
2002 text => "Close",
2003 expand => 1,
2004 on_activate => sub { $dialog->hide; 0 },
2005 );
2006 $dialog->show;
2007}
2008
1700sub video_shutdown { 2009sub video_shutdown {
1701 CFClient::OpenGL::shutdown; 2010 CFPlus::OpenGL::shutdown;
1702 2011
1703 undef $SDL_ACTIVE; 2012 undef $SDL_ACTIVE;
1704} 2013}
1705 2014
1706my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
1707my $bgmusic;#TODO#hack#d#
1708
1709sub audio_channel_finished { 2015sub audio_channel_finished {
1710 my ($channel) = @_; 2016 my ($channel) = @_;
1711 2017
1712 #warn "channel $channel finished\n";#d# 2018 #warn "channel $channel finished\n";#d#
1713} 2019}
1714 2020
2021sub audio_music_set {
2022 my ($songs) = @_;
2023
2024 my @want =
2025 grep $_,
2026 map $CONN->{music_meta}{$_},
2027 @$songs;
2028
2029 if (@want) {
2030 @MUSIC_WANT = @want;
2031 &audio_music_changed ();
2032 }
2033}
2034
2035sub audio_music_start {
2036 my $path = $MUSIC_PLAYING->{path}
2037 or return;
2038
2039 CFPlus::DB::prefetch_file $path, 1024_000, sub {
2040 # music might have changed...
2041 $path eq $MUSIC_PLAYING->{path}
2042 or return &audio_music_start ();
2043
2044 $MUSIC_PLAYER = new_from_file CFPlus::MixMusic $path;
2045
2046 my $NOW = time;
2047
2048 if ($MUSIC_PLAYING->{stop_time} > $NOW - $MUSIC_RESUME) {
2049 my $pos = $MUSIC_PLAYING->{stop_pos};
2050 $MUSIC_PLAYER->fade_in_pos (0, 1000, $pos);
2051 $MUSIC_START = time - $pos;
2052 } else {
2053 $MUSIC_PLAYER->play (0);
2054 $MUSIC_START = time;
2055 }
2056
2057 delete $MUSIC_PLAYING->{stop_time};
2058 delete $MUSIC_PLAYING->{stop_pos};
2059 }
2060}
2061
2062sub audio_music_changed {
2063 return unless $CFG->{bgm_enable};
2064
2065 # default MUSIC_WANT == MUSIC_DEFAULT
2066 @MUSIC_WANT = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_WANT;
2067
2068 # if the currently playing song is acceptable, let it continue
2069 return if $MUSIC_PLAYING
2070 && grep $MUSIC_PLAYING->{path} eq $_->{path}, @MUSIC_WANT;
2071
2072 my $NOW = time;
2073
2074 if ($MUSIC_PLAYING) {
2075 $MUSIC_PLAYING->{stop_time} = $NOW;
2076 $MUSIC_PLAYING->{stop_pos} = $NOW - $MUSIC_START;
2077 CFPlus::MixMusic::fade_out 1000;
2078 } else {
2079 # sort by stop time, oldest first
2080 @MUSIC_WANT = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_WANT;
2081
2082 # if the most recently-played piece played very recently,
2083 # resume it, else choose the oldest piece for rotation.
2084 $MUSIC_PLAYING =
2085 $MUSIC_WANT[-1]{stop_time} > $NOW - $MUSIC_RESUME
2086 ? $MUSIC_WANT[-1]
2087 : $MUSIC_WANT[0];
2088
2089 audio_music_start;
2090 }
2091}
2092
1715sub audio_music_finished { 2093sub audio_music_finished {
1716 return unless $CFG->{bgm_enable}; 2094 $MUSIC_PLAYING = undef;
2095 undef $MUSIC_PLAYER;
1717 2096
1718 # TODO: hack, do play loop and mood music 2097 audio_music_changed;
1719 $bgmusic = new_from_file CFClient::MixMusic CFClient::find_rcfile "music/$bgmusic[0]";
1720 $bgmusic->play (0);
1721
1722 push @bgmusic, shift @bgmusic;
1723} 2098}
1724 2099
1725sub audio_init { 2100sub audio_init {
1726 if ($CFG->{audio_enable}) { 2101 if ($CFG->{audio_enable}) {
1727 if (open my $fh, "<", CFClient::find_rcfile "sounds/config") { 2102 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
1728 $SDL_MIXER = !CFClient::Mix_OpenAudio; 2103 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
1729 2104
1730 unless ($SDL_MIXER) { 2105 unless ($SDL_MIXER) {
1731 status "Unable to open sound device: there will be no sound"; 2106 status "Unable to open sound device: there will be no sound";
1732 return; 2107 return;
1733 } 2108 }
1734 2109
1735 CFClient::Mix_AllocateChannels 8; 2110 CFPlus::Mix_AllocateChannels 8;
1736 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128; 2111 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1737 2112
1738 audio_music_finished; 2113 audio_music_finished;
1739 2114
2115 local $_;
1740 while (<$fh>) { 2116 while (<$fh>) {
1741 next if /^\s*#/; 2117 next if /^\s*#/;
1742 next if /^\s*$/; 2118 next if /^\s*$/;
1743 2119
1744 my ($file, $volume, $event) = split /\s+/, $_, 3; 2120 my ($file, $volume, $event) = split /\s+/, $_, 3;
1745 2121
1746 push @SOUNDS, "$volume,$file"; 2122 push @SOUNDS, "$volume,$file";
1747 2123
1748 $AUDIO_CHUNKS{"$volume,$file"} ||= do { 2124 $AUDIO_CHUNKS{"$volume,$file"} ||= do {
1749 my $chunk = new_from_file CFClient::MixChunk CFClient::find_rcfile "sounds/$file"; 2125 my $chunk = new_from_file CFPlus::MixChunk CFPlus::find_rcfile "sounds/$file";
1750 $chunk->volume ($volume * 128 / 100); 2126 $chunk->volume ($volume * 128 / 100);
1751 $chunk 2127 $chunk
1752 }; 2128 };
1753 } 2129 }
1754 } else { 2130 } else {
1756 } 2132 }
1757 } 2133 }
1758} 2134}
1759 2135
1760sub audio_shutdown { 2136sub audio_shutdown {
1761 CFClient::Mix_CloseAudio if $SDL_MIXER; 2137 CFPlus::Mix_CloseAudio if $SDL_MIXER;
1762 undef $SDL_MIXER; 2138 undef $SDL_MIXER;
1763 @SOUNDS = (); 2139 @SOUNDS = ();
1764 %AUDIO_CHUNKS = (); 2140 %AUDIO_CHUNKS = ();
1765} 2141}
1766 2142
1773 2149
1774sub force_refresh { 2150sub force_refresh {
1775 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 2151 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
1776 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 2152 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1777 2153
1778 $CFClient::UI::ROOT->draw; 2154 $CFPlus::UI::ROOT->draw;
1779 2155
1780 $WANT_REFRESH = 0; 2156 $WANT_REFRESH = 0;
1781 $CAN_REFRESH = 0; 2157 $CAN_REFRESH = 0;
1782 $LAST_REFRESH = $NOW; 2158 $LAST_REFRESH = $NOW;
1783 2159
17840 && do {
1785 # some weird model-drawing code, just a joke right now
1786 use CFClient::OpenGL;
1787
1788 $demo{t}{eye_auv} ||= new_from_file CFClient::Texture "eye2.png" or die;
1789 $demo{t}{body_auv} ||= new_from_file CFClient::Texture "body_auv3.png" or die;
1790 $demo{r} ||= do {
1791 my $mod = Compress::LZF::sthaw do { local $/; open my $fh, "<:raw:perlio", "dread.lz3"; <$fh> };
1792 $mod->{v} = pack "f*", @{$mod->{v}};
1793 $_ = [scalar @$_, pack "S!*", @$_]
1794 for values %{$mod->{g}};
1795 $mod
1796 };
1797
1798 my $r = $demo{r} or die;
1799
1800 glDepthMask 1;
1801 glClear GL_DEPTH_BUFFER_BIT;
1802 glEnable GL_TEXTURE_2D;
1803 glEnable GL_DEPTH_TEST;
1804 glEnable GL_CULL_FACE;
1805 glShadeModel $::FAST ? GL_FLAT : GL_SMOOTH;
1806
1807 glMatrixMode GL_PROJECTION;
1808 glLoadIdentity;
1809 glFrustum -1 * ($::WIDTH / $::HEIGHT), 1 * ($::WIDTH / $::HEIGHT), 1, -1, 1, 10000;
1810 #glOrtho 0, $::WIDTH, 0, $::HEIGHT, -10000, 10000;
1811 glMatrixMode GL_MODELVIEW;
1812 glLoadIdentity;
1813
1814 glPushMatrix;
1815 glTranslate 0, 0, -800;
1816 glScale 1, -1, 1;
1817 glRotate $NOW * 1000 % 36000 / 5, 0, 1, 0;
1818 glRotate $NOW * 1000 % 36000 / 6, 1, 0, 0;
1819 glRotate $NOW * 1000 % 36000 / 7, 0, 0, 1;
1820 glScale 50, 50, 50;
1821
1822 glInterleavedArrays GL_T2F_N3F_V3F, 0, $r->{v};
1823 while (my ($k, $v) = each %{$r->{g}}) {
1824 glBindTexture GL_TEXTURE_2D, ($demo{t}{$k}{name} or die);
1825 glDrawElements GL_TRIANGLES, $v->[0], GL_UNSIGNED_SHORT, $v->[1];
1826 }
1827
1828 glPopMatrix;
1829
1830 glShadeModel GL_FLAT;
1831 glDisable GL_DEPTH_TEST;
1832 glDisable GL_TEXTURE_2D;
1833 glDepthMask 0;
1834
1835 $WANT_REFRESH++;
1836};
1837
1838 CFClient::SDL_GL_SwapBuffers; 2160 CFPlus::SDL_GL_SwapBuffers;
1839} 2161}
1840 2162
1841my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub { 2163my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1842 $NOW = time; 2164 $NOW = time;
1843 2165
1844 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2166 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1845 for CFClient::SDL_PollEvent; 2167 for CFPlus::poll_events;
1846 2168
1847 if (%animate_object) { 2169 if (%animate_object) {
1848 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2170 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
1849 $WANT_REFRESH++; 2171 ++$WANT_REFRESH;
1850 } 2172 }
1851 2173
1852 if ($WANT_REFRESH) { 2174 if ($WANT_REFRESH) {
1853 force_refresh; 2175 force_refresh;
1854 } else { 2176 } else {
1874 $CONN->face_prefetch 2196 $CONN->face_prefetch
1875 if $CONN; 2197 if $CONN;
1876}); 2198});
1877 2199
1878%SDL_CB = ( 2200%SDL_CB = (
1879 CFClient::SDL_QUIT => sub { 2201 CFPlus::SDL_QUIT => sub {
1880 Event::unloop -1; 2202 exit;
1881 }, 2203 },
1882 CFClient::SDL_VIDEORESIZE => sub { 2204 CFPlus::SDL_VIDEORESIZE => sub {
1883 }, 2205 },
1884 CFClient::SDL_VIDEOEXPOSE => sub { 2206 CFPlus::SDL_VIDEOEXPOSE => sub {
1885 CFClient::UI::full_refresh; 2207 CFPlus::UI::full_refresh;
1886 }, 2208 },
1887 CFClient::SDL_ACTIVEEVENT => sub { 2209 CFPlus::SDL_ACTIVEEVENT => sub {
1888# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 2210# not useful, as APPACTIVE include sonly iconified state, not unmapped
2211# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, CFPlus::SDL_GetAppState;#d#
2212# printf "a %x\n", CFPlus::SDL_GetAppState & CFPlus::SDL_APPACTIVE;#d#
2213# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2214# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2215# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
1889 }, 2216 },
1890 CFClient::SDL_KEYDOWN => sub { 2217 CFPlus::SDL_KEYDOWN => sub {
1891 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) { 2218 if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
1892 # alt-enter 2219 # alt-enter
2220 $FULLSCREEN_ENABLE->toggle;
1893 video_shutdown; 2221 video_shutdown;
1894 $CFG->{fullscreen} = !$CFG->{fullscreen};
1895 video_init; 2222 video_init;
1896 } else { 2223 } else {
1897 CFClient::UI::feed_sdl_key_down_event ($_[0]); 2224 CFPlus::UI::feed_sdl_key_down_event ($_[0]);
1898 } 2225 }
1899 }, 2226 },
1900 CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event, 2227 CFPlus::SDL_KEYUP => \&CFPlus::UI::feed_sdl_key_up_event,
1901 CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event, 2228 CFPlus::SDL_MOUSEMOTION => \&CFPlus::UI::feed_sdl_motion_event,
1902 CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event, 2229 CFPlus::SDL_MOUSEBUTTONDOWN => \&CFPlus::UI::feed_sdl_button_down_event,
1903 CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event, 2230 CFPlus::SDL_MOUSEBUTTONUP => \&CFPlus::UI::feed_sdl_button_up_event,
1904 CFClient::SDL_USEREVENT => sub { 2231 CFPlus::SDL_USEREVENT => sub {
1905 if ($_[0]{code} == 1) { 2232 if ($_[0]{code} == 1) {
1906 audio_channel_finished $_[0]{data1}; 2233 audio_channel_finished $_[0]{data1};
1907 } elsif ($_[0]{code} == 0) { 2234 } elsif ($_[0]{code} == 0) {
1908 audio_music_finished; 2235 audio_music_finished;
1909 } 2236 }
1913############################################################################# 2240#############################################################################
1914 2241
1915$SIG{INT} = $SIG{TERM} = sub { exit }; 2242$SIG{INT} = $SIG{TERM} = sub { exit };
1916 2243
1917{ 2244{
1918 local $SIG{__DIE__} = sub {
1919 return unless defined $^S && !$^S;
1920 Carp::confess $_[1];#d#TODO: remove when stable
1921 CFClient::fatal $_[0];
1922 };
1923
1924 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc"; 2245 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
2246 CFPlus::DB::Server::run;
2247
1925 CFClient::UI::set_layout ($::CFG->{layout}); 2248 CFPlus::UI::set_layout ($::CFG->{layout});
1926 2249
1927 my %DEF_CFG = ( 2250 my %DEF_CFG = (
1928 sdl_mode => 0, 2251 sdl_mode => 0,
1929 width => 640, 2252 width => 640,
1930 height => 480, 2253 height => 480,
1931 fullscreen => 0, 2254 fullscreen => 0,
1932 fast => 0, 2255 fast => 0,
1933 map_scale => 1, 2256 map_scale => 1,
1934 fow_enable => 1, 2257 fow_enable => 1,
1935 fow_intensity => 0.45, 2258 fow_intensity => 0,
1936 fow_smooth => 0, 2259 fow_smooth => 1,
2260 map_smoothing => 1,
1937 gui_fontsize => 1, 2261 gui_fontsize => 1,
1938 log_fontsize => 0.7, 2262 log_fontsize => 0.7,
1939 gauge_fontsize => 1, 2263 gauge_fontsize => 1,
1940 gauge_size => 0.35, 2264 gauge_size => 0.35,
1941 stat_fontsize => 0.7, 2265 stat_fontsize => 0.7,
1942 mapsize => 100, 2266 mapsize => 100,
1943 say_command => 'say', 2267 say_command => 'chat',
1944 audio_enable => 1, 2268 audio_enable => 1,
1945 bgm_enable => 1, 2269 bgm_enable => 1,
1946 bgm_volume => 0.25, 2270 bgm_volume => 0.25,
1947 face_prefetch => 0, 2271 face_prefetch => 0,
1948 output_sync => 1, 2272 output_sync => 1,
1949 output_count => 1, 2273 output_count => 1,
2274 output_rate => "",
1950 pickup => 0, 2275 pickup => 0,
2276 inv_sort => "mtime",
1951 default => "profile", # default profile 2277 default => "profile", # default profile
2278 show_tips => 1,
2279 logview_max_par => 1000,
1952 ); 2280 );
1953 2281
1954 while (my ($k, $v) = each %DEF_CFG) { 2282 while (my ($k, $v) = each %DEF_CFG) {
1955 $CFG->{$k} = $v unless exists $CFG->{$k}; 2283 $CFG->{$k} = $v unless exists $CFG->{$k};
1956 } 2284 }
1957 2285
1958 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de"; 2286 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
2287 $PROFILE = $CFG->{profile}{default};
2288
2289 # convert old bindings (only default profile matters)
2290 if (my $bindings = delete $PROFILE->{bindings}) {
2291 while (my ($mod, $syms) = each %$bindings) {
2292 while (my ($sym, $cmds) = each %$syms) {
2293 push @{ $PROFILE->{macro} }, {
2294 accelkey => [$mod*1, $sym*1],
2295 action => $cmds,
2296 };
2297 }
2298 }
2299 }
1959 2300
1960 sdl_init; 2301 sdl_init;
1961 2302
1962 @SDL_MODES = reverse 2303 @SDL_MODES = CFPlus::SDL_ListModes 8, 8;
1963 grep $_->[0] >= 640 && $_->[1] >= 480, 2304 @SDL_MODES = CFPlus::SDL_ListModes 5, 0 unless @SDL_MODES;
1964 CFClient::SDL_ListModes;
1965
1966 @SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; 2305 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
1967 2306
1968 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 2307 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1969 2308
1970 { 2309 {
1971 my @fonts = map CFClient::find_rcfile "fonts/$_", qw( 2310 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
1972 DejaVuSans.ttf 2311 DejaVuSans.ttf
1973 DejaVuSansMono.ttf 2312 DejaVuSansMono.ttf
1974 DejaVuSans-Bold.ttf 2313 DejaVuSans-Bold.ttf
1975 DejaVuSansMono-Bold.ttf 2314 DejaVuSansMono-Bold.ttf
1976 DejaVuSans-Oblique.ttf 2315 DejaVuSans-Oblique.ttf
1977 DejaVuSansMono-Oblique.ttf 2316 DejaVuSansMono-Oblique.ttf
1978 DejaVuSans-BoldOblique.ttf 2317 DejaVuSans-BoldOblique.ttf
1979 DejaVuSansMono-BoldOblique.ttf 2318 DejaVuSansMono-BoldOblique.ttf
1980 ); 2319 );
1981 2320
1982 CFClient::add_font $_ for @fonts; 2321 CFPlus::add_font $_ for @fonts;
1983 2322
1984 CFClient::pango_init; 2323 CFPlus::pango_init;
1985 2324
1986 $FONT_PROP = new_from_file CFClient::Font $fonts[0]; 2325 $FONT_PROP = new_from_file CFPlus::Font $fonts[0];
1987 $FONT_FIXED = new_from_file CFClient::Font $fonts[1]; 2326 $FONT_FIXED = new_from_file CFPlus::Font $fonts[1];
1988 2327
1989 $FONT_PROP->make_default; 2328 $FONT_PROP->make_default;
1990 } 2329 }
1991 2330
1992# compare mono (ft) vs. rgba (cairo) 2331# compare mono (ft) vs. rgba (cairo)
1993# ft - 1.8s, cairo 3s, even in alpha-only mode 2332# ft - 1.8s, cairo 3s, even in alpha-only mode
1994# for my $rgba (0..1) { 2333# for my $rgba (0..1) {
1995# my $t1 = Time::HiRes::time; 2334# my $t1 = Time::HiRes::time;
1996# for (1..1000) { 2335# for (1..1000) {
1997# my $layout = CFClient::Layout->new ($rgba); 2336# my $layout = CFPlus::Layout->new ($rgba);
1998# $layout->set_text ("hallo" x 100); 2337# $layout->set_text ("hallo" x 100);
1999# $layout->render; 2338# $layout->render;
2000# } 2339# }
2001# my $t2 = Time::HiRes::time; 2340# my $t2 = Time::HiRes::time;
2002# warn $t2-$t1; 2341# warn $t2-$t1;
2003# } 2342# }
2004 2343
2344 $startup_done->();
2345
2005 video_init; 2346 video_init;
2006 audio_init; 2347 audio_init;
2007} 2348}
2008 2349
2350show_tip_of_the_day if $CFG->{show_tips};
2351
2009Event::loop; 2352Event::loop;
2010#CFClient::SDL_Quit; 2353#CFPlus::SDL_Quit;
2011#CFClient::_exit 0; 2354#CFPlus::_exit 0;
2012 2355
2013END { CFClient::SDL_Quit } 2356END {
2357 CFPlus::SDL_Quit;
2358 CFPlus::DB::Server::stop;
2359}
2014 2360
2015=head1 NAME 2361=head1 NAME
2016 2362
2017cfplus - A Crossfire+ and Crossfire game client 2363cfplus - A Crossfire+ and Crossfire game client
2018 2364

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines