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.79 by root, Fri Jun 23 23:54:31 2006 UTC vs.
Revision 1.175 by root, Tue Jul 17 22:08:57 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines