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

Diff Legend

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