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

Diff Legend

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