ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/bin/cfplus
(Generate patch)

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.85 by elmex, Sun Jul 2 19:32:56 2006 UTC vs.
Revision 1.175 by root, Tue Jul 17 22:08:57 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines