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

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines