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.37 by elmex, Wed May 31 10:15:34 2006 UTC vs.
Revision 1.96 by root, Mon Jul 17 01:41:54 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;
131
132our $PICKUP_CFG;
110 133
111sub status { 134sub status {
112 $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]);
113} 136}
114 137
115sub debug { 138sub debug {
116 $DEBUG_STATUS->set_text ($_[0]); 139 $DEBUG_STATUS->set_text ($_[0]);
117} 140}
118 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
119sub start_game { 332sub start_game {
120 status "logging in..."; 333 status "logging in...";
121 334
122 $LOGIN_BUTTON->set_text ("Logout"); 335 $LOGIN_BUTTON->set_text ("Logout");
123 $SERVER_SETUP->hide; 336 $SETUP_DIALOG->hide;
124 337
125 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;
126 339
127 my ($host, $port) = split /:/, $CFG->{host}; 340 my ($host, $port) = split /:/, $CFG->{profile}{default}{host};
128 341
129 $MAP = new CFClient::Map $mapsize, $mapsize; 342 $MAP = new CFClient::Map $mapsize, $mapsize;
130 343
131 $CONN = eval { 344 $CONN = eval {
132 new CFClient::Protocol 345 new CFClient::Protocol
133 host => $host, 346 host => $host,
134 port => $port || 13327, 347 port => $port || 13327,
135 user => $CFG->{user}, 348 user => $CFG->{profile}{default}{user},
136 pass => $CFG->{password}, 349 pass => $CFG->{profile}{default}{password},
137 mapw => $mapsize, 350 mapw => $mapsize,
138 maph => $mapsize, 351 maph => $mapsize,
139 352
140 map_widget => $MAPWIDGET, 353 map_widget => $MAPWIDGET,
141 logview => $LOGVIEW, 354 logview => $LOGVIEW,
142 statusbox => $STATUSBOX, 355 statusbox => $STATUSBOX,
143 map => $MAP, 356 map => $MAP,
144 mapmap => $MAPMAP, 357 mapmap => $MAPMAP,
358 query => \&server_query,
145 359
146 sound_play => sub { 360 sound_play => sub {
147 my ($x, $y, $soundnum, $type) = @_; 361 my ($x, $y, $soundnum, $type) = @_;
148 362
149 $SDL_MIXER 363 $SDL_MIXER
… …
166 } 380 }
167} 381}
168 382
169sub stop_game { 383sub stop_game {
170 $LOGIN_BUTTON->set_text ("Login"); 384 $LOGIN_BUTTON->set_text ("Login");
171 $SERVER_SETUP->show; 385 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
386 $SETUP_DIALOG->show;
172 $INV_WINDOW->hide; 387 $PL_WINDOW->hide;
173 $LOGVIEW->hide; 388 $SPELL_PAGE->clear_spells;
174 389
175 return unless $CONN; 390 return unless $CONN;
176 391
177 status "connection closed"; 392 status "connection closed";
178 393
394 destroy_query_dialog $CONN;
179 $CONN->destroy; 395 $CONN->destroy;
180 $CONN = 0; # false, does not autovivify 396 $CONN = 0; # false, does not autovivify
181}
182 397
183sub client_setup { 398 undef $MAP;
184 my $dialog = new CFClient::UI::FancyFrame 399}
185 x => 1, 400
186 y => $HEIGHT * (1/8), 401sub graphics_setup {
187 name => "client_setup",
188 title => "Client Setup",
189 child => (my $vbox = new CFClient::UI::VBox); 402 my $vbox = new CFClient::UI::VBox;
190 403
191 $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]);
192 405
193 $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");
194 $table->add (1, 0, my $hbox = new CFClient::UI::HBox); 407 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
… …
205 $mode_slider->emit (changed => $mode_slider->{range}[0]); 418 $mode_slider->emit (changed => $mode_slider->{range}[0]);
206 419
207 my $row = 1; 420 my $row = 1;
208 421
209 $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");
210 $table->add (1, $row++, new CFClient::UI::CheckBox 423 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFClient::UI::CheckBox
211 state => $CFG->{fullscreen}, 424 state => $CFG->{fullscreen},
212 tooltip => "Bring the client into fullscreen mode.", 425 tooltip => "Bring the client into fullscreen mode.",
213 on_changed => sub { 426 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
214 my ($self, $value) = @_;
215 $CFG->{fullscreen} = $value;
216 }
217 ); 427 );
218 428
219 $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");
220 $table->add (1, $row++, new CFClient::UI::CheckBox 430 $table->add (1, $row++, new CFClient::UI::CheckBox
221 state => $CFG->{fast}, 431 state => $CFG->{fast},
222 tooltip => "Lower the visual quality considerably to speed up rendering.", 432 tooltip => "Lower the visual quality considerably to speed up rendering.",
223 on_changed => sub { 433 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
224 my ($self, $value) = @_;
225 $CFG->{fast} = $value;
226 }
227 ); 434 );
228 435
229 $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");
230 $table->add (1, $row++, new CFClient::UI::Slider 437 $table->add (1, $row++, new CFClient::UI::Slider
231 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 438 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
232 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 439 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
233 on_changed => sub { 440 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
234 my ($self, $value) = @_;
235 $CFG->{map_scale} = 2 ** $value;
236 }
237 ); 441 );
238 442
239 $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");
240 $table->add (1, $row++, new CFClient::UI::CheckBox 444 $table->add (1, $row++, new CFClient::UI::CheckBox
241 state => $CFG->{fow_enable}, 445 state => $CFG->{fow_enable},
242 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.",
243 on_changed => sub { 447 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
244 my ($self, $value) = @_;
245 $CFG->{fow_enable} = $value;
246 }
247 ); 448 );
248 449
249 $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");
250 $table->add (1, $row++, new CFClient::UI::Slider 451 $table->add (1, $row++, new CFClient::UI::Slider
251 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 452 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
252 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.",
253 on_changed => sub { 454 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
254 my ($self, $value) = @_;
255 $CFG->{fow_intensity} = $value;
256 }
257 ); 455 );
258 456
259 $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");
260 $table->add (1, $row++, new CFClient::UI::CheckBox 458 $table->add (1, $row++, new CFClient::UI::CheckBox
261 state => $CFG->{fow_smooth}, 459 state => $CFG->{fow_smooth},
262 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.",
263 on_changed => sub { 461 on_changed => sub {
264 my ($self, $value) = @_; 462 my ($self, $value) = @_;
265 $CFG->{fow_smooth} = $value; 463 $CFG->{fow_smooth} = $value;
266 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
267 } 466 }
268 ); 467 );
269 468
270 $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");
271 $table->add (1, $row++, new CFClient::UI::Slider 470 $table->add (1, $row++, new CFClient::UI::Slider
272 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 471 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
273 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.",
274 on_changed => sub { $CFG->{gui_fontsize} = $_[1] }, 473 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
275 ); 474 );
276 475
277 $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");
278 $table->add (1, $row++, new CFClient::UI::Slider 477 $table->add (1, $row++, new CFClient::UI::Slider
279 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 478 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
280 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.",
281 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]) }, 480 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
282 );
283
284 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
285
286 $table->add (1, $row++, new CFClient::UI::Slider
287 range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1],
288 tooltip => "The font size used by the <b>statistics window</b> only. Changes are instant.",
289 on_changed => sub {
290 $CFG->{stat_fontsize} = $_[1];
291 &set_stats_window_fontsize;
292 }
293 ); 481 );
294 482
295 $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");
296 $table->add (1, $row++, new CFClient::UI::Slider 484 $table->add (1, $row++, new CFClient::UI::Slider
297 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 485 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
298 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.",
299 on_changed => sub { 487 on_changed => sub {
300 $CFG->{gauge_fontsize} = $_[1]; 488 $CFG->{gauge_fontsize} = $_[1];
301 &set_gauge_window_fontsize; 489 &set_gauge_window_fontsize;
490 0
302 } 491 }
303 ); 492 );
304 493
305 $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");
306 $table->add (1, $row++, new CFClient::UI::Slider 495 $table->add (1, $row++, new CFClient::UI::Slider
307 range => [$CFG->{gauge_size}, 0.2, 0.8], 496 range => [$CFG->{gauge_size}, 0.2, 0.8],
308 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.",
309 on_changed => sub { 498 on_changed => sub {
310 $CFG->{gauge_size} = $_[1]; 499 $CFG->{gauge_size} = $_[1];
311 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 500 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
501 0
312 } 502 }
313 ); 503 );
314 504
315 $table->add (1, $row++, new CFClient::UI::Button 505 $table->add (1, $row++, new CFClient::UI::Button
316 expand => 1, align => 0, text => "Apply", 506 expand => 1, align => 0, text => "Apply",
317 tooltip => "Apply the video settings", 507 tooltip => "Apply the video settings",
318 on_activate => sub { 508 on_activate => sub {
319 video_shutdown (); 509 video_shutdown ();
320 video_init (); 510 video_init ();
511 0
321 } 512 }
322 ); 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;
323 524
324 $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");
325 $table->add (1, $row++, new CFClient::UI::CheckBox 526 $table->add (1, $row++, new CFClient::UI::CheckBox
326 state => $CFG->{audio_enable}, 527 state => $CFG->{audio_enable},
327 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.",
328 on_changed => sub { 529 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
329 $CFG->{audio_enable} = $_[1];
330 }
331 ); 530 );
332# $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");
333# $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 {
334# $CFG->{effects_volume} = $_[1]; 533# $CFG->{effects_volume} = $_[1];
335# }); 534# });
336 $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");
337 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox); 536 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox);
338 $hbox->add (new CFClient::UI::CheckBox 537 $hbox->add (new CFClient::UI::CheckBox
339 expand => 1, state => $CFG->{bgm_enable}, 538 expand => 1, state => $CFG->{bgm_enable},
340 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.",
341 on_changed => sub { 540 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
342 $CFG->{bgm_enable} = $_[1];
343 }
344 ); 541 );
345 $hbox->add (new CFClient::UI::Slider 542 $hbox->add (new CFClient::UI::Slider
346 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 543 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
347 tooltip => "The volume of the background music. Changes are instant.", 544 tooltip => "The volume of the background music. Changes are instant.",
348 on_changed => sub { 545 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFClient::MixMusic::volume $_[1] * 128; 0 }
349 $CFG->{bgm_volume} = $_[1];
350 CFClient::MixMusic::volume $_[1] * 128;
351 }
352 ); 546 );
353 547
354 $table->add (1, $row++, new CFClient::UI::Button 548 $table->add (1, $row++, new CFClient::UI::Button
355 expand => 1, align => 0, text => "Apply", 549 expand => 1, align => 0, text => "Apply",
356 tooltip => "Apply the audio settings", 550 tooltip => "Apply the audio settings",
357 on_activate => sub { 551 on_activate => sub {
358 audio_shutdown (); 552 audio_shutdown ();
359 audio_init (); 553 audio_init ();
554 0
360 } 555 }
361 ); 556 );
362 557
363 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command"); 558 $vbox
364 $table->add (1, $row++, my $saycmd = new CFClient::UI::Entry
365 text => $CFG->{say_command},
366 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. "
367 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
368 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
369 on_changed => sub {
370 my ($self, $value) = @_;
371 $CFG->{say_command} = $value;
372 }
373 );
374
375 $dialog
376}
377
378sub set_stats_window_fontsize {
379 for (values %{$STATWIDS}) {
380 $_->set_fontsize ($::CFG->{stat_fontsize});
381 }
382} 559}
383 560
384sub set_gauge_window_fontsize { 561sub set_gauge_window_fontsize {
385 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) { 562 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) {
386 $_->set_fontsize ($::CFG->{gauge_fontsize}); 563 $_->set_fontsize ($::CFG->{gauge_fontsize});
… …
438 &set_gauge_window_fontsize; 615 &set_gauge_window_fontsize;
439 616
440 $win 617 $win
441} 618}
442 619
620sub debug_setup {
621 my $table = new CFClient::UI::Table;
443 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
444sub make_stats_window { 648sub stats_window {
445 my $tgw = new CFClient::UI::FancyFrame 649 my $vb = new CFClient::UI::VBox;
446 y => $HEIGHT * (2/8),
447 x => "max",
448 title => "Stats",
449 name => "stats_window";
450 650
451 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);
452 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1, 651 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
453 can_hover => 1, can_events => 1, 652 can_hover => 1, can_events => 1,
454 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server."); 653 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
455 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1, 654 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
456 can_hover => 1, can_events => 1, 655 can_hover => 1, can_events => 1,
… …
480 [0, 6, st_cha => "Cha", 30, "<b>Charisma</b>, how well you are received by NPCs. Affects buying and selling prices in shops."], 679 [0, 6, st_cha => "Cha", 30, "<b>Charisma</b>, how well you are received by NPCs. Affects buying and selling prices in shops."],
481 680
482 [2, 0, st_wc => "Wc", -120, "<b>Weapon Class</b>, effectiveness of melee/missile attacks. Lower is more potent. Current weapon, level and Str are some things which effect the value of Wc. The value of Wc may range between 25 and -72."], 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."],
483 [2, 1, st_ac => "Ac", -120, "<b>Armour Class</b>, how protected you are from being hit by any attack. Lower values are better. Ac is based on your race and is modified by the Dex and current armour worn. For characters that cannot wear armour, Ac improves as their level increases."], 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."],
484 [2, 2, st_dam => "Dam", 120, "<b>Damage</b>, how much damage your melee/missile attack inflicts. Higher values indicate a greater amount of damage will be inflicted with each attack."], 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."],
485 [2, 3, st_arm => "Arm", 120, "<b>Armour</b>, how much damage (from physical attacks) will be subtracted from successful hits made upon you. This value ranges between 0 to 99%. Current armour worn primarily determines Arm value."], 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."],
486 [2, 4, st_spd => "Spd", 10.54, "<b>Speed</b>, how fast you can move. The value of speed may range between nearly 0 (\"very slow\") to higher than 5 (\"lightning fast\"). Base speed is determined from the Dex and modified downward proportionally by the amount of weight carried which exceeds the Max Carry limit. The armour worn also sets the upper limit on speed."], 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."],
487 [2, 5, st_wspd => "WSp", 10.54, "<b>Weapon Speed</b>, how many attacks you may make per unit of time (0.120s). Higher values indicate faster attack speed. Current weapon and Dex effect the value of weapon speed."], 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."],
488 ) { 687 ) {
489 my ($col, $row, $id, $label, $template, $tooltip) = @$_; 688 my ($col, $row, $id, $label, $template, $tooltip) = @$_;
490 689
… …
492 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);
493 $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
494 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);
495 } 694 }
496 695
497 $hb->add (my $tbl2 = new CFClient::UI::Table expand => 1); 696 $vb->add (my $tbl2 = new CFClient::UI::Table expand => 1);
498 697
499 my $row = 0; 698 my $row = 0;
500 my $col = 0; 699 my $col = 0;
501 700
502 my %resist_names = ( 701 my %resist_names = (
702 slow => ["Slow",
503 slow => "<b>Slow</b> (slows you down when you are hit by the spell. Monsters will have an opportunity to come near you faster and hit you more often.)", 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",
504 holyw => "<b>Holy Word</b> (resistance you against getting the fear when someone whose god doesn't like you spells the holy word on you.)", 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",
505 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",
506 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",
507 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",
508 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",
509 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",
510 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",
511 pois => "<b>Poison</b> (resistance to getting poisoned)", 719 "<b>Poison</b> (resistance to getting poisoned)"],
720 para => ["Paralysation",
512 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",
513 deat => "<b>Death</b> (resistance against death spells)", 723 "<b>Death</b> (resistance against death spells)"],
514 phys => "<b>Physical</b> (this is the resistance against physical attacks, like when a monster hit you in melee combat)", 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",
515 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",
516 fear => "<b>Fear</b> (this attack will drive you away from monsters who cast this and hit you successfully, being resistant to this helps a lot when fighting those monsters)", 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",
517 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",
518 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",
519 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",
520 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)"],
521 ); 738 );
522 for (qw/slow holyw conf fire depl magic 739 for (qw/slow holyw conf fire depl magic
523 drain acid pois para deat phys 740 drain acid pois para deat phys
524 blind fear tund elec cold ghit/) 741 blind fear tund elec cold ghit/)
525 { 742 {
… …
530 template => "-100%", 747 template => "-100%",
531 align => +1, 748 align => +1,
532 valign => 0, 749 valign => 0,
533 can_events => 1, 750 can_events => 1,
534 can_hover => 1, 751 can_hover => 1,
535 tooltip => $resist_names{$_}, 752 tooltip => $resist_names{$_}->[1],
536 ); 753 );
537 $tbl2->add ($col + 1, $row, new CFClient::UI::Image 754 $tbl2->add ($col + 1, $row, new CFClient::UI::Image
538 font => $FONT_FIXED, 755 font => $FONT_FIXED,
539 can_hover => 1, 756 can_hover => 1,
540 can_events => 1, 757 can_events => 1,
541 image => "ui/resist/resist_$_.png", 758 path => "ui/resist/resist_$_.png",
542 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],
543 ); 767 );
544 768
545 $row++; 769 $row++;
546 if ($row % 6 == 0) { 770 if ($row % 6 == 0) {
547 $col += 2; 771 $col += 3;
548 $row = 0; 772 $row = 0;
549 } 773 }
550 } 774 }
551 775
552 &set_stats_window_fontsize;
553 update_stats_window ({}); 776 #update_stats_window ({});
554 777
555 $tgw 778 $vb
556} 779}
557 780
781sub skill_window {
782 $STATWIDS->{skill_tbl} = new CFClient::UI::Table expand => 1, col_expand => [0, 0, 1, 0, 0, 1]
783}
784
558sub formsep { 785sub formsep($) {
559 reverse join ",", grep length, split /(...)/, reverse $_[0] * 1 786 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
560}
561
562sub update_stats_window {
563 my ($stats) = @_;
564
565 # I love text protocols...
566
567 my $hp = $stats->{+CS_STAT_HP} * 1;
568 my $hp_m = $stats->{+CS_STAT_MAXHP} * 1;
569 my $sp = $stats->{+CS_STAT_SP} * 1;
570 my $sp_m = $stats->{+CS_STAT_MAXSP} * 1;
571 my $fo = $stats->{+CS_STAT_FOOD} * 1;
572 my $fo_m = 999;
573 my $gr = $stats->{+CS_STAT_GRACE} * 1;
574 my $gr_m = $stats->{+CS_STAT_MAXGRACE} * 1;
575
576 $GAUGES->{hp} ->set_value ($hp, $hp_m);
577 $GAUGES->{mana} ->set_value ($sp, $sp_m);
578 $GAUGES->{food} ->set_value ($fo, $fo_m);
579 $GAUGES->{grace} ->set_value ($gr, $gr_m);
580 $GAUGES->{exp} ->set_text ("Exp: " . (formsep $stats->{+CS_STAT_EXP64})
581 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
582 my $rng = $stats->{+CS_STAT_RANGE};
583 $rng =~ s/^Range: //; # thank you so much dear server
584 $GAUGES->{range} ->set_text ("Rng: " . $rng);
585 my $title = $stats->{+CS_STAT_TITLE};
586 $title =~ s/^Player: //;
587 $STATWIDS->{title} ->set_text ("Title: " . $title);
588
589 $STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
590 $STATWIDS->{st_dex} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DEX});
591 $STATWIDS->{st_con} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CON});
592 $STATWIDS->{st_int} ->set_text (sprintf "%d" , $stats->{+CS_STAT_INT});
593 $STATWIDS->{st_wis} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WIS});
594 $STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
595 $STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
596 $STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
597 $STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
598 $STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
599 $STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_ARMOUR});
600 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
601 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
602
603 $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000);
604
605 # TODO: replace by CS_STAT_RES_xxx constants
606 my %tbl = (
607 phys => 100,
608 magic => 101,
609 fire => 102,
610 elec => 103,
611 cold => 104,
612 conf => 105,
613 acid => 106,
614 drain => 107,
615 ghit => 108,
616 pois => 109,
617 slow => 110,
618 para => 111,
619 tund => 112,
620 fear => 113,
621 depl => 113,
622 deat => 115,
623 holyw => 116,
624 blind => 117,
625 );
626
627 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
628 for keys %tbl;
629}
630
631sub metaserver_dialog {
632 my $dialog = new CFClient::UI::FancyFrame
633 title => "Server List",
634 child => (my $vbox = new CFClient::UI::VBox);
635
636 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
637
638 $dialog
639} 787}
640 788
641my $METASERVER_ATIME; 789my $METASERVER_ATIME;
642 790
643sub update_metaserver { 791sub update_metaserver {
644 my ($HOST) = @_; 792 my ($metaserver_dialog) = @_;
793
794 $METASERVER = $metaserver_dialog
795 if defined $metaserver_dialog;
645 796
646 return if $METASERVER_ATIME > time; 797 return if $METASERVER_ATIME > time;
647 $METASERVER_ATIME = time + 60; 798 $METASERVER_ATIME = time + 60;
648 799
649 my $table = $METASERVER->{table}; 800 my $table = $METASERVER->{table};
… …
671 822
672 utf8::decode $buf if utf8::valid $buf; 823 utf8::decode $buf if utf8::valid $buf;
673 824
674 $table->clear; 825 $table->clear;
675 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 );
676 my @col = qw(Use #Users Host Uptime Version Description); 834 my @col = qw(#Users Host Uptime Version Description);
677 $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[$_])
678 for 0 .. $#col; 839 for 0 .. $#col;
679 840
680 my @align = qw(1 0 1 1 -1); 841 my @align = qw(1 0 1 1 -1);
681 842
682 my $y = 0; 843 my $y = 0;
683 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) {
… …
700 861
701 $m = [$users, $host, $uptime, $version, $desc]; 862 $m = [$users, $host, $uptime, $version, $desc];
702 863
703 $y++; 864 $y++;
704 865
705 $table->add (0, $y, new CFClient::UI::VBox children => [ 866 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [
706 (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 {
707 $HOST->set_text ($CFG->{host} = $host); 871 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
872 $METASERVER->hide;
873 0
874 },
708 }), 875 ),
709 (new CFClient::UI::Empty expand => 1), 876 (new CFClient::UI::Empty expand => 1),
710 ]); 877 ]);
711 878
712 $table->add ($_ + 1, $y, new CFClient::UI::Label 879 $table->add ($_, $y, new CFClient::UI::Label
713 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)
714 for 0 .. $#$m; 887 for 0 .. $#$m;
715 } 888 }
716 } 889 }
717 }); 890 });
718} 891}
719 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
720sub server_setup { 917sub server_setup {
721 my $dialog = $SERVER_SETUP = new CFClient::UI::FancyFrame
722 x => "center",
723 y => "center",
724 name => "server_setup",
725 title => "Server Setup",
726 child => (my $vbox = new CFClient::UI::VBox), 918 my $vbox = new CFClient::UI::VBox;
727 ;
728 919
729 $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]);
730 $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");
731 922
732 { 923 {
733 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 924 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
734 925
735 $vbox->add ( 926 $vbox->add (
736 my $HOST = new CFClient::UI::Entry 927 $HOST_ENTRY = new CFClient::UI::Entry
737 expand => 1, 928 expand => 1,
738 text => $CFG->{host}, 929 text => $CFG->{profile}{default}{host},
739 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",
740 on_changed => sub { 931 on_changed => sub {
741 my ($self, $value) = @_; 932 my ($self, $value) = @_;
742 $CFG->{host} = $value; 933 $CFG->{profile}{default}{host} = $value;
934 0
743 } 935 }
744 ); 936 );
745 937
746 $METASERVER = metaserver_dialog;
747
748 $vbox->add (new CFClient::UI::Flopper 938 $vbox->add (new CFClient::UI::Button
749 expand => 1, 939 expand => 1,
750 text => "Server List", 940 text => "Server List",
751 other => $METASERVER, 941 other => $METASERVER,
752 tooltip => "Show a list of available crossfire servers", 942 tooltip => "Show a list of available crossfire servers",
753 on_open => sub { 943 on_activate => sub { $METASERVER->toggle_visibility; 0 },
754 update_metaserver $HOST; 944 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
755 }
756 ); 945 );
757 } 946 }
758 947
759 $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");
760 $table->add (1, 4, new CFClient::UI::Entry 949 $table->add (1, 4, new CFClient::UI::Entry
761 text => $CFG->{user}, 950 text => $CFG->{profile}{default}{user},
762 tooltip => "The name of your character on the server", 951 tooltip => "The name of your character on the server",
763 on_changed => sub { 952 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
764 my ($self, $value) = @_;
765 $CFG->{user} = $value;
766 }
767 ); 953 );
768 954
769 $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");
770 $table->add (1, 5, new CFClient::UI::Entry 956 $table->add (1, 5, new CFClient::UI::Entry
771 text => $CFG->{password}, 957 text => $CFG->{profile}{default}{password},
772 hidden => 1, 958 hidden => 1,
773 tooltip => "The password for your character", 959 tooltip => "The password for your character",
774 on_changed => sub { 960 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
775 my ($self, $value) = @_;
776 $CFG->{password} = $value;
777 }
778 ); 961 );
779 962
780 $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");
781 $table->add (1, 7, new CFClient::UI::Slider 964 $table->add (1, 7, new CFClient::UI::Slider
782 force_w => 100, 965 force_w => 100,
783 range => [$CFG->{mapsize}, 10, 100, 0, 1], 966 range => [$CFG->{mapsize}, 10, 100, 0, 1],
784 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. "
785 . "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, "
786 . "but you also increase bandwidth requirements and latency. " 969 . "but you also increase bandwidth requirements and latency. "
787 . "This option is only used once at log-in.", 970 . "This option is only used once at log-in.",
788 on_changed => sub { 971 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },
789 my ($self, $value) = @_;
790
791 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
792 },
793 ); 972 );
794 973
795 $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");
796 $table->add (1, 8, new CFClient::UI::CheckBox 975 $table->add (1, 8, new CFClient::UI::CheckBox
797 state => $CFG->{face_prefetch}, 976 state => $CFG->{face_prefetch},
… …
800 . "This might increase or create lag, but increases the chances " 979 . "This might increase or create lag, but increases the chances "
801 . "of faces being ready for display when you encounter them. " 980 . "of faces being ready for display when you encounter them. "
802 . "It also uses up server bandwidth on every connect, " 981 . "It also uses up server bandwidth on every connect, "
803 . "so only set it if you really need to prefetch images. " 982 . "so only set it if you really need to prefetch images. "
804 . "This option can be set and unset any time.", 983 . "This option can be set and unset any time.",
805 on_changed => sub { $CFG->{face_prefetch} = $_[1] }, 984 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
806 ); 985 );
807 986
808 $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");
809 $table->add (1, 9, new CFClient::UI::Entry 988 $table->add (1, 9, new CFClient::UI::Entry
810 text => $CFG->{output_count}, 989 text => $CFG->{output_count},
811 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.",
812 on_changed => sub { $CFG->{output_count} = $_[1] }, 991 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
813 ); 992 );
814 993
815 $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");
816 $table->add (1, 10, new CFClient::UI::Entry 995 $table->add (1, 10, new CFClient::UI::Entry
817 text => $CFG->{output_sync}, 996 text => $CFG->{output_sync},
818 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.",
819 on_changed => sub { $CFG->{output_sync} = $_[1] }, 998 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
820 ); 999 );
821 1000
822 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button 1001 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button
823 expand => 1, 1002 expand => 1,
824 align => 0, 1003 align => 0,
825 text => "Login", 1004 text => "Login",
826 on_activate => sub { 1005 on_activate => sub {
827 $CONN ? stop_game 1006 $CONN ? stop_game
828 : start_game; 1007 : start_game;
1008 0
829 }, 1009 },
830 ); 1010 );
831 1011
832 $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
833} 1035}
834 1036
835sub message_window { 1037sub message_window {
836 my $window = new CFClient::UI::FancyFrame 1038 my $window = new CFClient::UI::FancyFrame
837 name => "message_window", 1039 name => "message_window",
838 title => "Messages", 1040 title => "Messages",
839 border_bg => [1, 1, 1, 1], 1041 border_bg => [1, 1, 1, 1],
840 bg => [0, 0, 0, 0.75],
841 x => "max", 1042 x => "max",
842 y => 0, 1043 y => 0,
843 force_w => $::WIDTH / 3, 1044 force_w => $::WIDTH * 0.4,
844 force_h => $::HEIGHT / 5, 1045 force_h => $::HEIGHT * 0.5,
845 child => (my $vbox = new CFClient::UI::VBox); 1046 child => (my $vbox = new CFClient::UI::VBox),
1047 has_close_button => 1;
846 1048
847 $vbox->add ($LOGVIEW); 1049 $vbox->add ($LOGVIEW);
848 1050
849 $vbox->add (my $input = new CFClient::UI::Entry 1051 $vbox->add (my $input = new CFClient::UI::Entry
850 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> "
… …
858 1060
859 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) { 1061 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
860 $input->{refocus_map} = 1; 1062 $input->{refocus_map} = 1;
861 } 1063 }
862 delete $input->{auto_activated}; 1064 delete $input->{auto_activated};
1065
1066 0
863 }, 1067 },
864 on_activate => sub { 1068 on_activate => sub {
865 my ($input, $text) = @_; 1069 my ($input, $text) = @_;
866 $input->set_text (''); 1070 $input->set_text ('');
867 1071
868 if ($text =~ /^\/bind\s+(.*)$/) {
869 CFClient::Binder::open_binding_dialog (sub {
870 my ($mod, $sym) = @_;
871 $::CFG->{bindings}->{$mod}->{$sym} = [$1];
872 });
873 } elsif ($text =~ /^\/(.*)/) { 1072 if ($text =~ /^\/(.*)/) {
874 $::CONN->user_send ($1); 1073 $::CONN->user_send ($1);
875 } else { 1074 } else {
876 my $say_cmd = $::CFG->{say_command} || 'say'; 1075 my $say_cmd = $::CFG->{say_command} || 'say';
877 $::CONN->user_send ("$say_cmd $text"); 1076 $::CONN->user_send ("$say_cmd $text");
878 } 1077 }
879 if ($input->{refocus_map}) { 1078 if ($input->{refocus_map}) {
880 delete $input->{refocus_map}; 1079 delete $input->{refocus_map};
881 $MAPWIDGET->focus_in 1080 $MAPWIDGET->focus_in
882 } 1081 }
1082
1083 0
883 }, 1084 },
884 on_escape => sub { 1085 on_escape => sub {
885 $MAPWIDGET->focus_in 1086 $MAPWIDGET->grab_focus;
1087
1088 0
886 }, 1089 },
887 ); 1090 );
888 1091
889 $CONSOLE = { 1092 $CONSOLE = {
890 window => $window, 1093 window => $window,
… …
897sub open_quit_dialog { 1100sub open_quit_dialog {
898 unless ($QUIT_DIALOG) { 1101 unless ($QUIT_DIALOG) {
899 $QUIT_DIALOG = new CFClient::UI::FancyFrame 1102 $QUIT_DIALOG = new CFClient::UI::FancyFrame
900 x => "center", 1103 x => "center",
901 y => "center", 1104 y => "center",
1105 z => 50,
902 title => "Really Quit?", 1106 title => "Really Quit?",
903 ; 1107 ;
904 1108
905 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1); 1109 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
906 1110
… …
911 ); 1115 );
912 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 1116 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
913 $hb->add (new CFClient::UI::Button 1117 $hb->add (new CFClient::UI::Button
914 text => "Ok", 1118 text => "Ok",
915 expand => 1, 1119 expand => 1,
916 on_activate => sub { $QUIT_DIALOG->hide }, 1120 on_activate => sub { $QUIT_DIALOG->hide; 0 },
917 ); 1121 );
918 $hb->add (new CFClient::UI::Button 1122 $hb->add (new CFClient::UI::Button
919 text => "Quit anyway", 1123 text => "Quit anyway",
920 expand => 1, 1124 expand => 1,
921 on_activate => sub { exit }, 1125 on_activate => sub { exit },
… …
923 } 1127 }
924 1128
925 $QUIT_DIALOG->show; 1129 $QUIT_DIALOG->show;
926} 1130}
927 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
928sub 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 {
929 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame 1260 my $plwin = $PL_WINDOW = new CFClient::UI::FancyFrame
930 x => "center", 1261 x => "center",
931 y => "center", 1262 y => "center",
932 force_w => $WIDTH * 9/10, 1263 force_w => $WIDTH * 9/10,
933 force_h => $HEIGHT * 9/10, 1264 force_h => $HEIGHT * 9/10,
934 title => "Inventory", 1265 title => "Player",
1266 name => "playerbook",
1267 has_close_button => 1
935 ; 1268 ;
936 1269
937 $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 ;
938 1277
939 $hb->add (my $vb1 = new CFClient::UI::VBox); 1278 $ntb->add (
940 $vb1->add (new CFClient::UI::Label align => 0, text => "Player"); 1279 "Statistics (F2)" => $STATS_PAGE = stats_window,
941 $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 );
942 1295
943 $hb->add (my $vb2 = new CFClient::UI::VBox); 1296 $ntb->set_current_page ($INVENTORY_PAGE);
944 1297
945 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox); 1298 $plwin->add ($ntb);
946 1299 $plwin
947 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
948
949 # XXX: Call after $INVR = ... because set_opencont sets the items
950 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
951
952 $invwin
953} 1300}
954 1301
955sub make_binding_window { 1302sub update_bindings {
1303 $BIND_UPD_CB->() if $BIND_UPD_CB;
1304}
1305
1306sub keyboard_setup {
956 my $binding_list = new CFClient::UI::VBox; 1307 my $binding_list = new CFClient::UI::VBox;
957 1308
958 my $refresh; 1309 my $refresh;
959 $refresh = sub { 1310 $refresh = $BIND_UPD_CB = sub {
960 $binding_list->clear (); 1311 $binding_list->clear ();
961 1312
962 for my $mod (keys %{$::CFG->{bindings}}) { 1313 for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) {
963 for my $sym (keys %{$::CFG->{bindings}->{$mod}}) { 1314 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
964 my $cmds = $::CFG->{bindings}->{$mod}->{$sym}; 1315 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
965 next unless ref $cmds eq 'ARRAY' and @$cmds > 0; 1316 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
966 1317
967 my $lbl = join "; ", @$cmds; 1318 my $lbl = join "; ", @$cmds;
968 my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym); 1319 my $nam = CFClient::BindingEditor::keycombo_to_name ($mod, $sym);
969 $binding_list->add (my $hb = new CFClient::UI::HBox); 1320 $binding_list->add (my $hb = new CFClient::UI::HBox);
970 $hb->add (new CFClient::UI::Button 1321 $hb->add (new CFClient::UI::Button
971 text => "delete", 1322 text => "delete",
972 tooltip => "Deletes the binding", 1323 tooltip => "Deletes the binding",
973 on_activate => sub { 1324 on_activate => sub {
974 $binding_list->remove ($hb); 1325 $binding_list->remove ($hb);
975 delete $::CFG->{bindings}->{$mod}->{$sym}; 1326 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1327 0
976 }); 1328 });
977 1329
978 $hb->add (new CFClient::UI::Button 1330 $hb->add (new CFClient::UI::Button
979 text => "edit", 1331 text => "edit",
980 tooltip => "Edits the binding", 1332 tooltip => "Edits the binding",
981 on_activate => sub { 1333 on_activate => sub {
982 $::BIND_EDITOR->set_binding ( 1334 $::BIND_EDITOR->set_binding (
983 $mod, $sym, $::CFG->{bindings}->{$mod}->{$sym}, 1335 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},
984 sub { 1336 sub {
985 my ($nmod, $nsym, $ncmds) = @_; 1337 my ($nmod, $nsym, $ncmds) = @_;
986 delete $::CFG->{bindings}->{$mod}->{$sym}; 1338 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
987 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds; 1339 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
988 $refresh->(); 1340 $refresh->();
1341 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
989 $::BIND_WINDOW->show; 1342 $SETUP_DIALOG->show;
990 }, 1343 },
991 sub { 1344 sub {
1345 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
992 $::BIND_WINDOW->show; 1346 $SETUP_DIALOG->show;
993 }); 1347 });
994 $::BIND_EDITOR->show; 1348 $::BIND_EDITOR->show;
995 $::BIND_WINDOW->hide; 1349 $SETUP_DIALOG->hide;
1350 0
996 }); 1351 });
997 1352
998 $hb->add (new CFClient::UI::Label text => "(Key: $nam)"); 1353 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
999 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1); 1354 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
1000 } 1355 }
1001 } 1356 }
1002 }; 1357 };
1003 1358
1004 $BIND_WINDOW = new CFClient::UI::FancyFrame 1359 my $vb = new CFClient::UI::VBox;
1005 title => "Bindings",
1006 x => "center",
1007 y => "center",
1008 def_w => int $WIDTH * 9/10,
1009 def_h => int $HEIGHT * 9/10,
1010 on_visibility_change => sub {
1011 my ($self, $visible) = @_;
1012 $refresh->() if $visible;
1013 };
1014
1015 $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
1016 $vb->add ($binding_list); 1372 $vb->add ($binding_list);
1017 $vb->add (my $hb = new CFClient::UI::HBox); 1373 $vb->add (my $hb = new CFClient::UI::HBox);
1374
1018 $hb->add (new CFClient::UI::Button 1375 $hb->add (new CFClient::UI::Button
1019 text => "record new", 1376 text => "record new",
1020 expand => 1, 1377 expand => 1,
1021 tooltip => "This button opens the binding editor with an empty binding.", 1378 tooltip => "This button opens the binding editor with an empty binding.",
1022 on_activate => sub { 1379 on_activate => sub {
1023 $::BIND_EDITOR->set_binding (undef, undef, [], 1380 $::BIND_EDITOR->set_binding (undef, undef, [],
1024 sub { 1381 sub {
1025 my ($mod, $sym, $cmds) = @_; 1382 my ($mod, $sym, $cmds) = @_;
1026 $::CFG->{bindings}->{$mod}->{$sym} = $cmds; 1383 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1027 $refresh->(); 1384 $refresh->();
1028 $::BIND_WINDOW->show; 1385 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1386 $SETUP_DIALOG->show;
1029 }, 1387 },
1030 sub { 1388 sub {
1031 $::BIND_WINDOW->show; 1389 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1390 $SETUP_DIALOG->show;
1032 }); 1391 },
1033 $::BIND_WINDOW->hide; 1392 );
1393 $SETUP_DIALOG->hide;
1034 $::BIND_EDITOR->show; 1394 $::BIND_EDITOR->show;
1395 0
1035 }, 1396 },
1036 ); 1397 );
1398
1037 $hb->add (new CFClient::UI::Button 1399 $hb->add (new CFClient::UI::Button
1038 text => "close", 1400 text => "close",
1039 tooltip => "Closes the binding window", 1401 tooltip => "Closes the binding window",
1040 expand => 1, 1402 expand => 1,
1041 on_activate => sub { 1403 on_activate => sub {
1042 $::BIND_WINDOW->hide; 1404 $SETUP_DIALOG->hide;
1405 0
1043 } 1406 }
1044 ); 1407 );
1045 1408
1046 $refresh->(); 1409 $refresh->();
1047 $BIND_WINDOW
1048}
1049 1410
1411 $vb
1412}
1413
1414# just weirdness, pls. ignore
1415sub load_html_page {
1416 my ($viewer, $base) = @_;
1417
1418 $viewer->clear;
1419
1420 require LWP::Simple;
1421 require HTML::Parser;
1422 require URI;
1423
1424 my $page = LWP::Simple::get ($base)
1425 or return;
1426
1427 my @s = { };
1428 my %passthrough = map ($_ => undef), qw(b i u s tt big small sub sup);
1429
1430 my $parser = HTML::Parser->new (
1431 text_h => [sub {
1432 my ($text) = @_;
1433 $text =~ s/\s+/ /g;
1434 $s[-1]{text} .= CFClient::UI::Label::escape $text;
1435 }, "dtext"],
1436 start_h => [sub {
1437 my ($tag, $attr) = @_;
1438 if ($passthrough{$tag}) {
1439 $s[-1]{text} .= "<$tag>";
1440 } elsif ($tag eq "h1") {
1441 push @s, { text => "<span foreground='#ffff00' size='x-large'>" };
1442 } elsif ($tag eq "h2") {
1443 push @s, { text => "<span foreground='#ccccff' size='large'>" };
1444 } elsif ($tag eq "h3") {
1445 push @s, { text => "<span size='large'>" };
1446 } elsif ($tag eq "a") {
1447 push @s, { text => "", url => $attr->{href} };
1448 } elsif ($tag eq "p") {
1449 push @s, { };
1450 } elsif ($tag eq "img") {
1451 eval {
1452 push @{$s[-1]{obj}}, new CFClient::UI::Image
1453 tex => (new_from_image CFClient::Texture LWP::Simple::get (URI->new ($attr->{src}, $base)->abs ($base)));
1454 $s[-1]{text} .= "\x{fffc}";
1455 };
1456 }
1457 }, "tagname, attr"],
1458 end_h => [sub {
1459 my ($tag) = @_;
1460 if ($passthrough{$tag}) {
1461 $s[-1]{text} .= "</$tag>";
1462 } elsif ($tag =~ /^h\d$/) {
1463 $s[-1]{text} .= "</span>";
1464 push @s, { };
1465 } elsif ($tag eq "a") {
1466 my $S = pop @s;
1467 $s[-1]{text} .= "\x{fffc}";
1468 push @{$s[-1]{obj}}, new CFClient::UI::Label
1469 fg => [0.8, 0.8, 1],
1470 markup => "<u>$S->{text}</u>",
1471 fontsize => 0.8,
1472 can_events => 1,
1473 can_focus => 1,
1474 on_button_up => sub {
1475 load_html_page ($viewer, URI->new ($S->{url}, $base)->abs ($base));
1476 },
1477 ;
1478 }
1479 }, "tagname"],
1480 );
1481
1482 $parser->parse ($page);
1483 $parser->eof;
1484
1485 $viewer->add_paragraph ([1, 1, 1, 1], [$_->{text}, @{ $_->{obj} || [] }], $_->{indent})
1486 for @s;
1487
1488 $viewer->set_offset (0);
1489}
1490
1050sub make_help_window { 1491sub help_window {
1051 my $win = new CFClient::UI::FancyFrame 1492 my $win = new CFClient::UI::FancyFrame
1493 x => 'center',
1494 y => 'center',
1495 z => 2,
1496 name => 'doc_browser',
1052 def_w => int $WIDTH * 7/8, 1497 force_w => int $WIDTH * 7/8,
1053 def_h => int $HEIGHT * 7/8, 1498 force_h => int $HEIGHT * 7/8,
1054 title => "Documentation"; 1499 title => "Help Browser",
1500 has_close_button => 1;
1055 1501
1056 $win->add (my $vbox = new CFClient::UI::VBox); 1502 $win->add (my $vbox = new CFClient::UI::VBox);
1057 1503
1058 $vbox->add (my $buttons = new CFClient::UI::HBox); 1504 $vbox->add (my $buttons = new CFClient::UI::HBox);
1059 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8); 1505 $vbox->add (my $viewer = new CFClient::UI::TextScroller
1506 expand => 1, fontsize => 0.8, padding_x => 4);
1060 1507
1061 for ( 1508 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: ");
1509 $buttons->add (my $combo = new CFClient::UI::Combobox
1510 value => undef,
1511 options => [
1062 [intro => "Introduction"], 1512 [intro => "Introduction"],
1063 [manual => "Manual"], 1513 [manual => "Main Manual"],
1514 [skill_help => "Skill Reference"],
1515 [command_help => "Command Reference"],
1064 [command_help => "Commands"], 1516 [dmcommand_help => "DM Commands"],
1065 [skill_help => "Skills"], 1517 [COPYING => "License Terms"],
1066 ) { 1518 [test => "test (do not select)"], #d#TODO
1067 my ($pod, $label) = @$_; 1519 ],
1520 on_changed => sub {
1521 my ($self, $pod) = @_;
1068 1522
1069 $buttons->add (new CFClient::UI::Button 1523 if ($pod eq "test") {#d#TODO
1070 text => $label, 1524 eval {
1071 on_activate => sub { 1525 load_html_page $viewer, "http://crossfire.real-time.com/guides/walkthrough/newbie-tower.html";
1072 my $parser = new Pod::POM; 1526 };
1073 my $pom = $parser->parse_file (CFClient::find_rcfile "pod/$pod.pod"); 1527 warn "$@" if $@;
1528 return;
1529 }
1074 1530
1531 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
1532 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };
1533
1075 $viewer->clear; 1534 $viewer->clear;
1535
1536# $viewer->add_paragraph ([1, 1, 1, 1], ["<big>Test</big>\n\n \x{fffc} \x{fffc}\n",
1537# (new CFClient::UI::Image path => "x.png", can_hover => 1, can_events => 1),
1538# (new CFClient::UI::Label text => "üüüü", can_hover => 1, can_events => 1, tooltip => "??"),
1539# ]);#d#
1076 1540
1077 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0]) 1541 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
1078 for @{ CFClient::pod_to_pango_list $pom }; 1542 for @$pom;
1079 1543
1080 $viewer->set_offset (0); 1544 $viewer->set_offset (0);
1545
1081 }, 1546 0
1547 },
1548 on_visibility_change => sub {
1549 my ($self, $visible) = @_;
1550 return unless $visible;
1551 return if $self->{value};
1552 $self->set_value ("intro");
1553 0
1554 },
1082 ); 1555 );
1083 }
1084
1085 $viewer->add_paragraph ([1, 1, 0, 1], "<big>Use one of the buttons above to display a document.</big>");
1086 1556
1087 $win 1557 $win
1088} 1558}
1089 1559
1090sub sdl_init { 1560sub sdl_init {
… …
1127 z => 100, 1597 z => 100,
1128 force_x => "max", 1598 force_x => "max",
1129 force_y => 0; 1599 force_y => 0;
1130 $DEBUG_STATUS->show; 1600 $DEBUG_STATUS->show;
1131 1601
1132 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0); 1602 $BIND_EDITOR = new CFClient::BindingEditor (x => "max", y => 0);
1133 1603
1134 $STATUSBOX = new CFClient::UI::Statusbox; 1604 $STATUSBOX = new CFClient::UI::Statusbox;
1135 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]); 1605 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1136 1606
1137 (new CFClient::UI::Frame 1607 (new CFClient::UI::Frame
1138 bg => [0, 0, 0, 0.4], 1608 bg => [0, 0, 0, 0.4],
1139 force_x => 0, 1609 force_x => 0,
1140 force_y => "max", 1610 force_y => "max",
1141 child => $STATUSBOX, 1611 child => $STATUSBOX,
1142 )->show; 1612 )->show;
1143 1613
1144 CFClient::UI::FancyFrame->new ( 1614 CFClient::UI::FancyFrame->new (
1615 title => "Map",
1616 name => "mapmap",
1145 x => 0, 1617 x => 0,
1146 y => $FONTSIZE + 8, 1618 y => $FONTSIZE + 8,
1147 border_bg => [1, 1, 1, 192/255], 1619 border_bg => [1, 1, 1, 192/255],
1148 bg => [1, 1, 1, 0], 1620 bg => [1, 1, 1, 0],
1149 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1621 child => ($MAPMAP = new CFClient::MapWidget::MapMap
… …
1155 $MAPWIDGET->connect (activate_console => sub { 1627 $MAPWIDGET->connect (activate_console => sub {
1156 my ($mapwidget, $preset) = @_; 1628 my ($mapwidget, $preset) = @_;
1157 1629
1158 if ($CONSOLE) { 1630 if ($CONSOLE) {
1159 $CONSOLE->{input}->{auto_activated} = 1; 1631 $CONSOLE->{input}->{auto_activated} = 1;
1160 $CONSOLE->{input}->focus_in; 1632 $CONSOLE->{input}->grab_focus;
1161 1633
1162 if ($preset && $CONSOLE->{input}->get_text eq '') { 1634 if ($preset && $CONSOLE->{input}->get_text eq '') {
1163 $CONSOLE->{input}->set_text ($preset); 1635 $CONSOLE->{input}->set_text ($preset);
1164 } 1636 }
1165 } 1637 }
1166 }); 1638 });
1167 $MAPWIDGET->show; 1639 $MAPWIDGET->show;
1168 $MAPWIDGET->focus_in; 1640 $MAPWIDGET->grab_focus;
1169 1641
1170 $LOGVIEW = new CFClient::UI::TextView 1642 $LOGVIEW = new CFClient::UI::TextScroller
1171 expand => 1, 1643 expand => 1,
1172 font => $FONT_FIXED, 1644 font => $FONT_FIXED,
1173 fontsize => $::CFG->{log_fontsize}, 1645 fontsize => $::CFG->{log_fontsize},
1646 indent => -4,
1174 can_hover => 1, 1647 can_hover => 1,
1175 can_events => 1, 1648 can_events => 1,
1176 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1649 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1177 ; 1650 ;
1178 1651
1652 $SETUP_DIALOG = new CFClient::UI::FancyFrame
1653 title => "Setup",
1654 name => "setup_dialog",
1655 x => 'center',
1656 y => 'center',
1657 z => 2,
1658 force_w => $::WIDTH * 0.6,
1659 force_h => $::HEIGHT * 0.6,
1660 has_close_button => 1,
1661 ;
1662
1663 $METASERVER = metaserver_dialog;
1664
1665 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,
1666 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1667
1668 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1669 "Configure the server to play on, your username, password and other server-related options.");
1670 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1671 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1672 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1673 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1674 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1675 "Configure the use of audio, sound effects and background music.");
1676 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1677 "Lets you define, edit and delete key bindings."
1678 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "
1679 . "with nothing set and the recording started. After doing the actions you "
1680 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1681 . "After pressing the combo the binding will be saved automatically and the "
1682 . "binding editor closes");
1683 $SETUP_NOTEBOOK->add (Debug => debug_setup,
1684 "Some debuggin' options. Do not ask.");
1685
1179 $BUTTONBAR = new CFClient::UI::HBox x => 0, y => 0; 1686 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1180 1687
1181 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup, 1688 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1182 tooltip => "Toggles a dialog where you can configure various aspects of the client, such as graphics mode, performance, and audio options."); 1689 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1183 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup, 1690
1184 tooltip => "Toggles a dialog where you can configure the server to play on, your username, password and other server-related options.");
1185 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window, 1691 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,
1186 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 1692 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1187 1693
1188 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 1694 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
1189 1695
1190 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window,
1191 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1192 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window, 1696 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Playerbook", other => player_window,
1193 tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :)." 1697 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
1194 ."You can also hit the Tab-key to show/hide the Inventory.");
1195 1698
1196 $BUTTONBAR->add (new CFClient::UI::Button 1699 $BUTTONBAR->add (new CFClient::UI::Button
1197 text => "Save Config", 1700 text => "Save Config",
1198 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 1701 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1199 on_activate => sub { 1702 on_activate => sub {
1200 $::CFG->{layout} = CFClient::UI::get_layout; 1703 $::CFG->{layout} = CFClient::UI::get_layout;
1201 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc"; 1704 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1202 status "Configuration Saved"; 1705 status "Configuration Saved";
1706 0
1203 }, 1707 },
1204 ); 1708 );
1205 1709
1206 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window, 1710 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1207 tooltip => "View Documentation"); 1711 tooltip => "View Documentation");
1208
1209 $BUTTONBAR->add (new CFClient::UI::Flopper
1210 text => "Bindings",
1211 other => make_binding_window,
1212 tooltip =>
1213 "Lets you define, edit and delete bindings."
1214 ."There is a shortcut for making bindings: LCTRL+Insert opens the binding editor "
1215 ."with nothing set and the recording started. After doing the actions you "
1216 ."want to record press Insert and you will be asked to press a key-combo."
1217 ."After pressing the combo the binding will be saved automatically and the "
1218 ."binding editor closes"
1219 );
1220 1712
1221 $BUTTONBAR->add (new CFClient::UI::Button 1713 $BUTTONBAR->add (new CFClient::UI::Button
1222 text => "Quit", 1714 text => "Quit",
1223 tooltip => "Terminates the program", 1715 tooltip => "Terminates the program",
1224 on_activate => sub { 1716 on_activate => sub {
1225 if ($CONN) { 1717 if ($CONN) {
1226 open_quit_dialog; 1718 open_quit_dialog;
1227 } else { 1719 } else {
1228 exit; 1720 exit;
1229 } 1721 }
1722 0
1230 }, 1723 },
1231 ); 1724 );
1232 1725
1233 $BUTTONBAR->show; 1726 $BUTTONBAR->show;
1234 $SERVER_SETUP->show; 1727 $SETUP_DIALOG->show;
1235
1236 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1237 } 1728 }
1729
1730 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1238} 1731}
1239 1732
1240sub video_shutdown { 1733sub video_shutdown {
1734 CFClient::OpenGL::shutdown;
1735
1241 undef $SDL_ACTIVE; 1736 undef $SDL_ACTIVE;
1242} 1737}
1243 1738
1244my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d# 1739my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
1245my $bgmusic;#TODO#hack#d# 1740my $bgmusic;#TODO#hack#d#
… …
1374}; 1869};
1375 1870
1376 CFClient::SDL_GL_SwapBuffers; 1871 CFClient::SDL_GL_SwapBuffers;
1377} 1872}
1378 1873
1379my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub { 1874my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1380 $NOW = time; 1875 $NOW = time;
1381 1876
1382 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 1877 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1383 for CFClient::SDL_PollEvent; 1878 for CFClient::SDL_PollEvent;
1384 1879
… …
1426# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 1921# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
1427 }, 1922 },
1428 CFClient::SDL_KEYDOWN => sub { 1923 CFClient::SDL_KEYDOWN => sub {
1429 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) { 1924 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {
1430 # alt-enter 1925 # alt-enter
1926 $FULLSCREEN_ENABLE->toggle;
1431 video_shutdown; 1927 video_shutdown;
1432 $CFG->{fullscreen} = !$CFG->{fullscreen};
1433 video_init; 1928 video_init;
1434 } else { 1929 } else {
1435 CFClient::UI::feed_sdl_key_down_event ($_[0]); 1930 CFClient::UI::feed_sdl_key_down_event ($_[0]);
1436 } 1931 }
1437 }, 1932 },
… …
1451############################################################################# 1946#############################################################################
1452 1947
1453$SIG{INT} = $SIG{TERM} = sub { exit }; 1948$SIG{INT} = $SIG{TERM} = sub { exit };
1454 1949
1455{ 1950{
1456 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] if defined $^S && !$^S }; 1951 local $SIG{__DIE__} = sub {
1952 return unless defined $^S && !$^S;
1953 Carp::confess $_[0];#d#TODO: remove when stable
1954 CFClient::fatal $_[0];
1955 };
1457 1956
1458 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc"; 1957 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1459 CFClient::UI::set_layout ($::CFG->{layout}); 1958 CFClient::UI::set_layout ($::CFG->{layout});
1460 1959
1461 my %DEF_CFG = ( 1960 my %DEF_CFG = (
1462 sdl_mode => 0, 1961 sdl_mode => 0,
1463 width => 640, 1962 width => 640,
1464 height => 480, 1963 height => 480,
1465 fullscreen => 0, 1964 fullscreen => 0,
1466 fast => 0, 1965 fast => 0,
1467 map_scale => 1, 1966 map_scale => 1,
1468 fow_enable => 1, 1967 fow_enable => 1,
1469 fow_intensity => 0.45, 1968 fow_intensity => 0.45,
1470 fow_smooth => 0, 1969 fow_smooth => 0,
1471 gui_fontsize => 1, 1970 gui_fontsize => 1,
1472 log_fontsize => 1, 1971 log_fontsize => 0.7,
1473 gauge_fontsize=> 1, 1972 gauge_fontsize => 1,
1474 gauge_size => 0.35, 1973 gauge_size => 0.35,
1475 stat_fontsize => 1, 1974 stat_fontsize => 0.7,
1476 mapsize => 100, 1975 mapsize => 100,
1477 host => "crossfire.schmorp.de",
1478 say_command => 'say', 1976 say_command => 'say',
1479 audio_enable => 1, 1977 audio_enable => 1,
1480 bgm_enable => 1, 1978 bgm_enable => 1,
1481 bgm_volume => 0.25, 1979 bgm_volume => 0.25,
1482 face_prefetch => 0, 1980 face_prefetch => 0,
1483 output_sync => 1, 1981 output_sync => 1,
1484 output_count => 1, 1982 output_count => 1,
1983 pickup => 0,
1984 default => "profile", # default profile
1985 );
1485 ); 1986
1486
1487 while (my ($k, $v) = each %DEF_CFG) { 1987 while (my ($k, $v) = each %DEF_CFG) {
1488 $CFG->{$k} = $v unless exists $CFG->{$k}; 1988 $CFG->{$k} = $v unless exists $CFG->{$k};
1489 } 1989 }
1990
1991 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
1490 1992
1491 sdl_init; 1993 sdl_init;
1492 1994
1493 @SDL_MODES = reverse 1995 @SDL_MODES = reverse
1494 grep $_->[0] >= 640 && $_->[1] >= 480, 1996 grep $_->[0] >= 640 && $_->[1] >= 480,
… …
1536 video_init; 2038 video_init;
1537 audio_init; 2039 audio_init;
1538} 2040}
1539 2041
1540Event::loop; 2042Event::loop;
2043#CFClient::SDL_Quit;
2044#CFClient::_exit 0;
1541 2045
1542END { CFClient::SDL_Quit } 2046END { CFClient::SDL_Quit }
1543 2047
1544=head1 NAME 2048=head1 NAME
1545 2049
… …
1552=head1 USAGE 2056=head1 USAGE
1553 2057
1554cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used 2058cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used
1555fullscreen and interactively. 2059fullscreen and interactively.
1556 2060
2061=head1 DEBUGGING
2062
2063
2064CFPLUS_DEBUG - environment variable
2065
2066 1 draw borders around widgets
2067 2 add low-level widget info to tooltips
2068 4 show fps
2069 8 suppress tooltips
2070
1557=head1 AUTHOR 2071=head1 AUTHOR
1558 2072
1559Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 2073Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
1560 2074
1561 2075

Diff Legend

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