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

Diff Legend

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