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.59 by root, Mon Jun 5 22:30:35 2006 UTC vs.
Revision 1.137 by root, Sat Dec 9 02:21:25 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines