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

Diff Legend

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