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

Diff Legend

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