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.1 by root, Thu May 25 16:24:45 2006 UTC vs.
Revision 1.90 by elmex, Mon Jul 10 06:59:14 2006 UTC

… …
25# need to do it again because that pile of garbage called PAR nukes it before main 25# need to do it again because that pile of garbage called PAR nukes it before main
26unshift @INC, $ENV{PAR_TEMP} 26unshift @INC, $ENV{PAR_TEMP}
27 if %PAR::LibCache; 27 if %PAR::LibCache;
28 28
29use Time::HiRes 'time'; 29use Time::HiRes 'time';
30use Pod::POM;
31use Event; 30use Event;
32 31
33use Crossfire; 32use Crossfire;
34use Crossfire::Protocol; 33use Crossfire::Protocol::Constants;
35 34
36use Compress::LZF; 35use Compress::LZF;
37 36
38use CFClient; 37use CFClient;
38use CFClient::OpenGL ();
39use CFClient::Protocol;
39use CFClient::UI; 40use CFClient::UI;
41use CFClient::BindingEditor;
40use CFClient::MapWidget; 42use CFClient::MapWidget;
43
44$SIG{QUIT} = sub { Carp::cluck "QUIT" };
41 45
42$Event::DIED = sub { 46$Event::DIED = sub {
43 # TODO: display dialog box or so 47 # TODO: display dialog box or so
48 Carp::confess $_[1];#d#TODO: remove when stable
44 CFClient::error $_[1]; 49 CFClient::error $_[1];
45}; 50};
46 51
47#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d# 52#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d#
48 53
… …
50 55
51my $MAX_FPS = 60; 56my $MAX_FPS = 60;
52my $MIN_FPS = 5; # unused as of yet 57my $MIN_FPS = 5; # unused as of yet
53 58
54our $META_SERVER = "crossfire.real-time.com:13326"; 59our $META_SERVER = "crossfire.real-time.com:13326";
55
56our $FACEMAP;
57our $TILECACHE;
58our $MAPCACHE;
59 60
60our $LAST_REFRESH; 61our $LAST_REFRESH;
61our $NOW; 62our $NOW;
62 63
63our $CFG; 64our $CFG;
… …
83our $LOGVIEW; 84our $LOGVIEW;
84our $CONSOLE; 85our $CONSOLE;
85our $METASERVER; 86our $METASERVER;
86our $LOGIN_BUTTON; 87our $LOGIN_BUTTON;
87our $QUIT_DIALOG; 88our $QUIT_DIALOG;
89our $HOST_ENTRY;
90our $PICKUP_ENABLE;
91our $SERVER_INFO;
88 92
93our $SETUP_DIALOG;
94our $SETUP_NOTEBOOK;
95our $SETUP_SERVER;
96our $SETUP_KEYBOARD;
97
98our $PL_NOTEBOOK;
99our $PL_WINDOW;
100
101our $INVENTORY_PAGE;
102our $STATS_PAGE;
103our $SPELL_PAGE;
104
105our $HELP_WINDOW;
106our $MESSAGE_WINDOW;
89our $FLOORBOX; 107our $FLOORBOX;
90our $GAUGES; 108our $GAUGES;
91our $STATWIDS; 109our $STATWIDS;
92 110
93our $SDL_ACTIVE; 111our $SDL_ACTIVE;
… …
99 117
100our $ALT_ENTER_MESSAGE; 118our $ALT_ENTER_MESSAGE;
101our $STATUSBOX; 119our $STATUSBOX;
102our $DEBUG_STATUS; 120our $DEBUG_STATUS;
103 121
104our $INVWIN;
105our $INV; 122our $INV;
106our $INVR; 123our $INVR;
107our $INVR_LBL; 124our $INV_RIGHT_HB;
108our $OPENCONT; 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),
386 (new CFClient::UI::VBox children => [ 577 (new CFClient::UI::VBox children => [
387 (new CFClient::UI::Empty expand => 1), 578 (new CFClient::UI::Empty expand => 1),
388 (new CFClient::UI::Frame bg => [0, 0, 0, 0.4], child => ($FLOORBOX = new CFClient::UI::VBox)), 579 (new CFClient::UI::Frame bg => [0, 0, 0, 0.4], child => ($FLOORBOX = new CFClient::UI::Table)),
389 ]), 580 ]),
390 (my $vbox = new CFClient::UI::VBox), 581 (my $vbox = new CFClient::UI::VBox),
391 ], 582 ],
392 ); 583 );
393 584
… …
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).");
654
655 $vb->add (my $hb0 = new CFClient::UI::HBox);
656 $hb0->add ($STATWIDS->{weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1,
657 can_hover => 1, can_events => 1,
658 tooltip => "The weight of the player including all inventory items.");
659 $hb0->add ($STATWIDS->{m_weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1,
660 can_hover => 1, can_events => 1,
661 tooltip => "The weight limit: you cannot carry more than this.");
662
436 663
437 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 664 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
438 $hb->add (my $tbl = new CFClient::UI::Table expand => 1); 665 $hb->add (my $tbl = new CFClient::UI::Table expand => 1);
439 666
440 my $color2 = [1, 1, 0]; 667 my $color2 = [1, 1, 0];
… …
449 [0, 6, st_cha => "Cha", 30, "<b>Charisma</b>, how well you are received by NPCs. Affects buying and selling prices in shops."], 676 [0, 6, st_cha => "Cha", 30, "<b>Charisma</b>, how well you are received by NPCs. Affects buying and selling prices in shops."],
450 677
451 [2, 0, st_wc => "Wc", -120, "<b>Weapon Class</b>, effectiveness of melee/missile attacks. Lower is more potent. Current weapon, level and Str are some things which effect the value of Wc. The value of Wc may range between 25 and -72."], 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."],
452 [2, 1, st_ac => "Ac", -120, "<b>Armour Class</b>, how protected you are from being hit by any attack. Lower values are better. Ac is based on your race and is modified by the Dex and current armour worn. For characters that cannot wear armour, Ac improves as their level increases."], 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."],
453 [2, 2, st_dam => "Dam", 120, "<b>Damage</b>, how much damage your melee/missile attack inflicts. Higher values indicate a greater amount of damage will be inflicted with each attack."], 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."],
454 [2, 3, st_arm => "Arm", 120, "<b>Armour</b>, how much damage (from physical attacks) will be subtracted from successful hits made upon you. This value ranges between 0 to 99%. Current armour worn primarily determines Arm value."], 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."],
455 [2, 4, st_spd => "Spd", 10.54, "<b>Speed</b>, how fast you can move. The value of speed may range between nearly 0 (\"very slow\") to higher than 5 (\"lightning fast\"). Base speed is determined from the Dex and modified downward proportionally by the amount of weight carried which exceeds the Max Carry limit. The armour worn also sets the upper limit on speed."], 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."],
456 [2, 5, st_wspd => "WSp", 10.54, "<b>Weapon Speed</b>, how many attacks you may make per unit of time (0.120s). Higher values indicate faster attack speed. Current weapon and Dex effect the value of weapon speed."], 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."],
457 ) { 684 ) {
458 my ($col, $row, $id, $label, $template, $tooltip) = @$_; 685 my ($col, $row, $id, $label, $template, $tooltip) = @$_;
459 686
… …
478 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)",
479 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)",
480 pois => "<b>Poison</b> (resistance to getting poisoned)", 707 pois => "<b>Poison</b> (resistance to getting poisoned)",
481 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)",
482 deat => "<b>Death</b> (resistance against death spells)", 709 deat => "<b>Death</b> (resistance against death spells)",
483 phys => "<b>Physical</b> (this is the resistance against physical attacks, like when a monster hit you in melee combat)", 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.)",
484 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)",
485 fear => "<b>Fear</b> (this attack will drive you away from monsters who cast this and hit you successfully, being resistant to this helps a lot when fighting those monsters)", 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)",
486 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...",
487 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, ...)",
488 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, ...)",
… …
505 ); 732 );
506 $tbl2->add ($col + 1, $row, new CFClient::UI::Image 733 $tbl2->add ($col + 1, $row, new CFClient::UI::Image
507 font => $FONT_FIXED, 734 font => $FONT_FIXED,
508 can_hover => 1, 735 can_hover => 1,
509 can_events => 1, 736 can_events => 1,
510 image => "ui/resist/resist_$_.png", 737 path => "ui/resist/resist_$_.png",
511 tooltip => $resist_names{$_}, 738 tooltip => $resist_names{$_},
512 ); 739 );
513 740
514 $row++; 741 $row++;
515 if ($row % 6 == 0) { 742 if ($row % 6 == 0) {
516 $col += 2; 743 $col += 2;
517 $row = 0; 744 $row = 0;
518 } 745 }
519 } 746 }
520 747
521 &set_stats_window_fontsize; 748 $vb->add (my $tbl3 = new CFClient::UI::Table expand => 1);
749 $STATWIDS->{"_skill_tbl"} = $tbl3;
750
522 update_stats_window ({}); 751 update_stats_window ({});
523 752
524 $tgw 753 $vb
525} 754}
526 755
527sub formsep { 756sub formsep($) {
528 reverse join ",", grep length, split /(...)/, reverse $_[0] * 1 757 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
529} 758}
530 759
531sub update_stats_window { 760sub update_stats_window {
532 my ($stats) = @_; 761 my ($stats) = @_;
533 762
534 # i love text protocols!!! 763 # I love text protocols...
764
535 my $hp = $stats->{Crossfire::Protocol::CS_STAT_HP} * 1; 765 my $hp = $stats->{+CS_STAT_HP} * 1;
536 my $hp_m = $stats->{Crossfire::Protocol::CS_STAT_MAXHP} * 1; 766 my $hp_m = $stats->{+CS_STAT_MAXHP} * 1;
537 my $sp = $stats->{Crossfire::Protocol::CS_STAT_SP} * 1; 767 my $sp = $stats->{+CS_STAT_SP} * 1;
538 my $sp_m = $stats->{Crossfire::Protocol::CS_STAT_MAXSP} * 1; 768 my $sp_m = $stats->{+CS_STAT_MAXSP} * 1;
539 my $fo = $stats->{Crossfire::Protocol::CS_STAT_FOOD} * 1; 769 my $fo = $stats->{+CS_STAT_FOOD} * 1;
540 my $fo_m = 999; 770 my $fo_m = 999;
541 my $gr = $stats->{Crossfire::Protocol::CS_STAT_GRACE} * 1; 771 my $gr = $stats->{+CS_STAT_GRACE} * 1;
542 my $gr_m = $stats->{Crossfire::Protocol::CS_STAT_MAXGRACE} * 1; 772 my $gr_m = $stats->{+CS_STAT_MAXGRACE} * 1;
543 773
544 $GAUGES->{hp} ->set_value ($hp, $hp_m); 774 $GAUGES->{hp} ->set_value ($hp, $hp_m);
545 $GAUGES->{mana} ->set_value ($sp, $sp_m); 775 $GAUGES->{mana} ->set_value ($sp, $sp_m);
546 $GAUGES->{food} ->set_value ($fo, $fo_m); 776 $GAUGES->{food} ->set_value ($fo, $fo_m);
547 $GAUGES->{grace} ->set_value ($gr, $gr_m); 777 $GAUGES->{grace} ->set_value ($gr, $gr_m);
548 $GAUGES->{exp} ->set_text ("Exp: " . (formsep $stats->{Crossfire::Protocol::CS_STAT_EXP64}) 778 $GAUGES->{exp} ->set_text ("Exp: " . (formsep $stats->{+CS_STAT_EXP64})
549 . " (lvl " . ($stats->{Crossfire::Protocol::CS_STAT_LEVEL} * 1) . ")"); 779 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
550 my $rng = $stats->{Crossfire::Protocol::CS_STAT_RANGE}; 780 my $rng = $stats->{+CS_STAT_RANGE};
551 $rng =~ s/^Range: //; # thank you so much dear server 781 $rng =~ s/^Range: //; # thank you so much dear server
552 $GAUGES->{range} ->set_text ("Rng: " . $rng); 782 $GAUGES->{range} ->set_text ("Rng: " . $rng);
553 my $title = $stats->{Crossfire::Protocol::CS_STAT_TITLE}; 783 my $title = $stats->{+CS_STAT_TITLE};
554 $title =~ s/^Player: //; 784 $title =~ s/^Player: //;
555 $STATWIDS->{title} ->set_text ("Title: " . $title); 785 $STATWIDS->{title} ->set_text ("Title: " . $title);
556 786
557 $STATWIDS->{st_str} ->set_text (sprintf "%d", $stats->{5}); 787 $STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
558 $STATWIDS->{st_dex} ->set_text (sprintf "%d", $stats->{8}); 788 $STATWIDS->{st_dex} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DEX});
559 $STATWIDS->{st_con} ->set_text (sprintf "%d", $stats->{9}); 789 $STATWIDS->{st_con} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CON});
560 $STATWIDS->{st_int} ->set_text (sprintf "%d", $stats->{6}); 790 $STATWIDS->{st_int} ->set_text (sprintf "%d" , $stats->{+CS_STAT_INT});
561 $STATWIDS->{st_wis} ->set_text (sprintf "%d", $stats->{7}); 791 $STATWIDS->{st_wis} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WIS});
562 $STATWIDS->{st_pow} ->set_text (sprintf "%d", $stats->{22}); 792 $STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
563 $STATWIDS->{st_cha} ->set_text (sprintf "%d", $stats->{10}); 793 $STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
564 $STATWIDS->{st_wc} ->set_text (sprintf "%d", $stats->{13}); 794 $STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
565 $STATWIDS->{st_ac} ->set_text (sprintf "%d", $stats->{14}); 795 $STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
566 $STATWIDS->{st_dam} ->set_text (sprintf "%d", $stats->{15}); 796 $STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
567 $STATWIDS->{st_arm} ->set_text (sprintf "%d", $stats->{16}); 797 $STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_RES_PHYS});
568 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{Crossfire::Protocol::CS_STAT_SPEED}); 798 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
569 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{Crossfire::Protocol::CS_STAT_WEAP_SP}); 799 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
800
801 $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000);
570 802
571 my %tbl = ( 803 my %tbl = (
572 phys => 100, 804 phys => CS_STAT_RES_PHYS,
573 magic => 101, 805 magic => CS_STAT_RES_MAG,
574 fire => 102, 806 fire => CS_STAT_RES_FIRE,
575 elec => 103, 807 elec => CS_STAT_RES_ELEC,
576 cold => 104, 808 cold => CS_STAT_RES_COLD,
577 conf => 105, 809 conf => CS_STAT_RES_CONF,
578 acid => 106, 810 acid => CS_STAT_RES_ACID,
579 drain => 107, 811 drain => CS_STAT_RES_DRAIN,
580 ghit => 108, 812 ghit => CS_STAT_RES_GHOSTHIT,
581 pois => 109, 813 pois => CS_STAT_RES_POISON,
582 slow => 110, 814 slow => CS_STAT_RES_SLOW,
583 para => 111, 815 para => CS_STAT_RES_PARA,
584 tund => 112, 816 tund => CS_STAT_TURN_UNDEAD,
585 fear => 113, 817 fear => CS_STAT_RES_FEAR,
586 depl => 113, 818 depl => CS_STAT_RES_DEPLETE,
587 deat => 115, 819 deat => CS_STAT_RES_DEATH,
588 holyw => 116, 820 holyw => CS_STAT_RES_HOLYWORD,
589 blind => 117 821 blind => CS_STAT_RES_BLIND,
590 ); 822 );
591 823
592 for (keys %tbl) { 824 if ($::CONN && !$STATWIDS->{_skill_tbl_init}) {
593 $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;
594 } 850 }
595 851
596} 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 }
597 860
598sub metaserver_dialog { 861 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
599 my $dialog = new CFClient::UI::FancyFrame 862 for keys %tbl;
600 title => "Server List",
601 child => (my $vbox = new CFClient::UI::VBox);
602
603 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
604
605 $dialog
606} 863}
607 864
608my $METASERVER_ATIME; 865my $METASERVER_ATIME;
609 866
610sub update_metaserver { 867sub update_metaserver {
611 my ($HOST) = @_; 868 my ($metaserver_dialog) = @_;
869
870 $METASERVER = $metaserver_dialog
871 if defined $metaserver_dialog;
612 872
613 return if $METASERVER_ATIME > time; 873 return if $METASERVER_ATIME > time;
614 $METASERVER_ATIME = time + 60; 874 $METASERVER_ATIME = time + 60;
615 875
616 my $table = $METASERVER->{table}; 876 my $table = $METASERVER->{table};
… …
638 898
639 utf8::decode $buf if utf8::valid $buf; 899 utf8::decode $buf if utf8::valid $buf;
640 900
641 $table->clear; 901 $table->clear;
642 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 );
643 my @col = qw(Use #Users Host Uptime Version Description); 910 my @col = qw(#Users Host Uptime Version Description);
644 $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[$_])
645 for 0 .. $#col; 915 for 0 .. $#col;
646 916
647 my @align = qw(1 0 1 1 -1); 917 my @align = qw(1 0 1 1 -1);
648 918
649 my $y = 0; 919 my $y = 0;
650 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) {
… …
667 937
668 $m = [$users, $host, $uptime, $version, $desc]; 938 $m = [$users, $host, $uptime, $version, $desc];
669 939
670 $y++; 940 $y++;
671 941
672 $table->add (0, $y, new CFClient::UI::VBox children => [ 942 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [
673 (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 {
674 $HOST->set_text ($CFG->{host} = $host); 947 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
948 $METASERVER->hide;
949 0
950 },
675 }), 951 ),
676 (new CFClient::UI::Empty expand => 1), 952 (new CFClient::UI::Empty expand => 1),
677 ]); 953 ]);
678 954
679 $table->add ($_ + 1, $y, new CFClient::UI::Label 955 $table->add ($_, $y, new CFClient::UI::Label
680 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)
681 for 0 .. $#$m; 963 for 0 .. $#$m;
682 } 964 }
683 } 965 }
684 }); 966 });
685} 967}
686 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
687sub server_setup { 993sub server_setup {
688 my $dialog = new CFClient::UI::FancyFrame
689 title => "Server Setup",
690 child => (my $vbox = new CFClient::UI::VBox); 994 my $vbox = new CFClient::UI::VBox;
691 995
692 $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]);
693 $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");
694 998
695 { 999 {
696 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 1000 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
697 1001
698 $vbox->add ( 1002 $vbox->add (
699 my $HOST = new CFClient::UI::Entry 1003 $HOST_ENTRY = new CFClient::UI::Entry
700 expand => 1, 1004 expand => 1,
701 text => $CFG->{host}, 1005 text => $CFG->{profile}{default}{host},
702 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",
703 connect_changed => sub { 1007 on_changed => sub {
704 my ($self, $value) = @_; 1008 my ($self, $value) = @_;
705 $CFG->{host} = $value; 1009 $CFG->{profile}{default}{host} = $value;
1010 0
706 } 1011 }
707 ); 1012 );
708 1013
709 $METASERVER = metaserver_dialog;
710
711 $vbox->add (new CFClient::UI::Flopper 1014 $vbox->add (new CFClient::UI::Button
712 expand => 1, 1015 expand => 1,
713 text => "Server List", 1016 text => "Server List",
714 other => $METASERVER, 1017 other => $METASERVER,
715 tooltip => "Show a list of available crossfire servers", 1018 tooltip => "Show a list of available crossfire servers",
716 connect_open => sub { 1019 on_activate => sub { $METASERVER->toggle_visibility; 0 },
717 update_metaserver $HOST; 1020 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
718 }
719 ); 1021 );
720 } 1022 }
721 1023
722 $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");
723 $table->add (1, 4, new CFClient::UI::Entry 1025 $table->add (1, 4, new CFClient::UI::Entry
724 text => $CFG->{user}, 1026 text => $CFG->{profile}{default}{user},
725 tooltip => "The name of your character on the server", 1027 tooltip => "The name of your character on the server",
726 connect_changed => sub { 1028 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
727 my ($self, $value) = @_;
728 $CFG->{user} = $value;
729 }
730 ); 1029 );
731 1030
732 $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");
733 $table->add (1, 5, new CFClient::UI::Entry 1032 $table->add (1, 5, new CFClient::UI::Entry
734 text => $CFG->{password}, 1033 text => $CFG->{profile}{default}{password},
735 hidden => 1, 1034 hidden => 1,
736 tooltip => "The password for your character", 1035 tooltip => "The password for your character",
737 connect_changed => sub { 1036 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
738 my ($self, $value) = @_;
739 $CFG->{password} = $value;
740 }
741 ); 1037 );
742 1038
743 $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");
744 $table->add (1, 7, new CFClient::UI::Slider 1040 $table->add (1, 7, new CFClient::UI::Slider
745 req_w => 100, 1041 force_w => 100,
746 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1042 range => [$CFG->{mapsize}, 10, 100, 0, 1],
747 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. "
748 . "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, "
749 . "but you also increase bandwidth requirements and latency. " 1045 . "but you also increase bandwidth requirements and latency. "
750 . "This option is only used once at log-in.", 1046 . "This option is only used once at log-in.",
751 connect_changed => sub { 1047 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },
752 my ($self, $value) = @_;
753
754 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
755 },
756 ); 1048 );
757 1049
758 $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");
759 $table->add (1, 8, new CFClient::UI::CheckBox 1051 $table->add (1, 8, new CFClient::UI::CheckBox
760 state => $CFG->{face_prefetch}, 1052 state => $CFG->{face_prefetch},
… …
763 . "This might increase or create lag, but increases the chances " 1055 . "This might increase or create lag, but increases the chances "
764 . "of faces being ready for display when you encounter them. " 1056 . "of faces being ready for display when you encounter them. "
765 . "It also uses up server bandwidth on every connect, " 1057 . "It also uses up server bandwidth on every connect, "
766 . "so only set it if you really need to prefetch images. " 1058 . "so only set it if you really need to prefetch images. "
767 . "This option can be set and unset any time.", 1059 . "This option can be set and unset any time.",
768 connect_changed => sub { $CFG->{face_prefetch} = $_[1] }, 1060 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
769 ); 1061 );
770 1062
771 $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");
772 $table->add (1, 9, new CFClient::UI::Entry 1064 $table->add (1, 9, new CFClient::UI::Entry
773 text => $CFG->{output_count}, 1065 text => $CFG->{output_count},
774 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1066 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
775 connect_changed => sub { $CFG->{output_count} = $_[1] }, 1067 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
776 ); 1068 );
777 1069
778 $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");
779 $table->add (1, 10, new CFClient::UI::Entry 1071 $table->add (1, 10, new CFClient::UI::Entry
780 text => $CFG->{output_sync}, 1072 text => $CFG->{output_sync},
781 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1073 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
782 connect_changed => sub { $CFG->{output_sync} = $_[1] }, 1074 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
783 ); 1075 );
784 1076
785 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button 1077 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button
786 expand => 1, 1078 expand => 1,
787 align => 0, 1079 align => 0,
788 text => "Login", 1080 text => "Login",
789 connect_activate => sub { 1081 on_activate => sub {
790 $CONN ? stop_game 1082 $CONN ? stop_game
791 : start_game; 1083 : start_game;
1084 0
792 }, 1085 },
793 ); 1086 );
794 1087
795 $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
796} 1111}
797 1112
798sub message_window { 1113sub message_window {
799 my $window = new CFClient::UI::FancyFrame 1114 my $window = new CFClient::UI::FancyFrame
1115 name => "message_window",
800 title => "Messages", 1116 title => "Messages",
801 border_bg => [1, 1, 1, 1], 1117 border_bg => [1, 1, 1, 1],
802 bg => [0, 0, 0, 0.75], 1118 bg => [0, 0, 0, 0.75],
803 user_w => int $::WIDTH / 3, 1119 x => "max",
1120 y => 0,
1121 force_w => $::WIDTH * 0.4,
804 user_h => int $::HEIGHT / 5, 1122 force_h => $::HEIGHT * 0.5,
805 child => (my $vbox = new CFClient::UI::VBox); 1123 child => (my $vbox = new CFClient::UI::VBox),
1124 has_close_button => 1;
806 1125
807 $vbox->add ($LOGVIEW); 1126 $vbox->add ($LOGVIEW);
808 1127
809 $vbox->add (my $input = new CFClient::UI::Entry 1128 $vbox->add (my $input = new CFClient::UI::Entry
810 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> " 1129 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
811 . "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). " 1130 . "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "
812 . "If you prepend a slash (/), you will submit a command instead (similar to IRC). " 1131 . "If you prepend a slash (/), you will submit a command instead (similar to IRC). "
813 . "A better way to submit commands (and the occasional chat command) is often the map command completer.", 1132 . "A better way to submit commands (and the occasional chat command) is often the map command completer.",
814 connect_focus_in => sub { 1133 on_focus_in => sub {
815 my ($input, $prev_focus) = @_; 1134 my ($input, $prev_focus) = @_;
816 1135
817 delete $input->{refocus_map}; 1136 delete $input->{refocus_map};
818 1137
819 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) { 1138 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
820 $input->{refocus_map} = 1; 1139 $input->{refocus_map} = 1;
821 } 1140 }
822 delete $input->{auto_activated}; 1141 delete $input->{auto_activated};
1142
1143 0
823 }, 1144 },
824 connect_activate => sub { 1145 on_activate => sub {
825 my ($input, $text) = @_; 1146 my ($input, $text) = @_;
826 $input->set_text (''); 1147 $input->set_text ('');
827 1148
828 if ($text =~ /^\/(.*)/) { 1149 if ($text =~ /^\/(.*)/) {
829 $::CONN->user_send ($1); 1150 $::CONN->user_send ($1);
… …
833 } 1154 }
834 if ($input->{refocus_map}) { 1155 if ($input->{refocus_map}) {
835 delete $input->{refocus_map}; 1156 delete $input->{refocus_map};
836 $MAPWIDGET->focus_in 1157 $MAPWIDGET->focus_in
837 } 1158 }
1159
1160 0
838 }, 1161 },
839 connect_escape => sub { 1162 on_escape => sub {
840 $MAPWIDGET->focus_in 1163 $MAPWIDGET->grab_focus;
1164
1165 0
841 }, 1166 },
842 ); 1167 );
843 1168
844 $CONSOLE = { 1169 $CONSOLE = {
845 window => $window, 1170 window => $window,
846 input => $input 1171 input => $input,
847 }; 1172 };
848 1173
849 $window 1174 $window
850} 1175}
851 1176
852sub open_quit_dialog { 1177sub open_quit_dialog {
853 unless ($QUIT_DIALOG) { 1178 unless ($QUIT_DIALOG) {
854
855 $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 ;
856 1185
857 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1); 1186 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
858 1187
859 $vb->add (new CFClient::UI::Label 1188 $vb->add (new CFClient::UI::Label
860 text => "You should find a savebed and apply it first!", 1189 text => "You should find a savebed and apply it first!",
… …
863 ); 1192 );
864 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 1193 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
865 $hb->add (new CFClient::UI::Button 1194 $hb->add (new CFClient::UI::Button
866 text => "Ok", 1195 text => "Ok",
867 expand => 1, 1196 expand => 1,
868 connect_activate => sub { $QUIT_DIALOG->hide }, 1197 on_activate => sub { $QUIT_DIALOG->hide; 0 },
869 ); 1198 );
870 $hb->add (new CFClient::UI::Button 1199 $hb->add (new CFClient::UI::Button
871 text => "Quit anyway", 1200 text => "Quit anyway",
872 expand => 1, 1201 expand => 1,
873 connect_activate => sub { exit }, 1202 on_activate => sub { exit },
874 );
875
876 $QUIT_DIALOG->show_centered;
877 } else {
878 $QUIT_DIALOG->show_centered;
879 }
880}
881
882sub make_inventory_window {
883 my $invwin = new CFClient::UI::FancyFrame
884 user_w => $WIDTH * (7/8), user_h => $HEIGHT * (7/8), title => "Inventory";
885
886 $invwin->add (my $hb = new CFClient::UI::HBox expand => 1);
887
888 $hb->add (my $vb1 = new CFClient::UI::VBox expand => 1);
889 $vb1->add (my $lbl = new CFClient::UI::Label);
890 $lbl->set_text ("Player");
891 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1);
892
893 $hb->add (my $vb2 = new CFClient::UI::VBox expand => 1);
894 $vb2->add ($INVR_LBL = new CFClient::UI::Label);
895 $INVR_LBL->set_text ("Floor");
896 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
897
898 $invwin
899}
900
901sub make_help_window {
902 my $win = new CFClient::UI::FancyFrame
903 user_w => $WIDTH * (7/8), user_h => $HEIGHT * (7/8), title => "Documentation";
904
905 $win->add (my $vbox = new CFClient::UI::VBox);
906
907 $vbox->add (my $buttons = new CFClient::UI::HBox);
908 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8);
909
910 for (
911 [intro => "Introduction"],
912 [manual => "Manual"],
913 [command_help => "Commands"],
914 [skill_help => "Skills"],
915 ) {
916 my ($pod, $label) = @$_;
917
918 $buttons->add (new CFClient::UI::Button
919 text => $label,
920 connect_activate => sub {
921 my $parser = new Pod::POM;
922 my $pom = $parser->parse_file (CFClient::find_rcfile "pod/$pod.pod");
923
924 $viewer->clear;
925
926 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
927 for @{ CFClient::pod_to_pango_list $pom };
928
929 $viewer->set_offset (0);
930 },
931 ); 1203 );
932 } 1204 }
933 1205
934 $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 name => "playerbook",
1344 has_close_button => 1
1345 ;
1346
1347 my $ntb =
1348 $PL_NOTEBOOK =
1349 new CFClient::UI::Notebook
1350 expand => 1,
1351 debug => 1,
1352 filter => (new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1),
1353 ;
1354
1355 $ntb->add (
1356 "Stats &amp; Skills" => $STATS_PAGE = stats_window,
1357 "Shows statistics and skill window, where all your Stats, Resistances and Skills are shown."
1358 );
1359 $ntb->add (
1360 Spellbook => $SPELL_PAGE = new CFClient::UI::SpellList,
1361 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1362 );
1363 $ntb->add (
1364 Inventory => $INVENTORY_PAGE = inventory_widget,
1365 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1366 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1367 );
1368
1369 $ntb->set_current_page ($INVENTORY_PAGE);
1370
1371 $plwin->add ($ntb);
1372 $plwin
1373}
1374
1375sub update_bindings {
1376 $BIND_UPD_CB->() if $BIND_UPD_CB;
1377}
1378
1379sub keyboard_setup {
1380 my $binding_list = new CFClient::UI::VBox;
1381
1382 my $refresh;
1383 $refresh = $BIND_UPD_CB = sub {
1384 $binding_list->clear ();
1385
1386 for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) {
1387 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
1388 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1389 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1390
1391 my $lbl = join "; ", @$cmds;
1392 my $nam = CFClient::BindingEditor::keycombo_to_name ($mod, $sym);
1393 $binding_list->add (my $hb = new CFClient::UI::HBox);
1394 $hb->add (new CFClient::UI::Button
1395 text => "delete",
1396 tooltip => "Deletes the binding",
1397 on_activate => sub {
1398 $binding_list->remove ($hb);
1399 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1400 0
1401 });
1402
1403 $hb->add (new CFClient::UI::Button
1404 text => "edit",
1405 tooltip => "Edits the binding",
1406 on_activate => sub {
1407 $::BIND_EDITOR->set_binding (
1408 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},
1409 sub {
1410 my ($nmod, $nsym, $ncmds) = @_;
1411 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
1412 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1413 $refresh->();
1414 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1415 $SETUP_DIALOG->show;
1416 },
1417 sub {
1418 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1419 $SETUP_DIALOG->show;
1420 });
1421 $::BIND_EDITOR->show;
1422 $SETUP_DIALOG->hide;
1423 0
1424 });
1425
1426 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
1427 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
1428 }
1429 }
1430 };
1431
1432 my $vb = new CFClient::UI::VBox;
1433 $vb->add (my $hb = new CFClient::UI::HBox);
1434 $hb->add (new CFClient::UI::Label text => "only shift-up stops fire");
1435 $hb->add (new CFClient::UI::CheckBox
1436 expand => 1,
1437 state => $CFG->{shift_fire_stop},
1438 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
1439 on_changed => sub {
1440 my ($cbox, $value) = @_;
1441 $CFG->{shift_fire_stop} = $value;
1442 0
1443 });
1444
1445 $vb->add ($binding_list);
1446 $vb->add (my $hb = new CFClient::UI::HBox);
1447
1448 $hb->add (new CFClient::UI::Button
1449 text => "record new",
1450 expand => 1,
1451 tooltip => "This button opens the binding editor with an empty binding.",
1452 on_activate => sub {
1453 $::BIND_EDITOR->set_binding (undef, undef, [],
1454 sub {
1455 my ($mod, $sym, $cmds) = @_;
1456 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1457 $refresh->();
1458 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1459 $SETUP_DIALOG->show;
1460 },
1461 sub {
1462 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1463 $SETUP_DIALOG->show;
1464 },
1465 );
1466 $SETUP_DIALOG->hide;
1467 $::BIND_EDITOR->show;
1468 0
1469 },
1470 );
1471
1472 $hb->add (new CFClient::UI::Button
1473 text => "close",
1474 tooltip => "Closes the binding window",
1475 expand => 1,
1476 on_activate => sub {
1477 $SETUP_DIALOG->hide;
1478 0
1479 }
1480 );
1481
1482 $refresh->();
1483
1484 $vb
1485}
1486
1487sub help_window {
1488 my $win = new CFClient::UI::FancyFrame
1489 x => 'center',
1490 y => 'center',
1491 z => 2,
1492 name => 'doc_browser',
1493 force_w => int $WIDTH * 7/8,
1494 force_h => int $HEIGHT * 7/8,
1495 title => "Help Browser",
1496 has_close_button => 1;
1497
1498 $win->add (my $vbox = new CFClient::UI::VBox);
1499
1500 $vbox->add (my $buttons = new CFClient::UI::HBox);
1501 $vbox->add (my $viewer = new CFClient::UI::TextScroller
1502 expand => 1, fontsize => 0.8, padding_x => 4);
1503
1504 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: ");
1505 $buttons->add (my $combo = new CFClient::UI::Combobox
1506 value => undef,
1507 options => [
1508 [intro => "Introduction"],
1509 [manual => "Main Manual"],
1510 [skill_help => "Skill Reference"],
1511 [command_help => "Command Reference"],
1512 [dmcommand_help => "DM Commands"],
1513 [COPYING => "License Terms"],
1514 ],
1515 on_changed => sub {
1516 my ($self, $pod) = @_;
1517
1518 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
1519 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };
1520
1521 $viewer->clear;
1522
1523# $viewer->add_paragraph ([1, 1, 1, 1], ["<big>Test</big>\n\n \x{fffc} \x{fffc}\n",
1524# (new CFClient::UI::Image path => "x.png", can_hover => 1, can_events => 1),
1525# (new CFClient::UI::Label text => "üüüü", can_hover => 1, can_events => 1, tooltip => "??"),
1526# ]);#d#
1527
1528 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
1529 for @$pom;
1530
1531 $viewer->set_offset (0);
1532
1533 0
1534 },
1535 on_visibility_change => sub {
1536 my ($self, $visible) = @_;
1537 return unless $visible;
1538 return if $self->{value};
1539 $self->set_value ("intro");
1540 0
1541 },
1542 );
935 1543
936 $win 1544 $win
937} 1545}
938 1546
939sub sdl_init { 1547sub sdl_init {
… …
956 or die "SDL_SetVideoMode failed: " . (CFClient::SDL_GetError) . "\n"; 1564 or die "SDL_SetVideoMode failed: " . (CFClient::SDL_GetError) . "\n";
957 1565
958 $SDL_ACTIVE = 1; 1566 $SDL_ACTIVE = 1;
959 $LAST_REFRESH = time - 0.01; 1567 $LAST_REFRESH = time - 0.01;
960 1568
961 CFClient::gl_init; 1569 CFClient::OpenGL::init;
962 1570
963 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 1571 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
964 1572
965 $CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d# 1573 $CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
966 1574
… …
969 if ($DEBUG_STATUS) { 1577 if ($DEBUG_STATUS) {
970 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 1578 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
971 } else { 1579 } else {
972 # create the widgets 1580 # create the widgets
973 1581
974 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, req_x => -1; 1582 $DEBUG_STATUS = new CFClient::UI::Label
1583 padding => 0,
1584 z => 100,
1585 force_x => "max",
1586 force_y => 0;
975 $DEBUG_STATUS->show; 1587 $DEBUG_STATUS->show;
976 1588
1589 $BIND_EDITOR = new CFClient::BindingEditor (x => "max", y => 0);
1590
977 $STATUSBOX = new CFClient::UI::Statusbox; 1591 $STATUSBOX = new CFClient::UI::Statusbox;
978 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]); 1592 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
979 1593
980 (new CFClient::UI::Frame 1594 (new CFClient::UI::Frame
981 bg => [0, 0, 0, 0.4], 1595 bg => [0, 0, 0, 0.4],
982 req_y => -1, 1596 force_x => 0,
1597 force_y => "max",
983 child => $STATUSBOX, 1598 child => $STATUSBOX,
984 )->show; 1599 )->show;
985 1600
986 CFClient::UI::FancyFrame->new ( 1601 CFClient::UI::FancyFrame->new (
1602 title => "Map",
1603 name => "mapmap",
1604 x => 0,
1605 y => $FONTSIZE + 8,
987 border_bg => [1, 1, 1, 192/255], 1606 border_bg => [1, 1, 1, 192/255],
988 bg => [1, 1, 1, 0], 1607 bg => [1, 1, 1, 0],
989 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1608 child => ($MAPMAP = new CFClient::MapWidget::MapMap
990 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.", 1609 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
991 ), 1610 ),
… …
995 $MAPWIDGET->connect (activate_console => sub { 1614 $MAPWIDGET->connect (activate_console => sub {
996 my ($mapwidget, $preset) = @_; 1615 my ($mapwidget, $preset) = @_;
997 1616
998 if ($CONSOLE) { 1617 if ($CONSOLE) {
999 $CONSOLE->{input}->{auto_activated} = 1; 1618 $CONSOLE->{input}->{auto_activated} = 1;
1000 $CONSOLE->{input}->focus_in; 1619 $CONSOLE->{input}->grab_focus;
1001 1620
1002 if ($preset && $CONSOLE->{input}->get_text eq '') { 1621 if ($preset && $CONSOLE->{input}->get_text eq '') {
1003 $CONSOLE->{input}->set_text ($preset); 1622 $CONSOLE->{input}->set_text ($preset);
1004 } 1623 }
1005 } 1624 }
1006 }); 1625 });
1007 $MAPWIDGET->show; 1626 $MAPWIDGET->show;
1008 $MAPWIDGET->focus_in; 1627 $MAPWIDGET->grab_focus;
1009 1628
1010 $LOGVIEW = new CFClient::UI::TextView 1629 $LOGVIEW = new CFClient::UI::TextScroller
1011 expand => 1, 1630 expand => 1,
1012 font => $FONT_FIXED, 1631 font => $FONT_FIXED,
1013 fontsize => $::CFG->{log_fontsize}, 1632 fontsize => $::CFG->{log_fontsize},
1633 indent => -4,
1014 can_hover => 1, 1634 can_hover => 1,
1015 can_events => 1, 1635 can_events => 1,
1016 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1636 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1017 ; 1637 ;
1018 1638
1019 $BUTTONBAR = new CFClient::UI::HBox; 1639 $SETUP_DIALOG = new CFClient::UI::FancyFrame
1640 title => "Setup",
1641 name => "setup_dialog",
1642 x => 'center',
1643 y => 'center',
1644 z => 2,
1645 force_w => $::WIDTH * 0.6,
1646 force_h => $::HEIGHT * 0.6,
1647 has_close_button => 1,
1648 ;
1020 1649
1650 $METASERVER = metaserver_dialog;
1651
1652 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,
1653 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1654
1655 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1656 "Configure the server to play on, your username, password and other server-related options.");
1657 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1658 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1659 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1660 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1661 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1662 "Configure the use of audio, sound effects and background music.");
1663 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1664 "Lets you define, edit and delete key bindings."
1665 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "
1666 . "with nothing set and the recording started. After doing the actions you "
1667 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1668 . "After pressing the combo the binding will be saved automatically and the "
1669 . "binding editor closes");
1670 $SETUP_NOTEBOOK->add (Debug => debug_setup,
1671 "Some debuggin' options. Do not ask.");
1672
1673 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1674
1021 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup, 1675 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1022 tooltip => "Toggles a dialog where you can configure various aspects of the client, such as graphics mode, performance, and audio options."); 1676 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1023 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup, 1677
1024 tooltip => "Toggles a dialog where you can configure the server to play on, your username, password and other server-related options.");
1025 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window, 1678 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,
1026 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 1679 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1027 1680
1028 make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D 1681 make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D
1029 1682
1030 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window,
1031 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1032 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window, 1683 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Playerbook", other => player_window,
1033 tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :)."); 1684 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
1034 1685
1035 $BUTTONBAR->add (new CFClient::UI::Button 1686 $BUTTONBAR->add (new CFClient::UI::Button
1036 text => "Save Config", 1687 text => "Save Config",
1037 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 1688 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1038 connect_activate => sub { 1689 on_activate => sub {
1690 $::CFG->{layout} = CFClient::UI::get_layout;
1039 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 1691 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1040 status "Configuration Saved"; 1692 status "Configuration Saved";
1693 0
1041 }, 1694 },
1042 ); 1695 );
1043 1696
1044 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window, 1697 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1045 tooltip => "View Documentation"); 1698 tooltip => "View Documentation");
1046 1699
1047 $BUTTONBAR->add (new CFClient::UI::Button 1700 $BUTTONBAR->add (new CFClient::UI::Button
1048 text => "Quit", 1701 text => "Quit",
1049 tooltip => "Terminates the program", 1702 tooltip => "Terminates the program",
1050 connect_activate => sub { 1703 on_activate => sub {
1051 if ($CONN) { 1704 if ($CONN) {
1052 open_quit_dialog; 1705 open_quit_dialog;
1053 } else { 1706 } else {
1054 exit; 1707 exit;
1055 } 1708 }
1709 0
1056 }, 1710 },
1057 ); 1711 );
1058 1712
1059 $BUTTONBAR->show; 1713 $BUTTONBAR->show;
1060 1714 $SETUP_DIALOG->show;
1061 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1062
1063 # delay till geometry is constant
1064 $CFClient::UI::ROOT->on_post_alloc (startup => sub {
1065 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
1066 my $widget = $GAUGES->{win};
1067 $widget->move (0, $HEIGHT - $widget->{h});#d# to in toplevel
1068 });
1069 force_refresh ();
1070 } 1715 }
1716
1717 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1071} 1718}
1072 1719
1073sub video_shutdown { 1720sub video_shutdown {
1721 CFClient::OpenGL::shutdown;
1722
1074 undef $SDL_ACTIVE; 1723 undef $SDL_ACTIVE;
1075} 1724}
1076 1725
1077my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d# 1726my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
1078my $bgmusic;#TODO#hack#d# 1727my $bgmusic;#TODO#hack#d#
… …
1142 1791
1143my %demo;#d# 1792my %demo;#d#
1144 1793
1145sub force_refresh { 1794sub force_refresh {
1146 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 1795 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
1147 debug sprintf "%3.2f", $fps; 1796 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1148 1797
1149 $CFClient::UI::ROOT->draw; 1798 $CFClient::UI::ROOT->draw;
1150 1799
1151 $WANT_REFRESH = 0; 1800 $WANT_REFRESH = 0;
1152 $CAN_REFRESH = 0; 1801 $CAN_REFRESH = 0;
… …
1207}; 1856};
1208 1857
1209 CFClient::SDL_GL_SwapBuffers; 1858 CFClient::SDL_GL_SwapBuffers;
1210} 1859}
1211 1860
1212my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub { 1861my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1213 $NOW = time; 1862 $NOW = time;
1214 1863
1215 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 1864 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1216 for CFClient::SDL_PollEvent; 1865 for CFClient::SDL_PollEvent;
1217 1866
… …
1235sub animation_stop { 1884sub animation_stop {
1236 my ($widget) = @_; 1885 my ($widget) = @_;
1237 delete $animate_object{$widget}; 1886 delete $animate_object{$widget};
1238} 1887}
1239 1888
1240@conn::ISA = Crossfire::Protocol::;
1241
1242sub conn::new {
1243 my $class = shift;
1244
1245 my $self = $class->Crossfire::Protocol::new (@_);
1246
1247 $MAPWIDGET->clr_commands;
1248
1249 my $parser = new Pod::POM;
1250 my $pod = $parser->parse_file (CFClient::find_rcfile "pod/command_help.pod");
1251
1252 for my $head2 ($pod->head2) {
1253 $head2->title =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
1254 or next;
1255
1256 my $cmd = $1;
1257 my @args = split /\|/, $2;
1258 @args = (".*") unless @args;
1259
1260 my $text = CFClient::pod_to_pango $head2->content;
1261
1262 for my $arg (@args) {
1263 $arg = $arg eq ".*" ? "" : " $arg";
1264
1265 $MAPWIDGET->add_command ("$cmd$arg", $text);
1266 }
1267 }
1268
1269 $self->{noface} = new_from_file CFClient::Texture
1270 CFClient::find_rcfile "noface.png", minify => 1, mipmap => 1;
1271
1272 $self
1273}
1274
1275sub conn::stats_update {
1276 my ($self, $stats) = @_;
1277
1278 if (my $exp = $stats->{Crossfire::Protocol::CS_STAT_EXP64}) {
1279 my $diff = $exp - $self->{prev_exp};
1280 $STATUSBOX->add ("$diff experience gained", group => "experience $diff", fg => [0.5, 1, 0.5, 0.8], timeout => 5)
1281 if exists $self->{prev_exp} && $diff;
1282 $self->{prev_exp} = $exp;
1283 }
1284
1285 update_stats_window ($stats);
1286}
1287
1288sub conn::user_send {
1289 my ($self, $command) = @_;
1290
1291 $self->send_command ($command);
1292 status $command;
1293}
1294
1295sub conn::map_scroll {
1296 my ($self, $dx, $dy) = @_;
1297
1298 $MAP->scroll ($dx, $dy);
1299}
1300
1301sub conn::feed_map1a {
1302 my ($self, $data) = @_;
1303
1304# $self->Crossfire::Protocol::feed_map1a ($data);
1305
1306 $MAP->map1a_update ($data);
1307 $MAPWIDGET->update;
1308}
1309
1310sub conn::flush_map {
1311 my ($self) = @_;
1312
1313 my $map_info = delete $self->{map_info}
1314 or return;
1315
1316 my ($hash, $x, $y, $w, $h) = @$map_info;
1317
1318 my $data = $MAP->get_rect ($x, $y, $w, $h);
1319 $MAPCACHE->put ($hash => Compress::LZF::compress $data);
1320 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
1321}
1322
1323sub conn::map_clear {
1324 my ($self) = @_;
1325
1326 $self->flush_map;
1327 delete $self->{neigh_map};
1328
1329 $MAP->clear;
1330}
1331
1332
1333sub conn::load_map($$$) {
1334 my ($self, $hash, $x, $y) = @_;
1335
1336 if (defined (my $data = $MAPCACHE->get ($hash))) {
1337 $data = Compress::LZF::decompress $data;
1338 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
1339 for my $id ($MAP->set_rect ($x, $y, $data)) {
1340 my $data = $TILECACHE->get ($id)
1341 or next;
1342
1343 $self->set_texture ($id => $data);
1344 }
1345 }
1346}
1347
1348# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
1349# (server resource,s latency, bandwidth), so this hack is warranted.
1350# the right fix is to make real tiled maps with an overview file
1351sub conn::send_mapinfo {
1352 my ($self, $data, $cb) = @_;
1353
1354 if ($self->{map_info}[0] =~ m%^/world/world_(\d\d\d)_(\d\d\d)$%) {
1355 my ($wx, $wy) = ($1, $2);
1356
1357 if ($data =~ /^spatial ([1-4]+)$/) {
1358 my @dx = (0, 0, 1, 0, -1);
1359 my @dy = (0, -1, 0, 1, 0);
1360 my ($dx, $dy);
1361
1362 for (split //, $1) {
1363 $dx += $dx[$_];
1364 $dy += $dy[$_];
1365 }
1366
1367 $cb->(spatial => 15,
1368 $self->{map_info}[1] - $MAP->ox + $dx * 50,
1369 $self->{map_info}[2] - $MAP->oy + $dy * 50,
1370 50, 50,
1371 sprintf "/world/world_%03d_%03d", $wx + $dx, $wy + $dy
1372 );
1373
1374 return;
1375 }
1376 }
1377
1378 $self->Crossfire::Protocol::send_mapinfo ($data, $cb);
1379}
1380
1381# this method does a "flood fill" into every tile direction
1382# it assumes that tiles are arranged in a rectangular grid,
1383# i.e. a map is the same as the left of the right map etc.
1384# failure to comply are harmless and result in display errors
1385# at worst.
1386sub conn::flood_fill {
1387 my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_;
1388
1389 # the server does not allow map paths > 6
1390 return if 7 <= length $path;
1391
1392 my ($x0, $y0, $x1, $y1) = @{$self->{neigh_rect}};
1393
1394 for (
1395 [1, 3, 0, -1],
1396 [2, 4, 1, 0],
1397 [3, 1, 0, 1],
1398 [4, 2, -1, 0],
1399 ) {
1400 my ($tile, $tile2, $dx, $dy) = @$_;
1401
1402 next if $block & (1 << $tile);
1403 my $block = $block | (1 << $tile2);
1404
1405 my $gx = $gx + $dx;
1406 my $gy = $gy + $dy;
1407
1408 next unless $flags & (1 << ($tile - 1));
1409 next if $self->{neigh_grid}{$gx, $gy}++;
1410
1411 my $neigh = $self->{neigh_map}{$hash} ||= [];
1412 if (my $info = $neigh->[$tile]) {
1413 my ($flags, $x, $y, $w, $h, $hash) = @$info;
1414
1415 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
1416 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
1417
1418 } else {
1419 $self->send_mapinfo ("spatial $path$tile", sub {
1420 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
1421
1422 return if $mode ne "spatial";
1423
1424 $x += $MAP->ox;
1425 $y += $MAP->oy;
1426
1427 $self->load_map ($hash, $x, $y)
1428 unless $self->{neigh_map}{$hash}[5]++;#d#
1429
1430 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash];
1431
1432 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
1433 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
1434 });
1435 }
1436 }
1437}
1438
1439sub conn::map_change {
1440 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
1441
1442 $self->flush_map;
1443
1444 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
1445
1446 my $mapmapw = $MAPMAP->{w};
1447 my $mapmaph = $MAPMAP->{h};
1448
1449 $self->{neigh_rect} = [
1450 $ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5,
1451 $ox + $mapmapw * 0.5 + $w, $oy + $mapmapw * 0.5 + $h,
1452 ];
1453
1454 delete $self->{neigh_grid};
1455
1456 $x += $ox;
1457 $y += $oy;
1458
1459 $self->{map_info} = [$hash, $x, $y, $w, $h];
1460
1461 (my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/;
1462 $STATWIDS->{map}->set_text ("Map: " . $map);
1463
1464 $self->load_map ($hash, $x, $y);
1465 $self->flood_fill (0, 0, 0, "", $hash, $flags);
1466}
1467
1468sub conn::face_find {
1469 my ($self, $facenum, $face) = @_;
1470
1471 my $hash = "$face->{chksum},$face->{name}";
1472
1473 my $id = $FACEMAP->get ($hash);
1474
1475 unless ($id) {
1476 # create new id for face
1477 # I love transactions
1478 for (1..100) {
1479 my $txn = $CFClient::DB_ENV->txn_begin;
1480 my $status = $FACEMAP->db_get (id => $id, BerkeleyDB::DB_RMW);
1481 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
1482 $id = ($id || 16) + 1;
1483 if ($FACEMAP->put (id => $id) == 0
1484 && $FACEMAP->put ($hash => $id) == 0) {
1485 $txn->txn_commit;
1486
1487 goto gotid;
1488 }
1489 }
1490 $txn->abort;
1491 }
1492
1493 CFClient::fatal "maximum number of transaction retries reached - database problems?";
1494 }
1495
1496gotid:
1497 $face->{id} = $id;
1498 $MAP->set_face ($facenum => $id);
1499 $self->{faceid}[$facenum] = $id;#d#
1500
1501 my $face = $TILECACHE->get ($id);
1502
1503 if ($face) {
1504 #$self->face_prefetch;
1505 $face
1506 } else {
1507 my $tex = $self->{noface};
1508 $MAP->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
1509 undef
1510 };
1511}
1512
1513sub conn::face_update {
1514 my ($self, $facenum, $face) = @_;
1515
1516 $TILECACHE->put ($face->{id} => $face->{image}); #TODO: try to avoid duplicate writes
1517
1518 $self->set_texture ($face->{id} => delete $face->{image});
1519}
1520
1521sub conn::set_texture {
1522 my ($self, $id, $data) = @_;
1523
1524 $self->{texture}[$id] ||= do {
1525 my $tex =
1526 new_from_image CFClient::Texture
1527 $data, minify => 1, mipmap => 1;
1528
1529 $MAP->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
1530 $MAPWIDGET->update;
1531
1532 $tex
1533 };
1534}
1535
1536sub conn::sound_play {
1537 my ($self, $x, $y, $soundnum, $type) = @_;
1538
1539 $SDL_MIXER
1540 or return;
1541
1542 my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]}
1543 or return;
1544
1545 $chunk->play;
1546# warn "sound $x,$y,$soundnum,$type\n";#d#
1547}
1548
1549my $LAST_QUERY; # server is stupid, stupid, stupid
1550
1551sub conn::query {
1552 my ($self, $flags, $prompt) = @_;
1553
1554 $prompt = $LAST_QUERY unless length $prompt;
1555 $LAST_QUERY = $prompt;
1556
1557 my $dialog = new CFClient::UI::FancyFrame
1558 title => "Query",
1559 child => my $vbox = new CFClient::UI::VBox;
1560
1561 $vbox->add (new CFClient::UI::Label
1562 max_w => $::WIDTH * 0.4,
1563 ellipsise => 0,
1564 text => $prompt);
1565
1566 if ($flags & Crossfire::Protocol::CS_QUERY_YESNO) {
1567 $vbox->add (my $hbox = new CFClient::HBox);
1568 $hbox->add (new CFClient::Button
1569 text => "No",
1570 connect_activate => sub {
1571 $self->send ("reply n");
1572 $dialog->destroy;
1573 $MAPWIDGET->focus_in;
1574 }
1575 );
1576 $hbox->add (new CFClient::Button
1577 text => "Yes",
1578 connect_activate => sub {
1579 $self->send ("reply y");
1580 $dialog->destroy;
1581 },
1582 );
1583
1584 $dialog->focus_in;
1585
1586 } elsif ($flags & Crossfire::Protocol::CS_QUERY_SINGLECHAR) {
1587 $dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)";
1588 $vbox->add (my $entry = new CFClient::UI::Entry
1589 connect_changed => sub {
1590 $self->send ("reply $_[1]");
1591 $dialog->destroy;
1592 },
1593 );
1594
1595 $entry->focus_in;
1596
1597 } else {
1598 $dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";
1599
1600 $vbox->add (my $entry = new CFClient::UI::Entry
1601 $flags & Crossfire::Protocol::CS_QUERY_HIDEINPUT ? (hiddenchar => "*") : (),
1602 connect_activate => sub {
1603 $self->send ("reply $_[1]");
1604 $dialog->destroy;
1605 },
1606 );
1607
1608 $entry->focus_in;
1609 }
1610
1611 $dialog->show_centered;
1612}
1613
1614sub conn::drawinfo {
1615 my ($self, $color, $text) = @_;
1616
1617 my @color = (
1618 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
1619 [1.00, 1.00, 1.00],
1620 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
1621 [1.00, 0.00, 0.00],
1622 [1.00, 0.54, 0.00],
1623 [0.11, 0.56, 1.00],
1624 [0.93, 0.46, 0.00],
1625 [0.18, 0.54, 0.34],
1626 [0.56, 0.73, 0.56],
1627 [0.80, 0.80, 0.80],
1628 [0.55, 0.41, 0.13],
1629 [0.99, 0.77, 0.26],
1630 [0.74, 0.65, 0.41],
1631 );
1632
1633 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
1634
1635 $text = CFClient::UI::Label::escape $text;
1636 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
1637 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
1638
1639 $LOGVIEW->add_paragraph ($color[$color],
1640 join "\n", map "$time $_", split /\n/, $text);
1641
1642 $STATUSBOX->add ($text,
1643 group => $text,
1644 fg => $color[$color],
1645 timeout => 10,
1646 tooltip_font => $::FONT_FIXED,
1647 );
1648}
1649
1650sub conn::drawextinfo {
1651 my ($self, $color, $type, $subtype, $message) = @_;
1652
1653 $self->drawinfo ($color, $message);
1654}
1655
1656sub conn::spell_add {
1657 my ($self, $spell) = @_;
1658
1659 # TODO
1660 # create a widget dynamically, using spell face (CF::Protocol downloads them)
1661 $MAPWIDGET->add_command ("invoke $spell->{name}", CFClient::UI::Label::escape $spell->{message});
1662 $MAPWIDGET->add_command ("cast $spell->{name}", CFClient::UI::Label::escape $spell->{message});
1663}
1664
1665sub conn::spell_delete {
1666 my ($self, $spell) = @_;
1667}
1668
1669sub conn::addme_success {
1670 my ($self) = @_;
1671
1672 $self->send ("command output-sync $CFG->{output_sync}");
1673 $self->send ("command output-count $CFG->{output_count}");
1674
1675 my $parser = new Pod::POM;
1676 my $pod = $parser->parse_file (CFClient::find_rcfile "pod/skill_help.pod");
1677
1678 my %skill_tooltip;
1679
1680 for my $head2 ($pod->head2) {
1681 $skill_tooltip{$head2->title} = CFClient::pod_to_pango $head2->content;
1682 }
1683
1684 for my $skill (values %{$self->{skill_info}}) {
1685 $MAPWIDGET->add_command ("ready_skill $skill",
1686 (CFClient::UI::Label::escape "Ready the skill '$skill'\n\n")
1687 . $skill_tooltip{$skill});
1688 $MAPWIDGET->add_command ("use_skill $skill",
1689 (CFClient::UI::Label::escape "Immediately use the skill '$skill'\n\n")
1690 . $skill_tooltip{$skill});
1691 }
1692}
1693
1694sub conn::eof {
1695 $MAPWIDGET->clr_commands;
1696
1697 stop_game;
1698}
1699
1700sub conn::image_info {
1701 my ($self, $numfaces) = @_;
1702
1703 $self->{num_faces} = $numfaces;
1704 $self->{face_prefetch} = [1 .. $numfaces];
1705 $self->face_prefetch;
1706}
1707
1708sub conn::face_prefetch {
1709 my ($self) = @_;
1710
1711 return unless $CFG->{face_prefetch};
1712
1713 if ($self->{num_faces}) {
1714 return if @{ $self->{send_queue} || [] };
1715 my $todo = @{ $self->{face_prefetch} }
1716 or return;
1717
1718 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
1719
1720 $self->send ("requestinfo image_sums $face $face");
1721
1722 $STATUSBOX->add (CFClient::UI::Label::escape "prefetching $todo",
1723 group => "prefetch", timeout => 2, fg => [1, 1, 0, 0.5]);
1724 } elsif (!exists $self->{num_faces}) {
1725 $self->send ("requestinfo image_info");
1726
1727 $self->{num_faces} = 0;
1728
1729 $STATUSBOX->add (CFClient::UI::Label::escape "starting to prefetch",
1730 group => "prefetch", timeout => 2, fg => [1, 1, 0, 0.5]);
1731 }
1732}
1733
1734# check once/second for faces that need to be prefetched 1889# check once/second for faces that need to be prefetched
1735# this should, of course, only run on demand, but 1890# this should, of course, only run on demand, but
1736# SDL forces worse things on us.... 1891# SDL forces worse things on us....
1737 1892
1738Event->timer (after => 1, interval => 0.25, cb => sub { 1893Event->timer (after => 1, interval => 0.25, cb => sub {
1739 $CONN->face_prefetch 1894 $CONN->face_prefetch
1740 if $CONN; 1895 if $CONN;
1741}); 1896});
1742
1743sub update_floorbox {
1744 $CFClient::UI::ROOT->on_refresh ($FLOORBOX => sub {
1745 return unless $CONN;
1746
1747 $FLOORBOX->clear;
1748 $FLOORBOX->add (new CFClient::UI::Empty expand => 1);
1749
1750 my $count = 7;
1751 for (@{ $CONN->{container}{0} }) {
1752 if (--$count) {
1753 $FLOORBOX->add (new CFClient::UI::InventoryItem item => $_);
1754 } else {
1755 $FLOORBOX->add (new CFClient::UI::Label text => "More...");
1756 last;
1757 }
1758 }
1759 });
1760
1761 $WANT_REFRESH++;
1762}
1763
1764sub conn::container_add {
1765 my ($self, $tag, $items) = @_;
1766
1767 #d# print "container_add: container $tag ($self->{player}{tag})\n";
1768
1769 if ($tag == 0) {
1770 update_floorbox;
1771 $OPENCONT = 0;
1772 $INVR_LBL->set_text ("Floor");
1773 $INVR->set_items ($self->{container}{0});
1774 } elsif ($tag == $self->{player}{tag}) {
1775 $INVR_LBL->set_text ("Player");
1776 $INV->set_items ($self->{container}{$self->{player}{tag}})
1777 } else {
1778 $OPENCONT = $tag;
1779 $INVR_LBL->set_text (CFClient::UI::InventoryItem::_item_to_desc ($self->{item}->{$OPENCONT}));
1780 $INVR->set_items ($self->{container}{$tag});
1781 }
1782
1783 # $self-<{player}{tag} => player inv
1784 #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}};
1785}
1786
1787sub conn::container_clear {
1788 my ($self, $tag) = @_;
1789
1790 #d# print "container_clear: container $tag ($self->{player}{tag})\n";
1791
1792 if ($tag == 0) {
1793 update_floorbox;
1794 $OPENCONT = 0;
1795 $INVR_LBL->set_text ("Floor");
1796 $INVR->set_items ($self->{container}{0});
1797 } elsif ($tag == $self->{player}{tag}) {
1798 $INVR_LBL->set_text ("Player");
1799 $INV->set_items ($self->{container}{$tag})
1800 } else {
1801 $OPENCONT = $tag;
1802 $INVR_LBL->set_text (CFClient::UI::InventoryItem::_item_to_desc ($self->{item}->{$OPENCONT}));
1803 $INVR->set_items ($self->{container}{$tag});
1804 }
1805
1806# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0};
1807}
1808
1809sub conn::item_delete {
1810 my ($self, @items) = @_;
1811
1812 for (@items) {
1813 #d# print "item_delete: $_->{tag} from $_->{container} ($self->{player}{tag})\n";
1814
1815 if ($_->{container} == 0) {
1816 update_floorbox;
1817 $OPENCONT = 0;
1818 $INVR_LBL->set_text ("Floor");
1819 $INVR->set_items ($self->{container}{0});
1820 } elsif ($_->{container} == $self->{player}{tag}) {
1821 $INVR_LBL->set_text ("Player");
1822 $INV->set_items ($self->{container}{$self->{player}{tag}})
1823 } else {
1824 $OPENCONT = $_->{container};
1825 $INVR_LBL->set_text (CFClient::UI::InventoryItem::_item_to_desc ($self->{item}->{$OPENCONT}));
1826 $INVR->set_items ($self->{container}{$_->{container}});
1827 }
1828 }
1829}
1830
1831sub conn::item_update {
1832 my ($self, $item) = @_;
1833
1834 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($OPENCONT)\n";
1835
1836 if ($item->{tag} == $OPENCONT && not ($item->{flags} & Crossfire::Protocol::F_OPEN)) {
1837 $OPENCONT = 0;
1838 $INVR_LBL->set_text ("Floor");
1839 $INVR->set_items ($self->{container}{0});
1840
1841 $item->{widget}->update_item
1842 if $item->{widget};
1843 } else {
1844 if ($item->{container} == 0) {
1845 update_floorbox;
1846 $OPENCONT = 0;
1847 $INVR_LBL->set_text ("Floor");
1848 $INVR->set_items ($self->{container}{0});
1849 } elsif ($item->{container} == $self->{player}{tag}) {
1850 $INV->set_items ($self->{container}{$item->{container}})
1851 }
1852 }
1853}
1854 1897
1855%SDL_CB = ( 1898%SDL_CB = (
1856 CFClient::SDL_QUIT => sub { 1899 CFClient::SDL_QUIT => sub {
1857 Event::unloop -1; 1900 Event::unloop -1;
1858 }, 1901 },
… …
1890############################################################################# 1933#############################################################################
1891 1934
1892$SIG{INT} = $SIG{TERM} = sub { exit }; 1935$SIG{INT} = $SIG{TERM} = sub { exit };
1893 1936
1894{ 1937{
1895 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] }; 1938 local $SIG{__DIE__} = sub {
1939 return unless defined $^S && !$^S;
1940 Carp::confess $_[1];#d#TODO: remove when stable
1941 CFClient::fatal $_[0];
1942 };
1896 1943
1897 CFClient::read_cfg "$Crossfire::VARDIR/pclientrc"; 1944 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1898 1945 CFClient::UI::set_layout ($::CFG->{layout});
1899 $TILECACHE = CFClient::db_table "tilecache";
1900 $FACEMAP = CFClient::db_table "facemap";
1901 1946
1902 my %DEF_CFG = ( 1947 my %DEF_CFG = (
1903 sdl_mode => 0, 1948 sdl_mode => 0,
1904 width => 640, 1949 width => 640,
1905 height => 480, 1950 height => 480,
1906 fullscreen => 0, 1951 fullscreen => 0,
1907 fast => 0, 1952 fast => 0,
1908 map_scale => 1, 1953 map_scale => 1,
1909 fow_enable => 1, 1954 fow_enable => 1,
1910 fow_intensity => 0.45, 1955 fow_intensity => 0.45,
1911 fow_smooth => 0, 1956 fow_smooth => 0,
1912 gui_fontsize => 1, 1957 gui_fontsize => 1,
1913 log_fontsize => 1, 1958 log_fontsize => 0.7,
1914 gauge_fontsize=> 1, 1959 gauge_fontsize => 1,
1915 gauge_size => 0.35, 1960 gauge_size => 0.35,
1916 stat_fontsize => 1, 1961 stat_fontsize => 0.7,
1917 mapsize => 100, 1962 mapsize => 100,
1918 host => "crossfire.schmorp.de",
1919 say_command => 'say', 1963 say_command => 'say',
1920 audio_enable => 1, 1964 audio_enable => 1,
1921 bgm_enable => 1, 1965 bgm_enable => 1,
1922 bgm_volume => 0.25, 1966 bgm_volume => 0.25,
1923 face_prefetch => 0, 1967 face_prefetch => 0,
1924 output_sync => 1, 1968 output_sync => 1,
1925 output_count => 1, 1969 output_count => 1,
1970 pickup => 0,
1971 default => "profile", # default profile
1972 );
1926 ); 1973
1927
1928 while (my ($k, $v) = each %DEF_CFG) { 1974 while (my ($k, $v) = each %DEF_CFG) {
1929 $CFG->{$k} = $v unless exists $CFG->{$k}; 1975 $CFG->{$k} = $v unless exists $CFG->{$k};
1930 } 1976 }
1977
1978 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
1931 1979
1932 sdl_init; 1980 sdl_init;
1933 1981
1934 @SDL_MODES = reverse 1982 @SDL_MODES = reverse
1935 grep $_->[0] >= 640 && $_->[1] >= 480, 1983 grep $_->[0] >= 640 && $_->[1] >= 480,
… …
1977 video_init; 2025 video_init;
1978 audio_init; 2026 audio_init;
1979} 2027}
1980 2028
1981Event::loop; 2029Event::loop;
2030#CFClient::SDL_Quit;
2031#CFClient::_exit 0;
1982 2032
1983END { CFClient::SDL_Quit } 2033END { CFClient::SDL_Quit }
1984 2034
1985=head1 NAME 2035=head1 NAME
1986 2036
1987pclient - A Crossfire+ and Crossfire game client 2037cfplus - A Crossfire+ and Crossfire game client
1988 2038
1989=head1 SYNOPSIS 2039=head1 SYNOPSIS
1990 2040
1991Just run it - no commandline arguments are supported. 2041Just run it - no commandline arguments are supported.
1992 2042
1993=head1 USAGE 2043=head1 USAGE
1994 2044
1995Pclient utilises OpenGL for all UI elements and the game. It is supposed to be used 2045cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used
1996fullscreen and interactively. 2046fullscreen and interactively.
1997 2047
2048=head1 DEBUGGING
2049
2050
2051CFPLUS_DEBUG - environment variable
2052
2053 1 draw borders around widgets
2054 2 add low-level widget info to tooltips
2055 4 show fps
2056 8 suppress tooltips
2057
1998=head1 AUTHOR 2058=head1 AUTHOR
1999 2059
2000Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 2060Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
2001 2061
2002 2062

Diff Legend

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