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.43 by elmex, Fri Jun 2 16:27:28 2006 UTC vs.
Revision 1.98 by root, Sat Jul 22 13:20:33 2006 UTC

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

Diff Legend

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