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

Diff Legend

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