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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines