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.58 by root, Mon Jun 5 22:07:43 2006 UTC vs.
Revision 1.91 by root, Tue Jul 11 13:51:38 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::BindingEditor;
41use CFClient::MapWidget; 42use CFClient::MapWidget;
43
44$SIG{QUIT} = sub { Carp::cluck "QUIT" };
45$SIG{PIPE} = 'IGNORE';
42 46
43$Event::DIED = sub { 47$Event::DIED = sub {
44 # TODO: display dialog box or so 48 # TODO: display dialog box or so
45 Carp::confess $_[1];#d#TODO: remove when stable 49 Carp::confess $_[1];#d#TODO: remove when stable
46 CFClient::error $_[1]; 50 CFClient::error $_[1];
82our $CONSOLE; 86our $CONSOLE;
83our $METASERVER; 87our $METASERVER;
84our $LOGIN_BUTTON; 88our $LOGIN_BUTTON;
85our $QUIT_DIALOG; 89our $QUIT_DIALOG;
86our $HOST_ENTRY; 90our $HOST_ENTRY;
91our $PICKUP_ENABLE;
92our $SERVER_INFO;
87 93
88our $SETUP_DIALOG; 94our $SETUP_DIALOG;
89our $SETUP_NOTEBOOK; 95our $SETUP_NOTEBOOK;
90our $SETUP_SERVER; 96our $SETUP_SERVER;
91our $SETUP_KEYBOARD; 97our $SETUP_KEYBOARD;
92our $SETUP_SPELLS;
93 98
99our $PL_NOTEBOOK;
100our $PL_WINDOW;
101
102our $INVENTORY_PAGE;
103our $STATS_PAGE;
104our $SPELL_PAGE;
105
106our $HELP_WINDOW;
107our $MESSAGE_WINDOW;
94our $FLOORBOX; 108our $FLOORBOX;
95our $GAUGES; 109our $GAUGES;
96our $STATWIDS; 110our $STATWIDS;
97 111
98our $SDL_ACTIVE; 112our $SDL_ACTIVE;
104 118
105our $ALT_ENTER_MESSAGE; 119our $ALT_ENTER_MESSAGE;
106our $STATUSBOX; 120our $STATUSBOX;
107our $DEBUG_STATUS; 121our $DEBUG_STATUS;
108 122
109our $INV_WINDOW;
110our $INV; 123our $INV;
111our $INVR; 124our $INVR;
112our $INV_RIGHT_HB; 125our $INV_RIGHT_HB;
113 126
114our $BIND_EDITOR; 127our $BIND_EDITOR;
128our $BIND_UPD_CB;
115 129
116our $PICKUP_CFG; 130our $PICKUP_CFG;
117 131
118sub status { 132sub status {
119 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 133 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
121 135
122sub debug { 136sub debug {
123 $DEBUG_STATUS->set_text ($_[0]); 137 $DEBUG_STATUS->set_text ($_[0]);
124} 138}
125 139
140sub destroy_query_dialog {
141 (delete $_[0]{query_dialog})->destroy
142 if $_[0]{query_dialog};
143}
144
145# server query dialog
146sub server_query {
147 my ($conn, $flags, $prompt) = @_;
148
149 $conn->{query_dialog} = my $dialog = new CFClient::UI::FancyFrame
150 x => "center",
151 y => "center",
152 title => "Server Query",
153 child => my $vbox = new CFClient::UI::VBox,
154 ;
155
156 my @dialog = my $label = new CFClient::UI::Label
157 max_w => $::WIDTH * 0.4,
158 ellipsise => 0,
159 text => $prompt;
160
161 if ($flags & CS_QUERY_YESNO) {
162 push @dialog, my $hbox = new CFClient::UI::HBox;
163
164 $hbox->add (new CFClient::UI::Button
165 text => "No",
166 on_activate => sub {
167 $conn->send ("reply n");
168 $dialog->destroy;
169 0
170 }
171 );
172 $hbox->add (new CFClient::UI::Button
173 text => "Yes",
174 on_activate => sub {
175 $conn->send ("reply y");
176 destroy_query_dialog $conn;
177 0
178 },
179 );
180
181 $dialog->grab_focus;
182
183 } elsif ($flags & CS_QUERY_SINGLECHAR) {
184 $dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)";
185
186 if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
187 $MESSAGE_WINDOW->show;
188
189 unshift @dialog, new CFClient::UI::Label
190 max_w => $::WIDTH * 0.4,
191 ellipsise => 0,
192 markup => "\nOr use your keyboard:\n";
193
194 unshift @dialog, my $table = new CFClient::UI::Table;
195
196 $table->add (0, 0, new CFClient::UI::Button
197 text => "Next Race",
198 on_activate => sub {
199 $conn->send ("reply n");
200 destroy_query_dialog $conn;
201 0
202 },
203 );
204 $table->add (2, 0, new CFClient::UI::Button
205 text => "Accept",
206 on_activate => sub {
207 $conn->send ("reply d");
208 destroy_query_dialog $conn;
209 0
210 },
211 );
212
213 unshift @dialog, new CFClient::UI::Label
214 max_w => $::WIDTH * 0.4,
215 ellipsise => 0,
216 markup =>
217 "<big><b>Character Creation: Race</b></big>\n\n"
218 . "Look at the <b>Messages</b> window to see a description of this race "
219 . "(<small>or hover with your mouse over the bottommost entry in the status area in the lower left area of the screen</small>) "
220 . "and the center of the screen to see how this race looks like "
221 . "(<small>this is below this dialog window, you may need to click on the display area to make it visible</small>).\n\n"
222 . "You can look at another race, or accept this race (you will come back to this race eventually, "
223 . "so you can take your time making this important choice."
224 ;
225
226 } elsif ($prompt =~ /roll new stats/) {
227 if (my $stat = delete $conn->{stat_change_with}) {
228 $conn->send ("reply $stat");
229 destroy_query_dialog $conn;
230 return;
231 }
232
233 $STATS_PAGE->show;
234 $MESSAGE_WINDOW->hide;
235
236 unshift @dialog, new CFClient::UI::Label
237 max_w => $::WIDTH * 0.4,
238 ellipsise => 0,
239 markup => "\nOr use your keyboard:\n";
240
241 unshift @dialog, my $table = new CFClient::UI::Table;
242
243 # left: re-roll
244 $table->add (0, 0, new CFClient::UI::Button
245 text => "Roll Again",
246 on_activate => sub {
247 $conn->send ("reply y");
248 destroy_query_dialog $conn;
249 0
250 },
251 );
252
253 # center: swap stats
254 my ($sw1, $sw2) = map +(new CFClient::UI::Combobox
255 value => $_,
256 options => [
257 [1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"],
258 [2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],
259 [3 => "Con", "Constitution ($conn->{stat}{+CS_STAT_CON})"],
260 [4 => "Int", "Intelligence ($conn->{stat}{+CS_STAT_INT})"],
261 [5 => "Wis", "Wisdom ($conn->{stat}{+CS_STAT_WIS})"],
262 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
263 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
264 ],
265 ), 1 .. 2;
266
267 $table->add (2, 0, new CFClient::UI::Button
268 text => "Swap Stats",
269 on_activate => sub {
270 $conn->{stat_change_with} = $sw2->{value};
271 $conn->send ("reply $sw1->{value}");
272 destroy_query_dialog $conn;
273 0
274 },
275 );
276 $table->add (2, 1, new CFClient::UI::HBox children => [$sw1, $sw2]);
277
278 # right: accept
279 $table->add (4, 0, new CFClient::UI::Button
280 text => "Accept",
281 on_activate => sub {
282 $conn->send ("reply n");
283 $STATS_PAGE->hide;
284 destroy_query_dialog $conn;
285 0
286 },
287 );
288
289 unshift @dialog, new CFClient::UI::Label
290 max_w => $::WIDTH * 0.4,
291 ellipsise => 0,
292 markup =>
293 "<big><b>Character Creation: Stats</b></big>\n\n"
294 . "Look at the <b>Stats</b> window to see your basic stats "
295 . "(first column: 1 strength, 2 dexterity, 3 constitution, 4 intelligence, 5 wisdom, 6 power and 7 charisma).\n\n"
296 . "You can create another set of stats, swap two stat values with each other or accept the stats as they are now and continue. "
297 . "Race selection will influence those values later on."
298 ;
299 }
300
301 push @dialog, my $entry = new CFClient::UI::Entry
302 on_changed => sub {
303 $conn->send ("reply $_[1]");
304 destroy_query_dialog $conn;
305 0
306 },
307 ;
308
309 $entry->grab_focus;
310
311 } else {
312 $dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";
313
314 push @dialog, my $entry = new CFClient::UI::Entry
315 $flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (),
316 on_activate => sub {
317 $conn->send ("reply $_[1]");
318 destroy_query_dialog $conn;
319 0
320 },
321 ;
322
323 $entry->grab_focus;
324 }
325
326 $vbox->add (@dialog);
327 $dialog->show;
328}
329
126sub start_game { 330sub start_game {
127 status "logging in..."; 331 status "logging in...";
128 332
129 $LOGIN_BUTTON->set_text ("Logout"); 333 $LOGIN_BUTTON->set_text ("Logout");
130 $SETUP_DIALOG->hide; 334 $SETUP_DIALOG->hide;
131 335
132 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 336 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
133 337
134 my ($host, $port) = split /:/, $CFG->{host}; 338 my ($host, $port) = split /:/, $CFG->{profile}{default}{host};
135 339
136 $MAP = new CFClient::Map $mapsize, $mapsize; 340 $MAP = new CFClient::Map $mapsize, $mapsize;
137 341
138 $CONN = eval { 342 $CONN = eval {
139 new CFClient::Protocol 343 new CFClient::Protocol
140 host => $host, 344 host => $host,
141 port => $port || 13327, 345 port => $port || 13327,
142 user => $CFG->{user}, 346 user => $CFG->{profile}{default}{user},
143 pass => $CFG->{password}, 347 pass => $CFG->{profile}{default}{password},
144 mapw => $mapsize, 348 mapw => $mapsize,
145 maph => $mapsize, 349 maph => $mapsize,
146 350
147 map_widget => $MAPWIDGET, 351 map_widget => $MAPWIDGET,
148 logview => $LOGVIEW, 352 logview => $LOGVIEW,
149 statusbox => $STATUSBOX, 353 statusbox => $STATUSBOX,
150 map => $MAP, 354 map => $MAP,
151 mapmap => $MAPMAP, 355 mapmap => $MAPMAP,
356 query => \&server_query,
152 357
153 sound_play => sub { 358 sound_play => sub {
154 my ($x, $y, $soundnum, $type) = @_; 359 my ($x, $y, $soundnum, $type) = @_;
155 360
156 $SDL_MIXER 361 $SDL_MIXER
175 380
176sub stop_game { 381sub stop_game {
177 $LOGIN_BUTTON->set_text ("Login"); 382 $LOGIN_BUTTON->set_text ("Login");
178 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 383 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
179 $SETUP_DIALOG->show; 384 $SETUP_DIALOG->show;
180 $INV_WINDOW->hide; 385 $PL_WINDOW->hide;
386 $SPELL_PAGE->clear_spells;
181 387
182 return unless $CONN; 388 return unless $CONN;
183 389
184 status "connection closed"; 390 status "connection closed";
185 391
392 destroy_query_dialog $CONN;
186 $CONN->destroy; 393 $CONN->destroy;
187 $CONN = 0; # false, does not autovivify 394 $CONN = 0; # false, does not autovivify
395
396 undef $MAP;
188} 397}
189 398
190sub graphics_setup { 399sub graphics_setup {
191 my $vbox = new CFClient::UI::VBox; 400 my $vbox = new CFClient::UI::VBox;
192 401
210 419
211 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen"); 420 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen");
212 $table->add (1, $row++, new CFClient::UI::CheckBox 421 $table->add (1, $row++, new CFClient::UI::CheckBox
213 state => $CFG->{fullscreen}, 422 state => $CFG->{fullscreen},
214 tooltip => "Bring the client into fullscreen mode.", 423 tooltip => "Bring the client into fullscreen mode.",
215 on_changed => sub { 424 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
216 my ($self, $value) = @_;
217 $CFG->{fullscreen} = $value;
218 }
219 ); 425 );
220 426
221 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 427 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
222 $table->add (1, $row++, new CFClient::UI::CheckBox 428 $table->add (1, $row++, new CFClient::UI::CheckBox
223 state => $CFG->{fast}, 429 state => $CFG->{fast},
224 tooltip => "Lower the visual quality considerably to speed up rendering.", 430 tooltip => "Lower the visual quality considerably to speed up rendering.",
225 on_changed => sub { 431 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
226 my ($self, $value) = @_;
227 $CFG->{fast} = $value;
228 }
229 ); 432 );
230 433
231 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale"); 434 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale");
232 $table->add (1, $row++, new CFClient::UI::Slider 435 $table->add (1, $row++, new CFClient::UI::Slider
233 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 436 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
234 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 437 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
235 on_changed => sub { 438 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
236 my ($self, $value) = @_;
237 $CFG->{map_scale} = 2 ** $value;
238 }
239 ); 439 );
240 440
241 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War"); 441 $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 442 $table->add (1, $row++, new CFClient::UI::CheckBox
243 state => $CFG->{fow_enable}, 443 state => $CFG->{fow_enable},
244 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 444 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
245 on_changed => sub { 445 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
246 my ($self, $value) = @_;
247 $CFG->{fow_enable} = $value;
248 }
249 ); 446 );
250 447
251 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 448 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity");
252 $table->add (1, $row++, new CFClient::UI::Slider 449 $table->add (1, $row++, new CFClient::UI::Slider
253 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 450 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.", 451 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 { 452 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
256 my ($self, $value) = @_;
257 $CFG->{fow_intensity} = $value;
258 }
259 ); 453 );
260 454
261 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth"); 455 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth");
262 $table->add (1, $row++, new CFClient::UI::CheckBox 456 $table->add (1, $row++, new CFClient::UI::CheckBox
263 state => $CFG->{fow_smooth}, 457 state => $CFG->{fow_smooth},
264 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.", 458 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
265 on_changed => sub { 459 on_changed => sub {
266 my ($self, $value) = @_; 460 my ($self, $value) = @_;
267 $CFG->{fow_smooth} = $value; 461 $CFG->{fow_smooth} = $value;
268 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::OpenGL::GL_VERSION < 1.2; 462 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::OpenGL::GL_VERSION < 1.2;
463 0
269 } 464 }
270 ); 465 );
271 466
272 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); 467 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
273 $table->add (1, $row++, new CFClient::UI::Slider 468 $table->add (1, $row++, new CFClient::UI::Slider
274 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 469 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.", 470 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] }, 471 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
277 ); 472 );
278 473
279 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 474 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Message Fontsize");
280 $table->add (1, $row++, new CFClient::UI::Slider 475 $table->add (1, $row++, new CFClient::UI::Slider
281 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 476 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.", 477 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]) }, 478 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 ); 479 );
296 480
297 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 481 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
298 $table->add (1, $row++, new CFClient::UI::Slider 482 $table->add (1, $row++, new CFClient::UI::Slider
299 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 483 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.", 484 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
301 on_changed => sub { 485 on_changed => sub {
302 $CFG->{gauge_fontsize} = $_[1]; 486 $CFG->{gauge_fontsize} = $_[1];
303 &set_gauge_window_fontsize; 487 &set_gauge_window_fontsize;
488 0
304 } 489 }
305 ); 490 );
306 491
307 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size"); 492 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size");
308 $table->add (1, $row++, new CFClient::UI::Slider 493 $table->add (1, $row++, new CFClient::UI::Slider
309 range => [$CFG->{gauge_size}, 0.2, 0.8], 494 range => [$CFG->{gauge_size}, 0.2, 0.8],
310 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 495 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
311 on_changed => sub { 496 on_changed => sub {
312 $CFG->{gauge_size} = $_[1]; 497 $CFG->{gauge_size} = $_[1];
313 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 498 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
499 0
314 } 500 }
315 ); 501 );
316 502
317 $table->add (1, $row++, new CFClient::UI::Button 503 $table->add (1, $row++, new CFClient::UI::Button
318 expand => 1, align => 0, text => "Apply", 504 expand => 1, align => 0, text => "Apply",
319 tooltip => "Apply the video settings", 505 tooltip => "Apply the video settings",
320 on_activate => sub { 506 on_activate => sub {
321 video_shutdown (); 507 video_shutdown ();
322 video_init (); 508 video_init ();
509 0
323 } 510 }
324 ); 511 );
325 512
326 $vbox 513 $vbox
327} 514}
335 522
336 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable"); 523 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");
337 $table->add (1, $row++, new CFClient::UI::CheckBox 524 $table->add (1, $row++, new CFClient::UI::CheckBox
338 state => $CFG->{audio_enable}, 525 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.", 526 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 { 527 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
341 $CFG->{audio_enable} = $_[1];
342 }
343 ); 528 );
344# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume"); 529# $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 { 530# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
346# $CFG->{effects_volume} = $_[1]; 531# $CFG->{effects_volume} = $_[1];
347# }); 532# });
348 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music"); 533 $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); 534 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox);
350 $hbox->add (new CFClient::UI::CheckBox 535 $hbox->add (new CFClient::UI::CheckBox
351 expand => 1, state => $CFG->{bgm_enable}, 536 expand => 1, state => $CFG->{bgm_enable},
352 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 537 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
353 on_changed => sub { 538 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
354 $CFG->{bgm_enable} = $_[1];
355 }
356 ); 539 );
357 $hbox->add (new CFClient::UI::Slider 540 $hbox->add (new CFClient::UI::Slider
358 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 541 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
359 tooltip => "The volume of the background music. Changes are instant.", 542 tooltip => "The volume of the background music. Changes are instant.",
360 on_changed => sub { 543 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 ); 544 );
365 545
366 $table->add (1, $row++, new CFClient::UI::Button 546 $table->add (1, $row++, new CFClient::UI::Button
367 expand => 1, align => 0, text => "Apply", 547 expand => 1, align => 0, text => "Apply",
368 tooltip => "Apply the audio settings", 548 tooltip => "Apply the audio settings",
369 on_activate => sub { 549 on_activate => sub {
370 audio_shutdown (); 550 audio_shutdown ();
371 audio_init (); 551 audio_init ();
552 0
372 } 553 }
373 ); 554 );
374 555
375 $vbox 556 $vbox
376}
377
378sub set_stats_window_fontsize {
379 for (values %{$STATWIDS}) {
380 $_->set_fontsize ($::CFG->{stat_fontsize});
381 }
382} 557}
383 558
384sub set_gauge_window_fontsize { 559sub set_gauge_window_fontsize {
385 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) { 560 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) {
386 $_->set_fontsize ($::CFG->{gauge_fontsize}); 561 $_->set_fontsize ($::CFG->{gauge_fontsize});
438 &set_gauge_window_fontsize; 613 &set_gauge_window_fontsize;
439 614
440 $win 615 $win
441} 616}
442 617
618sub debug_setup {
619 my $table = new CFClient::UI::Table;
443 620
621 $table->add (0, 0, new CFClient::UI::Label text => "Widget Borders");
622 $table->add (1, 0, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });
623 $table->add (0, 1, new CFClient::UI::Label text => "Tooltip Widget Info");
624 $table->add (1, 1, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
625 $table->add (0, 2, new CFClient::UI::Label text => "Show FPS");
626 $table->add (1, 2, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
627 $table->add (0, 3, new CFClient::UI::Label text => "Suppress Tooltips");
628 $table->add (1, 3, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
629
630 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
631
632 for my $x (0..2) {
633 for my $y (0 .. 2) {
634 $table->add ($x + 3, $y,
635 new CFClient::UI::Entry
636 text => $default_smooth[$x * 3 + $y],
637 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
638 );
639 }
640 }
641
642
643 $table
644}
645
444sub make_stats_window { 646sub stats_window {
445 my $tgw = new CFClient::UI::FancyFrame 647 my $vb = new CFClient::UI::VBox;
446 y => $HEIGHT * (2/8),
447 x => "max",
448 title => "Stats",
449 name => "stats_window";
450 648
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, 649 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
453 can_hover => 1, can_events => 1, 650 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."); 651 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, 652 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
456 can_hover => 1, can_events => 1, 653 can_hover => 1, can_events => 1,
480 [0, 6, st_cha => "Cha", 30, "<b>Charisma</b>, how well you are received by NPCs. Affects buying and selling prices in shops."], 677 [0, 6, st_cha => "Cha", 30, "<b>Charisma</b>, how well you are received by NPCs. Affects buying and selling prices in shops."],
481 678
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."], 679 [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."],
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."], 680 [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."],
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."], 681 [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."],
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."], 682 [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. This is the same as the physical resistance."],
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."], 683 [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."],
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."], 684 [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."],
488 ) { 685 ) {
489 my ($col, $row, $id, $label, $template, $tooltip) = @$_; 686 my ($col, $row, $id, $label, $template, $tooltip) = @$_;
490 687
509 drain => "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)", 706 drain => "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)",
510 acid => "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)", 707 acid => "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)",
511 pois => "<b>Poison</b> (resistance to getting poisoned)", 708 pois => "<b>Poison</b> (resistance to getting poisoned)",
512 para => "<b>Paralysation</b> (this resistance affects the chance you get paralysed)", 709 para => "<b>Paralysation</b> (this resistance affects the chance you get paralysed)",
513 deat => "<b>Death</b> (resistance against death spells)", 710 deat => "<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)", 711 phys => "<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.)",
515 blind => "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)", 712 blind => "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)",
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)", 713 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)",
517 tund => "<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead...", 714 tund => "<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead...",
518 elec => "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)", 715 elec => "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)",
519 cold => "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)", 716 cold => "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)",
536 ); 733 );
537 $tbl2->add ($col + 1, $row, new CFClient::UI::Image 734 $tbl2->add ($col + 1, $row, new CFClient::UI::Image
538 font => $FONT_FIXED, 735 font => $FONT_FIXED,
539 can_hover => 1, 736 can_hover => 1,
540 can_events => 1, 737 can_events => 1,
541 image => "ui/resist/resist_$_.png", 738 path => "ui/resist/resist_$_.png",
542 tooltip => $resist_names{$_}, 739 tooltip => $resist_names{$_},
543 ); 740 );
544 741
545 $row++; 742 $row++;
546 if ($row % 6 == 0) { 743 if ($row % 6 == 0) {
547 $col += 2; 744 $col += 2;
548 $row = 0; 745 $row = 0;
549 } 746 }
550 } 747 }
551 748
552 &set_stats_window_fontsize; 749 $vb->add (my $tbl3 = new CFClient::UI::Table expand => 1);
750 $STATWIDS->{"_skill_tbl"} = $tbl3;
751
553 update_stats_window ({}); 752 update_stats_window ({});
554 753
555 $tgw 754 $vb
556} 755}
557 756
558sub formsep($) { 757sub formsep($) {
559 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1 758 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
560} 759}
594 $STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW}); 793 $STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
595 $STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA}); 794 $STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
596 $STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC}); 795 $STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
597 $STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC}); 796 $STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
598 $STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM}); 797 $STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
599 $STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_ARMOUR}); 798 $STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_RES_PHYS});
600 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED}); 799 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
601 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP}); 800 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
602 801
603 $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000); 802 $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000);
604 803
605 # TODO: replace by CS_STAT_RES_xxx constants
606 my %tbl = ( 804 my %tbl = (
607 phys => 100, 805 phys => CS_STAT_RES_PHYS,
608 magic => 101, 806 magic => CS_STAT_RES_MAG,
609 fire => 102, 807 fire => CS_STAT_RES_FIRE,
610 elec => 103, 808 elec => CS_STAT_RES_ELEC,
611 cold => 104, 809 cold => CS_STAT_RES_COLD,
612 conf => 105, 810 conf => CS_STAT_RES_CONF,
613 acid => 106, 811 acid => CS_STAT_RES_ACID,
614 drain => 107, 812 drain => CS_STAT_RES_DRAIN,
615 ghit => 108, 813 ghit => CS_STAT_RES_GHOSTHIT,
616 pois => 109, 814 pois => CS_STAT_RES_POISON,
617 slow => 110, 815 slow => CS_STAT_RES_SLOW,
618 para => 111, 816 para => CS_STAT_RES_PARA,
619 tund => 112, 817 tund => CS_STAT_TURN_UNDEAD,
620 fear => 113, 818 fear => CS_STAT_RES_FEAR,
621 depl => 113, 819 depl => CS_STAT_RES_DEPLETE,
622 deat => 115, 820 deat => CS_STAT_RES_DEATH,
623 holyw => 116, 821 holyw => CS_STAT_RES_HOLYWORD,
624 blind => 117, 822 blind => CS_STAT_RES_BLIND,
625 ); 823 );
824
825 if ($::CONN && !$STATWIDS->{_skill_tbl_init}) {
826 my $sktbl = $STATWIDS->{_skill_tbl};
827 $sktbl->clear;
828
829 $sktbl->add (0, 0, new CFClient::UI::Label text => "Exp.", align => 1);
830 $sktbl->add (1, 0, new CFClient::UI::Label text => "Level", align => 1);
831 $sktbl->add (2, 0, new CFClient::UI::Label text => "Skillname");
832
833 my @skills;
834
835 for (my $i = CS_STAT_SKILLINFO; $i < CS_STAT_SKILLINFO+CS_NUM_SKILLS; $i++) {
836 push @skills, [$i, $::CONN->{skill_info}{$i}];
837 }
838
839 my $y = 1;
840 for (sort { $a->[1] cmp $b->[1] } @skills) {
841 my ($idx, $name) = @$_;
842
843 unless (defined $STATWIDS->{"sk_xp_$idx"} || !$::CONN->{skill_info}{$idx}) {
844 $sktbl->add (0, $y, $STATWIDS->{"sk_xp_$idx"} = new CFClient::UI::Label text => "0", align => 1);
845 $sktbl->add (1, $y, $STATWIDS->{"sk_lvl_$idx"} = new CFClient::UI::Label text => "0", align => 1);
846 $sktbl->add (2, $y++, new CFClient::UI::Label text => $name);
847 }
848 }
849
850 $STATWIDS->{_skill_tbl_init} = 1;
851 }
852
853 for (my $i = CS_STAT_SKILLINFO; $i < CS_STAT_SKILLINFO+CS_NUM_SKILLS; $i++) {
854 if (exists $stats->{$i}) {
855 $STATWIDS->{"sk_xp_$i"}->set_text (formsep $stats->{$i}->[1])
856 if $STATWIDS->{"sk_xp_$i"};
857 $STATWIDS->{"sk_lvl_$i"}->set_text (sprintf "%d", $stats->{$i}->[0])
858 if $STATWIDS->{"sk_lvl_$i"};
859 }
860 }
626 861
627 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}}) 862 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
628 for keys %tbl; 863 for keys %tbl;
629} 864}
630 865
631my $METASERVER_ATIME; 866my $METASERVER_ATIME;
632 867
633sub update_metaserver { 868sub update_metaserver {
869 my ($metaserver_dialog) = @_;
870
871 $METASERVER = $metaserver_dialog
872 if defined $metaserver_dialog;
873
634 return if $METASERVER_ATIME > time; 874 return if $METASERVER_ATIME > time;
635 $METASERVER_ATIME = time + 60; 875 $METASERVER_ATIME = time + 60;
636 876
637 my $table = $METASERVER->{table}; 877 my $table = $METASERVER->{table};
638 $table->clear; 878 $table->clear;
659 899
660 utf8::decode $buf if utf8::valid $buf; 900 utf8::decode $buf if utf8::valid $buf;
661 901
662 $table->clear; 902 $table->clear;
663 903
904 my @tip = (
905 "The current number of users logged in on the server.",
906 "The hostname of the server.",
907 "The time this server has been running without being restarted.",
908 "The server software version - a '+' indicates a Crossfire+ server.",
909 "Short information about this server provided by its admins.",
910 );
664 my @col = qw(Use #Users Host Uptime Version Description); 911 my @col = qw(#Users Host Uptime Version Description);
665 $table->add ($_, 0, new CFClient::UI::Label align => 0, fg => [1, 1, 0], text => $col[$_]) 912 $table->add ($_, 0, new CFClient::UI::Label
913 can_hover => 1, can_events => 1,
914 align => 0, fg => [1, 1, 0],
915 text => $col[$_], tooltip => $tip[$_])
666 for 0 .. $#col; 916 for 0 .. $#col;
667 917
668 my @align = qw(1 0 1 1 -1); 918 my @align = qw(1 0 1 1 -1);
669 919
670 my $y = 0; 920 my $y = 0;
671 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) { 921 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) {
688 938
689 $m = [$users, $host, $uptime, $version, $desc]; 939 $m = [$users, $host, $uptime, $version, $desc];
690 940
691 $y++; 941 $y++;
692 942
693 $table->add (0, $y, new CFClient::UI::VBox children => [ 943 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [
694 (new CFClient::UI::Button text => "Use", on_activate => sub { 944 (new CFClient::UI::Button
945 text => "Use",
946 tooltip => "Put this server into the <b>Host:Port</b> field",
947 on_activate => sub {
695 $HOST_ENTRY->set_text ($CFG->{host} = $host); 948 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
696 $METASERVER->toggle_visibility; 949 $METASERVER->hide;
950 0
951 },
697 }), 952 ),
698 (new CFClient::UI::Empty expand => 1), 953 (new CFClient::UI::Empty expand => 1),
699 ]); 954 ]);
700 955
701 $table->add ($_ + 1, $y, new CFClient::UI::Label 956 $table->add ($_, $y, new CFClient::UI::Label
702 ellipsise => 0, align => $align[$_], text => $m->[$_], fontsize => 0.8) 957 ellipsise => 0,
958 align => $align[$_],
959 text => $m->[$_],
960 tooltip => $tip[$_],
961 can_hover => 1,
962 can_events => 1,
963 fontsize => 0.8)
703 for 0 .. $#$m; 964 for 0 .. $#$m;
704 } 965 }
705 } 966 }
706 }); 967 });
707} 968}
708 969
709sub metaserver_dialog { 970sub metaserver_dialog {
971 my $vbox = new CFClient::UI::VBox;
972 my $table = new CFClient::UI::Table;
973 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $table);
974
710 my $dialog = new CFClient::UI::FancyFrame 975 my $dialog = new CFClient::UI::FancyFrame
711 title => "Server List", 976 title => "Server List",
712 name => 'metaserver_dialog', 977 name => 'metaserver_dialog',
713 x => 'center', 978 x => 'center',
714 y => 'center', 979 y => 'center',
715 z => 3, 980 z => 3,
716 child => (my $vbox = new CFClient::UI::VBox), 981 force_h => $::HEIGHT * 0.4,
982 child => $vbox,
983 has_close_button => 1,
984 table => $table,
717 on_visibility_change => sub { 985 on_visibility_change => sub {
718 update_metaserver if $_[1]; 986 update_metaserver ($_[0]) if $_[1];
987 0
719 }, 988 },
720 ; 989 ;
721
722 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
723 990
724 $dialog 991 $dialog
725} 992}
726 993
727sub server_setup { 994sub server_setup {
734 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 1001 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
735 1002
736 $vbox->add ( 1003 $vbox->add (
737 $HOST_ENTRY = new CFClient::UI::Entry 1004 $HOST_ENTRY = new CFClient::UI::Entry
738 expand => 1, 1005 expand => 1,
739 text => $CFG->{host}, 1006 text => $CFG->{profile}{default}{host},
740 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 1007 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
741 on_changed => sub { 1008 on_changed => sub {
742 my ($self, $value) = @_; 1009 my ($self, $value) = @_;
743 $CFG->{host} = $value; 1010 $CFG->{profile}{default}{host} = $value;
1011 0
744 } 1012 }
745 ); 1013 );
746
747 $METASERVER = metaserver_dialog;
748 1014
749 $vbox->add (new CFClient::UI::Button 1015 $vbox->add (new CFClient::UI::Button
750 expand => 1, 1016 expand => 1,
751 text => "Server List", 1017 text => "Server List",
752 other => $METASERVER, 1018 other => $METASERVER,
753 tooltip => "Show a list of available crossfire servers", 1019 tooltip => "Show a list of available crossfire servers",
754 on_activate => sub { $METASERVER->toggle_visibility }, 1020 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1021 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
755 ); 1022 );
756 } 1023 }
757 1024
758 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username"); 1025 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
759 $table->add (1, 4, new CFClient::UI::Entry 1026 $table->add (1, 4, new CFClient::UI::Entry
760 text => $CFG->{user}, 1027 text => $CFG->{profile}{default}{user},
761 tooltip => "The name of your character on the server", 1028 tooltip => "The name of your character on the server",
762 on_changed => sub { 1029 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
763 my ($self, $value) = @_;
764 $CFG->{user} = $value;
765 }
766 ); 1030 );
767 1031
768 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password"); 1032 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password");
769 $table->add (1, 5, new CFClient::UI::Entry 1033 $table->add (1, 5, new CFClient::UI::Entry
770 text => $CFG->{password}, 1034 text => $CFG->{profile}{default}{password},
771 hidden => 1, 1035 hidden => 1,
772 tooltip => "The password for your character", 1036 tooltip => "The password for your character",
773 on_changed => sub { 1037 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
774 my ($self, $value) = @_;
775 $CFG->{password} = $value;
776 }
777 ); 1038 );
778 1039
779 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size"); 1040 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
780 $table->add (1, 7, new CFClient::UI::Slider 1041 $table->add (1, 7, new CFClient::UI::Slider
781 force_w => 100, 1042 force_w => 100,
782 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1043 range => [$CFG->{mapsize}, 10, 100, 0, 1],
783 tooltip => "This is the size of the portion of the map update the server sends you. " 1044 tooltip => "This is the size of the portion of the map update the server sends you. "
784 . "If you set this to a high value you will be able to see further, " 1045 . "If you set this to a high value you will be able to see further, "
785 . "but you also increase bandwidth requirements and latency. " 1046 . "but you also increase bandwidth requirements and latency. "
786 . "This option is only used once at log-in.", 1047 . "This option is only used once at log-in.",
787 on_changed => sub { 1048 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },
788 my ($self, $value) = @_;
789
790 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
791 },
792 ); 1049 );
793 1050
794 $table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Face Prefetch"); 1051 $table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Face Prefetch");
795 $table->add (1, 8, new CFClient::UI::CheckBox 1052 $table->add (1, 8, new CFClient::UI::CheckBox
796 state => $CFG->{face_prefetch}, 1053 state => $CFG->{face_prefetch},
799 . "This might increase or create lag, but increases the chances " 1056 . "This might increase or create lag, but increases the chances "
800 . "of faces being ready for display when you encounter them. " 1057 . "of faces being ready for display when you encounter them. "
801 . "It also uses up server bandwidth on every connect, " 1058 . "It also uses up server bandwidth on every connect, "
802 . "so only set it if you really need to prefetch images. " 1059 . "so only set it if you really need to prefetch images. "
803 . "This option can be set and unset any time.", 1060 . "This option can be set and unset any time.",
804 on_changed => sub { $CFG->{face_prefetch} = $_[1] }, 1061 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
805 ); 1062 );
806 1063
807 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count"); 1064 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count");
808 $table->add (1, 9, new CFClient::UI::Entry 1065 $table->add (1, 9, new CFClient::UI::Entry
809 text => $CFG->{output_count}, 1066 text => $CFG->{output_count},
810 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1067 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
811 on_changed => sub { $CFG->{output_count} = $_[1] }, 1068 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
812 ); 1069 );
813 1070
814 $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1071 $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync");
815 $table->add (1, 10, new CFClient::UI::Entry 1072 $table->add (1, 10, new CFClient::UI::Entry
816 text => $CFG->{output_sync}, 1073 text => $CFG->{output_sync},
817 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1074 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
818 on_changed => sub { $CFG->{output_sync} = $_[1] }, 1075 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
819 ); 1076 );
820 1077
821 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button 1078 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button
822 expand => 1, 1079 expand => 1,
823 align => 0, 1080 align => 0,
824 text => "Login", 1081 text => "Login",
825 on_activate => sub { 1082 on_activate => sub {
826 $CONN ? stop_game 1083 $CONN ? stop_game
827 : start_game; 1084 : start_game;
1085 0
828 }, 1086 },
829 ); 1087 );
830 1088
831 $table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command"); 1089 $table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command");
832 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry 1090 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry
835 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. " 1093 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
836 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.", 1094 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
837 on_changed => sub { 1095 on_changed => sub {
838 my ($self, $value) = @_; 1096 my ($self, $value) = @_;
839 $CFG->{say_command} = $value; 1097 $CFG->{say_command} = $value;
1098 0
840 } 1099 }
841 ); 1100 );
1101
1102 $vbox->add (new CFClient::UI::Label
1103 text => "Server Info",
1104 fontsize => 1.2,
1105 padding_y => 8,
1106 fg => [1, 1, 0, 1],
1107 );
1108
1109 $vbox->add ($SERVER_INFO = new CFClient::UI::Label ellipsise => 0);
842 1110
843 $vbox 1111 $vbox
844} 1112}
845 1113
846sub message_window { 1114sub message_window {
849 title => "Messages", 1117 title => "Messages",
850 border_bg => [1, 1, 1, 1], 1118 border_bg => [1, 1, 1, 1],
851 bg => [0, 0, 0, 0.75], 1119 bg => [0, 0, 0, 0.75],
852 x => "max", 1120 x => "max",
853 y => 0, 1121 y => 0,
854 force_w => $::WIDTH / 3, 1122 force_w => $::WIDTH * 0.4,
855 force_h => $::HEIGHT / 5, 1123 force_h => $::HEIGHT * 0.5,
856 child => (my $vbox = new CFClient::UI::VBox); 1124 child => (my $vbox = new CFClient::UI::VBox),
1125 has_close_button => 1;
857 1126
858 $vbox->add ($LOGVIEW); 1127 $vbox->add ($LOGVIEW);
859 1128
860 $vbox->add (my $input = new CFClient::UI::Entry 1129 $vbox->add (my $input = new CFClient::UI::Entry
861 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> " 1130 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
869 1138
870 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) { 1139 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
871 $input->{refocus_map} = 1; 1140 $input->{refocus_map} = 1;
872 } 1141 }
873 delete $input->{auto_activated}; 1142 delete $input->{auto_activated};
1143
1144 0
874 }, 1145 },
875 on_activate => sub { 1146 on_activate => sub {
876 my ($input, $text) = @_; 1147 my ($input, $text) = @_;
877 $input->set_text (''); 1148 $input->set_text ('');
878 1149
884 } 1155 }
885 if ($input->{refocus_map}) { 1156 if ($input->{refocus_map}) {
886 delete $input->{refocus_map}; 1157 delete $input->{refocus_map};
887 $MAPWIDGET->focus_in 1158 $MAPWIDGET->focus_in
888 } 1159 }
1160
1161 0
889 }, 1162 },
890 on_escape => sub { 1163 on_escape => sub {
891 $MAPWIDGET->focus_in 1164 $MAPWIDGET->grab_focus;
1165
1166 0
892 }, 1167 },
893 ); 1168 );
894 1169
895 $CONSOLE = { 1170 $CONSOLE = {
896 window => $window, 1171 window => $window,
918 ); 1193 );
919 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 1194 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
920 $hb->add (new CFClient::UI::Button 1195 $hb->add (new CFClient::UI::Button
921 text => "Ok", 1196 text => "Ok",
922 expand => 1, 1197 expand => 1,
923 on_activate => sub { $QUIT_DIALOG->hide }, 1198 on_activate => sub { $QUIT_DIALOG->hide; 0 },
924 ); 1199 );
925 $hb->add (new CFClient::UI::Button 1200 $hb->add (new CFClient::UI::Button
926 text => "Quit anyway", 1201 text => "Quit anyway",
927 expand => 1, 1202 expand => 1,
928 on_activate => sub { exit }, 1203 on_activate => sub { exit },
935sub autopickup_setup { 1210sub autopickup_setup {
936 my $table = new CFClient::UI::Table; 1211 my $table = new CFClient::UI::Table;
937 1212
938 for ( 1213 for (
939 ["General", 0, 0, 1214 ["General", 0, 0,
940 ["Enable autopickup" => PICKUP_NEWMODE], 1215 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
941 ["Inhibit autopickup" => PICKUP_INHIBIT], 1216 ["Inhibit autopickup" => PICKUP_INHIBIT],
942 ["Stop before pickup" => PICKUP_STOP], 1217 ["Stop before pickup" => PICKUP_STOP],
943 ["Debug autopickup" => PICKUP_DEBUG], 1218 ["Debug autopickup" => PICKUP_DEBUG],
944 ], 1219 ],
945 ["Weapons", 0, 6, 1220 ["Weapons", 0, 6,
971 ["Potions" => PICKUP_POTION], 1246 ["Potions" => PICKUP_POTION],
972 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1247 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
973 ["Ignore cursed" => PICKUP_NOT_CURSED], 1248 ["Ignore cursed" => PICKUP_NOT_CURSED],
974 ["Jewelery" => PICKUP_JEWELS], 1249 ["Jewelery" => PICKUP_JEWELS],
975 ], 1250 ],
1251 ["Weight/Value ratio", 2, 17]
976 ) 1252 )
977 { 1253 {
978 my ($title, $x, $y, @bits) = @$_; 1254 my ($title, $x, $y, @bits) = @$_;
979 $table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1255 $table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
980 1256
981 for (@bits) { 1257 for (@bits) {
982 ++$y; 1258 ++$y;
983 1259
984 my $mask = $_->[1]; 1260 my $mask = $_->[1];
985 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1); 1261 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);
986 $table->add ($x+1, $y, new CFClient::UI::CheckBox 1262 $table->add ($x+1, $y, my $checkbox = new CFClient::UI::CheckBox
987 state => $CFG->{pickup} & $mask, 1263 state => $::CFG->{pickup} & $mask,
988 on_changed => sub { 1264 on_changed => sub {
989 my ($box, $value) = @_; 1265 my ($box, $value) = @_;
1266
990 if ($value) { 1267 if ($value) {
991 $::CFG->{pickup} |= $mask; 1268 $::CFG->{pickup} |= $mask;
992 } else { 1269 } else {
993 $::CFG->{pickup} = $::CFG->{pickup} & ~$mask; 1270 $::CFG->{pickup} &= ~$mask;
994 } 1271 }
1272
995 $::CONN->send (sprintf "command pickup %u", $::CFG->{pickup}) 1273 $::CONN->send_command ("pickup $::CFG->{pickup}")
996 if defined $::CONN; 1274 if defined $::CONN;
1275
1276 0
997 }); 1277 });
1278
1279 ${$_->[2]} = $checkbox if $_->[2];
998 } 1280 }
999 } 1281 }
1000 1282
1283 $table->add (2, 18, new CFClient::UI::ValSlider
1284 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1285 template => ">= 99",
1286 to_value => sub { ">= " . 5 * $_[0] },
1287 on_changed => sub {
1288 my ($slider, $value) = @_;
1289
1290 $::CFG->{pickup} &= ~0xF;
1291 $::CFG->{pickup} |= int $value
1292 if $value;
1293 1;
1294 });
1295
1296 $table->add (3, 18, new CFClient::UI::Button
1297 text => "set",
1298 on_activate => sub {
1299 $::CONN->send_command ("pickup $::CFG->{pickup}")
1300 if defined $::CONN;
1301 0
1302 });
1303
1001 $table 1304 $table
1002} 1305}
1003 1306
1004sub make_inventory_window { 1307sub inventory_widget {
1308 my $hb = new CFClient::UI::HBox homogeneous => 1;
1309
1310 $hb->add (my $vb1 = new CFClient::UI::VBox);
1311 $vb1->add (new CFClient::UI::Label align => 0, text => "Player");
1312 $vb1->add ($INV = new CFClient::UI::Inventory);
1313
1314 $hb->add (my $vb2 = new CFClient::UI::VBox);
1315
1316 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
1317
1318 $vb2->add ($INVR = new CFClient::UI::Inventory);
1319
1320 # XXX: Call after $INVR = ... because set_opencont sets the items
1321 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1322
1323 $hb
1324}
1325
1326sub toggle_player_page {
1327 my ($widget) = @_;
1328
1329 if ($PL_WINDOW->{visible} && $PL_NOTEBOOK->get_current_page == $widget) {
1330 $PL_WINDOW->hide;
1331 } else {
1332 $PL_NOTEBOOK->set_current_page ($widget);
1333 $PL_WINDOW->show;
1334 }
1335}
1336
1337sub player_window {
1005 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame 1338 my $plwin = $PL_WINDOW = new CFClient::UI::FancyFrame
1006 x => "center", 1339 x => "center",
1007 y => "center", 1340 y => "center",
1008 force_w => $WIDTH * 9/10, 1341 force_w => $WIDTH * 9/10,
1009 force_h => $HEIGHT * 9/10, 1342 force_h => $HEIGHT * 9/10,
1010 title => "Inventory", 1343 title => "Player",
1344 name => "playerbook",
1345 has_close_button => 1
1011 ; 1346 ;
1012 1347
1013 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1); 1348 my $ntb =
1349 $PL_NOTEBOOK =
1350 new CFClient::UI::Notebook
1351 expand => 1,
1352 debug => 1,
1353 filter => (new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1),
1354 ;
1014 1355
1015 $hb->add (my $vb1 = new CFClient::UI::VBox); 1356 $ntb->add (
1016 $vb1->add (new CFClient::UI::Label align => 0, text => "Player"); 1357 "Stats &amp; Skills" => $STATS_PAGE = stats_window,
1017 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1); 1358 "Shows statistics and skill window, where all your Stats, Resistances and Skills are shown."
1359 );
1360 $ntb->add (
1361 Spellbook => $SPELL_PAGE = new CFClient::UI::SpellList,
1362 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1363 );
1364 $ntb->add (
1365 Inventory => $INVENTORY_PAGE = inventory_widget,
1366 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1367 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1368 );
1018 1369
1019 $hb->add (my $vb2 = new CFClient::UI::VBox); 1370 $ntb->set_current_page ($INVENTORY_PAGE);
1020 1371
1021 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox); 1372 $plwin->add ($ntb);
1022 1373 $plwin
1023 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
1024
1025 # XXX: Call after $INVR = ... because set_opencont sets the items
1026 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1027
1028 $invwin
1029} 1374}
1030 1375
1031sub spell_setup { 1376sub update_bindings {
1032 new CFClient::UI::SpellList 1377 $BIND_UPD_CB->() if $BIND_UPD_CB;
1033} 1378}
1034 1379
1035sub keyboard_setup { 1380sub keyboard_setup {
1036 my $binding_list = new CFClient::UI::VBox; 1381 my $binding_list = new CFClient::UI::VBox;
1037 1382
1038 my $refresh; 1383 my $refresh;
1039 $refresh = sub { 1384 $refresh = $BIND_UPD_CB = sub {
1040 $binding_list->clear (); 1385 $binding_list->clear ();
1041 1386
1042 for my $mod (keys %{$::CFG->{bindings}}) { 1387 for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) {
1043 for my $sym (keys %{$::CFG->{bindings}->{$mod}}) { 1388 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
1044 my $cmds = $::CFG->{bindings}->{$mod}->{$sym}; 1389 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1045 next unless ref $cmds eq 'ARRAY' and @$cmds > 0; 1390 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1046 1391
1047 my $lbl = join "; ", @$cmds; 1392 my $lbl = join "; ", @$cmds;
1048 my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym); 1393 my $nam = CFClient::BindingEditor::keycombo_to_name ($mod, $sym);
1049 $binding_list->add (my $hb = new CFClient::UI::HBox); 1394 $binding_list->add (my $hb = new CFClient::UI::HBox);
1050 $hb->add (new CFClient::UI::Button 1395 $hb->add (new CFClient::UI::Button
1051 text => "delete", 1396 text => "delete",
1052 tooltip => "Deletes the binding", 1397 tooltip => "Deletes the binding",
1053 on_activate => sub { 1398 on_activate => sub {
1054 $binding_list->remove ($hb); 1399 $binding_list->remove ($hb);
1055 delete $::CFG->{bindings}->{$mod}->{$sym}; 1400 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1401 0
1056 }); 1402 });
1057 1403
1058 $hb->add (new CFClient::UI::Button 1404 $hb->add (new CFClient::UI::Button
1059 text => "edit", 1405 text => "edit",
1060 tooltip => "Edits the binding", 1406 tooltip => "Edits the binding",
1061 on_activate => sub { 1407 on_activate => sub {
1062 $::BIND_EDITOR->set_binding ( 1408 $::BIND_EDITOR->set_binding (
1063 $mod, $sym, $::CFG->{bindings}->{$mod}->{$sym}, 1409 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},
1064 sub { 1410 sub {
1065 my ($nmod, $nsym, $ncmds) = @_; 1411 my ($nmod, $nsym, $ncmds) = @_;
1066 delete $::CFG->{bindings}->{$mod}->{$sym}; 1412 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
1067 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds; 1413 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1068 $refresh->(); 1414 $refresh->();
1069 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1415 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1070 $SETUP_DIALOG->show; 1416 $SETUP_DIALOG->show;
1071 }, 1417 },
1072 sub { 1418 sub {
1073 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1419 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1074 $SETUP_DIALOG->show; 1420 $SETUP_DIALOG->show;
1075 }); 1421 });
1076 $::BIND_EDITOR->show; 1422 $::BIND_EDITOR->show;
1077 $SETUP_DIALOG->hide; 1423 $SETUP_DIALOG->hide;
1424 0
1078 }); 1425 });
1079 1426
1080 $hb->add (new CFClient::UI::Label text => "(Key: $nam)"); 1427 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
1081 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1); 1428 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
1082 } 1429 }
1083 } 1430 }
1084 }; 1431 };
1085 1432
1086 my $vb = new CFClient::UI::VBox; 1433 my $vb = new CFClient::UI::VBox;
1434 $vb->add (my $hb = new CFClient::UI::HBox);
1435 $hb->add (new CFClient::UI::Label text => "only shift-up stops fire");
1436 $hb->add (new CFClient::UI::CheckBox
1437 expand => 1,
1438 state => $CFG->{shift_fire_stop},
1439 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
1440 on_changed => sub {
1441 my ($cbox, $value) = @_;
1442 $CFG->{shift_fire_stop} = $value;
1443 0
1444 });
1445
1087 $vb->add ($binding_list); 1446 $vb->add ($binding_list);
1088 $vb->add (my $hb = new CFClient::UI::HBox); 1447 $vb->add (my $hb = new CFClient::UI::HBox);
1089 1448
1090 $hb->add (new CFClient::UI::Button 1449 $hb->add (new CFClient::UI::Button
1091 text => "record new", 1450 text => "record new",
1093 tooltip => "This button opens the binding editor with an empty binding.", 1452 tooltip => "This button opens the binding editor with an empty binding.",
1094 on_activate => sub { 1453 on_activate => sub {
1095 $::BIND_EDITOR->set_binding (undef, undef, [], 1454 $::BIND_EDITOR->set_binding (undef, undef, [],
1096 sub { 1455 sub {
1097 my ($mod, $sym, $cmds) = @_; 1456 my ($mod, $sym, $cmds) = @_;
1098 $::CFG->{bindings}->{$mod}->{$sym} = $cmds; 1457 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1099 $refresh->(); 1458 $refresh->();
1100 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1459 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1101 $SETUP_DIALOG->show; 1460 $SETUP_DIALOG->show;
1102 }, 1461 },
1103 sub { 1462 sub {
1105 $SETUP_DIALOG->show; 1464 $SETUP_DIALOG->show;
1106 }, 1465 },
1107 ); 1466 );
1108 $SETUP_DIALOG->hide; 1467 $SETUP_DIALOG->hide;
1109 $::BIND_EDITOR->show; 1468 $::BIND_EDITOR->show;
1469 0
1110 }, 1470 },
1111 ); 1471 );
1112 1472
1113 $hb->add (new CFClient::UI::Button 1473 $hb->add (new CFClient::UI::Button
1114 text => "close", 1474 text => "close",
1115 tooltip => "Closes the binding window", 1475 tooltip => "Closes the binding window",
1116 expand => 1, 1476 expand => 1,
1117 on_activate => sub { 1477 on_activate => sub {
1118 $SETUP_DIALOG->hide; 1478 $SETUP_DIALOG->hide;
1479 0
1119 } 1480 }
1120 ); 1481 );
1121 1482
1122 $refresh->(); 1483 $refresh->();
1123 1484
1124 $vb 1485 $vb
1125} 1486}
1126 1487
1127sub make_help_window { 1488sub help_window {
1128 my $win = new CFClient::UI::FancyFrame 1489 my $win = new CFClient::UI::FancyFrame
1129 x => 'center', 1490 x => 'center',
1130 y => 'center', 1491 y => 'center',
1131 z => 2, 1492 z => 2,
1132 name => 'doc_browser', 1493 name => 'doc_browser',
1133 force_w => int $WIDTH * 7/8, 1494 force_w => int $WIDTH * 7/8,
1134 force_h => int $HEIGHT * 7/8, 1495 force_h => int $HEIGHT * 7/8,
1135 title => "Documentation"; 1496 title => "Help Browser",
1497 has_close_button => 1;
1136 1498
1137 $win->add (my $vbox = new CFClient::UI::VBox); 1499 $win->add (my $vbox = new CFClient::UI::VBox);
1138 1500
1139 $vbox->add (my $buttons = new CFClient::UI::HBox); 1501 $vbox->add (my $buttons = new CFClient::UI::HBox);
1140 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8); 1502 $vbox->add (my $viewer = new CFClient::UI::TextScroller
1503 expand => 1, fontsize => 0.8, padding_x => 4);
1141 1504
1142 for ( 1505 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: ");
1506 $buttons->add (my $combo = new CFClient::UI::Combobox
1507 value => undef,
1508 options => [
1143 [intro => "Introduction"], 1509 [intro => "Introduction"],
1144 [manual => "Manual"], 1510 [manual => "Main Manual"],
1511 [skill_help => "Skill Reference"],
1512 [command_help => "Command Reference"],
1145 [command_help => "Commands"], 1513 [dmcommand_help => "DM Commands"],
1146 [skill_help => "Skills"], 1514 [COPYING => "License Terms"],
1147 ) { 1515 ],
1148 my ($pod, $label) = @$_; 1516 on_changed => sub {
1517 my ($self, $pod) = @_;
1149 1518
1150 $buttons->add (new CFClient::UI::Button
1151 text => $label,
1152 on_activate => sub {
1153 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod", 1519 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
1154 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] }; 1520 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };
1155 1521
1156 $viewer->clear; 1522 $viewer->clear;
1523
1524# $viewer->add_paragraph ([1, 1, 1, 1], ["<big>Test</big>\n\n \x{fffc} \x{fffc}\n",
1525# (new CFClient::UI::Image path => "x.png", can_hover => 1, can_events => 1),
1526# (new CFClient::UI::Label text => "üüüü", can_hover => 1, can_events => 1, tooltip => "??"),
1527# ]);#d#
1157 1528
1158 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0]) 1529 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
1159 for @$pom; 1530 for @$pom;
1160 1531
1161 $viewer->set_offset (0); 1532 $viewer->set_offset (0);
1533
1162 }, 1534 0
1535 },
1536 on_visibility_change => sub {
1537 my ($self, $visible) = @_;
1538 return unless $visible;
1539 return if $self->{value};
1540 $self->set_value ("intro");
1541 0
1542 },
1163 ); 1543 );
1164 }
1165
1166 $viewer->add_paragraph ([1, 1, 0, 1], "<big>Use one of the buttons above to display a document.</big>");
1167 1544
1168 $win 1545 $win
1169} 1546}
1170 1547
1171sub sdl_init { 1548sub sdl_init {
1208 z => 100, 1585 z => 100,
1209 force_x => "max", 1586 force_x => "max",
1210 force_y => 0; 1587 force_y => 0;
1211 $DEBUG_STATUS->show; 1588 $DEBUG_STATUS->show;
1212 1589
1213 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0); 1590 $BIND_EDITOR = new CFClient::BindingEditor (x => "max", y => 0);
1214 1591
1215 $STATUSBOX = new CFClient::UI::Statusbox; 1592 $STATUSBOX = new CFClient::UI::Statusbox;
1216 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]); 1593 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1217 1594
1218 (new CFClient::UI::Frame 1595 (new CFClient::UI::Frame
1238 $MAPWIDGET->connect (activate_console => sub { 1615 $MAPWIDGET->connect (activate_console => sub {
1239 my ($mapwidget, $preset) = @_; 1616 my ($mapwidget, $preset) = @_;
1240 1617
1241 if ($CONSOLE) { 1618 if ($CONSOLE) {
1242 $CONSOLE->{input}->{auto_activated} = 1; 1619 $CONSOLE->{input}->{auto_activated} = 1;
1243 $CONSOLE->{input}->focus_in; 1620 $CONSOLE->{input}->grab_focus;
1244 1621
1245 if ($preset && $CONSOLE->{input}->get_text eq '') { 1622 if ($preset && $CONSOLE->{input}->get_text eq '') {
1246 $CONSOLE->{input}->set_text ($preset); 1623 $CONSOLE->{input}->set_text ($preset);
1247 } 1624 }
1248 } 1625 }
1249 }); 1626 });
1250 $MAPWIDGET->show; 1627 $MAPWIDGET->show;
1251 $MAPWIDGET->focus_in; 1628 $MAPWIDGET->grab_focus;
1252 1629
1253 $LOGVIEW = new CFClient::UI::TextView 1630 $LOGVIEW = new CFClient::UI::TextScroller
1254 expand => 1, 1631 expand => 1,
1255 font => $FONT_FIXED, 1632 font => $FONT_FIXED,
1256 fontsize => $::CFG->{log_fontsize}, 1633 fontsize => $::CFG->{log_fontsize},
1634 indent => -4,
1257 can_hover => 1, 1635 can_hover => 1,
1258 can_events => 1, 1636 can_events => 1,
1259 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1637 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1260 ; 1638 ;
1261 1639
1265 x => 'center', 1643 x => 'center',
1266 y => 'center', 1644 y => 'center',
1267 z => 2, 1645 z => 2,
1268 force_w => $::WIDTH * 0.6, 1646 force_w => $::WIDTH * 0.6,
1269 force_h => $::HEIGHT * 0.6, 1647 force_h => $::HEIGHT * 0.6,
1648 has_close_button => 1,
1270 ; 1649 ;
1271 1650
1651 $METASERVER = metaserver_dialog;
1652
1272 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1, 1653 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,
1273 filter => new CFClient::UI::ScrolledWindow xxx => 1, expand => 1, scroll_y => 1); 1654 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1274 1655
1275 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1656 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1276 "Configure the server to play on, your username, password and other server-related options."); 1657 "Configure the server to play on, your username, password and other server-related options.");
1277 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup, 1658 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1278 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them."); 1659 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1279 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 1660 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1280 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 1661 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1281 $SETUP_NOTEBOOK->add (Audio => audio_setup, 1662 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1282 "Configure the use of audio, sound effects and background music."); 1663 "Configure the use of audio, sound effects and background music.");
1283 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 1664 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1284 "Lets you define, edit and delete bindings." 1665 "Lets you define, edit and delete key bindings."
1285 . "There is a shortcut for making bindings: <b>Left Control + Insert</b> opens the binding editor " 1666 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "
1286 . "with nothing set and the recording started. After doing the actions you " 1667 . "with nothing set and the recording started. After doing the actions you "
1287 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. " 1668 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1288 . "After pressing the combo the binding will be saved automatically and the " 1669 . "After pressing the combo the binding will be saved automatically and the "
1289 . "binding editor closes"); 1670 . "binding editor closes");
1290 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup, 1671 $SETUP_NOTEBOOK->add (Debug => debug_setup,
1291 "Displays all spells you have and lets you edit keyboard shortcuts for them."); 1672 "Some debuggin' options. Do not ask.");
1292 1673
1293 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 1674 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1294 1675
1295 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 1676 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1296 tooltip => "Toggles a dialog where you can configure all aspects of this client."); 1677 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1297 1678
1298 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window, 1679 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,
1299 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 1680 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1300 1681
1301 make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D 1682 make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D
1302 1683
1303 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window,
1304 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1305 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window, 1684 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Playerbook", other => player_window,
1306 tooltip => "Toggles the inventory window, where you can manage your loot (or treasures :). " 1685 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
1307 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1308 1686
1309 $BUTTONBAR->add (new CFClient::UI::Button 1687 $BUTTONBAR->add (new CFClient::UI::Button
1310 text => "Save Config", 1688 text => "Save Config",
1311 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 1689 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1312 on_activate => sub { 1690 on_activate => sub {
1313 $::CFG->{layout} = CFClient::UI::get_layout; 1691 $::CFG->{layout} = CFClient::UI::get_layout;
1314 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc"; 1692 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1315 status "Configuration Saved"; 1693 status "Configuration Saved";
1694 0
1316 }, 1695 },
1317 ); 1696 );
1318 1697
1319 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window, 1698 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1320 tooltip => "View Documentation"); 1699 tooltip => "View Documentation");
1321 1700
1322 $BUTTONBAR->add (new CFClient::UI::Button 1701 $BUTTONBAR->add (new CFClient::UI::Button
1323 text => "Quit", 1702 text => "Quit",
1324 tooltip => "Terminates the program", 1703 tooltip => "Terminates the program",
1326 if ($CONN) { 1705 if ($CONN) {
1327 open_quit_dialog; 1706 open_quit_dialog;
1328 } else { 1707 } else {
1329 exit; 1708 exit;
1330 } 1709 }
1710 0
1331 }, 1711 },
1332 ); 1712 );
1333 1713
1334 $BUTTONBAR->show; 1714 $BUTTONBAR->show;
1335 $SETUP_DIALOG->show; 1715 $SETUP_DIALOG->show;
1337 1717
1338 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1718 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1339} 1719}
1340 1720
1341sub video_shutdown { 1721sub video_shutdown {
1722 CFClient::OpenGL::shutdown;
1723
1342 undef $SDL_ACTIVE; 1724 undef $SDL_ACTIVE;
1343} 1725}
1344 1726
1345my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d# 1727my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
1346my $bgmusic;#TODO#hack#d# 1728my $bgmusic;#TODO#hack#d#
1562 1944
1563 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc"; 1945 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1564 CFClient::UI::set_layout ($::CFG->{layout}); 1946 CFClient::UI::set_layout ($::CFG->{layout});
1565 1947
1566 my %DEF_CFG = ( 1948 my %DEF_CFG = (
1567 sdl_mode => 0, 1949 sdl_mode => 0,
1568 width => 640, 1950 width => 640,
1569 height => 480, 1951 height => 480,
1570 fullscreen => 0, 1952 fullscreen => 0,
1571 fast => 0, 1953 fast => 0,
1572 map_scale => 1, 1954 map_scale => 1,
1573 fow_enable => 1, 1955 fow_enable => 1,
1574 fow_intensity => 0.45, 1956 fow_intensity => 0.45,
1575 fow_smooth => 0, 1957 fow_smooth => 0,
1576 gui_fontsize => 1, 1958 gui_fontsize => 1,
1577 log_fontsize => 1, 1959 log_fontsize => 0.7,
1578 gauge_fontsize=> 1, 1960 gauge_fontsize => 1,
1579 gauge_size => 0.35, 1961 gauge_size => 0.35,
1580 stat_fontsize => 1, 1962 stat_fontsize => 0.7,
1581 mapsize => 100, 1963 mapsize => 100,
1582 host => "crossfire.schmorp.de",
1583 say_command => 'say', 1964 say_command => 'say',
1584 audio_enable => 1, 1965 audio_enable => 1,
1585 bgm_enable => 1, 1966 bgm_enable => 1,
1586 bgm_volume => 0.25, 1967 bgm_volume => 0.25,
1587 face_prefetch => 0, 1968 face_prefetch => 0,
1588 output_sync => 1, 1969 output_sync => 1,
1589 output_count => 1, 1970 output_count => 1,
1971 pickup => 0,
1972 default => "profile", # default profile
1973 );
1590 ); 1974
1591
1592 while (my ($k, $v) = each %DEF_CFG) { 1975 while (my ($k, $v) = each %DEF_CFG) {
1593 $CFG->{$k} = $v unless exists $CFG->{$k}; 1976 $CFG->{$k} = $v unless exists $CFG->{$k};
1594 } 1977 }
1978
1979 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
1595 1980
1596 sdl_init; 1981 sdl_init;
1597 1982
1598 @SDL_MODES = reverse 1983 @SDL_MODES = reverse
1599 grep $_->[0] >= 640 && $_->[1] >= 480, 1984 grep $_->[0] >= 640 && $_->[1] >= 480,
1641 video_init; 2026 video_init;
1642 audio_init; 2027 audio_init;
1643} 2028}
1644 2029
1645Event::loop; 2030Event::loop;
2031#CFClient::SDL_Quit;
2032#CFClient::_exit 0;
1646 2033
1647END { CFClient::SDL_Quit } 2034END { CFClient::SDL_Quit }
1648 2035
1649=head1 NAME 2036=head1 NAME
1650 2037

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines