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.62 by root, Tue Jun 6 08:35:22 2006 UTC vs.
Revision 1.174 by root, Tue Jul 17 18:34:24 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines