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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines