ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/bin/cfplus
(Generate patch)

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.11 by root, Fri May 26 18:56:14 2006 UTC vs.
Revision 1.92 by elmex, Fri Jul 14 17:35:35 2006 UTC

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

Diff Legend

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