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

Diff Legend

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