ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/bin/cfplus
(Generate patch)

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.59 by root, Mon Jun 5 22:30:35 2006 UTC vs.
Revision 1.102 by root, Mon Jul 24 04:24:43 2006 UTC

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

Diff Legend

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