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

Diff Legend

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