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

Diff Legend

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