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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines