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.40 by root, Fri Jun 2 02:12:04 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; 132our $PICKUP_CFG;
113 133
114sub status { 134sub status {
115 $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]);
116} 136}
117 137
118sub debug { 138sub debug {
119 $DEBUG_STATUS->set_text ($_[0]); 139 $DEBUG_STATUS->set_text ($_[0]);
120} 140}
121 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
122sub start_game { 332sub start_game {
123 status "logging in..."; 333 status "logging in...";
124 334
125 $LOGIN_BUTTON->set_text ("Logout"); 335 $LOGIN_BUTTON->set_text ("Logout");
126 $SERVER_SETUP->hide; 336 $SETUP_DIALOG->hide;
127 337
128 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;
129 339
130 my ($host, $port) = split /:/, $CFG->{host}; 340 my ($host, $port) = split /:/, $CFG->{profile}{default}{host};
131 341
132 $MAP = new CFClient::Map $mapsize, $mapsize; 342 $MAP = new CFClient::Map $mapsize, $mapsize;
133 343
134 $CONN = eval { 344 $CONN = eval {
135 new CFClient::Protocol 345 new CFClient::Protocol
136 host => $host, 346 host => $host,
137 port => $port || 13327, 347 port => $port || 13327,
138 user => $CFG->{user}, 348 user => $CFG->{profile}{default}{user},
139 pass => $CFG->{password}, 349 pass => $CFG->{profile}{default}{password},
140 mapw => $mapsize, 350 mapw => $mapsize,
141 maph => $mapsize, 351 maph => $mapsize,
142 352
143 map_widget => $MAPWIDGET, 353 map_widget => $MAPWIDGET,
144 logview => $LOGVIEW, 354 logview => $LOGVIEW,
145 statusbox => $STATUSBOX, 355 statusbox => $STATUSBOX,
146 map => $MAP, 356 map => $MAP,
147 mapmap => $MAPMAP, 357 mapmap => $MAPMAP,
358 query => \&server_query,
148 359
149 sound_play => sub { 360 sound_play => sub {
150 my ($x, $y, $soundnum, $type) = @_; 361 my ($x, $y, $soundnum, $type) = @_;
151 362
152 $SDL_MIXER 363 $SDL_MIXER
169 } 380 }
170} 381}
171 382
172sub stop_game { 383sub stop_game {
173 $LOGIN_BUTTON->set_text ("Login"); 384 $LOGIN_BUTTON->set_text ("Login");
174 $SERVER_SETUP->show; 385 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
386 $SETUP_DIALOG->show;
175 $INV_WINDOW->hide; 387 $PL_WINDOW->hide;
176 $LOGVIEW->hide; 388 $SPELL_PAGE->clear_spells;
177 389
178 return unless $CONN; 390 return unless $CONN;
179 391
180 status "connection closed"; 392 status "connection closed";
181 393
394 destroy_query_dialog $CONN;
182 $CONN->destroy; 395 $CONN->destroy;
183 $CONN = 0; # false, does not autovivify 396 $CONN = 0; # false, does not autovivify
184}
185 397
186sub client_setup { 398 undef $MAP;
187 my $dialog = new CFClient::UI::FancyFrame 399}
188 x => 1, 400
189 y => $HEIGHT * (1/8), 401sub graphics_setup {
190 name => "client_setup",
191 title => "Client Setup",
192 child => (my $vbox = new CFClient::UI::VBox); 402 my $vbox = new CFClient::UI::VBox;
193 403
194 $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]);
195 405
196 $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");
197 $table->add (1, 0, my $hbox = new CFClient::UI::HBox); 407 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
208 $mode_slider->emit (changed => $mode_slider->{range}[0]); 418 $mode_slider->emit (changed => $mode_slider->{range}[0]);
209 419
210 my $row = 1; 420 my $row = 1;
211 421
212 $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");
213 $table->add (1, $row++, new CFClient::UI::CheckBox 423 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFClient::UI::CheckBox
214 state => $CFG->{fullscreen}, 424 state => $CFG->{fullscreen},
215 tooltip => "Bring the client into fullscreen mode.", 425 tooltip => "Bring the client into fullscreen mode.",
216 on_changed => sub { 426 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
217 my ($self, $value) = @_;
218 $CFG->{fullscreen} = $value;
219 }
220 ); 427 );
221 428
222 $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");
223 $table->add (1, $row++, new CFClient::UI::CheckBox 430 $table->add (1, $row++, new CFClient::UI::CheckBox
224 state => $CFG->{fast}, 431 state => $CFG->{fast},
225 tooltip => "Lower the visual quality considerably to speed up rendering.", 432 tooltip => "Lower the visual quality considerably to speed up rendering.",
226 on_changed => sub { 433 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
227 my ($self, $value) = @_;
228 $CFG->{fast} = $value;
229 }
230 ); 434 );
231 435
232 $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");
233 $table->add (1, $row++, new CFClient::UI::Slider 437 $table->add (1, $row++, new CFClient::UI::Slider
234 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 438 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
235 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 439 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
236 on_changed => sub { 440 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
237 my ($self, $value) = @_;
238 $CFG->{map_scale} = 2 ** $value;
239 }
240 ); 441 );
241 442
242 $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");
243 $table->add (1, $row++, new CFClient::UI::CheckBox 444 $table->add (1, $row++, new CFClient::UI::CheckBox
244 state => $CFG->{fow_enable}, 445 state => $CFG->{fow_enable},
245 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.",
246 on_changed => sub { 447 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
247 my ($self, $value) = @_;
248 $CFG->{fow_enable} = $value;
249 }
250 ); 448 );
251 449
252 $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");
253 $table->add (1, $row++, new CFClient::UI::Slider 451 $table->add (1, $row++, new CFClient::UI::Slider
254 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 452 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
255 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 453 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
256 on_changed => sub { 454 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
257 my ($self, $value) = @_;
258 $CFG->{fow_intensity} = $value;
259 }
260 ); 455 );
261 456
262 $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");
263 $table->add (1, $row++, new CFClient::UI::CheckBox 458 $table->add (1, $row++, new CFClient::UI::CheckBox
264 state => $CFG->{fow_smooth}, 459 state => $CFG->{fow_smooth},
265 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.",
266 on_changed => sub { 461 on_changed => sub {
267 my ($self, $value) = @_; 462 my ($self, $value) = @_;
268 $CFG->{fow_smooth} = $value; 463 $CFG->{fow_smooth} = $value;
269 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
270 } 466 }
271 ); 467 );
272 468
273 $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");
274 $table->add (1, $row++, new CFClient::UI::Slider 470 $table->add (1, $row++, new CFClient::UI::Slider
275 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 471 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
276 tooltip => "The base font size used by most GUI elements that do not have their own setting.", 472 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
277 on_changed => sub { $CFG->{gui_fontsize} = $_[1] }, 473 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
278 ); 474 );
279 475
280 $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");
281 $table->add (1, $row++, new CFClient::UI::Slider 477 $table->add (1, $row++, new CFClient::UI::Slider
282 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 478 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
283 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.", 479 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",
284 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]) }, 480 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
285 );
286
287 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
288
289 $table->add (1, $row++, new CFClient::UI::Slider
290 range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1],
291 tooltip => "The font size used by the <b>statistics window</b> only. Changes are instant.",
292 on_changed => sub {
293 $CFG->{stat_fontsize} = $_[1];
294 &set_stats_window_fontsize;
295 }
296 ); 481 );
297 482
298 $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");
299 $table->add (1, $row++, new CFClient::UI::Slider 484 $table->add (1, $row++, new CFClient::UI::Slider
300 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 485 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
301 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 486 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
302 on_changed => sub { 487 on_changed => sub {
303 $CFG->{gauge_fontsize} = $_[1]; 488 $CFG->{gauge_fontsize} = $_[1];
304 &set_gauge_window_fontsize; 489 &set_gauge_window_fontsize;
490 0
305 } 491 }
306 ); 492 );
307 493
308 $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");
309 $table->add (1, $row++, new CFClient::UI::Slider 495 $table->add (1, $row++, new CFClient::UI::Slider
310 range => [$CFG->{gauge_size}, 0.2, 0.8], 496 range => [$CFG->{gauge_size}, 0.2, 0.8],
311 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.",
312 on_changed => sub { 498 on_changed => sub {
313 $CFG->{gauge_size} = $_[1]; 499 $CFG->{gauge_size} = $_[1];
314 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 500 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
501 0
315 } 502 }
316 ); 503 );
317 504
318 $table->add (1, $row++, new CFClient::UI::Button 505 $table->add (1, $row++, new CFClient::UI::Button
319 expand => 1, align => 0, text => "Apply", 506 expand => 1, align => 0, text => "Apply",
320 tooltip => "Apply the video settings", 507 tooltip => "Apply the video settings",
321 on_activate => sub { 508 on_activate => sub {
322 video_shutdown (); 509 video_shutdown ();
323 video_init (); 510 video_init ();
511 0
324 } 512 }
325 ); 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;
326 524
327 $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");
328 $table->add (1, $row++, new CFClient::UI::CheckBox 526 $table->add (1, $row++, new CFClient::UI::CheckBox
329 state => $CFG->{audio_enable}, 527 state => $CFG->{audio_enable},
330 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.",
331 on_changed => sub { 529 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
332 $CFG->{audio_enable} = $_[1];
333 }
334 ); 530 );
335# $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");
336# $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 {
337# $CFG->{effects_volume} = $_[1]; 533# $CFG->{effects_volume} = $_[1];
338# }); 534# });
339 $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");
340 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox); 536 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox);
341 $hbox->add (new CFClient::UI::CheckBox 537 $hbox->add (new CFClient::UI::CheckBox
342 expand => 1, state => $CFG->{bgm_enable}, 538 expand => 1, state => $CFG->{bgm_enable},
343 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.",
344 on_changed => sub { 540 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
345 $CFG->{bgm_enable} = $_[1];
346 }
347 ); 541 );
348 $hbox->add (new CFClient::UI::Slider 542 $hbox->add (new CFClient::UI::Slider
349 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 543 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
350 tooltip => "The volume of the background music. Changes are instant.", 544 tooltip => "The volume of the background music. Changes are instant.",
351 on_changed => sub { 545 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFClient::MixMusic::volume $_[1] * 128; 0 }
352 $CFG->{bgm_volume} = $_[1];
353 CFClient::MixMusic::volume $_[1] * 128;
354 }
355 ); 546 );
356 547
357 $table->add (1, $row++, new CFClient::UI::Button 548 $table->add (1, $row++, new CFClient::UI::Button
358 expand => 1, align => 0, text => "Apply", 549 expand => 1, align => 0, text => "Apply",
359 tooltip => "Apply the audio settings", 550 tooltip => "Apply the audio settings",
360 on_activate => sub { 551 on_activate => sub {
361 audio_shutdown (); 552 audio_shutdown ();
362 audio_init (); 553 audio_init ();
554 0
363 } 555 }
364 ); 556 );
365 557
366 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command"); 558 $vbox
367 $table->add (1, $row++, my $saycmd = new CFClient::UI::Entry
368 text => $CFG->{say_command},
369 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. "
370 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
371 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
372 on_changed => sub {
373 my ($self, $value) = @_;
374 $CFG->{say_command} = $value;
375 }
376 );
377
378 $dialog
379}
380
381sub set_stats_window_fontsize {
382 for (values %{$STATWIDS}) {
383 $_->set_fontsize ($::CFG->{stat_fontsize});
384 }
385} 559}
386 560
387sub set_gauge_window_fontsize { 561sub set_gauge_window_fontsize {
388 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) { 562 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) {
389 $_->set_fontsize ($::CFG->{gauge_fontsize}); 563 $_->set_fontsize ($::CFG->{gauge_fontsize});
441 &set_gauge_window_fontsize; 615 &set_gauge_window_fontsize;
442 616
443 $win 617 $win
444} 618}
445 619
620sub debug_setup {
621 my $table = new CFClient::UI::Table;
446 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
447sub make_stats_window { 648sub stats_window {
448 my $tgw = new CFClient::UI::FancyFrame 649 my $vb = new CFClient::UI::VBox;
449 y => $HEIGHT * (2/8),
450 x => "max",
451 title => "Stats",
452 name => "stats_window";
453 650
454 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);
455 $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,
456 can_hover => 1, can_events => 1, 652 can_hover => 1, can_events => 1,
457 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.");
458 $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,
459 can_hover => 1, can_events => 1, 655 can_hover => 1, can_events => 1,
483 [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."],
484 680
485 [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."],
486 [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."],
487 [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."],
488 [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."],
489 [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."],
490 [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."],
491 ) { 687 ) {
492 my ($col, $row, $id, $label, $template, $tooltip) = @$_; 688 my ($col, $row, $id, $label, $template, $tooltip) = @$_;
493 689
495 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);
496 $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
497 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);
498 } 694 }
499 695
500 $hb->add (my $tbl2 = new CFClient::UI::Table expand => 1); 696 $vb->add (my $tbl2 = new CFClient::UI::Table expand => 1);
501 697
502 my $row = 0; 698 my $row = 0;
503 my $col = 0; 699 my $col = 0;
504 700
505 my %resist_names = ( 701 my %resist_names = (
702 slow => ["Slow",
506 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",
507 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",
508 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",
509 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",
510 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",
511 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",
512 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",
513 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",
514 pois => "<b>Poison</b> (resistance to getting poisoned)", 719 "<b>Poison</b> (resistance to getting poisoned)"],
720 para => ["Paralysation",
515 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",
516 deat => "<b>Death</b> (resistance against death spells)", 723 "<b>Death</b> (resistance against death spells)"],
517 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",
518 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",
519 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",
520 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",
521 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",
522 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",
523 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)"],
524 ); 738 );
525 for (qw/slow holyw conf fire depl magic 739 for (qw/slow holyw conf fire depl magic
526 drain acid pois para deat phys 740 drain acid pois para deat phys
527 blind fear tund elec cold ghit/) 741 blind fear tund elec cold ghit/)
528 { 742 {
533 template => "-100%", 747 template => "-100%",
534 align => +1, 748 align => +1,
535 valign => 0, 749 valign => 0,
536 can_events => 1, 750 can_events => 1,
537 can_hover => 1, 751 can_hover => 1,
538 tooltip => $resist_names{$_}, 752 tooltip => $resist_names{$_}->[1],
539 ); 753 );
540 $tbl2->add ($col + 1, $row, new CFClient::UI::Image 754 $tbl2->add ($col + 1, $row, new CFClient::UI::Image
541 font => $FONT_FIXED, 755 font => $FONT_FIXED,
542 can_hover => 1, 756 can_hover => 1,
543 can_events => 1, 757 can_events => 1,
544 image => "ui/resist/resist_$_.png", 758 path => "ui/resist/resist_$_.png",
545 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],
546 ); 767 );
547 768
548 $row++; 769 $row++;
549 if ($row % 6 == 0) { 770 if ($row % 6 == 0) {
550 $col += 2; 771 $col += 3;
551 $row = 0; 772 $row = 0;
552 } 773 }
553 } 774 }
554 775
555 &set_stats_window_fontsize;
556 update_stats_window ({}); 776 #update_stats_window ({});
557 777
558 $tgw 778 $vb
559} 779}
560 780
781sub skill_window {
782 $STATWIDS->{skill_tbl} = new CFClient::UI::Table expand => 1, col_expand => [0, 0, 1, 0, 0, 1]
783}
784
561sub formsep { 785sub formsep($) {
562 reverse join ",", grep length, split /(...)/, reverse $_[0] * 1 786 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
563}
564
565sub update_stats_window {
566 my ($stats) = @_;
567
568 # I love text protocols...
569
570 my $hp = $stats->{+CS_STAT_HP} * 1;
571 my $hp_m = $stats->{+CS_STAT_MAXHP} * 1;
572 my $sp = $stats->{+CS_STAT_SP} * 1;
573 my $sp_m = $stats->{+CS_STAT_MAXSP} * 1;
574 my $fo = $stats->{+CS_STAT_FOOD} * 1;
575 my $fo_m = 999;
576 my $gr = $stats->{+CS_STAT_GRACE} * 1;
577 my $gr_m = $stats->{+CS_STAT_MAXGRACE} * 1;
578
579 $GAUGES->{hp} ->set_value ($hp, $hp_m);
580 $GAUGES->{mana} ->set_value ($sp, $sp_m);
581 $GAUGES->{food} ->set_value ($fo, $fo_m);
582 $GAUGES->{grace} ->set_value ($gr, $gr_m);
583 $GAUGES->{exp} ->set_text ("Exp: " . (formsep $stats->{+CS_STAT_EXP64})
584 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
585 my $rng = $stats->{+CS_STAT_RANGE};
586 $rng =~ s/^Range: //; # thank you so much dear server
587 $GAUGES->{range} ->set_text ("Rng: " . $rng);
588 my $title = $stats->{+CS_STAT_TITLE};
589 $title =~ s/^Player: //;
590 $STATWIDS->{title} ->set_text ("Title: " . $title);
591
592 $STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
593 $STATWIDS->{st_dex} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DEX});
594 $STATWIDS->{st_con} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CON});
595 $STATWIDS->{st_int} ->set_text (sprintf "%d" , $stats->{+CS_STAT_INT});
596 $STATWIDS->{st_wis} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WIS});
597 $STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
598 $STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
599 $STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
600 $STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
601 $STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
602 $STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_ARMOUR});
603 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
604 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
605
606 $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000);
607
608 # TODO: replace by CS_STAT_RES_xxx constants
609 my %tbl = (
610 phys => 100,
611 magic => 101,
612 fire => 102,
613 elec => 103,
614 cold => 104,
615 conf => 105,
616 acid => 106,
617 drain => 107,
618 ghit => 108,
619 pois => 109,
620 slow => 110,
621 para => 111,
622 tund => 112,
623 fear => 113,
624 depl => 113,
625 deat => 115,
626 holyw => 116,
627 blind => 117,
628 );
629
630 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
631 for keys %tbl;
632} 787}
633 788
634my $METASERVER_ATIME; 789my $METASERVER_ATIME;
635 790
636sub update_metaserver { 791sub update_metaserver {
792 my ($metaserver_dialog) = @_;
793
794 $METASERVER = $metaserver_dialog
795 if defined $metaserver_dialog;
796
637 return if $METASERVER_ATIME > time; 797 return if $METASERVER_ATIME > time;
638 $METASERVER_ATIME = time + 60; 798 $METASERVER_ATIME = time + 60;
639 799
640 my $table = $METASERVER->{table}; 800 my $table = $METASERVER->{table};
641 $table->clear; 801 $table->clear;
662 822
663 utf8::decode $buf if utf8::valid $buf; 823 utf8::decode $buf if utf8::valid $buf;
664 824
665 $table->clear; 825 $table->clear;
666 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 );
667 my @col = qw(Use #Users Host Uptime Version Description); 834 my @col = qw(#Users Host Uptime Version Description);
668 $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[$_])
669 for 0 .. $#col; 839 for 0 .. $#col;
670 840
671 my @align = qw(1 0 1 1 -1); 841 my @align = qw(1 0 1 1 -1);
672 842
673 my $y = 0; 843 my $y = 0;
674 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) {
691 861
692 $m = [$users, $host, $uptime, $version, $desc]; 862 $m = [$users, $host, $uptime, $version, $desc];
693 863
694 $y++; 864 $y++;
695 865
696 $table->add (0, $y, new CFClient::UI::VBox children => [ 866 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [
697 (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 {
698 $HOST_ENTRY->set_text ($CFG->{host} = $host); 871 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
699 $METASERVER->toggle_visibility; 872 $METASERVER->hide;
873 0
874 },
700 }), 875 ),
701 (new CFClient::UI::Empty expand => 1), 876 (new CFClient::UI::Empty expand => 1),
702 ]); 877 ]);
703 878
704 $table->add ($_ + 1, $y, new CFClient::UI::Label 879 $table->add ($_, $y, new CFClient::UI::Label
705 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)
706 for 0 .. $#$m; 887 for 0 .. $#$m;
707 } 888 }
708 } 889 }
709 }); 890 });
710} 891}
711 892
712sub 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
713 my $dialog = new CFClient::UI::FancyFrame 898 my $dialog = new CFClient::UI::FancyFrame
714 title => "Server List", 899 title => "Server List",
900 name => 'metaserver_dialog',
715 x => 'center', 901 x => 'center',
716 y => 'center', 902 y => 'center',
717 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,
718 on_visibility_change => sub { 908 on_visibility_change => sub {
719 update_metaserver if $_[1]; 909 update_metaserver ($_[0]) if $_[1];
910 0
720 }, 911 },
721 ; 912 ;
722 913
723 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
724
725 $dialog 914 $dialog
726} 915}
727 916
728sub server_setup { 917sub server_setup {
729 my $dialog = $SERVER_SETUP = new CFClient::UI::FancyFrame
730 x => "center",
731 y => "center",
732 name => "server_setup",
733 title => "Server Setup",
734 child => (my $vbox = new CFClient::UI::VBox), 918 my $vbox = new CFClient::UI::VBox;
735 ;
736 919
737 $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]);
738 $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");
739 922
740 { 923 {
741 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 924 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
742 925
743 $vbox->add ( 926 $vbox->add (
744 $HOST_ENTRY = new CFClient::UI::Entry 927 $HOST_ENTRY = new CFClient::UI::Entry
745 expand => 1, 928 expand => 1,
746 text => $CFG->{host}, 929 text => $CFG->{profile}{default}{host},
747 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",
748 on_changed => sub { 931 on_changed => sub {
749 my ($self, $value) = @_; 932 my ($self, $value) = @_;
750 $CFG->{host} = $value; 933 $CFG->{profile}{default}{host} = $value;
934 0
751 } 935 }
752 ); 936 );
753
754 $METASERVER = metaserver_dialog;
755 937
756 $vbox->add (new CFClient::UI::Button 938 $vbox->add (new CFClient::UI::Button
757 expand => 1, 939 expand => 1,
758 text => "Server List", 940 text => "Server List",
759 other => $METASERVER, 941 other => $METASERVER,
760 tooltip => "Show a list of available crossfire servers", 942 tooltip => "Show a list of available crossfire servers",
761 on_activate => sub { $METASERVER->toggle_visibility }, 943 on_activate => sub { $METASERVER->toggle_visibility; 0 },
944 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
762 ); 945 );
763 } 946 }
764 947
765 $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");
766 $table->add (1, 4, new CFClient::UI::Entry 949 $table->add (1, 4, new CFClient::UI::Entry
767 text => $CFG->{user}, 950 text => $CFG->{profile}{default}{user},
768 tooltip => "The name of your character on the server", 951 tooltip => "The name of your character on the server",
769 on_changed => sub { 952 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
770 my ($self, $value) = @_;
771 $CFG->{user} = $value;
772 }
773 ); 953 );
774 954
775 $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");
776 $table->add (1, 5, new CFClient::UI::Entry 956 $table->add (1, 5, new CFClient::UI::Entry
777 text => $CFG->{password}, 957 text => $CFG->{profile}{default}{password},
778 hidden => 1, 958 hidden => 1,
779 tooltip => "The password for your character", 959 tooltip => "The password for your character",
780 on_changed => sub { 960 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
781 my ($self, $value) = @_;
782 $CFG->{password} = $value;
783 }
784 ); 961 );
785 962
786 $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");
787 $table->add (1, 7, new CFClient::UI::Slider 964 $table->add (1, 7, new CFClient::UI::Slider
788 force_w => 100, 965 force_w => 100,
789 range => [$CFG->{mapsize}, 10, 100, 0, 1], 966 range => [$CFG->{mapsize}, 10, 100, 0, 1],
790 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. "
791 . "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, "
792 . "but you also increase bandwidth requirements and latency. " 969 . "but you also increase bandwidth requirements and latency. "
793 . "This option is only used once at log-in.", 970 . "This option is only used once at log-in.",
794 on_changed => sub { 971 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },
795 my ($self, $value) = @_;
796
797 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
798 },
799 ); 972 );
800 973
801 $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");
802 $table->add (1, 8, new CFClient::UI::CheckBox 975 $table->add (1, 8, new CFClient::UI::CheckBox
803 state => $CFG->{face_prefetch}, 976 state => $CFG->{face_prefetch},
806 . "This might increase or create lag, but increases the chances " 979 . "This might increase or create lag, but increases the chances "
807 . "of faces being ready for display when you encounter them. " 980 . "of faces being ready for display when you encounter them. "
808 . "It also uses up server bandwidth on every connect, " 981 . "It also uses up server bandwidth on every connect, "
809 . "so only set it if you really need to prefetch images. " 982 . "so only set it if you really need to prefetch images. "
810 . "This option can be set and unset any time.", 983 . "This option can be set and unset any time.",
811 on_changed => sub { $CFG->{face_prefetch} = $_[1] }, 984 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
812 ); 985 );
813 986
814 $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");
815 $table->add (1, 9, new CFClient::UI::Entry 988 $table->add (1, 9, new CFClient::UI::Entry
816 text => $CFG->{output_count}, 989 text => $CFG->{output_count},
817 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.",
818 on_changed => sub { $CFG->{output_count} = $_[1] }, 991 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
819 ); 992 );
820 993
821 $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");
822 $table->add (1, 10, new CFClient::UI::Entry 995 $table->add (1, 10, new CFClient::UI::Entry
823 text => $CFG->{output_sync}, 996 text => $CFG->{output_sync},
824 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.",
825 on_changed => sub { $CFG->{output_sync} = $_[1] }, 998 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
826 ); 999 );
827 1000
828 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button 1001 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button
829 expand => 1, 1002 expand => 1,
830 align => 0, 1003 align => 0,
831 text => "Login", 1004 text => "Login",
832 on_activate => sub { 1005 on_activate => sub {
833 $CONN ? stop_game 1006 $CONN ? stop_game
834 : start_game; 1007 : start_game;
1008 0
835 }, 1009 },
836 ); 1010 );
837 1011
838 $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
839} 1035}
840 1036
841sub message_window { 1037sub message_window {
842 my $window = new CFClient::UI::FancyFrame 1038 my $window = new CFClient::UI::FancyFrame
843 name => "message_window", 1039 name => "message_window",
844 title => "Messages", 1040 title => "Messages",
845 border_bg => [1, 1, 1, 1], 1041 border_bg => [1, 1, 1, 1],
846 bg => [0, 0, 0, 0.75],
847 x => "max", 1042 x => "max",
848 y => 0, 1043 y => 0,
849 force_w => $::WIDTH / 3, 1044 force_w => $::WIDTH * 0.4,
850 force_h => $::HEIGHT / 5, 1045 force_h => $::HEIGHT * 0.5,
851 child => (my $vbox = new CFClient::UI::VBox); 1046 child => (my $vbox = new CFClient::UI::VBox),
1047 has_close_button => 1;
852 1048
853 $vbox->add ($LOGVIEW); 1049 $vbox->add ($LOGVIEW);
854 1050
855 $vbox->add (my $input = new CFClient::UI::Entry 1051 $vbox->add (my $input = new CFClient::UI::Entry
856 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> "
864 1060
865 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) { 1061 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
866 $input->{refocus_map} = 1; 1062 $input->{refocus_map} = 1;
867 } 1063 }
868 delete $input->{auto_activated}; 1064 delete $input->{auto_activated};
1065
1066 0
869 }, 1067 },
870 on_activate => sub { 1068 on_activate => sub {
871 my ($input, $text) = @_; 1069 my ($input, $text) = @_;
872 $input->set_text (''); 1070 $input->set_text ('');
873 1071
874 if ($text =~ /^\/bind\s+(.*)$/) {
875 CFClient::Binder::open_binding_dialog (sub {
876 my ($mod, $sym) = @_;
877 $::CFG->{bindings}->{$mod}->{$sym} = [$1];
878 });
879 } elsif ($text =~ /^\/(.*)/) { 1072 if ($text =~ /^\/(.*)/) {
880 $::CONN->user_send ($1); 1073 $::CONN->user_send ($1);
881 } else { 1074 } else {
882 my $say_cmd = $::CFG->{say_command} || 'say'; 1075 my $say_cmd = $::CFG->{say_command} || 'say';
883 $::CONN->user_send ("$say_cmd $text"); 1076 $::CONN->user_send ("$say_cmd $text");
884 } 1077 }
885 if ($input->{refocus_map}) { 1078 if ($input->{refocus_map}) {
886 delete $input->{refocus_map}; 1079 delete $input->{refocus_map};
887 $MAPWIDGET->focus_in 1080 $MAPWIDGET->focus_in
888 } 1081 }
1082
1083 0
889 }, 1084 },
890 on_escape => sub { 1085 on_escape => sub {
891 $MAPWIDGET->focus_in 1086 $MAPWIDGET->grab_focus;
1087
1088 0
892 }, 1089 },
893 ); 1090 );
894 1091
895 $CONSOLE = { 1092 $CONSOLE = {
896 window => $window, 1093 window => $window,
903sub open_quit_dialog { 1100sub open_quit_dialog {
904 unless ($QUIT_DIALOG) { 1101 unless ($QUIT_DIALOG) {
905 $QUIT_DIALOG = new CFClient::UI::FancyFrame 1102 $QUIT_DIALOG = new CFClient::UI::FancyFrame
906 x => "center", 1103 x => "center",
907 y => "center", 1104 y => "center",
1105 z => 50,
908 title => "Really Quit?", 1106 title => "Really Quit?",
909 ; 1107 ;
910 1108
911 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1); 1109 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
912 1110
917 ); 1115 );
918 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 1116 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
919 $hb->add (new CFClient::UI::Button 1117 $hb->add (new CFClient::UI::Button
920 text => "Ok", 1118 text => "Ok",
921 expand => 1, 1119 expand => 1,
922 on_activate => sub { $QUIT_DIALOG->hide }, 1120 on_activate => sub { $QUIT_DIALOG->hide; 0 },
923 ); 1121 );
924 $hb->add (new CFClient::UI::Button 1122 $hb->add (new CFClient::UI::Button
925 text => "Quit anyway", 1123 text => "Quit anyway",
926 expand => 1, 1124 expand => 1,
927 on_activate => sub { exit }, 1125 on_activate => sub { exit },
929 } 1127 }
930 1128
931 $QUIT_DIALOG->show; 1129 $QUIT_DIALOG->show;
932} 1130}
933 1131
1132sub autopickup_setup {
1133 my $table = new CFClient::UI::Table;
1134
1135 for (
1136 ["General", 0, 0,
1137 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1138 ["Inhibit autopickup" => PICKUP_INHIBIT],
1139 ["Stop before pickup" => PICKUP_STOP],
1140 ["Debug autopickup" => PICKUP_DEBUG],
1141 ],
1142 ["Weapons", 0, 6,
1143 ["All weapons" => PICKUP_ALLWEAPON],
1144 ["Missile weapons" => PICKUP_MISSILEWEAPON],
1145 ["Bows" => PICKUP_BOW],
1146 ["Arrows" => PICKUP_ARROW],
1147 ],
1148 ["Armour", 0, 12,
1149 ["Helmets" => PICKUP_HELMET],
1150 ["Shields" => PICKUP_SHIELD],
1151 ["Body Armour" => PICKUP_ARMOUR],
1152 ["Boots" => PICKUP_BOOTS],
1153 ["Gloves" => PICKUP_GLOVES],
1154 ["Cloaks" => PICKUP_CLOAK],
1155 ],
1156
1157 ["Readables", 2, 2,
1158 ["Spellbooks" => PICKUP_SPELLBOOK],
1159 ["Skillscrolls" => PICKUP_SKILLSCROLL],
1160 ["Normal Books/Scrolls" => PICKUP_READABLES],
1161 ],
1162 ["Misc", 2, 7,
1163 ["Food" => PICKUP_FOOD],
1164 ["Drinks" => PICKUP_DRINK],
1165 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
1166 ["Keys" => PICKUP_KEY],
1167 ["Magical Items" => PICKUP_MAGICAL],
1168 ["Potions" => PICKUP_POTION],
1169 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1170 ["Ignore cursed" => PICKUP_NOT_CURSED],
1171 ["Jewelery" => PICKUP_JEWELS],
1172 ],
1173 ["Weight/Value ratio", 2, 17]
1174 )
1175 {
1176 my ($title, $x, $y, @bits) = @$_;
1177 $table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1178
1179 for (@bits) {
1180 ++$y;
1181
1182 my $mask = $_->[1];
1183 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);
1184 $table->add ($x+1, $y, my $checkbox = new CFClient::UI::CheckBox
1185 state => $::CFG->{pickup} & $mask,
1186 on_changed => sub {
1187 my ($box, $value) = @_;
1188
1189 if ($value) {
1190 $::CFG->{pickup} |= $mask;
1191 } else {
1192 $::CFG->{pickup} &= ~$mask;
1193 }
1194
1195 $::CONN->send_command ("pickup $::CFG->{pickup}")
1196 if defined $::CONN;
1197
1198 0
1199 });
1200
1201 ${$_->[2]} = $checkbox if $_->[2];
1202 }
1203 }
1204
1205 $table->add (2, 18, new CFClient::UI::ValSlider
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) = @_;
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
934sub 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 {
935 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame 1260 my $plwin = $PL_WINDOW = new CFClient::UI::FancyFrame
936 x => "center", 1261 x => "center",
937 y => "center", 1262 y => "center",
938 force_w => $WIDTH * 9/10, 1263 force_w => $WIDTH * 9/10,
939 force_h => $HEIGHT * 9/10, 1264 force_h => $HEIGHT * 9/10,
940 title => "Inventory", 1265 title => "Player",
1266 name => "playerbook",
1267 has_close_button => 1
941 ; 1268 ;
942 1269
943 $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 ;
944 1277
945 $hb->add (my $vb1 = new CFClient::UI::VBox); 1278 $ntb->add (
946 $vb1->add (new CFClient::UI::Label align => 0, text => "Player"); 1279 "Statistics (F2)" => $STATS_PAGE = stats_window,
947 $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 );
948 1295
949 $hb->add (my $vb2 = new CFClient::UI::VBox); 1296 $ntb->set_current_page ($INVENTORY_PAGE);
950 1297
951 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox); 1298 $plwin->add ($ntb);
952 1299 $plwin
953 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
954
955 # XXX: Call after $INVR = ... because set_opencont sets the items
956 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
957
958 $invwin
959} 1300}
960 1301
961sub make_spell_list { 1302sub update_bindings {
962 $SPELL_LIST = new CFClient::UI::SpellList 1303 $BIND_UPD_CB->() if $BIND_UPD_CB;
963 force_w => $WIDTH * (9/10),
964 force_h => $HEIGHT * (9/10);
965 $SPELL_LIST
966} 1304}
967 1305
968sub make_binding_window { 1306sub keyboard_setup {
969 my $binding_list = new CFClient::UI::VBox; 1307 my $binding_list = new CFClient::UI::VBox;
970 1308
971 my $refresh; 1309 my $refresh;
972 $refresh = sub { 1310 $refresh = $BIND_UPD_CB = sub {
973 $binding_list->clear (); 1311 $binding_list->clear ();
974 1312
975 for my $mod (keys %{$::CFG->{bindings}}) { 1313 for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) {
976 for my $sym (keys %{$::CFG->{bindings}->{$mod}}) { 1314 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
977 my $cmds = $::CFG->{bindings}->{$mod}->{$sym}; 1315 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
978 next unless ref $cmds eq 'ARRAY' and @$cmds > 0; 1316 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
979 1317
980 my $lbl = join "; ", @$cmds; 1318 my $lbl = join "; ", @$cmds;
981 my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym); 1319 my $nam = CFClient::BindingEditor::keycombo_to_name ($mod, $sym);
982 $binding_list->add (my $hb = new CFClient::UI::HBox); 1320 $binding_list->add (my $hb = new CFClient::UI::HBox);
983 $hb->add (new CFClient::UI::Button 1321 $hb->add (new CFClient::UI::Button
984 text => "delete", 1322 text => "delete",
985 tooltip => "Deletes the binding", 1323 tooltip => "Deletes the binding",
986 on_activate => sub { 1324 on_activate => sub {
987 $binding_list->remove ($hb); 1325 $binding_list->remove ($hb);
988 delete $::CFG->{bindings}->{$mod}->{$sym}; 1326 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1327 0
989 }); 1328 });
990 1329
991 $hb->add (new CFClient::UI::Button 1330 $hb->add (new CFClient::UI::Button
992 text => "edit", 1331 text => "edit",
993 tooltip => "Edits the binding", 1332 tooltip => "Edits the binding",
994 on_activate => sub { 1333 on_activate => sub {
995 $::BIND_EDITOR->set_binding ( 1334 $::BIND_EDITOR->set_binding (
996 $mod, $sym, $::CFG->{bindings}->{$mod}->{$sym}, 1335 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},
997 sub { 1336 sub {
998 my ($nmod, $nsym, $ncmds) = @_; 1337 my ($nmod, $nsym, $ncmds) = @_;
999 delete $::CFG->{bindings}->{$mod}->{$sym}; 1338 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
1000 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds; 1339 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1001 $refresh->(); 1340 $refresh->();
1341 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1002 $::BIND_WINDOW->show; 1342 $SETUP_DIALOG->show;
1003 }, 1343 },
1004 sub { 1344 sub {
1345 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1005 $::BIND_WINDOW->show; 1346 $SETUP_DIALOG->show;
1006 }); 1347 });
1007 $::BIND_EDITOR->show; 1348 $::BIND_EDITOR->show;
1008 $::BIND_WINDOW->hide; 1349 $SETUP_DIALOG->hide;
1350 0
1009 }); 1351 });
1010 1352
1011 $hb->add (new CFClient::UI::Label text => "(Key: $nam)"); 1353 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
1012 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1); 1354 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
1013 } 1355 }
1014 } 1356 }
1015 }; 1357 };
1016 1358
1017 $BIND_WINDOW = new CFClient::UI::FancyFrame 1359 my $vb = new CFClient::UI::VBox;
1018 title => "Bindings",
1019 x => "center",
1020 y => "center",
1021 def_w => int $WIDTH * 9/10,
1022 def_h => int $HEIGHT * 9/10,
1023 on_visibility_change => sub {
1024 my ($self, $visible) = @_;
1025 $refresh->() if $visible;
1026 };
1027
1028 $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
1029 $vb->add ($binding_list); 1372 $vb->add ($binding_list);
1030 $vb->add (my $hb = new CFClient::UI::HBox); 1373 $vb->add (my $hb = new CFClient::UI::HBox);
1374
1031 $hb->add (new CFClient::UI::Button 1375 $hb->add (new CFClient::UI::Button
1032 text => "record new", 1376 text => "record new",
1033 expand => 1, 1377 expand => 1,
1034 tooltip => "This button opens the binding editor with an empty binding.", 1378 tooltip => "This button opens the binding editor with an empty binding.",
1035 on_activate => sub { 1379 on_activate => sub {
1036 $::BIND_EDITOR->set_binding (undef, undef, [], 1380 $::BIND_EDITOR->set_binding (undef, undef, [],
1037 sub { 1381 sub {
1038 my ($mod, $sym, $cmds) = @_; 1382 my ($mod, $sym, $cmds) = @_;
1039 $::CFG->{bindings}->{$mod}->{$sym} = $cmds; 1383 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1040 $refresh->(); 1384 $refresh->();
1041 $::BIND_WINDOW->show; 1385 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1386 $SETUP_DIALOG->show;
1042 }, 1387 },
1043 sub { 1388 sub {
1044 $::BIND_WINDOW->show; 1389 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1390 $SETUP_DIALOG->show;
1045 }); 1391 },
1046 $::BIND_WINDOW->hide; 1392 );
1393 $SETUP_DIALOG->hide;
1047 $::BIND_EDITOR->show; 1394 $::BIND_EDITOR->show;
1395 0
1048 }, 1396 },
1049 ); 1397 );
1398
1050 $hb->add (new CFClient::UI::Button 1399 $hb->add (new CFClient::UI::Button
1051 text => "close", 1400 text => "close",
1052 tooltip => "Closes the binding window", 1401 tooltip => "Closes the binding window",
1053 expand => 1, 1402 expand => 1,
1054 on_activate => sub { 1403 on_activate => sub {
1055 $::BIND_WINDOW->hide; 1404 $SETUP_DIALOG->hide;
1405 0
1056 } 1406 }
1057 ); 1407 );
1058 1408
1059 $refresh->(); 1409 $refresh->();
1060 $BIND_WINDOW
1061}
1062 1410
1411 $vb
1412}
1413
1063sub make_help_window { 1414sub help_window {
1064 my $win = new CFClient::UI::FancyFrame 1415 my $win = new CFClient::UI::FancyFrame
1416 x => 'center',
1417 y => 'center',
1418 z => 2,
1419 name => 'doc_browser',
1065 def_w => int $WIDTH * 7/8, 1420 force_w => int $WIDTH * 7/8,
1066 def_h => int $HEIGHT * 7/8, 1421 force_h => int $HEIGHT * 7/8,
1067 title => "Documentation"; 1422 title => "Help Browser",
1423 has_close_button => 1;
1068 1424
1069 $win->add (my $vbox = new CFClient::UI::VBox); 1425 $win->add (my $vbox = new CFClient::UI::VBox);
1070 1426
1071 $vbox->add (my $buttons = new CFClient::UI::HBox); 1427 $vbox->add (my $buttons = new CFClient::UI::HBox);
1072 $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);
1073 1430
1074 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 => [
1075 [intro => "Introduction"], 1435 [intro => "Introduction"],
1076 [manual => "Manual"], 1436 [manual => "Main Manual"],
1437 [skill_help => "Skill Reference"],
1438 [command_help => "Command Reference"],
1077 [command_help => "Commands"], 1439 [dmcommand_help => "DM Commands"],
1078 [skill_help => "Skills"], 1440 [COPYING => "License Terms"],
1079 ) { 1441 ],
1080 my ($pod, $label) = @$_; 1442 on_changed => sub {
1443 my ($self, $pod) = @_;
1081 1444
1082 $buttons->add (new CFClient::UI::Button 1445 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
1083 text => $label, 1446 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };
1084 on_activate => sub {
1085 my $parser = new Pod::POM;
1086 my $pom = $parser->parse_file (CFClient::find_rcfile "pod/$pod.pod");
1087 1447
1088 $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#
1089 1454
1090 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0]) 1455 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
1091 for @{ CFClient::pod_to_pango_list $pom }; 1456 for @$pom;
1092 1457
1093 $viewer->set_offset (0); 1458 $viewer->set_offset (0);
1459
1094 }, 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 },
1095 ); 1469 );
1096 }
1097
1098 $viewer->add_paragraph ([1, 1, 0, 1], "<big>Use one of the buttons above to display a document.</big>");
1099 1470
1100 $win 1471 $win
1101} 1472}
1102 1473
1103sub sdl_init { 1474sub sdl_init {
1140 z => 100, 1511 z => 100,
1141 force_x => "max", 1512 force_x => "max",
1142 force_y => 0; 1513 force_y => 0;
1143 $DEBUG_STATUS->show; 1514 $DEBUG_STATUS->show;
1144 1515
1145 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0); 1516 $BIND_EDITOR = new CFClient::BindingEditor (x => "max", y => 0);
1146 1517
1147 $STATUSBOX = new CFClient::UI::Statusbox; 1518 $STATUSBOX = new CFClient::UI::Statusbox;
1148 $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]);
1149 1520
1150 (new CFClient::UI::Frame 1521 (new CFClient::UI::Frame
1151 bg => [0, 0, 0, 0.4], 1522 bg => [0, 0, 0, 0.4],
1152 force_x => 0, 1523 force_x => 0,
1153 force_y => "max", 1524 force_y => "max",
1154 child => $STATUSBOX, 1525 child => $STATUSBOX,
1155 )->show; 1526 )->show;
1156 1527
1157 CFClient::UI::FancyFrame->new ( 1528 CFClient::UI::FancyFrame->new (
1529 title => "Map",
1530 name => "mapmap",
1158 x => 0, 1531 x => 0,
1159 y => $FONTSIZE + 8, 1532 y => $FONTSIZE + 8,
1160 border_bg => [1, 1, 1, 192/255], 1533 border_bg => [1, 1, 1, 192/255],
1161 bg => [1, 1, 1, 0], 1534 bg => [1, 1, 1, 0],
1162 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1535 child => ($MAPMAP = new CFClient::MapWidget::MapMap
1168 $MAPWIDGET->connect (activate_console => sub { 1541 $MAPWIDGET->connect (activate_console => sub {
1169 my ($mapwidget, $preset) = @_; 1542 my ($mapwidget, $preset) = @_;
1170 1543
1171 if ($CONSOLE) { 1544 if ($CONSOLE) {
1172 $CONSOLE->{input}->{auto_activated} = 1; 1545 $CONSOLE->{input}->{auto_activated} = 1;
1173 $CONSOLE->{input}->focus_in; 1546 $CONSOLE->{input}->grab_focus;
1174 1547
1175 if ($preset && $CONSOLE->{input}->get_text eq '') { 1548 if ($preset && $CONSOLE->{input}->get_text eq '') {
1176 $CONSOLE->{input}->set_text ($preset); 1549 $CONSOLE->{input}->set_text ($preset);
1177 } 1550 }
1178 } 1551 }
1179 }); 1552 });
1180 $MAPWIDGET->show; 1553 $MAPWIDGET->show;
1181 $MAPWIDGET->focus_in; 1554 $MAPWIDGET->grab_focus;
1182 1555
1183 $LOGVIEW = new CFClient::UI::TextView 1556 $LOGVIEW = new CFClient::UI::TextScroller
1184 expand => 1, 1557 expand => 1,
1185 font => $FONT_FIXED, 1558 font => $FONT_FIXED,
1186 fontsize => $::CFG->{log_fontsize}, 1559 fontsize => $::CFG->{log_fontsize},
1560 indent => -4,
1187 can_hover => 1, 1561 can_hover => 1,
1188 can_events => 1, 1562 can_events => 1,
1189 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.",
1190 ; 1564 ;
1191 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
1192 $BUTTONBAR = new CFClient::UI::HBox x => 0, y => 0; 1600 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1193 1601
1194 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup, 1602 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1195 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.");
1196 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup, 1604
1197 tooltip => "Toggles a dialog where you can configure the server to play on, your username, password and other server-related options.");
1198 $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,
1199 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.");
1200 1607
1201 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
1202 1609
1203 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window,
1204 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1205 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window, 1610 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Playerbook", other => player_window,
1206 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.");
1207 ."You can also hit the Tab-key to show/hide the Inventory.");
1208 1612
1209 $BUTTONBAR->add (new CFClient::UI::Button 1613 $BUTTONBAR->add (new CFClient::UI::Button
1210 text => "Save Config", 1614 text => "Save Config",
1211 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.",
1212 on_activate => sub { 1616 on_activate => sub {
1213 $::CFG->{layout} = CFClient::UI::get_layout; 1617 $::CFG->{layout} = CFClient::UI::get_layout;
1214 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc"; 1618 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1215 status "Configuration Saved"; 1619 status "Configuration Saved";
1620 0
1216 }, 1621 },
1217 ); 1622 );
1218 1623
1219 $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,
1220 tooltip => "View Documentation"); 1625 tooltip => "View Documentation");
1221
1222 $BUTTONBAR->add (new CFClient::UI::Flopper
1223 text => "Bindings",
1224 other => make_binding_window,
1225 tooltip =>
1226 "Lets you define, edit and delete bindings."
1227 ."There is a shortcut for making bindings: LCTRL+Insert opens the binding editor "
1228 ."with nothing set and the recording started. After doing the actions you "
1229 ."want to record press Insert and you will be asked to press a key-combo."
1230 ."After pressing the combo the binding will be saved automatically and the "
1231 ."binding editor closes");
1232
1233 $BUTTONBAR->add (new CFClient::UI::Flopper
1234 text => "Spells",
1235 other => make_spell_list,
1236 tooltip => "The spell list");
1237 1626
1238 $BUTTONBAR->add (new CFClient::UI::Button 1627 $BUTTONBAR->add (new CFClient::UI::Button
1239 text => "Quit", 1628 text => "Quit",
1240 tooltip => "Terminates the program", 1629 tooltip => "Terminates the program",
1241 on_activate => sub { 1630 on_activate => sub {
1242 if ($CONN) { 1631 if ($CONN) {
1243 open_quit_dialog; 1632 open_quit_dialog;
1244 } else { 1633 } else {
1245 exit; 1634 exit;
1246 } 1635 }
1636 0
1247 }, 1637 },
1248 ); 1638 );
1249 1639
1250 $BUTTONBAR->show; 1640 $BUTTONBAR->show;
1251 $SERVER_SETUP->show; 1641 $SETUP_DIALOG->show;
1252
1253 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1254 } 1642 }
1643
1644 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1255} 1645}
1256 1646
1257sub video_shutdown { 1647sub video_shutdown {
1648 CFClient::OpenGL::shutdown;
1649
1258 undef $SDL_ACTIVE; 1650 undef $SDL_ACTIVE;
1259} 1651}
1260 1652
1261my @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#
1262my $bgmusic;#TODO#hack#d# 1654my $bgmusic;#TODO#hack#d#
1391}; 1783};
1392 1784
1393 CFClient::SDL_GL_SwapBuffers; 1785 CFClient::SDL_GL_SwapBuffers;
1394} 1786}
1395 1787
1396my $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 {
1397 $NOW = time; 1789 $NOW = time;
1398 1790
1399 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 1791 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1400 for CFClient::SDL_PollEvent; 1792 for CFClient::SDL_PollEvent;
1401 1793
1443# 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#
1444 }, 1836 },
1445 CFClient::SDL_KEYDOWN => sub { 1837 CFClient::SDL_KEYDOWN => sub {
1446 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) { 1838 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {
1447 # alt-enter 1839 # alt-enter
1840 $FULLSCREEN_ENABLE->toggle;
1448 video_shutdown; 1841 video_shutdown;
1449 $CFG->{fullscreen} = !$CFG->{fullscreen};
1450 video_init; 1842 video_init;
1451 } else { 1843 } else {
1452 CFClient::UI::feed_sdl_key_down_event ($_[0]); 1844 CFClient::UI::feed_sdl_key_down_event ($_[0]);
1453 } 1845 }
1454 }, 1846 },
1468############################################################################# 1860#############################################################################
1469 1861
1470$SIG{INT} = $SIG{TERM} = sub { exit }; 1862$SIG{INT} = $SIG{TERM} = sub { exit };
1471 1863
1472{ 1864{
1473 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 };
1474 1870
1475 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc"; 1871 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1476 CFClient::UI::set_layout ($::CFG->{layout}); 1872 CFClient::UI::set_layout ($::CFG->{layout});
1477 1873
1478 my %DEF_CFG = ( 1874 my %DEF_CFG = (
1479 sdl_mode => 0, 1875 sdl_mode => 0,
1480 width => 640, 1876 width => 640,
1481 height => 480, 1877 height => 480,
1482 fullscreen => 0, 1878 fullscreen => 0,
1483 fast => 0, 1879 fast => 0,
1484 map_scale => 1, 1880 map_scale => 1,
1485 fow_enable => 1, 1881 fow_enable => 1,
1486 fow_intensity => 0.45, 1882 fow_intensity => 0.45,
1487 fow_smooth => 0, 1883 fow_smooth => 0,
1488 gui_fontsize => 1, 1884 gui_fontsize => 1,
1489 log_fontsize => 1, 1885 log_fontsize => 0.7,
1490 gauge_fontsize=> 1, 1886 gauge_fontsize => 1,
1491 gauge_size => 0.35, 1887 gauge_size => 0.35,
1492 stat_fontsize => 1, 1888 stat_fontsize => 0.7,
1493 mapsize => 100, 1889 mapsize => 100,
1494 host => "crossfire.schmorp.de",
1495 say_command => 'say', 1890 say_command => 'say',
1496 audio_enable => 1, 1891 audio_enable => 1,
1497 bgm_enable => 1, 1892 bgm_enable => 1,
1498 bgm_volume => 0.25, 1893 bgm_volume => 0.25,
1499 face_prefetch => 0, 1894 face_prefetch => 0,
1500 output_sync => 1, 1895 output_sync => 1,
1501 output_count => 1, 1896 output_count => 1,
1897 pickup => 0,
1898 default => "profile", # default profile
1899 );
1502 ); 1900
1503
1504 while (my ($k, $v) = each %DEF_CFG) { 1901 while (my ($k, $v) = each %DEF_CFG) {
1505 $CFG->{$k} = $v unless exists $CFG->{$k}; 1902 $CFG->{$k} = $v unless exists $CFG->{$k};
1506 } 1903 }
1904
1905 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
1507 1906
1508 sdl_init; 1907 sdl_init;
1509 1908
1510 @SDL_MODES = reverse 1909 @SDL_MODES = reverse
1511 grep $_->[0] >= 640 && $_->[1] >= 480, 1910 grep $_->[0] >= 640 && $_->[1] >= 480,
1553 video_init; 1952 video_init;
1554 audio_init; 1953 audio_init;
1555} 1954}
1556 1955
1557Event::loop; 1956Event::loop;
1957#CFClient::SDL_Quit;
1958#CFClient::_exit 0;
1558 1959
1559END { CFClient::SDL_Quit } 1960END { CFClient::SDL_Quit }
1560 1961
1561=head1 NAME 1962=head1 NAME
1562 1963

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines