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.44 by elmex, Fri Jun 2 16:32:12 2006 UTC vs.
Revision 1.106 by root, Sun Aug 13 02:43:22 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines