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.76 by root, Tue Jun 20 08:49:40 2006 UTC vs.
Revision 1.173 by root, Tue Jul 17 17:39:08 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines