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.45 by elmex, Fri Jun 2 16:52:49 2006 UTC vs.
Revision 1.95 by root, Sun Jul 16 23:30:08 2006 UTC

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

Diff Legend

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