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.77 by elmex, Wed Jun 21 12:59:23 2006 UTC vs.
Revision 1.163 by root, Thu Jul 12 17:56:51 2007 UTC

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

Diff Legend

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