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

Diff Legend

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