ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/bin/cfplus
(Generate patch)

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines