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.23 by root, Sun May 28 02:31:04 2006 UTC vs.
Revision 1.97 by elmex, Wed Jul 19 16:41:51 2006 UTC

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

Diff Legend

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