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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines