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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines