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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines