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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines