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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines