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.11 by root, Fri May 26 18:56:14 2006 UTC vs.
Revision 1.91 by root, Tue Jul 11 13:51:38 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::Base; 33use Crossfire::Protocol::Constants;
35 34
36use Compress::LZF; 35use Compress::LZF;
37 36
38use CFClient; 37use CFClient;
39use CFClient::OpenGL (); 38use CFClient::OpenGL ();
40use CFClient::Protocol; 39use CFClient::Protocol;
41use CFClient::UI; 40use CFClient::UI;
41use CFClient::BindingEditor;
42use CFClient::MapWidget; 42use CFClient::MapWidget;
43
44$SIG{QUIT} = sub { Carp::cluck "QUIT" };
45$SIG{PIPE} = 'IGNORE';
43 46
44$Event::DIED = sub { 47$Event::DIED = sub {
45 # TODO: display dialog box or so 48 # TODO: display dialog box or so
49 Carp::confess $_[1];#d#TODO: remove when stable
46 CFClient::error $_[1]; 50 CFClient::error $_[1];
47}; 51};
48 52
49#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d# 53#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d#
50 54
… …
81our $LOGVIEW; 85our $LOGVIEW;
82our $CONSOLE; 86our $CONSOLE;
83our $METASERVER; 87our $METASERVER;
84our $LOGIN_BUTTON; 88our $LOGIN_BUTTON;
85our $QUIT_DIALOG; 89our $QUIT_DIALOG;
90our $HOST_ENTRY;
91our $PICKUP_ENABLE;
92our $SERVER_INFO;
86 93
94our $SETUP_DIALOG;
95our $SETUP_NOTEBOOK;
96our $SETUP_SERVER;
97our $SETUP_KEYBOARD;
98
99our $PL_NOTEBOOK;
100our $PL_WINDOW;
101
102our $INVENTORY_PAGE;
103our $STATS_PAGE;
104our $SPELL_PAGE;
105
106our $HELP_WINDOW;
107our $MESSAGE_WINDOW;
87our $FLOORBOX; 108our $FLOORBOX;
88our $GAUGES; 109our $GAUGES;
89our $STATWIDS; 110our $STATWIDS;
90 111
91our $SDL_ACTIVE; 112our $SDL_ACTIVE;
… …
97 118
98our $ALT_ENTER_MESSAGE; 119our $ALT_ENTER_MESSAGE;
99our $STATUSBOX; 120our $STATUSBOX;
100our $DEBUG_STATUS; 121our $DEBUG_STATUS;
101 122
102our $INVWIN;
103our $INV; 123our $INV;
104our $INVR; 124our $INVR;
105our $INVR_LBL; 125our $INV_RIGHT_HB;
126
127our $BIND_EDITOR;
128our $BIND_UPD_CB;
129
130our $PICKUP_CFG;
106 131
107sub status { 132sub status {
108 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 133 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
109} 134}
110 135
111sub debug { 136sub debug {
112 $DEBUG_STATUS->set_text ($_[0]); 137 $DEBUG_STATUS->set_text ($_[0]);
113 my ($w, $h) = $DEBUG_STATUS->size_request; 138}
114 $DEBUG_STATUS->move ($WIDTH - $w, 0); 139
140sub destroy_query_dialog {
141 (delete $_[0]{query_dialog})->destroy
142 if $_[0]{query_dialog};
143}
144
145# server query dialog
146sub server_query {
147 my ($conn, $flags, $prompt) = @_;
148
149 $conn->{query_dialog} = my $dialog = new CFClient::UI::FancyFrame
150 x => "center",
151 y => "center",
152 title => "Server Query",
153 child => my $vbox = new CFClient::UI::VBox,
154 ;
155
156 my @dialog = my $label = new CFClient::UI::Label
157 max_w => $::WIDTH * 0.4,
158 ellipsise => 0,
159 text => $prompt;
160
161 if ($flags & CS_QUERY_YESNO) {
162 push @dialog, my $hbox = new CFClient::UI::HBox;
163
164 $hbox->add (new CFClient::UI::Button
165 text => "No",
166 on_activate => sub {
167 $conn->send ("reply n");
168 $dialog->destroy;
169 0
170 }
171 );
172 $hbox->add (new CFClient::UI::Button
173 text => "Yes",
174 on_activate => sub {
175 $conn->send ("reply y");
176 destroy_query_dialog $conn;
177 0
178 },
179 );
180
181 $dialog->grab_focus;
182
183 } elsif ($flags & CS_QUERY_SINGLECHAR) {
184 $dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)";
185
186 if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
187 $MESSAGE_WINDOW->show;
188
189 unshift @dialog, new CFClient::UI::Label
190 max_w => $::WIDTH * 0.4,
191 ellipsise => 0,
192 markup => "\nOr use your keyboard:\n";
193
194 unshift @dialog, my $table = new CFClient::UI::Table;
195
196 $table->add (0, 0, new CFClient::UI::Button
197 text => "Next Race",
198 on_activate => sub {
199 $conn->send ("reply n");
200 destroy_query_dialog $conn;
201 0
202 },
203 );
204 $table->add (2, 0, new CFClient::UI::Button
205 text => "Accept",
206 on_activate => sub {
207 $conn->send ("reply d");
208 destroy_query_dialog $conn;
209 0
210 },
211 );
212
213 unshift @dialog, new CFClient::UI::Label
214 max_w => $::WIDTH * 0.4,
215 ellipsise => 0,
216 markup =>
217 "<big><b>Character Creation: Race</b></big>\n\n"
218 . "Look at the <b>Messages</b> window to see a description of this race "
219 . "(<small>or hover with your mouse over the bottommost entry in the status area in the lower left area of the screen</small>) "
220 . "and the center of the screen to see how this race looks like "
221 . "(<small>this is below this dialog window, you may need to click on the display area to make it visible</small>).\n\n"
222 . "You can look at another race, or accept this race (you will come back to this race eventually, "
223 . "so you can take your time making this important choice."
224 ;
225
226 } elsif ($prompt =~ /roll new stats/) {
227 if (my $stat = delete $conn->{stat_change_with}) {
228 $conn->send ("reply $stat");
229 destroy_query_dialog $conn;
230 return;
231 }
232
233 $STATS_PAGE->show;
234 $MESSAGE_WINDOW->hide;
235
236 unshift @dialog, new CFClient::UI::Label
237 max_w => $::WIDTH * 0.4,
238 ellipsise => 0,
239 markup => "\nOr use your keyboard:\n";
240
241 unshift @dialog, my $table = new CFClient::UI::Table;
242
243 # left: re-roll
244 $table->add (0, 0, new CFClient::UI::Button
245 text => "Roll Again",
246 on_activate => sub {
247 $conn->send ("reply y");
248 destroy_query_dialog $conn;
249 0
250 },
251 );
252
253 # center: swap stats
254 my ($sw1, $sw2) = map +(new CFClient::UI::Combobox
255 value => $_,
256 options => [
257 [1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"],
258 [2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],
259 [3 => "Con", "Constitution ($conn->{stat}{+CS_STAT_CON})"],
260 [4 => "Int", "Intelligence ($conn->{stat}{+CS_STAT_INT})"],
261 [5 => "Wis", "Wisdom ($conn->{stat}{+CS_STAT_WIS})"],
262 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
263 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
264 ],
265 ), 1 .. 2;
266
267 $table->add (2, 0, new CFClient::UI::Button
268 text => "Swap Stats",
269 on_activate => sub {
270 $conn->{stat_change_with} = $sw2->{value};
271 $conn->send ("reply $sw1->{value}");
272 destroy_query_dialog $conn;
273 0
274 },
275 );
276 $table->add (2, 1, new CFClient::UI::HBox children => [$sw1, $sw2]);
277
278 # right: accept
279 $table->add (4, 0, new CFClient::UI::Button
280 text => "Accept",
281 on_activate => sub {
282 $conn->send ("reply n");
283 $STATS_PAGE->hide;
284 destroy_query_dialog $conn;
285 0
286 },
287 );
288
289 unshift @dialog, new CFClient::UI::Label
290 max_w => $::WIDTH * 0.4,
291 ellipsise => 0,
292 markup =>
293 "<big><b>Character Creation: Stats</b></big>\n\n"
294 . "Look at the <b>Stats</b> window to see your basic stats "
295 . "(first column: 1 strength, 2 dexterity, 3 constitution, 4 intelligence, 5 wisdom, 6 power and 7 charisma).\n\n"
296 . "You can create another set of stats, swap two stat values with each other or accept the stats as they are now and continue. "
297 . "Race selection will influence those values later on."
298 ;
299 }
300
301 push @dialog, my $entry = new CFClient::UI::Entry
302 on_changed => sub {
303 $conn->send ("reply $_[1]");
304 destroy_query_dialog $conn;
305 0
306 },
307 ;
308
309 $entry->grab_focus;
310
311 } else {
312 $dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";
313
314 push @dialog, my $entry = new CFClient::UI::Entry
315 $flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (),
316 on_activate => sub {
317 $conn->send ("reply $_[1]");
318 destroy_query_dialog $conn;
319 0
320 },
321 ;
322
323 $entry->grab_focus;
324 }
325
326 $vbox->add (@dialog);
327 $dialog->show;
115} 328}
116 329
117sub start_game { 330sub start_game {
118 status "logging in..."; 331 status "logging in...";
119 332
333 $LOGIN_BUTTON->set_text ("Logout");
334 $SETUP_DIALOG->hide;
335
120 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 336 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
121 337
122 my ($host, $port) = split /:/, $CFG->{host}; 338 my ($host, $port) = split /:/, $CFG->{profile}{default}{host};
123 339
124 $MAP = new CFClient::Map $mapsize, $mapsize; 340 $MAP = new CFClient::Map $mapsize, $mapsize;
125 341
126 $CONN = eval { 342 $CONN = eval {
127 new CFClient::Protocol 343 new CFClient::Protocol
128 host => $host, 344 host => $host,
129 port => $port || 13327, 345 port => $port || 13327,
130 user => $CFG->{user}, 346 user => $CFG->{profile}{default}{user},
131 pass => $CFG->{password}, 347 pass => $CFG->{profile}{default}{password},
132 mapw => $mapsize, 348 mapw => $mapsize,
133 maph => $mapsize, 349 maph => $mapsize,
134 350
135 map_widget => $MAPWIDGET, 351 map_widget => $MAPWIDGET,
136 logview => $LOGVIEW, 352 logview => $LOGVIEW,
137 statusbox => $STATUSBOX, 353 statusbox => $STATUSBOX,
138 map => $MAP, 354 map => $MAP,
139 mapmap => $MAPMAP, 355 mapmap => $MAPMAP,
356 query => \&server_query,
140 357
141 sound_play => sub { 358 sound_play => sub {
142 my ($x, $y, $soundnum, $type) = @_; 359 my ($x, $y, $soundnum, $type) = @_;
143 360
144 $SDL_MIXER 361 $SDL_MIXER
… …
152 }; 369 };
153 370
154 if ($CONN) { 371 if ($CONN) {
155 CFClient::lowdelay fileno $CONN->{fh}; 372 CFClient::lowdelay fileno $CONN->{fh};
156 373
157 $LOGIN_BUTTON->set_text ("Logout");
158 status "login successful"; 374 status "login successful";
159
160 $BUTTONBAR->{children}[1]->emit ("activate")
161 if $BUTTONBAR->{children}[1]->{state};
162
163 } else { 375 } else {
164 status "unable to connect"; 376 status "unable to connect";
165 stop_game(); 377 stop_game();
166 } 378 }
167} 379}
168 380
169sub stop_game { 381sub stop_game {
382 $LOGIN_BUTTON->set_text ("Login");
383 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
384 $SETUP_DIALOG->show;
385 $PL_WINDOW->hide;
386 $SPELL_PAGE->clear_spells;
387
170 return unless $CONN; 388 return unless $CONN;
171 389
172 status "connection closed"; 390 status "connection closed";
173 $LOGIN_BUTTON->set_text ("Login"); 391
392 destroy_query_dialog $CONN;
174 $CONN->destroy; 393 $CONN->destroy;
175 $CONN = 0; # false, does not autovivify 394 $CONN = 0; # false, does not autovivify
176 395
177 $BUTTONBAR->{children}[1]->emit ("activate") 396 undef $MAP;
178 unless $BUTTONBAR->{children}[1]->{state};
179} 397}
180 398
181sub client_setup { 399sub graphics_setup {
182 my $dialog = new CFClient::UI::FancyFrame
183 title => "Client Setup",
184 child => (my $vbox = new CFClient::UI::VBox); 400 my $vbox = new CFClient::UI::VBox;
401
185 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 402 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
186 403
187 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode"); 404 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode");
188 $table->add (1, 0, my $hbox = new CFClient::UI::HBox); 405 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
189 406
190 $hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]); 407 $hbox->add (my $mode_slider = new CFClient::UI::Slider force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]);
191 $hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999"); 408 $hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
192 409
193 $mode_slider->connect (changed => sub { 410 $mode_slider->connect (changed => sub {
194 my ($self, $value) = @_; 411 my ($self, $value) = @_;
195 412
… …
202 419
203 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen"); 420 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen");
204 $table->add (1, $row++, new CFClient::UI::CheckBox 421 $table->add (1, $row++, new CFClient::UI::CheckBox
205 state => $CFG->{fullscreen}, 422 state => $CFG->{fullscreen},
206 tooltip => "Bring the client into fullscreen mode.", 423 tooltip => "Bring the client into fullscreen mode.",
207 connect_changed => sub { 424 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
208 my ($self, $value) = @_;
209 $CFG->{fullscreen} = $value;
210 }
211 ); 425 );
212 426
213 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 427 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
214 $table->add (1, $row++, new CFClient::UI::CheckBox 428 $table->add (1, $row++, new CFClient::UI::CheckBox
215 state => $CFG->{fast}, 429 state => $CFG->{fast},
216 tooltip => "Lower the visual quality considerably to speed up rendering.", 430 tooltip => "Lower the visual quality considerably to speed up rendering.",
217 connect_changed => sub { 431 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
218 my ($self, $value) = @_;
219 $CFG->{fast} = $value;
220 }
221 ); 432 );
222 433
223 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale"); 434 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale");
224 $table->add (1, $row++, new CFClient::UI::Slider 435 $table->add (1, $row++, new CFClient::UI::Slider
225 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 436 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
226 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 437 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
227 connect_changed => sub { 438 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
228 my ($self, $value) = @_;
229 $CFG->{map_scale} = 2 ** $value;
230 }
231 ); 439 );
232 440
233 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War"); 441 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War");
234 $table->add (1, $row++, new CFClient::UI::CheckBox 442 $table->add (1, $row++, new CFClient::UI::CheckBox
235 state => $CFG->{fow_enable}, 443 state => $CFG->{fow_enable},
236 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 444 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
237 connect_changed => sub { 445 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
238 my ($self, $value) = @_;
239 $CFG->{fow_enable} = $value;
240 }
241 ); 446 );
242 447
243 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 448 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity");
244 $table->add (1, $row++, new CFClient::UI::Slider 449 $table->add (1, $row++, new CFClient::UI::Slider
245 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 450 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
246 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 451 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
247 connect_changed => sub { 452 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
248 my ($self, $value) = @_;
249 $CFG->{fow_intensity} = $value;
250 }
251 ); 453 );
252 454
253 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth"); 455 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth");
254 $table->add (1, $row++, new CFClient::UI::CheckBox 456 $table->add (1, $row++, new CFClient::UI::CheckBox
255 state => $CFG->{fow_smooth}, 457 state => $CFG->{fow_smooth},
256 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.", 458 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
257 connect_changed => sub { 459 on_changed => sub {
258 my ($self, $value) = @_; 460 my ($self, $value) = @_;
259 $CFG->{fow_smooth} = $value; 461 $CFG->{fow_smooth} = $value;
260 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::GL_VERSION < 1.2; 462 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::OpenGL::GL_VERSION < 1.2;
463 0
261 } 464 }
262 ); 465 );
263 466
264 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); 467 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
265 $table->add (1, $row++, new CFClient::UI::Slider 468 $table->add (1, $row++, new CFClient::UI::Slider
266 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 469 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
267 tooltip => "The base font size used by most GUI elements that do not have their own setting.", 470 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
268 connect_changed => sub { $CFG->{gui_fontsize} = $_[1] }, 471 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
269 ); 472 );
270 473
271 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 474 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Message Fontsize");
272 $table->add (1, $row++, new CFClient::UI::Slider 475 $table->add (1, $row++, new CFClient::UI::Slider
273 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 476 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
274 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.", 477 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",
275 connect_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]) }, 478 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
276 );
277
278 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
279
280 $table->add (1, $row++, new CFClient::UI::Slider
281 range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1],
282 tooltip => "The font size used by the <b>statistics window</b> only. Changes are instant.",
283 connect_changed => sub {
284 $CFG->{stat_fontsize} = $_[1];
285 &set_stats_window_fontsize;
286 }
287 ); 479 );
288 480
289 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 481 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
290 $table->add (1, $row++, new CFClient::UI::Slider 482 $table->add (1, $row++, new CFClient::UI::Slider
291 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 483 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
292 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 484 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
293 connect_changed => sub { 485 on_changed => sub {
294 $CFG->{gauge_fontsize} = $_[1]; 486 $CFG->{gauge_fontsize} = $_[1];
295 &set_gauge_window_fontsize; 487 &set_gauge_window_fontsize;
488 0
296 } 489 }
297 ); 490 );
298 491
299 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size"); 492 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size");
300 $table->add (1, $row++, new CFClient::UI::Slider 493 $table->add (1, $row++, new CFClient::UI::Slider
301 range => [$CFG->{gauge_size}, 0.2, 0.8], 494 range => [$CFG->{gauge_size}, 0.2, 0.8],
302 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 495 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
303 connect_changed => sub { 496 on_changed => sub {
304 $CFG->{gauge_size} = $_[1]; 497 $CFG->{gauge_size} = $_[1];
305 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 498 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
499 0
306 } 500 }
307 ); 501 );
308 502
309 $table->add (1, $row++, new CFClient::UI::Button 503 $table->add (1, $row++, new CFClient::UI::Button
310 expand => 1, align => 0, text => "Apply", 504 expand => 1, align => 0, text => "Apply",
311 tooltip => "Apply the video settings", 505 tooltip => "Apply the video settings",
312 connect_activate => sub { 506 on_activate => sub {
313 video_shutdown (); 507 video_shutdown ();
314 video_init (); 508 video_init ();
509 0
315 } 510 }
316 ); 511 );
512
513 $vbox
514}
515
516sub audio_setup {
517 my $vbox = new CFClient::UI::VBox;
518
519 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
520
521 my $row = 0;
317 522
318 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable"); 523 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");
319 $table->add (1, $row++, new CFClient::UI::CheckBox 524 $table->add (1, $row++, new CFClient::UI::CheckBox
320 state => $CFG->{audio_enable}, 525 state => $CFG->{audio_enable},
321 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.", 526 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.",
322 connect_changed => sub { 527 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
323 $CFG->{audio_enable} = $_[1];
324 }
325 ); 528 );
326# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume"); 529# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume");
327# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], connect_changed => sub { 530# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
328# $CFG->{effects_volume} = $_[1]; 531# $CFG->{effects_volume} = $_[1];
329# }); 532# });
330 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music"); 533 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music");
331 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox); 534 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox);
332 $hbox->add (new CFClient::UI::CheckBox 535 $hbox->add (new CFClient::UI::CheckBox
333 expand => 1, state => $CFG->{bgm_enable}, 536 expand => 1, state => $CFG->{bgm_enable},
334 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 537 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
335 connect_changed => sub { 538 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
336 $CFG->{bgm_enable} = $_[1];
337 }
338 ); 539 );
339 $hbox->add (new CFClient::UI::Slider 540 $hbox->add (new CFClient::UI::Slider
340 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 541 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
341 tooltip => "The volume of the background music. Changes are instant.", 542 tooltip => "The volume of the background music. Changes are instant.",
342 connect_changed => sub { 543 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFClient::MixMusic::volume $_[1] * 128; 0 }
343 $CFG->{bgm_volume} = $_[1];
344 CFClient::MixMusic::volume $_[1] * 128;
345 }
346 ); 544 );
347 545
348 $table->add (1, $row++, new CFClient::UI::Button 546 $table->add (1, $row++, new CFClient::UI::Button
349 expand => 1, align => 0, text => "Apply", 547 expand => 1, align => 0, text => "Apply",
350 tooltip => "Apply the audio settings", 548 tooltip => "Apply the audio settings",
351 connect_activate => sub { 549 on_activate => sub {
352 audio_shutdown (); 550 audio_shutdown ();
353 audio_init (); 551 audio_init ();
552 0
354 } 553 }
355 ); 554 );
356 555
357 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command"); 556 $vbox
358 $table->add (1, $row++, my $saycmd = new CFClient::UI::Entry
359 text => $CFG->{say_command},
360 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. "
361 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
362 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
363 connect_changed => sub {
364 my ($self, $value) = @_;
365 $CFG->{say_command} = $value;
366 }
367 );
368
369 $dialog
370}
371
372sub set_stats_window_fontsize {
373 for (values %{$STATWIDS}) {
374 $_->set_fontsize ($::CFG->{stat_fontsize});
375 }
376} 557}
377 558
378sub set_gauge_window_fontsize { 559sub set_gauge_window_fontsize {
379 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) { 560 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) {
380 $_->set_fontsize ($::CFG->{gauge_fontsize}); 561 $_->set_fontsize ($::CFG->{gauge_fontsize});
… …
383 564
384sub make_gauge_window { 565sub make_gauge_window {
385 my $gh = int $HEIGHT * $CFG->{gauge_size}; 566 my $gh = int $HEIGHT * $CFG->{gauge_size};
386 567
387 my $win = new CFClient::UI::Frame ( 568 my $win = new CFClient::UI::Frame (
388 req_y => -1, 569 force_x => 0,
570 force_y => "max",
389 user_w => $WIDTH, 571 force_w => $WIDTH,
390 user_h => $gh, 572 force_h => $gh,
391 ); 573 );
392 574
393 $win->add (my $hbox = new CFClient::UI::HBox 575 $win->add (my $hbox = new CFClient::UI::HBox
394 children => [ 576 children => [
395 (new CFClient::UI::HBox expand => 1), 577 (new CFClient::UI::HBox expand => 1),
… …
431 &set_gauge_window_fontsize; 613 &set_gauge_window_fontsize;
432 614
433 $win 615 $win
434} 616}
435 617
618sub debug_setup {
619 my $table = new CFClient::UI::Table;
620
621 $table->add (0, 0, new CFClient::UI::Label text => "Widget Borders");
622 $table->add (1, 0, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });
623 $table->add (0, 1, new CFClient::UI::Label text => "Tooltip Widget Info");
624 $table->add (1, 1, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
625 $table->add (0, 2, new CFClient::UI::Label text => "Show FPS");
626 $table->add (1, 2, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
627 $table->add (0, 3, new CFClient::UI::Label text => "Suppress Tooltips");
628 $table->add (1, 3, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
629
630 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
631
632 for my $x (0..2) {
633 for my $y (0 .. 2) {
634 $table->add ($x + 3, $y,
635 new CFClient::UI::Entry
636 text => $default_smooth[$x * 3 + $y],
637 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
638 );
639 }
640 }
641
642
643 $table
644}
645
436sub make_stats_window { 646sub stats_window {
437 my $tgw = new CFClient::UI::FancyFrame title => "Stats"; 647 my $vb = new CFClient::UI::VBox;
438 648
439 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);
440 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1, 649 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
441 can_hover => 1, can_events => 1, 650 can_hover => 1, can_events => 1,
442 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server."); 651 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
443 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1, 652 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
444 can_hover => 1, can_events => 1, 653 can_hover => 1, can_events => 1,
445 tooltip => "The map you are currently on (if supported by the server)."); 654 tooltip => "The map you are currently on (if supported by the server).");
446 655
447 $vb->add (my $hb0 = new CFClient::UI::HBox); 656 $vb->add (my $hb0 = new CFClient::UI::HBox);
448 $hb0->add ($STATWIDS->{weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1, 657 $hb0->add ($STATWIDS->{weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1,
449 can_hover => 1, can_events => 1, 658 can_hover => 1, can_events => 1,
450 tooltip => "This is the amount the Player weights."); 659 tooltip => "The weight of the player including all inventory items.");
451 $hb0->add ($STATWIDS->{m_weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1, 660 $hb0->add ($STATWIDS->{m_weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1,
452 can_hover => 1, can_events => 1, 661 can_hover => 1, can_events => 1,
453 tooltip => "The weight limit, you can't carry more than this."); 662 tooltip => "The weight limit: you cannot carry more than this.");
454 663
455 664
456 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 665 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
457 $hb->add (my $tbl = new CFClient::UI::Table expand => 1); 666 $hb->add (my $tbl = new CFClient::UI::Table expand => 1);
458 667
… …
468 [0, 6, st_cha => "Cha", 30, "<b>Charisma</b>, how well you are received by NPCs. Affects buying and selling prices in shops."], 677 [0, 6, st_cha => "Cha", 30, "<b>Charisma</b>, how well you are received by NPCs. Affects buying and selling prices in shops."],
469 678
470 [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."], 679 [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."],
471 [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."], 680 [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."],
472 [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."], 681 [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."],
473 [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."], 682 [2, 3, st_arm => "Arm", 120, "<b>Armour</b>, how much damage (from physical attacks) will be subtracted from successful hits made upon you. This value ranges between 0 to 99%. Current armour worn primarily determines Arm value. This is the same as the physical resistance."],
474 [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."], 683 [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."],
475 [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."], 684 [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."],
476 ) { 685 ) {
477 my ($col, $row, $id, $label, $template, $tooltip) = @$_; 686 my ($col, $row, $id, $label, $template, $tooltip) = @$_;
478 687
… …
497 drain => "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)", 706 drain => "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)",
498 acid => "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)", 707 acid => "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)",
499 pois => "<b>Poison</b> (resistance to getting poisoned)", 708 pois => "<b>Poison</b> (resistance to getting poisoned)",
500 para => "<b>Paralysation</b> (this resistance affects the chance you get paralysed)", 709 para => "<b>Paralysation</b> (this resistance affects the chance you get paralysed)",
501 deat => "<b>Death</b> (resistance against death spells)", 710 deat => "<b>Death</b> (resistance against death spells)",
502 phys => "<b>Physical</b> (this is the resistance against physical attacks, like when a monster hit you in melee combat)", 711 phys => "<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.)",
503 blind => "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)", 712 blind => "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)",
504 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)", 713 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)",
505 tund => "<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead...", 714 tund => "<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead...",
506 elec => "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)", 715 elec => "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)",
507 cold => "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)", 716 cold => "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)",
… …
524 ); 733 );
525 $tbl2->add ($col + 1, $row, new CFClient::UI::Image 734 $tbl2->add ($col + 1, $row, new CFClient::UI::Image
526 font => $FONT_FIXED, 735 font => $FONT_FIXED,
527 can_hover => 1, 736 can_hover => 1,
528 can_events => 1, 737 can_events => 1,
529 image => "ui/resist/resist_$_.png", 738 path => "ui/resist/resist_$_.png",
530 tooltip => $resist_names{$_}, 739 tooltip => $resist_names{$_},
531 ); 740 );
532 741
533 $row++; 742 $row++;
534 if ($row % 6 == 0) { 743 if ($row % 6 == 0) {
535 $col += 2; 744 $col += 2;
536 $row = 0; 745 $row = 0;
537 } 746 }
538 } 747 }
539 748
540 &set_stats_window_fontsize; 749 $vb->add (my $tbl3 = new CFClient::UI::Table expand => 1);
750 $STATWIDS->{"_skill_tbl"} = $tbl3;
751
541 update_stats_window ({}); 752 update_stats_window ({});
542 753
543 $tgw 754 $vb
544} 755}
545 756
546sub formsep { 757sub formsep($) {
547 reverse join ",", grep length, split /(...)/, reverse $_[0] * 1 758 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
548} 759}
549 760
550sub update_stats_window { 761sub update_stats_window {
551 my ($stats) = @_; 762 my ($stats) = @_;
552 763
553 # i love text protocols!!! 764 # I love text protocols...
554 my $hp = $stats->{Crossfire::Protocol::Base::CS_STAT_HP} * 1; 765
766 my $hp = $stats->{+CS_STAT_HP} * 1;
555 my $hp_m = $stats->{Crossfire::Protocol::Base::CS_STAT_MAXHP} * 1; 767 my $hp_m = $stats->{+CS_STAT_MAXHP} * 1;
556 my $sp = $stats->{Crossfire::Protocol::Base::CS_STAT_SP} * 1; 768 my $sp = $stats->{+CS_STAT_SP} * 1;
557 my $sp_m = $stats->{Crossfire::Protocol::Base::CS_STAT_MAXSP} * 1; 769 my $sp_m = $stats->{+CS_STAT_MAXSP} * 1;
558 my $fo = $stats->{Crossfire::Protocol::Base::CS_STAT_FOOD} * 1; 770 my $fo = $stats->{+CS_STAT_FOOD} * 1;
559 my $fo_m = 999; 771 my $fo_m = 999;
560 my $gr = $stats->{Crossfire::Protocol::Base::CS_STAT_GRACE} * 1; 772 my $gr = $stats->{+CS_STAT_GRACE} * 1;
561 my $gr_m = $stats->{Crossfire::Protocol::Base::CS_STAT_MAXGRACE} * 1; 773 my $gr_m = $stats->{+CS_STAT_MAXGRACE} * 1;
562 774
563 $GAUGES->{hp} ->set_value ($hp, $hp_m); 775 $GAUGES->{hp} ->set_value ($hp, $hp_m);
564 $GAUGES->{mana} ->set_value ($sp, $sp_m); 776 $GAUGES->{mana} ->set_value ($sp, $sp_m);
565 $GAUGES->{food} ->set_value ($fo, $fo_m); 777 $GAUGES->{food} ->set_value ($fo, $fo_m);
566 $GAUGES->{grace} ->set_value ($gr, $gr_m); 778 $GAUGES->{grace} ->set_value ($gr, $gr_m);
567 $GAUGES->{exp} ->set_text ("Exp: " . (formsep $stats->{Crossfire::Protocol::Base::CS_STAT_EXP64}) 779 $GAUGES->{exp} ->set_text ("Exp: " . (formsep $stats->{+CS_STAT_EXP64})
568 . " (lvl " . ($stats->{Crossfire::Protocol::Base::CS_STAT_LEVEL} * 1) . ")"); 780 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
569 my $rng = $stats->{Crossfire::Protocol::Base::CS_STAT_RANGE}; 781 my $rng = $stats->{+CS_STAT_RANGE};
570 $rng =~ s/^Range: //; # thank you so much dear server 782 $rng =~ s/^Range: //; # thank you so much dear server
571 $GAUGES->{range} ->set_text ("Rng: " . $rng); 783 $GAUGES->{range} ->set_text ("Rng: " . $rng);
572 my $title = $stats->{Crossfire::Protocol::Base::CS_STAT_TITLE}; 784 my $title = $stats->{+CS_STAT_TITLE};
573 $title =~ s/^Player: //; 785 $title =~ s/^Player: //;
574 $STATWIDS->{title} ->set_text ("Title: " . $title); 786 $STATWIDS->{title} ->set_text ("Title: " . $title);
575 787
576 $STATWIDS->{st_str} ->set_text (sprintf "%d", $stats->{5}); 788 $STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
577 $STATWIDS->{st_dex} ->set_text (sprintf "%d", $stats->{8}); 789 $STATWIDS->{st_dex} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DEX});
578 $STATWIDS->{st_con} ->set_text (sprintf "%d", $stats->{9}); 790 $STATWIDS->{st_con} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CON});
579 $STATWIDS->{st_int} ->set_text (sprintf "%d", $stats->{6}); 791 $STATWIDS->{st_int} ->set_text (sprintf "%d" , $stats->{+CS_STAT_INT});
580 $STATWIDS->{st_wis} ->set_text (sprintf "%d", $stats->{7}); 792 $STATWIDS->{st_wis} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WIS});
581 $STATWIDS->{st_pow} ->set_text (sprintf "%d", $stats->{22}); 793 $STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
582 $STATWIDS->{st_cha} ->set_text (sprintf "%d", $stats->{10}); 794 $STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
583 $STATWIDS->{st_wc} ->set_text (sprintf "%d", $stats->{13}); 795 $STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
584 $STATWIDS->{st_ac} ->set_text (sprintf "%d", $stats->{14}); 796 $STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
585 $STATWIDS->{st_dam} ->set_text (sprintf "%d", $stats->{15}); 797 $STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
586 $STATWIDS->{st_arm} ->set_text (sprintf "%d", $stats->{16}); 798 $STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_RES_PHYS});
587 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{Crossfire::Protocol::Base::CS_STAT_SPEED}); 799 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
588 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{Crossfire::Protocol::Base::CS_STAT_WEAP_SP}); 800 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
589 801
590 $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{Crossfire::Protocol::Base::CS_STAT_WEIGHT_LIM} / 1000); 802 $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000);
591 803
592 my %tbl = ( 804 my %tbl = (
593 phys => 100, 805 phys => CS_STAT_RES_PHYS,
594 magic => 101, 806 magic => CS_STAT_RES_MAG,
595 fire => 102, 807 fire => CS_STAT_RES_FIRE,
596 elec => 103, 808 elec => CS_STAT_RES_ELEC,
597 cold => 104, 809 cold => CS_STAT_RES_COLD,
598 conf => 105, 810 conf => CS_STAT_RES_CONF,
599 acid => 106, 811 acid => CS_STAT_RES_ACID,
600 drain => 107, 812 drain => CS_STAT_RES_DRAIN,
601 ghit => 108, 813 ghit => CS_STAT_RES_GHOSTHIT,
602 pois => 109, 814 pois => CS_STAT_RES_POISON,
603 slow => 110, 815 slow => CS_STAT_RES_SLOW,
604 para => 111, 816 para => CS_STAT_RES_PARA,
605 tund => 112, 817 tund => CS_STAT_TURN_UNDEAD,
606 fear => 113, 818 fear => CS_STAT_RES_FEAR,
607 depl => 113, 819 depl => CS_STAT_RES_DEPLETE,
608 deat => 115, 820 deat => CS_STAT_RES_DEATH,
609 holyw => 116, 821 holyw => CS_STAT_RES_HOLYWORD,
610 blind => 117 822 blind => CS_STAT_RES_BLIND,
611 ); 823 );
612 824
613 for (keys %tbl) { 825 if ($::CONN && !$STATWIDS->{_skill_tbl_init}) {
614 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}}); 826 my $sktbl = $STATWIDS->{_skill_tbl};
827 $sktbl->clear;
828
829 $sktbl->add (0, 0, new CFClient::UI::Label text => "Exp.", align => 1);
830 $sktbl->add (1, 0, new CFClient::UI::Label text => "Level", align => 1);
831 $sktbl->add (2, 0, new CFClient::UI::Label text => "Skillname");
832
833 my @skills;
834
835 for (my $i = CS_STAT_SKILLINFO; $i < CS_STAT_SKILLINFO+CS_NUM_SKILLS; $i++) {
836 push @skills, [$i, $::CONN->{skill_info}{$i}];
837 }
838
839 my $y = 1;
840 for (sort { $a->[1] cmp $b->[1] } @skills) {
841 my ($idx, $name) = @$_;
842
843 unless (defined $STATWIDS->{"sk_xp_$idx"} || !$::CONN->{skill_info}{$idx}) {
844 $sktbl->add (0, $y, $STATWIDS->{"sk_xp_$idx"} = new CFClient::UI::Label text => "0", align => 1);
845 $sktbl->add (1, $y, $STATWIDS->{"sk_lvl_$idx"} = new CFClient::UI::Label text => "0", align => 1);
846 $sktbl->add (2, $y++, new CFClient::UI::Label text => $name);
847 }
848 }
849
850 $STATWIDS->{_skill_tbl_init} = 1;
615 } 851 }
616 852
617} 853 for (my $i = CS_STAT_SKILLINFO; $i < CS_STAT_SKILLINFO+CS_NUM_SKILLS; $i++) {
854 if (exists $stats->{$i}) {
855 $STATWIDS->{"sk_xp_$i"}->set_text (formsep $stats->{$i}->[1])
856 if $STATWIDS->{"sk_xp_$i"};
857 $STATWIDS->{"sk_lvl_$i"}->set_text (sprintf "%d", $stats->{$i}->[0])
858 if $STATWIDS->{"sk_lvl_$i"};
859 }
860 }
618 861
619sub metaserver_dialog { 862 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
620 my $dialog = new CFClient::UI::FancyFrame 863 for keys %tbl;
621 title => "Server List",
622 child => (my $vbox = new CFClient::UI::VBox);
623
624 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
625
626 $dialog
627} 864}
628 865
629my $METASERVER_ATIME; 866my $METASERVER_ATIME;
630 867
631sub update_metaserver { 868sub update_metaserver {
632 my ($HOST) = @_; 869 my ($metaserver_dialog) = @_;
870
871 $METASERVER = $metaserver_dialog
872 if defined $metaserver_dialog;
633 873
634 return if $METASERVER_ATIME > time; 874 return if $METASERVER_ATIME > time;
635 $METASERVER_ATIME = time + 60; 875 $METASERVER_ATIME = time + 60;
636 876
637 my $table = $METASERVER->{table}; 877 my $table = $METASERVER->{table};
… …
659 899
660 utf8::decode $buf if utf8::valid $buf; 900 utf8::decode $buf if utf8::valid $buf;
661 901
662 $table->clear; 902 $table->clear;
663 903
904 my @tip = (
905 "The current number of users logged in on the server.",
906 "The hostname of the server.",
907 "The time this server has been running without being restarted.",
908 "The server software version - a '+' indicates a Crossfire+ server.",
909 "Short information about this server provided by its admins.",
910 );
664 my @col = qw(Use #Users Host Uptime Version Description); 911 my @col = qw(#Users Host Uptime Version Description);
665 $table->add ($_, 0, new CFClient::UI::Label align => 0, fg => [1, 1, 0], text => $col[$_]) 912 $table->add ($_, 0, new CFClient::UI::Label
913 can_hover => 1, can_events => 1,
914 align => 0, fg => [1, 1, 0],
915 text => $col[$_], tooltip => $tip[$_])
666 for 0 .. $#col; 916 for 0 .. $#col;
667 917
668 my @align = qw(1 0 1 1 -1); 918 my @align = qw(1 0 1 1 -1);
669 919
670 my $y = 0; 920 my $y = 0;
671 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) { 921 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) {
… …
688 938
689 $m = [$users, $host, $uptime, $version, $desc]; 939 $m = [$users, $host, $uptime, $version, $desc];
690 940
691 $y++; 941 $y++;
692 942
693 $table->add (0, $y, new CFClient::UI::VBox children => [ 943 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [
694 (new CFClient::UI::Button text => "Use", connect_activate => sub { 944 (new CFClient::UI::Button
945 text => "Use",
946 tooltip => "Put this server into the <b>Host:Port</b> field",
947 on_activate => sub {
695 $HOST->set_text ($CFG->{host} = $host); 948 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
949 $METASERVER->hide;
950 0
951 },
696 }), 952 ),
697 (new CFClient::UI::Empty expand => 1), 953 (new CFClient::UI::Empty expand => 1),
698 ]); 954 ]);
699 955
700 $table->add ($_ + 1, $y, new CFClient::UI::Label 956 $table->add ($_, $y, new CFClient::UI::Label
701 ellipsise => 0, align => $align[$_], text => $m->[$_], fontsize => 0.8) 957 ellipsise => 0,
958 align => $align[$_],
959 text => $m->[$_],
960 tooltip => $tip[$_],
961 can_hover => 1,
962 can_events => 1,
963 fontsize => 0.8)
702 for 0 .. $#$m; 964 for 0 .. $#$m;
703 } 965 }
704 } 966 }
705 }); 967 });
706} 968}
707 969
970sub metaserver_dialog {
971 my $vbox = new CFClient::UI::VBox;
972 my $table = new CFClient::UI::Table;
973 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $table);
974
975 my $dialog = new CFClient::UI::FancyFrame
976 title => "Server List",
977 name => 'metaserver_dialog',
978 x => 'center',
979 y => 'center',
980 z => 3,
981 force_h => $::HEIGHT * 0.4,
982 child => $vbox,
983 has_close_button => 1,
984 table => $table,
985 on_visibility_change => sub {
986 update_metaserver ($_[0]) if $_[1];
987 0
988 },
989 ;
990
991 $dialog
992}
993
708sub server_setup { 994sub server_setup {
709 my $dialog = new CFClient::UI::FancyFrame
710 title => "Server Setup",
711 child => (my $vbox = new CFClient::UI::VBox); 995 my $vbox = new CFClient::UI::VBox;
712 996
713 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 997 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
714 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port"); 998 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");
715 999
716 { 1000 {
717 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 1001 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
718 1002
719 $vbox->add ( 1003 $vbox->add (
720 my $HOST = new CFClient::UI::Entry 1004 $HOST_ENTRY = new CFClient::UI::Entry
721 expand => 1, 1005 expand => 1,
722 text => $CFG->{host}, 1006 text => $CFG->{profile}{default}{host},
723 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 1007 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
724 connect_changed => sub { 1008 on_changed => sub {
725 my ($self, $value) = @_; 1009 my ($self, $value) = @_;
726 $CFG->{host} = $value; 1010 $CFG->{profile}{default}{host} = $value;
1011 0
727 } 1012 }
728 ); 1013 );
729 1014
730 $METASERVER = metaserver_dialog;
731
732 $vbox->add (new CFClient::UI::Flopper 1015 $vbox->add (new CFClient::UI::Button
733 expand => 1, 1016 expand => 1,
734 text => "Server List", 1017 text => "Server List",
735 other => $METASERVER, 1018 other => $METASERVER,
736 tooltip => "Show a list of available crossfire servers", 1019 tooltip => "Show a list of available crossfire servers",
737 connect_open => sub { 1020 on_activate => sub { $METASERVER->toggle_visibility; 0 },
738 update_metaserver $HOST; 1021 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
739 }
740 ); 1022 );
741 } 1023 }
742 1024
743 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username"); 1025 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
744 $table->add (1, 4, new CFClient::UI::Entry 1026 $table->add (1, 4, new CFClient::UI::Entry
745 text => $CFG->{user}, 1027 text => $CFG->{profile}{default}{user},
746 tooltip => "The name of your character on the server", 1028 tooltip => "The name of your character on the server",
747 connect_changed => sub { 1029 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
748 my ($self, $value) = @_;
749 $CFG->{user} = $value;
750 }
751 ); 1030 );
752 1031
753 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password"); 1032 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password");
754 $table->add (1, 5, new CFClient::UI::Entry 1033 $table->add (1, 5, new CFClient::UI::Entry
755 text => $CFG->{password}, 1034 text => $CFG->{profile}{default}{password},
756 hidden => 1, 1035 hidden => 1,
757 tooltip => "The password for your character", 1036 tooltip => "The password for your character",
758 connect_changed => sub { 1037 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
759 my ($self, $value) = @_;
760 $CFG->{password} = $value;
761 }
762 ); 1038 );
763 1039
764 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size"); 1040 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
765 $table->add (1, 7, new CFClient::UI::Slider 1041 $table->add (1, 7, new CFClient::UI::Slider
766 req_w => 100, 1042 force_w => 100,
767 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1043 range => [$CFG->{mapsize}, 10, 100, 0, 1],
768 tooltip => "This is the size of the portion of the map update the server sends you. " 1044 tooltip => "This is the size of the portion of the map update the server sends you. "
769 . "If you set this to a high value you will be able to see further, " 1045 . "If you set this to a high value you will be able to see further, "
770 . "but you also increase bandwidth requirements and latency. " 1046 . "but you also increase bandwidth requirements and latency. "
771 . "This option is only used once at log-in.", 1047 . "This option is only used once at log-in.",
772 connect_changed => sub { 1048 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },
773 my ($self, $value) = @_;
774
775 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
776 },
777 ); 1049 );
778 1050
779 $table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Face Prefetch"); 1051 $table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Face Prefetch");
780 $table->add (1, 8, new CFClient::UI::CheckBox 1052 $table->add (1, 8, new CFClient::UI::CheckBox
781 state => $CFG->{face_prefetch}, 1053 state => $CFG->{face_prefetch},
… …
784 . "This might increase or create lag, but increases the chances " 1056 . "This might increase or create lag, but increases the chances "
785 . "of faces being ready for display when you encounter them. " 1057 . "of faces being ready for display when you encounter them. "
786 . "It also uses up server bandwidth on every connect, " 1058 . "It also uses up server bandwidth on every connect, "
787 . "so only set it if you really need to prefetch images. " 1059 . "so only set it if you really need to prefetch images. "
788 . "This option can be set and unset any time.", 1060 . "This option can be set and unset any time.",
789 connect_changed => sub { $CFG->{face_prefetch} = $_[1] }, 1061 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
790 ); 1062 );
791 1063
792 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count"); 1064 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count");
793 $table->add (1, 9, new CFClient::UI::Entry 1065 $table->add (1, 9, new CFClient::UI::Entry
794 text => $CFG->{output_count}, 1066 text => $CFG->{output_count},
795 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1067 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
796 connect_changed => sub { $CFG->{output_count} = $_[1] }, 1068 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
797 ); 1069 );
798 1070
799 $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1071 $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync");
800 $table->add (1, 10, new CFClient::UI::Entry 1072 $table->add (1, 10, new CFClient::UI::Entry
801 text => $CFG->{output_sync}, 1073 text => $CFG->{output_sync},
802 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1074 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
803 connect_changed => sub { $CFG->{output_sync} = $_[1] }, 1075 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
804 ); 1076 );
805 1077
806 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button 1078 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button
807 expand => 1, 1079 expand => 1,
808 align => 0, 1080 align => 0,
809 text => "Login", 1081 text => "Login",
810 connect_activate => sub { 1082 on_activate => sub {
811 $CONN ? stop_game 1083 $CONN ? stop_game
812 : start_game; 1084 : start_game;
1085 0
813 }, 1086 },
814 ); 1087 );
815 1088
816 $dialog 1089 $table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command");
1090 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry
1091 text => $CFG->{say_command},
1092 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. "
1093 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1094 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1095 on_changed => sub {
1096 my ($self, $value) = @_;
1097 $CFG->{say_command} = $value;
1098 0
1099 }
1100 );
1101
1102 $vbox->add (new CFClient::UI::Label
1103 text => "Server Info",
1104 fontsize => 1.2,
1105 padding_y => 8,
1106 fg => [1, 1, 0, 1],
1107 );
1108
1109 $vbox->add ($SERVER_INFO = new CFClient::UI::Label ellipsise => 0);
1110
1111 $vbox
817} 1112}
818 1113
819sub message_window { 1114sub message_window {
820 my $window = new CFClient::UI::FancyFrame 1115 my $window = new CFClient::UI::FancyFrame
1116 name => "message_window",
821 title => "Messages", 1117 title => "Messages",
822 border_bg => [1, 1, 1, 1], 1118 border_bg => [1, 1, 1, 1],
823 bg => [0, 0, 0, 0.75], 1119 bg => [0, 0, 0, 0.75],
824 user_w => int $::WIDTH / 3, 1120 x => "max",
1121 y => 0,
1122 force_w => $::WIDTH * 0.4,
825 user_h => int $::HEIGHT / 5, 1123 force_h => $::HEIGHT * 0.5,
826 child => (my $vbox = new CFClient::UI::VBox); 1124 child => (my $vbox = new CFClient::UI::VBox),
1125 has_close_button => 1;
827 1126
828 $vbox->add ($LOGVIEW); 1127 $vbox->add ($LOGVIEW);
829 1128
830 $vbox->add (my $input = new CFClient::UI::Entry 1129 $vbox->add (my $input = new CFClient::UI::Entry
831 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> " 1130 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
832 . "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). " 1131 . "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "
833 . "If you prepend a slash (/), you will submit a command instead (similar to IRC). " 1132 . "If you prepend a slash (/), you will submit a command instead (similar to IRC). "
834 . "A better way to submit commands (and the occasional chat command) is often the map command completer.", 1133 . "A better way to submit commands (and the occasional chat command) is often the map command completer.",
835 connect_focus_in => sub { 1134 on_focus_in => sub {
836 my ($input, $prev_focus) = @_; 1135 my ($input, $prev_focus) = @_;
837 1136
838 delete $input->{refocus_map}; 1137 delete $input->{refocus_map};
839 1138
840 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) { 1139 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
841 $input->{refocus_map} = 1; 1140 $input->{refocus_map} = 1;
842 } 1141 }
843 delete $input->{auto_activated}; 1142 delete $input->{auto_activated};
1143
1144 0
844 }, 1145 },
845 connect_activate => sub { 1146 on_activate => sub {
846 my ($input, $text) = @_; 1147 my ($input, $text) = @_;
847 $input->set_text (''); 1148 $input->set_text ('');
848 1149
849 if ($text =~ /^\/(.*)/) { 1150 if ($text =~ /^\/(.*)/) {
850 $::CONN->user_send ($1); 1151 $::CONN->user_send ($1);
… …
854 } 1155 }
855 if ($input->{refocus_map}) { 1156 if ($input->{refocus_map}) {
856 delete $input->{refocus_map}; 1157 delete $input->{refocus_map};
857 $MAPWIDGET->focus_in 1158 $MAPWIDGET->focus_in
858 } 1159 }
1160
1161 0
859 }, 1162 },
860 connect_escape => sub { 1163 on_escape => sub {
861 $MAPWIDGET->focus_in 1164 $MAPWIDGET->grab_focus;
1165
1166 0
862 }, 1167 },
863 ); 1168 );
864 1169
865 $CONSOLE = { 1170 $CONSOLE = {
866 window => $window, 1171 window => $window,
867 input => $input 1172 input => $input,
868 }; 1173 };
869 1174
870 $window 1175 $window
871} 1176}
872 1177
873sub open_quit_dialog { 1178sub open_quit_dialog {
874 unless ($QUIT_DIALOG) { 1179 unless ($QUIT_DIALOG) {
875
876 $QUIT_DIALOG = new CFClient::UI::FancyFrame title => "Really Quit?"; 1180 $QUIT_DIALOG = new CFClient::UI::FancyFrame
1181 x => "center",
1182 y => "center",
1183 z => 50,
1184 title => "Really Quit?",
1185 ;
877 1186
878 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1); 1187 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
879 1188
880 $vb->add (new CFClient::UI::Label 1189 $vb->add (new CFClient::UI::Label
881 text => "You should find a savebed and apply it first!", 1190 text => "You should find a savebed and apply it first!",
… …
884 ); 1193 );
885 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 1194 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
886 $hb->add (new CFClient::UI::Button 1195 $hb->add (new CFClient::UI::Button
887 text => "Ok", 1196 text => "Ok",
888 expand => 1, 1197 expand => 1,
889 connect_activate => sub { $QUIT_DIALOG->hide }, 1198 on_activate => sub { $QUIT_DIALOG->hide; 0 },
890 ); 1199 );
891 $hb->add (new CFClient::UI::Button 1200 $hb->add (new CFClient::UI::Button
892 text => "Quit anyway", 1201 text => "Quit anyway",
893 expand => 1, 1202 expand => 1,
894 connect_activate => sub { exit }, 1203 on_activate => sub { exit },
895 );
896
897 $QUIT_DIALOG->show_centered;
898 } else {
899 $QUIT_DIALOG->show_centered;
900 }
901}
902
903sub make_inventory_window {
904 my $invwin = new CFClient::UI::FancyFrame
905 user_w => $WIDTH * (7/8), user_h => $HEIGHT * (7/8), title => "Inventory";
906
907 $invwin->add (my $hb = new CFClient::UI::HBox expand => 1);
908
909 $hb->add (my $vb1 = new CFClient::UI::VBox expand => 1);
910 $vb1->add (my $lbl = new CFClient::UI::Label xalign => 0.5);
911 $lbl->set_text ("Player");
912 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1);
913
914 $hb->add (my $vb2 = new CFClient::UI::VBox expand => 1);
915 $vb2->add ($INVR_LBL = new CFClient::UI::Label xalign => 0.5);
916 $INVR_LBL->set_text ("Floor");
917 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
918
919 $invwin
920}
921
922sub make_help_window {
923 my $win = new CFClient::UI::FancyFrame
924 user_w => $WIDTH * (7/8), user_h => $HEIGHT * (7/8), title => "Documentation";
925
926 $win->add (my $vbox = new CFClient::UI::VBox);
927
928 $vbox->add (my $buttons = new CFClient::UI::HBox);
929 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8);
930
931 for (
932 [intro => "Introduction"],
933 [manual => "Manual"],
934 [command_help => "Commands"],
935 [skill_help => "Skills"],
936 ) {
937 my ($pod, $label) = @$_;
938
939 $buttons->add (new CFClient::UI::Button
940 text => $label,
941 connect_activate => sub {
942 my $parser = new Pod::POM;
943 my $pom = $parser->parse_file (CFClient::find_rcfile "pod/$pod.pod");
944
945 $viewer->clear;
946
947 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
948 for @{ CFClient::pod_to_pango_list $pom };
949
950 $viewer->set_offset (0);
951 },
952 ); 1204 );
953 } 1205 }
954 1206
955 $viewer->add_paragraph ([1, 1, 0, 1], "<big>Use one of the buttons above to display a document.</big>"); 1207 $QUIT_DIALOG->show;
1208}
1209
1210sub autopickup_setup {
1211 my $table = new CFClient::UI::Table;
1212
1213 for (
1214 ["General", 0, 0,
1215 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1216 ["Inhibit autopickup" => PICKUP_INHIBIT],
1217 ["Stop before pickup" => PICKUP_STOP],
1218 ["Debug autopickup" => PICKUP_DEBUG],
1219 ],
1220 ["Weapons", 0, 6,
1221 ["All weapons" => PICKUP_ALLWEAPON],
1222 ["Missile weapons" => PICKUP_MISSILEWEAPON],
1223 ["Bows" => PICKUP_BOW],
1224 ["Arrows" => PICKUP_ARROW],
1225 ],
1226 ["Armour", 0, 12,
1227 ["Helmets" => PICKUP_HELMET],
1228 ["Shields" => PICKUP_SHIELD],
1229 ["Body Armour" => PICKUP_ARMOUR],
1230 ["Boots" => PICKUP_BOOTS],
1231 ["Gloves" => PICKUP_GLOVES],
1232 ["Cloaks" => PICKUP_CLOAK],
1233 ],
1234
1235 ["Readables", 2, 2,
1236 ["Spellbooks" => PICKUP_SPELLBOOK],
1237 ["Skillscrolls" => PICKUP_SKILLSCROLL],
1238 ["Normal Books/Scrolls" => PICKUP_READABLES],
1239 ],
1240 ["Misc", 2, 7,
1241 ["Food" => PICKUP_FOOD],
1242 ["Drinks" => PICKUP_DRINK],
1243 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
1244 ["Keys" => PICKUP_KEY],
1245 ["Magical Items" => PICKUP_MAGICAL],
1246 ["Potions" => PICKUP_POTION],
1247 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1248 ["Ignore cursed" => PICKUP_NOT_CURSED],
1249 ["Jewelery" => PICKUP_JEWELS],
1250 ],
1251 ["Weight/Value ratio", 2, 17]
1252 )
1253 {
1254 my ($title, $x, $y, @bits) = @$_;
1255 $table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1256
1257 for (@bits) {
1258 ++$y;
1259
1260 my $mask = $_->[1];
1261 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);
1262 $table->add ($x+1, $y, my $checkbox = new CFClient::UI::CheckBox
1263 state => $::CFG->{pickup} & $mask,
1264 on_changed => sub {
1265 my ($box, $value) = @_;
1266
1267 if ($value) {
1268 $::CFG->{pickup} |= $mask;
1269 } else {
1270 $::CFG->{pickup} &= ~$mask;
1271 }
1272
1273 $::CONN->send_command ("pickup $::CFG->{pickup}")
1274 if defined $::CONN;
1275
1276 0
1277 });
1278
1279 ${$_->[2]} = $checkbox if $_->[2];
1280 }
1281 }
1282
1283 $table->add (2, 18, new CFClient::UI::ValSlider
1284 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1285 template => ">= 99",
1286 to_value => sub { ">= " . 5 * $_[0] },
1287 on_changed => sub {
1288 my ($slider, $value) = @_;
1289
1290 $::CFG->{pickup} &= ~0xF;
1291 $::CFG->{pickup} |= int $value
1292 if $value;
1293 1;
1294 });
1295
1296 $table->add (3, 18, new CFClient::UI::Button
1297 text => "set",
1298 on_activate => sub {
1299 $::CONN->send_command ("pickup $::CFG->{pickup}")
1300 if defined $::CONN;
1301 0
1302 });
1303
1304 $table
1305}
1306
1307sub inventory_widget {
1308 my $hb = new CFClient::UI::HBox homogeneous => 1;
1309
1310 $hb->add (my $vb1 = new CFClient::UI::VBox);
1311 $vb1->add (new CFClient::UI::Label align => 0, text => "Player");
1312 $vb1->add ($INV = new CFClient::UI::Inventory);
1313
1314 $hb->add (my $vb2 = new CFClient::UI::VBox);
1315
1316 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
1317
1318 $vb2->add ($INVR = new CFClient::UI::Inventory);
1319
1320 # XXX: Call after $INVR = ... because set_opencont sets the items
1321 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1322
1323 $hb
1324}
1325
1326sub toggle_player_page {
1327 my ($widget) = @_;
1328
1329 if ($PL_WINDOW->{visible} && $PL_NOTEBOOK->get_current_page == $widget) {
1330 $PL_WINDOW->hide;
1331 } else {
1332 $PL_NOTEBOOK->set_current_page ($widget);
1333 $PL_WINDOW->show;
1334 }
1335}
1336
1337sub player_window {
1338 my $plwin = $PL_WINDOW = new CFClient::UI::FancyFrame
1339 x => "center",
1340 y => "center",
1341 force_w => $WIDTH * 9/10,
1342 force_h => $HEIGHT * 9/10,
1343 title => "Player",
1344 name => "playerbook",
1345 has_close_button => 1
1346 ;
1347
1348 my $ntb =
1349 $PL_NOTEBOOK =
1350 new CFClient::UI::Notebook
1351 expand => 1,
1352 debug => 1,
1353 filter => (new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1),
1354 ;
1355
1356 $ntb->add (
1357 "Stats &amp; Skills" => $STATS_PAGE = stats_window,
1358 "Shows statistics and skill window, where all your Stats, Resistances and Skills are shown."
1359 );
1360 $ntb->add (
1361 Spellbook => $SPELL_PAGE = new CFClient::UI::SpellList,
1362 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1363 );
1364 $ntb->add (
1365 Inventory => $INVENTORY_PAGE = inventory_widget,
1366 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1367 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1368 );
1369
1370 $ntb->set_current_page ($INVENTORY_PAGE);
1371
1372 $plwin->add ($ntb);
1373 $plwin
1374}
1375
1376sub update_bindings {
1377 $BIND_UPD_CB->() if $BIND_UPD_CB;
1378}
1379
1380sub keyboard_setup {
1381 my $binding_list = new CFClient::UI::VBox;
1382
1383 my $refresh;
1384 $refresh = $BIND_UPD_CB = sub {
1385 $binding_list->clear ();
1386
1387 for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) {
1388 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
1389 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1390 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1391
1392 my $lbl = join "; ", @$cmds;
1393 my $nam = CFClient::BindingEditor::keycombo_to_name ($mod, $sym);
1394 $binding_list->add (my $hb = new CFClient::UI::HBox);
1395 $hb->add (new CFClient::UI::Button
1396 text => "delete",
1397 tooltip => "Deletes the binding",
1398 on_activate => sub {
1399 $binding_list->remove ($hb);
1400 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1401 0
1402 });
1403
1404 $hb->add (new CFClient::UI::Button
1405 text => "edit",
1406 tooltip => "Edits the binding",
1407 on_activate => sub {
1408 $::BIND_EDITOR->set_binding (
1409 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},
1410 sub {
1411 my ($nmod, $nsym, $ncmds) = @_;
1412 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
1413 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1414 $refresh->();
1415 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1416 $SETUP_DIALOG->show;
1417 },
1418 sub {
1419 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1420 $SETUP_DIALOG->show;
1421 });
1422 $::BIND_EDITOR->show;
1423 $SETUP_DIALOG->hide;
1424 0
1425 });
1426
1427 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
1428 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
1429 }
1430 }
1431 };
1432
1433 my $vb = new CFClient::UI::VBox;
1434 $vb->add (my $hb = new CFClient::UI::HBox);
1435 $hb->add (new CFClient::UI::Label text => "only shift-up stops fire");
1436 $hb->add (new CFClient::UI::CheckBox
1437 expand => 1,
1438 state => $CFG->{shift_fire_stop},
1439 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
1440 on_changed => sub {
1441 my ($cbox, $value) = @_;
1442 $CFG->{shift_fire_stop} = $value;
1443 0
1444 });
1445
1446 $vb->add ($binding_list);
1447 $vb->add (my $hb = new CFClient::UI::HBox);
1448
1449 $hb->add (new CFClient::UI::Button
1450 text => "record new",
1451 expand => 1,
1452 tooltip => "This button opens the binding editor with an empty binding.",
1453 on_activate => sub {
1454 $::BIND_EDITOR->set_binding (undef, undef, [],
1455 sub {
1456 my ($mod, $sym, $cmds) = @_;
1457 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1458 $refresh->();
1459 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1460 $SETUP_DIALOG->show;
1461 },
1462 sub {
1463 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1464 $SETUP_DIALOG->show;
1465 },
1466 );
1467 $SETUP_DIALOG->hide;
1468 $::BIND_EDITOR->show;
1469 0
1470 },
1471 );
1472
1473 $hb->add (new CFClient::UI::Button
1474 text => "close",
1475 tooltip => "Closes the binding window",
1476 expand => 1,
1477 on_activate => sub {
1478 $SETUP_DIALOG->hide;
1479 0
1480 }
1481 );
1482
1483 $refresh->();
1484
1485 $vb
1486}
1487
1488sub help_window {
1489 my $win = new CFClient::UI::FancyFrame
1490 x => 'center',
1491 y => 'center',
1492 z => 2,
1493 name => 'doc_browser',
1494 force_w => int $WIDTH * 7/8,
1495 force_h => int $HEIGHT * 7/8,
1496 title => "Help Browser",
1497 has_close_button => 1;
1498
1499 $win->add (my $vbox = new CFClient::UI::VBox);
1500
1501 $vbox->add (my $buttons = new CFClient::UI::HBox);
1502 $vbox->add (my $viewer = new CFClient::UI::TextScroller
1503 expand => 1, fontsize => 0.8, padding_x => 4);
1504
1505 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: ");
1506 $buttons->add (my $combo = new CFClient::UI::Combobox
1507 value => undef,
1508 options => [
1509 [intro => "Introduction"],
1510 [manual => "Main Manual"],
1511 [skill_help => "Skill Reference"],
1512 [command_help => "Command Reference"],
1513 [dmcommand_help => "DM Commands"],
1514 [COPYING => "License Terms"],
1515 ],
1516 on_changed => sub {
1517 my ($self, $pod) = @_;
1518
1519 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
1520 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };
1521
1522 $viewer->clear;
1523
1524# $viewer->add_paragraph ([1, 1, 1, 1], ["<big>Test</big>\n\n \x{fffc} \x{fffc}\n",
1525# (new CFClient::UI::Image path => "x.png", can_hover => 1, can_events => 1),
1526# (new CFClient::UI::Label text => "üüüü", can_hover => 1, can_events => 1, tooltip => "??"),
1527# ]);#d#
1528
1529 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
1530 for @$pom;
1531
1532 $viewer->set_offset (0);
1533
1534 0
1535 },
1536 on_visibility_change => sub {
1537 my ($self, $visible) = @_;
1538 return unless $visible;
1539 return if $self->{value};
1540 $self->set_value ("intro");
1541 0
1542 },
1543 );
956 1544
957 $win 1545 $win
958} 1546}
959 1547
960sub sdl_init { 1548sub sdl_init {
… …
990 if ($DEBUG_STATUS) { 1578 if ($DEBUG_STATUS) {
991 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 1579 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
992 } else { 1580 } else {
993 # create the widgets 1581 # create the widgets
994 1582
995 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, req_x => -1; 1583 $DEBUG_STATUS = new CFClient::UI::Label
1584 padding => 0,
1585 z => 100,
1586 force_x => "max",
1587 force_y => 0;
996 $DEBUG_STATUS->show; 1588 $DEBUG_STATUS->show;
997 1589
1590 $BIND_EDITOR = new CFClient::BindingEditor (x => "max", y => 0);
1591
998 $STATUSBOX = new CFClient::UI::Statusbox; 1592 $STATUSBOX = new CFClient::UI::Statusbox;
999 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]); 1593 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1000 1594
1001 (new CFClient::UI::Frame 1595 (new CFClient::UI::Frame
1002 bg => [0, 0, 0, 0.4], 1596 bg => [0, 0, 0, 0.4],
1003 req_y => -1, 1597 force_x => 0,
1598 force_y => "max",
1004 child => $STATUSBOX, 1599 child => $STATUSBOX,
1005 )->show; 1600 )->show;
1006 1601
1007 CFClient::UI::FancyFrame->new ( 1602 CFClient::UI::FancyFrame->new (
1603 title => "Map",
1604 name => "mapmap",
1605 x => 0,
1606 y => $FONTSIZE + 8,
1008 border_bg => [1, 1, 1, 192/255], 1607 border_bg => [1, 1, 1, 192/255],
1009 bg => [1, 1, 1, 0], 1608 bg => [1, 1, 1, 0],
1010 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1609 child => ($MAPMAP = new CFClient::MapWidget::MapMap
1011 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.", 1610 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
1012 ), 1611 ),
… …
1016 $MAPWIDGET->connect (activate_console => sub { 1615 $MAPWIDGET->connect (activate_console => sub {
1017 my ($mapwidget, $preset) = @_; 1616 my ($mapwidget, $preset) = @_;
1018 1617
1019 if ($CONSOLE) { 1618 if ($CONSOLE) {
1020 $CONSOLE->{input}->{auto_activated} = 1; 1619 $CONSOLE->{input}->{auto_activated} = 1;
1021 $CONSOLE->{input}->focus_in; 1620 $CONSOLE->{input}->grab_focus;
1022 1621
1023 if ($preset && $CONSOLE->{input}->get_text eq '') { 1622 if ($preset && $CONSOLE->{input}->get_text eq '') {
1024 $CONSOLE->{input}->set_text ($preset); 1623 $CONSOLE->{input}->set_text ($preset);
1025 } 1624 }
1026 } 1625 }
1027 }); 1626 });
1028 $MAPWIDGET->show; 1627 $MAPWIDGET->show;
1029 $MAPWIDGET->focus_in; 1628 $MAPWIDGET->grab_focus;
1030 1629
1031 $LOGVIEW = new CFClient::UI::TextView 1630 $LOGVIEW = new CFClient::UI::TextScroller
1032 expand => 1, 1631 expand => 1,
1033 font => $FONT_FIXED, 1632 font => $FONT_FIXED,
1034 fontsize => $::CFG->{log_fontsize}, 1633 fontsize => $::CFG->{log_fontsize},
1634 indent => -4,
1035 can_hover => 1, 1635 can_hover => 1,
1036 can_events => 1, 1636 can_events => 1,
1037 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1637 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1038 ; 1638 ;
1039 1639
1040 $BUTTONBAR = new CFClient::UI::HBox; 1640 $SETUP_DIALOG = new CFClient::UI::FancyFrame
1641 title => "Setup",
1642 name => "setup_dialog",
1643 x => 'center',
1644 y => 'center',
1645 z => 2,
1646 force_w => $::WIDTH * 0.6,
1647 force_h => $::HEIGHT * 0.6,
1648 has_close_button => 1,
1649 ;
1041 1650
1651 $METASERVER = metaserver_dialog;
1652
1653 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,
1654 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1655
1656 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1657 "Configure the server to play on, your username, password and other server-related options.");
1658 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1659 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1660 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1661 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1662 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1663 "Configure the use of audio, sound effects and background music.");
1664 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1665 "Lets you define, edit and delete key bindings."
1666 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "
1667 . "with nothing set and the recording started. After doing the actions you "
1668 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1669 . "After pressing the combo the binding will be saved automatically and the "
1670 . "binding editor closes");
1671 $SETUP_NOTEBOOK->add (Debug => debug_setup,
1672 "Some debuggin' options. Do not ask.");
1673
1674 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1675
1042 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup, 1676 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1043 tooltip => "Toggles a dialog where you can configure various aspects of the client, such as graphics mode, performance, and audio options."); 1677 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1044 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup, 1678
1045 tooltip => "Toggles a dialog where you can configure the server to play on, your username, password and other server-related options.");
1046 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window, 1679 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,
1047 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 1680 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1048 1681
1049 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 1682 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
1050 1683
1051 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window,
1052 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1053 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window, 1684 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Playerbook", other => player_window,
1054 tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :)."); 1685 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
1055 1686
1056 $BUTTONBAR->add (new CFClient::UI::Button 1687 $BUTTONBAR->add (new CFClient::UI::Button
1057 text => "Save Config", 1688 text => "Save Config",
1058 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 1689 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1059 connect_activate => sub { 1690 on_activate => sub {
1691 $::CFG->{layout} = CFClient::UI::get_layout;
1060 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 1692 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1061 status "Configuration Saved"; 1693 status "Configuration Saved";
1694 0
1062 }, 1695 },
1063 ); 1696 );
1064 1697
1065 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window, 1698 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1066 tooltip => "View Documentation"); 1699 tooltip => "View Documentation");
1067 1700
1068 $BUTTONBAR->add (new CFClient::UI::Button 1701 $BUTTONBAR->add (new CFClient::UI::Button
1069 text => "Quit", 1702 text => "Quit",
1070 tooltip => "Terminates the program", 1703 tooltip => "Terminates the program",
1071 connect_activate => sub { 1704 on_activate => sub {
1072 if ($CONN) { 1705 if ($CONN) {
1073 open_quit_dialog; 1706 open_quit_dialog;
1074 } else { 1707 } else {
1075 exit; 1708 exit;
1076 } 1709 }
1710 0
1077 }, 1711 },
1078 ); 1712 );
1079 1713
1080 $BUTTONBAR->show; 1714 $BUTTONBAR->show;
1081 1715 $SETUP_DIALOG->show;
1082 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1083
1084 # delay till geometry is constant
1085 $CFClient::UI::ROOT->on_post_alloc (startup => sub {
1086 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
1087 my $widget = $GAUGES->{win};
1088 $widget->move (0, $HEIGHT - $widget->{h});#d# to in toplevel
1089 });
1090 force_refresh ();
1091 } 1716 }
1717
1718 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1092} 1719}
1093 1720
1094sub video_shutdown { 1721sub video_shutdown {
1722 CFClient::OpenGL::shutdown;
1723
1095 undef $SDL_ACTIVE; 1724 undef $SDL_ACTIVE;
1096} 1725}
1097 1726
1098my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d# 1727my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
1099my $bgmusic;#TODO#hack#d# 1728my $bgmusic;#TODO#hack#d#
… …
1163 1792
1164my %demo;#d# 1793my %demo;#d#
1165 1794
1166sub force_refresh { 1795sub force_refresh {
1167 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 1796 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
1168 debug sprintf "%3.2f", $fps; 1797 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1169 1798
1170 $CFClient::UI::ROOT->draw; 1799 $CFClient::UI::ROOT->draw;
1171 1800
1172 $WANT_REFRESH = 0; 1801 $WANT_REFRESH = 0;
1173 $CAN_REFRESH = 0; 1802 $CAN_REFRESH = 0;
… …
1228}; 1857};
1229 1858
1230 CFClient::SDL_GL_SwapBuffers; 1859 CFClient::SDL_GL_SwapBuffers;
1231} 1860}
1232 1861
1233my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub { 1862my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1234 $NOW = time; 1863 $NOW = time;
1235 1864
1236 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 1865 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1237 for CFClient::SDL_PollEvent; 1866 for CFClient::SDL_PollEvent;
1238 1867
… …
1305############################################################################# 1934#############################################################################
1306 1935
1307$SIG{INT} = $SIG{TERM} = sub { exit }; 1936$SIG{INT} = $SIG{TERM} = sub { exit };
1308 1937
1309{ 1938{
1310 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] }; 1939 local $SIG{__DIE__} = sub {
1940 return unless defined $^S && !$^S;
1941 Carp::confess $_[1];#d#TODO: remove when stable
1942 CFClient::fatal $_[0];
1943 };
1311 1944
1312 CFClient::read_cfg "$Crossfire::VARDIR/pclientrc"; 1945 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1946 CFClient::UI::set_layout ($::CFG->{layout});
1313 1947
1314 my %DEF_CFG = ( 1948 my %DEF_CFG = (
1315 sdl_mode => 0, 1949 sdl_mode => 0,
1316 width => 640, 1950 width => 640,
1317 height => 480, 1951 height => 480,
1318 fullscreen => 0, 1952 fullscreen => 0,
1319 fast => 0, 1953 fast => 0,
1320 map_scale => 1, 1954 map_scale => 1,
1321 fow_enable => 1, 1955 fow_enable => 1,
1322 fow_intensity => 0.45, 1956 fow_intensity => 0.45,
1323 fow_smooth => 0, 1957 fow_smooth => 0,
1324 gui_fontsize => 1, 1958 gui_fontsize => 1,
1325 log_fontsize => 1, 1959 log_fontsize => 0.7,
1326 gauge_fontsize=> 1, 1960 gauge_fontsize => 1,
1327 gauge_size => 0.35, 1961 gauge_size => 0.35,
1328 stat_fontsize => 1, 1962 stat_fontsize => 0.7,
1329 mapsize => 100, 1963 mapsize => 100,
1330 host => "crossfire.schmorp.de",
1331 say_command => 'say', 1964 say_command => 'say',
1332 audio_enable => 1, 1965 audio_enable => 1,
1333 bgm_enable => 1, 1966 bgm_enable => 1,
1334 bgm_volume => 0.25, 1967 bgm_volume => 0.25,
1335 face_prefetch => 0, 1968 face_prefetch => 0,
1336 output_sync => 1, 1969 output_sync => 1,
1337 output_count => 1, 1970 output_count => 1,
1971 pickup => 0,
1972 default => "profile", # default profile
1973 );
1338 ); 1974
1339
1340 while (my ($k, $v) = each %DEF_CFG) { 1975 while (my ($k, $v) = each %DEF_CFG) {
1341 $CFG->{$k} = $v unless exists $CFG->{$k}; 1976 $CFG->{$k} = $v unless exists $CFG->{$k};
1342 } 1977 }
1978
1979 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
1343 1980
1344 sdl_init; 1981 sdl_init;
1345 1982
1346 @SDL_MODES = reverse 1983 @SDL_MODES = reverse
1347 grep $_->[0] >= 640 && $_->[1] >= 480, 1984 grep $_->[0] >= 640 && $_->[1] >= 480,
… …
1389 video_init; 2026 video_init;
1390 audio_init; 2027 audio_init;
1391} 2028}
1392 2029
1393Event::loop; 2030Event::loop;
2031#CFClient::SDL_Quit;
2032#CFClient::_exit 0;
1394 2033
1395END { CFClient::SDL_Quit } 2034END { CFClient::SDL_Quit }
1396 2035
1397=head1 NAME 2036=head1 NAME
1398 2037
1399pclient - A Crossfire+ and Crossfire game client 2038cfplus - A Crossfire+ and Crossfire game client
1400 2039
1401=head1 SYNOPSIS 2040=head1 SYNOPSIS
1402 2041
1403Just run it - no commandline arguments are supported. 2042Just run it - no commandline arguments are supported.
1404 2043
1405=head1 USAGE 2044=head1 USAGE
1406 2045
1407Pclient utilises OpenGL for all UI elements and the game. It is supposed to be used 2046cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used
1408fullscreen and interactively. 2047fullscreen and interactively.
1409 2048
2049=head1 DEBUGGING
2050
2051
2052CFPLUS_DEBUG - environment variable
2053
2054 1 draw borders around widgets
2055 2 add low-level widget info to tooltips
2056 4 show fps
2057 8 suppress tooltips
2058
1410=head1 AUTHOR 2059=head1 AUTHOR
1411 2060
1412Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 2061Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
1413 2062
1414 2063

Diff Legend

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