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.11 by root, Fri May 26 18:56:14 2006 UTC vs.
Revision 1.41 by root, Fri Jun 2 02:21:48 2006 UTC

… …
29use Time::HiRes 'time'; 29use Time::HiRes 'time';
30use Pod::POM; 30use Pod::POM;
31use Event; 31use Event;
32 32
33use Crossfire; 33use Crossfire;
34use Crossfire::Protocol::Base; 34use Crossfire::Protocol::Constants;
35 35
36use Compress::LZF; 36use Compress::LZF;
37 37
38use CFClient; 38use CFClient;
39use CFClient::OpenGL (); 39use CFClient::OpenGL ();
… …
81our $LOGVIEW; 81our $LOGVIEW;
82our $CONSOLE; 82our $CONSOLE;
83our $METASERVER; 83our $METASERVER;
84our $LOGIN_BUTTON; 84our $LOGIN_BUTTON;
85our $QUIT_DIALOG; 85our $QUIT_DIALOG;
86our $HOST_ENTRY;
87our $SERVER_SETUP;
86 88
87our $FLOORBOX; 89our $FLOORBOX;
88our $GAUGES; 90our $GAUGES;
89our $STATWIDS; 91our $STATWIDS;
90 92
… …
97 99
98our $ALT_ENTER_MESSAGE; 100our $ALT_ENTER_MESSAGE;
99our $STATUSBOX; 101our $STATUSBOX;
100our $DEBUG_STATUS; 102our $DEBUG_STATUS;
101 103
102our $INVWIN; 104our $INV_WINDOW;
103our $INV; 105our $INV;
104our $INVR; 106our $INVR;
105our $INVR_LBL; 107our $INV_RIGHT_HB;
108
109our $BIND_WINDOW;
110our $BIND_EDITOR;
111
112our $SPELL_LIST;
106 113
107sub status { 114sub status {
108 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 115 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
109} 116}
110 117
111sub debug { 118sub debug {
112 $DEBUG_STATUS->set_text ($_[0]); 119 $DEBUG_STATUS->set_text ($_[0]);
113 my ($w, $h) = $DEBUG_STATUS->size_request;
114 $DEBUG_STATUS->move ($WIDTH - $w, 0);
115} 120}
116 121
117sub start_game { 122sub start_game {
118 status "logging in..."; 123 status "logging in...";
124
125 $LOGIN_BUTTON->set_text ("Logout");
126 $SERVER_SETUP->hide;
119 127
120 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 128 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
121 129
122 my ($host, $port) = split /:/, $CFG->{host}; 130 my ($host, $port) = split /:/, $CFG->{host};
123 131
… …
152 }; 160 };
153 161
154 if ($CONN) { 162 if ($CONN) {
155 CFClient::lowdelay fileno $CONN->{fh}; 163 CFClient::lowdelay fileno $CONN->{fh};
156 164
157 $LOGIN_BUTTON->set_text ("Logout");
158 status "login successful"; 165 status "login successful";
159
160 $BUTTONBAR->{children}[1]->emit ("activate")
161 if $BUTTONBAR->{children}[1]->{state};
162
163 } else { 166 } else {
164 status "unable to connect"; 167 status "unable to connect";
165 stop_game(); 168 stop_game();
166 } 169 }
167} 170}
168 171
169sub stop_game { 172sub stop_game {
173 $LOGIN_BUTTON->set_text ("Login");
174 $SERVER_SETUP->show;
175 $INV_WINDOW->hide;
176 $LOGVIEW->hide;
177
170 return unless $CONN; 178 return unless $CONN;
171 179
172 status "connection closed"; 180 status "connection closed";
173 $LOGIN_BUTTON->set_text ("Login"); 181
174 $CONN->destroy; 182 $CONN->destroy;
175 $CONN = 0; # false, does not autovivify 183 $CONN = 0; # false, does not autovivify
176
177 $BUTTONBAR->{children}[1]->emit ("activate")
178 unless $BUTTONBAR->{children}[1]->{state};
179} 184}
180 185
181sub client_setup { 186sub client_setup {
182 my $dialog = new CFClient::UI::FancyFrame 187 my $dialog = new CFClient::UI::FancyFrame
188 x => 1,
189 y => $HEIGHT * (1/8),
190 name => "client_setup",
183 title => "Client Setup", 191 title => "Client Setup",
184 child => (my $vbox = new CFClient::UI::VBox); 192 child => (my $vbox = new CFClient::UI::VBox);
193
185 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 194 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
186 195
187 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode"); 196 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode");
188 $table->add (1, 0, my $hbox = new CFClient::UI::HBox); 197 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
189 198
190 $hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]); 199 $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]);
191 $hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999"); 200 $hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
192 201
193 $mode_slider->connect (changed => sub { 202 $mode_slider->connect (changed => sub {
194 my ($self, $value) = @_; 203 my ($self, $value) = @_;
195 204
… …
202 211
203 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen"); 212 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen");
204 $table->add (1, $row++, new CFClient::UI::CheckBox 213 $table->add (1, $row++, new CFClient::UI::CheckBox
205 state => $CFG->{fullscreen}, 214 state => $CFG->{fullscreen},
206 tooltip => "Bring the client into fullscreen mode.", 215 tooltip => "Bring the client into fullscreen mode.",
207 connect_changed => sub { 216 on_changed => sub {
208 my ($self, $value) = @_; 217 my ($self, $value) = @_;
209 $CFG->{fullscreen} = $value; 218 $CFG->{fullscreen} = $value;
210 } 219 }
211 ); 220 );
212 221
213 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 222 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
214 $table->add (1, $row++, new CFClient::UI::CheckBox 223 $table->add (1, $row++, new CFClient::UI::CheckBox
215 state => $CFG->{fast}, 224 state => $CFG->{fast},
216 tooltip => "Lower the visual quality considerably to speed up rendering.", 225 tooltip => "Lower the visual quality considerably to speed up rendering.",
217 connect_changed => sub { 226 on_changed => sub {
218 my ($self, $value) = @_; 227 my ($self, $value) = @_;
219 $CFG->{fast} = $value; 228 $CFG->{fast} = $value;
220 } 229 }
221 ); 230 );
222 231
223 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale"); 232 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale");
224 $table->add (1, $row++, new CFClient::UI::Slider 233 $table->add (1, $row++, new CFClient::UI::Slider
225 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 234 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
226 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 235 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
227 connect_changed => sub { 236 on_changed => sub {
228 my ($self, $value) = @_; 237 my ($self, $value) = @_;
229 $CFG->{map_scale} = 2 ** $value; 238 $CFG->{map_scale} = 2 ** $value;
230 } 239 }
231 ); 240 );
232 241
233 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War"); 242 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War");
234 $table->add (1, $row++, new CFClient::UI::CheckBox 243 $table->add (1, $row++, new CFClient::UI::CheckBox
235 state => $CFG->{fow_enable}, 244 state => $CFG->{fow_enable},
236 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 245 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
237 connect_changed => sub { 246 on_changed => sub {
238 my ($self, $value) = @_; 247 my ($self, $value) = @_;
239 $CFG->{fow_enable} = $value; 248 $CFG->{fow_enable} = $value;
240 } 249 }
241 ); 250 );
242 251
243 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 252 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity");
244 $table->add (1, $row++, new CFClient::UI::Slider 253 $table->add (1, $row++, new CFClient::UI::Slider
245 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 254 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
246 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 255 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
247 connect_changed => sub { 256 on_changed => sub {
248 my ($self, $value) = @_; 257 my ($self, $value) = @_;
249 $CFG->{fow_intensity} = $value; 258 $CFG->{fow_intensity} = $value;
250 } 259 }
251 ); 260 );
252 261
253 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth"); 262 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth");
254 $table->add (1, $row++, new CFClient::UI::CheckBox 263 $table->add (1, $row++, new CFClient::UI::CheckBox
255 state => $CFG->{fow_smooth}, 264 state => $CFG->{fow_smooth},
256 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.", 265 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
257 connect_changed => sub { 266 on_changed => sub {
258 my ($self, $value) = @_; 267 my ($self, $value) = @_;
259 $CFG->{fow_smooth} = $value; 268 $CFG->{fow_smooth} = $value;
260 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::GL_VERSION < 1.2; 269 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::OpenGL::GL_VERSION < 1.2;
261 } 270 }
262 ); 271 );
263 272
264 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); 273 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
265 $table->add (1, $row++, new CFClient::UI::Slider 274 $table->add (1, $row++, new CFClient::UI::Slider
266 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 275 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
267 tooltip => "The base font size used by most GUI elements that do not have their own setting.", 276 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
268 connect_changed => sub { $CFG->{gui_fontsize} = $_[1] }, 277 on_changed => sub { $CFG->{gui_fontsize} = $_[1] },
269 ); 278 );
270 279
271 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 280 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Message Fontsize");
272 $table->add (1, $row++, new CFClient::UI::Slider 281 $table->add (1, $row++, new CFClient::UI::Slider
273 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 282 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
274 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.", 283 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",
275 connect_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]) }, 284 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]) },
276 ); 285 );
277 286
278 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize"); 287 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
279 288
280 $table->add (1, $row++, new CFClient::UI::Slider 289 $table->add (1, $row++, new CFClient::UI::Slider
281 range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1], 290 range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1],
282 tooltip => "The font size used by the <b>statistics window</b> only. Changes are instant.", 291 tooltip => "The font size used by the <b>statistics window</b> only. Changes are instant.",
283 connect_changed => sub { 292 on_changed => sub {
284 $CFG->{stat_fontsize} = $_[1]; 293 $CFG->{stat_fontsize} = $_[1];
285 &set_stats_window_fontsize; 294 &set_stats_window_fontsize;
286 } 295 }
287 ); 296 );
288 297
289 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 298 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
290 $table->add (1, $row++, new CFClient::UI::Slider 299 $table->add (1, $row++, new CFClient::UI::Slider
291 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 300 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
292 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 301 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
293 connect_changed => sub { 302 on_changed => sub {
294 $CFG->{gauge_fontsize} = $_[1]; 303 $CFG->{gauge_fontsize} = $_[1];
295 &set_gauge_window_fontsize; 304 &set_gauge_window_fontsize;
296 } 305 }
297 ); 306 );
298 307
299 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size"); 308 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size");
300 $table->add (1, $row++, new CFClient::UI::Slider 309 $table->add (1, $row++, new CFClient::UI::Slider
301 range => [$CFG->{gauge_size}, 0.2, 0.8], 310 range => [$CFG->{gauge_size}, 0.2, 0.8],
302 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 311 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
303 connect_changed => sub { 312 on_changed => sub {
304 $CFG->{gauge_size} = $_[1]; 313 $CFG->{gauge_size} = $_[1];
305 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 314 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
306 } 315 }
307 ); 316 );
308 317
309 $table->add (1, $row++, new CFClient::UI::Button 318 $table->add (1, $row++, new CFClient::UI::Button
310 expand => 1, align => 0, text => "Apply", 319 expand => 1, align => 0, text => "Apply",
311 tooltip => "Apply the video settings", 320 tooltip => "Apply the video settings",
312 connect_activate => sub { 321 on_activate => sub {
313 video_shutdown (); 322 video_shutdown ();
314 video_init (); 323 video_init ();
315 } 324 }
316 ); 325 );
317 326
318 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable"); 327 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");
319 $table->add (1, $row++, new CFClient::UI::CheckBox 328 $table->add (1, $row++, new CFClient::UI::CheckBox
320 state => $CFG->{audio_enable}, 329 state => $CFG->{audio_enable},
321 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.", 330 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.",
322 connect_changed => sub { 331 on_changed => sub {
323 $CFG->{audio_enable} = $_[1]; 332 $CFG->{audio_enable} = $_[1];
324 } 333 }
325 ); 334 );
326# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume"); 335# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume");
327# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], connect_changed => sub { 336# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
328# $CFG->{effects_volume} = $_[1]; 337# $CFG->{effects_volume} = $_[1];
329# }); 338# });
330 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music"); 339 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music");
331 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox); 340 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox);
332 $hbox->add (new CFClient::UI::CheckBox 341 $hbox->add (new CFClient::UI::CheckBox
333 expand => 1, state => $CFG->{bgm_enable}, 342 expand => 1, state => $CFG->{bgm_enable},
334 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 343 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
335 connect_changed => sub { 344 on_changed => sub {
336 $CFG->{bgm_enable} = $_[1]; 345 $CFG->{bgm_enable} = $_[1];
337 } 346 }
338 ); 347 );
339 $hbox->add (new CFClient::UI::Slider 348 $hbox->add (new CFClient::UI::Slider
340 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 349 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
341 tooltip => "The volume of the background music. Changes are instant.", 350 tooltip => "The volume of the background music. Changes are instant.",
342 connect_changed => sub { 351 on_changed => sub {
343 $CFG->{bgm_volume} = $_[1]; 352 $CFG->{bgm_volume} = $_[1];
344 CFClient::MixMusic::volume $_[1] * 128; 353 CFClient::MixMusic::volume $_[1] * 128;
345 } 354 }
346 ); 355 );
347 356
348 $table->add (1, $row++, new CFClient::UI::Button 357 $table->add (1, $row++, new CFClient::UI::Button
349 expand => 1, align => 0, text => "Apply", 358 expand => 1, align => 0, text => "Apply",
350 tooltip => "Apply the audio settings", 359 tooltip => "Apply the audio settings",
351 connect_activate => sub { 360 on_activate => sub {
352 audio_shutdown (); 361 audio_shutdown ();
353 audio_init (); 362 audio_init ();
354 } 363 }
355 ); 364 );
356 365
… …
358 $table->add (1, $row++, my $saycmd = new CFClient::UI::Entry 367 $table->add (1, $row++, my $saycmd = new CFClient::UI::Entry
359 text => $CFG->{say_command}, 368 text => $CFG->{say_command},
360 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. " 369 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. "
361 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. " 370 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
362 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.", 371 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
363 connect_changed => sub { 372 on_changed => sub {
364 my ($self, $value) = @_; 373 my ($self, $value) = @_;
365 $CFG->{say_command} = $value; 374 $CFG->{say_command} = $value;
366 } 375 }
367 ); 376 );
368 377
… …
383 392
384sub make_gauge_window { 393sub make_gauge_window {
385 my $gh = int $HEIGHT * $CFG->{gauge_size}; 394 my $gh = int $HEIGHT * $CFG->{gauge_size};
386 395
387 my $win = new CFClient::UI::Frame ( 396 my $win = new CFClient::UI::Frame (
388 req_y => -1, 397 force_x => 0,
398 force_y => "max",
389 user_w => $WIDTH, 399 force_w => $WIDTH,
390 user_h => $gh, 400 force_h => $gh,
391 ); 401 );
392 402
393 $win->add (my $hbox = new CFClient::UI::HBox 403 $win->add (my $hbox = new CFClient::UI::HBox
394 children => [ 404 children => [
395 (new CFClient::UI::HBox expand => 1), 405 (new CFClient::UI::HBox expand => 1),
… …
431 &set_gauge_window_fontsize; 441 &set_gauge_window_fontsize;
432 442
433 $win 443 $win
434} 444}
435 445
446
436sub make_stats_window { 447sub make_stats_window {
437 my $tgw = new CFClient::UI::FancyFrame title => "Stats"; 448 my $tgw = new CFClient::UI::FancyFrame
449 y => $HEIGHT * (2/8),
450 x => "max",
451 title => "Stats",
452 name => "stats_window";
438 453
439 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox); 454 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);
440 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1, 455 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
441 can_hover => 1, can_events => 1, 456 can_hover => 1, can_events => 1,
442 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server."); 457 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
… …
445 tooltip => "The map you are currently on (if supported by the server)."); 460 tooltip => "The map you are currently on (if supported by the server).");
446 461
447 $vb->add (my $hb0 = new CFClient::UI::HBox); 462 $vb->add (my $hb0 = new CFClient::UI::HBox);
448 $hb0->add ($STATWIDS->{weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1, 463 $hb0->add ($STATWIDS->{weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1,
449 can_hover => 1, can_events => 1, 464 can_hover => 1, can_events => 1,
450 tooltip => "This is the amount the Player weights."); 465 tooltip => "The weight of the player including all inventory items.");
451 $hb0->add ($STATWIDS->{m_weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1, 466 $hb0->add ($STATWIDS->{m_weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1,
452 can_hover => 1, can_events => 1, 467 can_hover => 1, can_events => 1,
453 tooltip => "The weight limit, you can't carry more than this."); 468 tooltip => "The weight limit: you cannot carry more than this.");
454 469
455 470
456 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 471 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
457 $hb->add (my $tbl = new CFClient::UI::Table expand => 1); 472 $hb->add (my $tbl = new CFClient::UI::Table expand => 1);
458 473
… …
548} 563}
549 564
550sub update_stats_window { 565sub update_stats_window {
551 my ($stats) = @_; 566 my ($stats) = @_;
552 567
553 # i love text protocols!!! 568 # I love text protocols...
554 my $hp = $stats->{Crossfire::Protocol::Base::CS_STAT_HP} * 1; 569
570 my $hp = $stats->{+CS_STAT_HP} * 1;
555 my $hp_m = $stats->{Crossfire::Protocol::Base::CS_STAT_MAXHP} * 1; 571 my $hp_m = $stats->{+CS_STAT_MAXHP} * 1;
556 my $sp = $stats->{Crossfire::Protocol::Base::CS_STAT_SP} * 1; 572 my $sp = $stats->{+CS_STAT_SP} * 1;
557 my $sp_m = $stats->{Crossfire::Protocol::Base::CS_STAT_MAXSP} * 1; 573 my $sp_m = $stats->{+CS_STAT_MAXSP} * 1;
558 my $fo = $stats->{Crossfire::Protocol::Base::CS_STAT_FOOD} * 1; 574 my $fo = $stats->{+CS_STAT_FOOD} * 1;
559 my $fo_m = 999; 575 my $fo_m = 999;
560 my $gr = $stats->{Crossfire::Protocol::Base::CS_STAT_GRACE} * 1; 576 my $gr = $stats->{+CS_STAT_GRACE} * 1;
561 my $gr_m = $stats->{Crossfire::Protocol::Base::CS_STAT_MAXGRACE} * 1; 577 my $gr_m = $stats->{+CS_STAT_MAXGRACE} * 1;
562 578
563 $GAUGES->{hp} ->set_value ($hp, $hp_m); 579 $GAUGES->{hp} ->set_value ($hp, $hp_m);
564 $GAUGES->{mana} ->set_value ($sp, $sp_m); 580 $GAUGES->{mana} ->set_value ($sp, $sp_m);
565 $GAUGES->{food} ->set_value ($fo, $fo_m); 581 $GAUGES->{food} ->set_value ($fo, $fo_m);
566 $GAUGES->{grace} ->set_value ($gr, $gr_m); 582 $GAUGES->{grace} ->set_value ($gr, $gr_m);
567 $GAUGES->{exp} ->set_text ("Exp: " . (formsep $stats->{Crossfire::Protocol::Base::CS_STAT_EXP64}) 583 $GAUGES->{exp} ->set_text ("Exp: " . (formsep $stats->{+CS_STAT_EXP64})
568 . " (lvl " . ($stats->{Crossfire::Protocol::Base::CS_STAT_LEVEL} * 1) . ")"); 584 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
569 my $rng = $stats->{Crossfire::Protocol::Base::CS_STAT_RANGE}; 585 my $rng = $stats->{+CS_STAT_RANGE};
570 $rng =~ s/^Range: //; # thank you so much dear server 586 $rng =~ s/^Range: //; # thank you so much dear server
571 $GAUGES->{range} ->set_text ("Rng: " . $rng); 587 $GAUGES->{range} ->set_text ("Rng: " . $rng);
572 my $title = $stats->{Crossfire::Protocol::Base::CS_STAT_TITLE}; 588 my $title = $stats->{+CS_STAT_TITLE};
573 $title =~ s/^Player: //; 589 $title =~ s/^Player: //;
574 $STATWIDS->{title} ->set_text ("Title: " . $title); 590 $STATWIDS->{title} ->set_text ("Title: " . $title);
575 591
576 $STATWIDS->{st_str} ->set_text (sprintf "%d", $stats->{5}); 592 $STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
577 $STATWIDS->{st_dex} ->set_text (sprintf "%d", $stats->{8}); 593 $STATWIDS->{st_dex} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DEX});
578 $STATWIDS->{st_con} ->set_text (sprintf "%d", $stats->{9}); 594 $STATWIDS->{st_con} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CON});
579 $STATWIDS->{st_int} ->set_text (sprintf "%d", $stats->{6}); 595 $STATWIDS->{st_int} ->set_text (sprintf "%d" , $stats->{+CS_STAT_INT});
580 $STATWIDS->{st_wis} ->set_text (sprintf "%d", $stats->{7}); 596 $STATWIDS->{st_wis} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WIS});
581 $STATWIDS->{st_pow} ->set_text (sprintf "%d", $stats->{22}); 597 $STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
582 $STATWIDS->{st_cha} ->set_text (sprintf "%d", $stats->{10}); 598 $STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
583 $STATWIDS->{st_wc} ->set_text (sprintf "%d", $stats->{13}); 599 $STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
584 $STATWIDS->{st_ac} ->set_text (sprintf "%d", $stats->{14}); 600 $STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
585 $STATWIDS->{st_dam} ->set_text (sprintf "%d", $stats->{15}); 601 $STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
586 $STATWIDS->{st_arm} ->set_text (sprintf "%d", $stats->{16}); 602 $STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_ARMOUR});
587 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{Crossfire::Protocol::Base::CS_STAT_SPEED}); 603 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
588 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{Crossfire::Protocol::Base::CS_STAT_WEAP_SP}); 604 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
589 605
590 $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{Crossfire::Protocol::Base::CS_STAT_WEIGHT_LIM} / 1000); 606 $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000);
591 607
608 # TODO: replace by CS_STAT_RES_xxx constants
592 my %tbl = ( 609 my %tbl = (
593 phys => 100, 610 phys => 100,
594 magic => 101, 611 magic => 101,
595 fire => 102, 612 fire => 102,
596 elec => 103, 613 elec => 103,
… …
605 tund => 112, 622 tund => 112,
606 fear => 113, 623 fear => 113,
607 depl => 113, 624 depl => 113,
608 deat => 115, 625 deat => 115,
609 holyw => 116, 626 holyw => 116,
610 blind => 117 627 blind => 117,
611 ); 628 );
612 629
613 for (keys %tbl) {
614 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}}); 630 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
615 } 631 for keys %tbl;
616
617}
618
619sub metaserver_dialog {
620 my $dialog = new CFClient::UI::FancyFrame
621 title => "Server List",
622 child => (my $vbox = new CFClient::UI::VBox);
623
624 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
625
626 $dialog
627} 632}
628 633
629my $METASERVER_ATIME; 634my $METASERVER_ATIME;
630 635
631sub update_metaserver { 636sub update_metaserver {
632 my ($HOST) = @_;
633
634 return if $METASERVER_ATIME > time; 637 return if $METASERVER_ATIME > time;
635 $METASERVER_ATIME = time + 60; 638 $METASERVER_ATIME = time + 60;
636 639
637 my $table = $METASERVER->{table}; 640 my $table = $METASERVER->{table};
638 $table->clear; 641 $table->clear;
… …
689 $m = [$users, $host, $uptime, $version, $desc]; 692 $m = [$users, $host, $uptime, $version, $desc];
690 693
691 $y++; 694 $y++;
692 695
693 $table->add (0, $y, new CFClient::UI::VBox children => [ 696 $table->add (0, $y, new CFClient::UI::VBox children => [
694 (new CFClient::UI::Button text => "Use", connect_activate => sub { 697 (new CFClient::UI::Button text => "Use", on_activate => sub {
695 $HOST->set_text ($CFG->{host} = $host); 698 $HOST_ENTRY->set_text ($CFG->{host} = $host);
699 $METASERVER->toggle_visibility;
696 }), 700 }),
697 (new CFClient::UI::Empty expand => 1), 701 (new CFClient::UI::Empty expand => 1),
698 ]); 702 ]);
699 703
700 $table->add ($_ + 1, $y, new CFClient::UI::Label 704 $table->add ($_ + 1, $y, new CFClient::UI::Label
… …
703 } 707 }
704 } 708 }
705 }); 709 });
706} 710}
707 711
712sub metaserver_dialog {
713 my $dialog = new CFClient::UI::FancyFrame
714 title => "Server List",
715 name => 'metaserver_dialog',
716 x => 'center',
717 y => 'center',
718 child => (my $vbox = new CFClient::UI::VBox),
719 on_visibility_change => sub {
720 update_metaserver if $_[1];
721 },
722 ;
723
724 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
725
726 $dialog
727}
728
708sub server_setup { 729sub server_setup {
709 my $dialog = new CFClient::UI::FancyFrame 730 my $dialog = $SERVER_SETUP = new CFClient::UI::FancyFrame
731 x => "center",
732 y => "center",
733 name => "server_setup",
710 title => "Server Setup", 734 title => "Server Setup",
711 child => (my $vbox = new CFClient::UI::VBox); 735 child => (my $vbox = new CFClient::UI::VBox),
712 736 ;
737
713 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 738 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
714 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port"); 739 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");
715 740
716 { 741 {
717 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 742 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
718 743
719 $vbox->add ( 744 $vbox->add (
720 my $HOST = new CFClient::UI::Entry 745 $HOST_ENTRY = new CFClient::UI::Entry
721 expand => 1, 746 expand => 1,
722 text => $CFG->{host}, 747 text => $CFG->{host},
723 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 748 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
724 connect_changed => sub { 749 on_changed => sub {
725 my ($self, $value) = @_; 750 my ($self, $value) = @_;
726 $CFG->{host} = $value; 751 $CFG->{host} = $value;
727 } 752 }
728 ); 753 );
729 754
730 $METASERVER = metaserver_dialog; 755 $METASERVER = metaserver_dialog;
731 756
732 $vbox->add (new CFClient::UI::Flopper 757 $vbox->add (new CFClient::UI::Button
733 expand => 1, 758 expand => 1,
734 text => "Server List", 759 text => "Server List",
735 other => $METASERVER, 760 other => $METASERVER,
736 tooltip => "Show a list of available crossfire servers", 761 tooltip => "Show a list of available crossfire servers",
737 connect_open => sub { 762 on_activate => sub { $METASERVER->toggle_visibility },
738 update_metaserver $HOST;
739 }
740 ); 763 );
741 } 764 }
742 765
743 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username"); 766 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
744 $table->add (1, 4, new CFClient::UI::Entry 767 $table->add (1, 4, new CFClient::UI::Entry
745 text => $CFG->{user}, 768 text => $CFG->{user},
746 tooltip => "The name of your character on the server", 769 tooltip => "The name of your character on the server",
747 connect_changed => sub { 770 on_changed => sub {
748 my ($self, $value) = @_; 771 my ($self, $value) = @_;
749 $CFG->{user} = $value; 772 $CFG->{user} = $value;
750 } 773 }
751 ); 774 );
752 775
753 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password"); 776 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password");
754 $table->add (1, 5, new CFClient::UI::Entry 777 $table->add (1, 5, new CFClient::UI::Entry
755 text => $CFG->{password}, 778 text => $CFG->{password},
756 hidden => 1, 779 hidden => 1,
757 tooltip => "The password for your character", 780 tooltip => "The password for your character",
758 connect_changed => sub { 781 on_changed => sub {
759 my ($self, $value) = @_; 782 my ($self, $value) = @_;
760 $CFG->{password} = $value; 783 $CFG->{password} = $value;
761 } 784 }
762 ); 785 );
763 786
764 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size"); 787 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
765 $table->add (1, 7, new CFClient::UI::Slider 788 $table->add (1, 7, new CFClient::UI::Slider
766 req_w => 100, 789 force_w => 100,
767 range => [$CFG->{mapsize}, 10, 100, 0, 1], 790 range => [$CFG->{mapsize}, 10, 100, 0, 1],
768 tooltip => "This is the size of the portion of the map update the server sends you. " 791 tooltip => "This is the size of the portion of the map update the server sends you. "
769 . "If you set this to a high value you will be able to see further, " 792 . "If you set this to a high value you will be able to see further, "
770 . "but you also increase bandwidth requirements and latency. " 793 . "but you also increase bandwidth requirements and latency. "
771 . "This option is only used once at log-in.", 794 . "This option is only used once at log-in.",
772 connect_changed => sub { 795 on_changed => sub {
773 my ($self, $value) = @_; 796 my ($self, $value) = @_;
774 797
775 $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 798 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
776 }, 799 },
777 ); 800 );
… …
784 . "This might increase or create lag, but increases the chances " 807 . "This might increase or create lag, but increases the chances "
785 . "of faces being ready for display when you encounter them. " 808 . "of faces being ready for display when you encounter them. "
786 . "It also uses up server bandwidth on every connect, " 809 . "It also uses up server bandwidth on every connect, "
787 . "so only set it if you really need to prefetch images. " 810 . "so only set it if you really need to prefetch images. "
788 . "This option can be set and unset any time.", 811 . "This option can be set and unset any time.",
789 connect_changed => sub { $CFG->{face_prefetch} = $_[1] }, 812 on_changed => sub { $CFG->{face_prefetch} = $_[1] },
790 ); 813 );
791 814
792 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count"); 815 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count");
793 $table->add (1, 9, new CFClient::UI::Entry 816 $table->add (1, 9, new CFClient::UI::Entry
794 text => $CFG->{output_count}, 817 text => $CFG->{output_count},
795 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 818 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
796 connect_changed => sub { $CFG->{output_count} = $_[1] }, 819 on_changed => sub { $CFG->{output_count} = $_[1] },
797 ); 820 );
798 821
799 $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync"); 822 $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync");
800 $table->add (1, 10, new CFClient::UI::Entry 823 $table->add (1, 10, new CFClient::UI::Entry
801 text => $CFG->{output_sync}, 824 text => $CFG->{output_sync},
802 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 825 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
803 connect_changed => sub { $CFG->{output_sync} = $_[1] }, 826 on_changed => sub { $CFG->{output_sync} = $_[1] },
804 ); 827 );
805 828
806 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button 829 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button
807 expand => 1, 830 expand => 1,
808 align => 0, 831 align => 0,
809 text => "Login", 832 text => "Login",
810 connect_activate => sub { 833 on_activate => sub {
811 $CONN ? stop_game 834 $CONN ? stop_game
812 : start_game; 835 : start_game;
813 }, 836 },
814 ); 837 );
815 838
816 $dialog 839 $dialog
817} 840}
818 841
819sub message_window { 842sub message_window {
820 my $window = new CFClient::UI::FancyFrame 843 my $window = new CFClient::UI::FancyFrame
844 name => "message_window",
821 title => "Messages", 845 title => "Messages",
822 border_bg => [1, 1, 1, 1], 846 border_bg => [1, 1, 1, 1],
823 bg => [0, 0, 0, 0.75], 847 bg => [0, 0, 0, 0.75],
848 x => "max",
849 y => 0,
824 user_w => int $::WIDTH / 3, 850 force_w => $::WIDTH / 3,
825 user_h => int $::HEIGHT / 5, 851 force_h => $::HEIGHT / 5,
826 child => (my $vbox = new CFClient::UI::VBox); 852 child => (my $vbox = new CFClient::UI::VBox);
827 853
828 $vbox->add ($LOGVIEW); 854 $vbox->add ($LOGVIEW);
829 855
830 $vbox->add (my $input = new CFClient::UI::Entry 856 $vbox->add (my $input = new CFClient::UI::Entry
831 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> " 857 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
832 . "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). " 858 . "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "
833 . "If you prepend a slash (/), you will submit a command instead (similar to IRC). " 859 . "If you prepend a slash (/), you will submit a command instead (similar to IRC). "
834 . "A better way to submit commands (and the occasional chat command) is often the map command completer.", 860 . "A better way to submit commands (and the occasional chat command) is often the map command completer.",
835 connect_focus_in => sub { 861 on_focus_in => sub {
836 my ($input, $prev_focus) = @_; 862 my ($input, $prev_focus) = @_;
837 863
838 delete $input->{refocus_map}; 864 delete $input->{refocus_map};
839 865
840 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) { 866 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
841 $input->{refocus_map} = 1; 867 $input->{refocus_map} = 1;
842 } 868 }
843 delete $input->{auto_activated}; 869 delete $input->{auto_activated};
844 }, 870 },
845 connect_activate => sub { 871 on_activate => sub {
846 my ($input, $text) = @_; 872 my ($input, $text) = @_;
847 $input->set_text (''); 873 $input->set_text ('');
848 874
875 if ($text =~ /^\/bind\s+(.*)$/) {
876 CFClient::Binder::open_binding_dialog (sub {
877 my ($mod, $sym) = @_;
878 $::CFG->{bindings}->{$mod}->{$sym} = [$1];
879 });
849 if ($text =~ /^\/(.*)/) { 880 } elsif ($text =~ /^\/(.*)/) {
850 $::CONN->user_send ($1); 881 $::CONN->user_send ($1);
851 } else { 882 } else {
852 my $say_cmd = $::CFG->{say_command} || 'say'; 883 my $say_cmd = $::CFG->{say_command} || 'say';
853 $::CONN->user_send ("$say_cmd $text"); 884 $::CONN->user_send ("$say_cmd $text");
854 } 885 }
855 if ($input->{refocus_map}) { 886 if ($input->{refocus_map}) {
856 delete $input->{refocus_map}; 887 delete $input->{refocus_map};
857 $MAPWIDGET->focus_in 888 $MAPWIDGET->focus_in
858 } 889 }
859 }, 890 },
860 connect_escape => sub { 891 on_escape => sub {
861 $MAPWIDGET->focus_in 892 $MAPWIDGET->focus_in
862 }, 893 },
863 ); 894 );
864 895
865 $CONSOLE = { 896 $CONSOLE = {
866 window => $window, 897 window => $window,
867 input => $input 898 input => $input,
868 }; 899 };
869 900
870 $window 901 $window
871} 902}
872 903
873sub open_quit_dialog { 904sub open_quit_dialog {
874 unless ($QUIT_DIALOG) { 905 unless ($QUIT_DIALOG) {
875
876 $QUIT_DIALOG = new CFClient::UI::FancyFrame title => "Really Quit?"; 906 $QUIT_DIALOG = new CFClient::UI::FancyFrame
907 x => "center",
908 y => "center",
909 title => "Really Quit?",
910 ;
877 911
878 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1); 912 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
879 913
880 $vb->add (new CFClient::UI::Label 914 $vb->add (new CFClient::UI::Label
881 text => "You should find a savebed and apply it first!", 915 text => "You should find a savebed and apply it first!",
… …
884 ); 918 );
885 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 919 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
886 $hb->add (new CFClient::UI::Button 920 $hb->add (new CFClient::UI::Button
887 text => "Ok", 921 text => "Ok",
888 expand => 1, 922 expand => 1,
889 connect_activate => sub { $QUIT_DIALOG->hide }, 923 on_activate => sub { $QUIT_DIALOG->hide },
890 ); 924 );
891 $hb->add (new CFClient::UI::Button 925 $hb->add (new CFClient::UI::Button
892 text => "Quit anyway", 926 text => "Quit anyway",
893 expand => 1, 927 expand => 1,
894 connect_activate => sub { exit }, 928 on_activate => sub { exit },
895 ); 929 );
930 }
896 931
897 $QUIT_DIALOG->show_centered; 932 $QUIT_DIALOG->show;
898 } else {
899 $QUIT_DIALOG->show_centered;
900 }
901} 933}
902 934
903sub make_inventory_window { 935sub make_inventory_window {
904 my $invwin = new CFClient::UI::FancyFrame 936 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
905 user_w => $WIDTH * (7/8), user_h => $HEIGHT * (7/8), title => "Inventory"; 937 x => "center",
938 y => "center",
939 force_w => $WIDTH * 9/10,
940 force_h => $HEIGHT * 9/10,
941 title => "Inventory",
942 ;
906 943
907 $invwin->add (my $hb = new CFClient::UI::HBox expand => 1); 944 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);
908 945
909 $hb->add (my $vb1 = new CFClient::UI::VBox expand => 1); 946 $hb->add (my $vb1 = new CFClient::UI::VBox);
910 $vb1->add (my $lbl = new CFClient::UI::Label xalign => 0.5); 947 $vb1->add (new CFClient::UI::Label align => 0, text => "Player");
911 $lbl->set_text ("Player");
912 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1); 948 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1);
913 949
914 $hb->add (my $vb2 = new CFClient::UI::VBox expand => 1); 950 $hb->add (my $vb2 = new CFClient::UI::VBox);
951
915 $vb2->add ($INVR_LBL = new CFClient::UI::Label xalign => 0.5); 952 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
916 $INVR_LBL->set_text ("Floor"); 953
917 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1); 954 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
918 955
956 # XXX: Call after $INVR = ... because set_opencont sets the items
957 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
958
919 $invwin 959 $invwin
960}
961
962sub make_spell_list {
963 $SPELL_LIST = new CFClient::UI::SpellList
964 force_w => $WIDTH * (9/10),
965 force_h => $HEIGHT * (9/10);
966 $SPELL_LIST
967}
968
969sub make_binding_window {
970 my $binding_list = new CFClient::UI::VBox;
971
972 my $refresh;
973 $refresh = sub {
974 $binding_list->clear ();
975
976 for my $mod (keys %{$::CFG->{bindings}}) {
977 for my $sym (keys %{$::CFG->{bindings}->{$mod}}) {
978 my $cmds = $::CFG->{bindings}->{$mod}->{$sym};
979 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
980
981 my $lbl = join "; ", @$cmds;
982 my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym);
983 $binding_list->add (my $hb = new CFClient::UI::HBox);
984 $hb->add (new CFClient::UI::Button
985 text => "delete",
986 tooltip => "Deletes the binding",
987 on_activate => sub {
988 $binding_list->remove ($hb);
989 delete $::CFG->{bindings}->{$mod}->{$sym};
990 });
991
992 $hb->add (new CFClient::UI::Button
993 text => "edit",
994 tooltip => "Edits the binding",
995 on_activate => sub {
996 $::BIND_EDITOR->set_binding (
997 $mod, $sym, $::CFG->{bindings}->{$mod}->{$sym},
998 sub {
999 my ($nmod, $nsym, $ncmds) = @_;
1000 delete $::CFG->{bindings}->{$mod}->{$sym};
1001 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds;
1002 $refresh->();
1003 $::BIND_WINDOW->show;
1004 },
1005 sub {
1006 $::BIND_WINDOW->show;
1007 });
1008 $::BIND_EDITOR->show;
1009 $::BIND_WINDOW->hide;
1010 });
1011
1012 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
1013 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
1014 }
1015 }
1016 };
1017
1018 $BIND_WINDOW = new CFClient::UI::FancyFrame
1019 title => "Bindings",
1020 x => "center",
1021 y => "center",
1022 def_w => int $WIDTH * 9/10,
1023 def_h => int $HEIGHT * 9/10,
1024 on_visibility_change => sub {
1025 my ($self, $visible) = @_;
1026 $refresh->() if $visible;
1027 };
1028
1029 $BIND_WINDOW->add (my $vb = new CFClient::UI::VBox);
1030 $vb->add ($binding_list);
1031 $vb->add (my $hb = new CFClient::UI::HBox);
1032 $hb->add (new CFClient::UI::Button
1033 text => "record new",
1034 expand => 1,
1035 tooltip => "This button opens the binding editor with an empty binding.",
1036 on_activate => sub {
1037 $::BIND_EDITOR->set_binding (undef, undef, [],
1038 sub {
1039 my ($mod, $sym, $cmds) = @_;
1040 $::CFG->{bindings}->{$mod}->{$sym} = $cmds;
1041 $refresh->();
1042 $::BIND_WINDOW->show;
1043 },
1044 sub {
1045 $::BIND_WINDOW->show;
1046 });
1047 $::BIND_WINDOW->hide;
1048 $::BIND_EDITOR->show;
1049 },
1050 );
1051 $hb->add (new CFClient::UI::Button
1052 text => "close",
1053 tooltip => "Closes the binding window",
1054 expand => 1,
1055 on_activate => sub {
1056 $::BIND_WINDOW->hide;
1057 }
1058 );
1059
1060 $refresh->();
1061 $BIND_WINDOW
920} 1062}
921 1063
922sub make_help_window { 1064sub make_help_window {
923 my $win = new CFClient::UI::FancyFrame 1065 my $win = new CFClient::UI::FancyFrame
924 user_w => $WIDTH * (7/8), user_h => $HEIGHT * (7/8), title => "Documentation"; 1066 x => 'center',
1067 y => 'center',
1068 name => 'doc_browser',
1069 force_w => int $WIDTH * 7/8,
1070 force_h => int $HEIGHT * 7/8,
1071 title => "Documentation";
925 1072
926 $win->add (my $vbox = new CFClient::UI::VBox); 1073 $win->add (my $vbox = new CFClient::UI::VBox);
927 1074
928 $vbox->add (my $buttons = new CFClient::UI::HBox); 1075 $vbox->add (my $buttons = new CFClient::UI::HBox);
929 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8); 1076 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8);
… …
936 ) { 1083 ) {
937 my ($pod, $label) = @$_; 1084 my ($pod, $label) = @$_;
938 1085
939 $buttons->add (new CFClient::UI::Button 1086 $buttons->add (new CFClient::UI::Button
940 text => $label, 1087 text => $label,
941 connect_activate => sub { 1088 on_activate => sub {
942 my $parser = new Pod::POM; 1089 my $parser = new Pod::POM;
943 my $pom = $parser->parse_file (CFClient::find_rcfile "pod/$pod.pod"); 1090 my $pom = $parser->parse_file (CFClient::find_rcfile "pod/$pod.pod");
944 1091
945 $viewer->clear; 1092 $viewer->clear;
946 1093
… …
990 if ($DEBUG_STATUS) { 1137 if ($DEBUG_STATUS) {
991 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 1138 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
992 } else { 1139 } else {
993 # create the widgets 1140 # create the widgets
994 1141
995 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, req_x => -1; 1142 $DEBUG_STATUS = new CFClient::UI::Label
1143 padding => 0,
1144 z => 100,
1145 force_x => "max",
1146 force_y => 0;
996 $DEBUG_STATUS->show; 1147 $DEBUG_STATUS->show;
997 1148
1149 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);
1150
998 $STATUSBOX = new CFClient::UI::Statusbox; 1151 $STATUSBOX = new CFClient::UI::Statusbox;
999 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]); 1152 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]);
1000 1153
1001 (new CFClient::UI::Frame 1154 (new CFClient::UI::Frame
1002 bg => [0, 0, 0, 0.4], 1155 bg => [0, 0, 0, 0.4],
1003 req_y => -1, 1156 force_x => 0,
1157 force_y => "max",
1004 child => $STATUSBOX, 1158 child => $STATUSBOX,
1005 )->show; 1159 )->show;
1006 1160
1007 CFClient::UI::FancyFrame->new ( 1161 CFClient::UI::FancyFrame->new (
1162 x => 0,
1163 y => $FONTSIZE + 8,
1008 border_bg => [1, 1, 1, 192/255], 1164 border_bg => [1, 1, 1, 192/255],
1009 bg => [1, 1, 1, 0], 1165 bg => [1, 1, 1, 0],
1010 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1166 child => ($MAPMAP = new CFClient::MapWidget::MapMap
1011 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.", 1167 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
1012 ), 1168 ),
… …
1035 can_hover => 1, 1191 can_hover => 1,
1036 can_events => 1, 1192 can_events => 1,
1037 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1193 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1038 ; 1194 ;
1039 1195
1040 $BUTTONBAR = new CFClient::UI::HBox; 1196 $BUTTONBAR = new CFClient::UI::HBox x => 0, y => 0;
1041 1197
1042 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup, 1198 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup,
1043 tooltip => "Toggles a dialog where you can configure various aspects of the client, such as graphics mode, performance, and audio options."); 1199 tooltip => "Toggles a dialog where you can configure various aspects of the client, such as graphics mode, performance, and audio options.");
1044 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup, 1200 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup,
1045 tooltip => "Toggles a dialog where you can configure the server to play on, your username, password and other server-related options."); 1201 tooltip => "Toggles a dialog where you can configure the server to play on, your username, password and other server-related options.");
… …
1049 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 1205 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
1050 1206
1051 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window, 1207 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window,
1052 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times."); 1208 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1053 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window, 1209 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window,
1054 tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :)."); 1210 tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :)."
1211 ."You can also hit the Tab-key to show/hide the Inventory.");
1055 1212
1056 $BUTTONBAR->add (new CFClient::UI::Button 1213 $BUTTONBAR->add (new CFClient::UI::Button
1057 text => "Save Config", 1214 text => "Save Config",
1058 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 1215 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1059 connect_activate => sub { 1216 on_activate => sub {
1217 $::CFG->{layout} = CFClient::UI::get_layout;
1060 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 1218 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1061 status "Configuration Saved"; 1219 status "Configuration Saved";
1062 }, 1220 },
1063 ); 1221 );
1064 1222
1065 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window, 1223 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window,
1066 tooltip => "View Documentation"); 1224 tooltip => "View Documentation");
1067 1225
1226 $BUTTONBAR->add (new CFClient::UI::Flopper
1227 text => "Bindings",
1228 other => make_binding_window,
1229 tooltip =>
1230 "Lets you define, edit and delete bindings."
1231 ."There is a shortcut for making bindings: LCTRL+Insert opens the binding editor "
1232 ."with nothing set and the recording started. After doing the actions you "
1233 ."want to record press Insert and you will be asked to press a key-combo."
1234 ."After pressing the combo the binding will be saved automatically and the "
1235 ."binding editor closes");
1236
1237 $BUTTONBAR->add (new CFClient::UI::Flopper
1238 text => "Spells",
1239 other => make_spell_list,
1240 tooltip => "The spell list");
1241
1068 $BUTTONBAR->add (new CFClient::UI::Button 1242 $BUTTONBAR->add (new CFClient::UI::Button
1069 text => "Quit", 1243 text => "Quit",
1070 tooltip => "Terminates the program", 1244 tooltip => "Terminates the program",
1071 connect_activate => sub { 1245 on_activate => sub {
1072 if ($CONN) { 1246 if ($CONN) {
1073 open_quit_dialog; 1247 open_quit_dialog;
1074 } else { 1248 } else {
1075 exit; 1249 exit;
1076 } 1250 }
1077 }, 1251 },
1078 ); 1252 );
1079 1253
1080 $BUTTONBAR->show; 1254 $BUTTONBAR->show;
1255 $SERVER_SETUP->show;
1081 1256
1082 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1257 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1083
1084 # delay till geometry is constant
1085 $CFClient::UI::ROOT->on_post_alloc (startup => sub {
1086 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
1087 my $widget = $GAUGES->{win};
1088 $widget->move (0, $HEIGHT - $widget->{h});#d# to in toplevel
1089 });
1090 force_refresh ();
1091 } 1258 }
1092} 1259}
1093 1260
1094sub video_shutdown { 1261sub video_shutdown {
1095 undef $SDL_ACTIVE; 1262 undef $SDL_ACTIVE;
… …
1163 1330
1164my %demo;#d# 1331my %demo;#d#
1165 1332
1166sub force_refresh { 1333sub force_refresh {
1167 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 1334 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
1168 debug sprintf "%3.2f", $fps; 1335 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1169 1336
1170 $CFClient::UI::ROOT->draw; 1337 $CFClient::UI::ROOT->draw;
1171 1338
1172 $WANT_REFRESH = 0; 1339 $WANT_REFRESH = 0;
1173 $CAN_REFRESH = 0; 1340 $CAN_REFRESH = 0;
… …
1305############################################################################# 1472#############################################################################
1306 1473
1307$SIG{INT} = $SIG{TERM} = sub { exit }; 1474$SIG{INT} = $SIG{TERM} = sub { exit };
1308 1475
1309{ 1476{
1310 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] }; 1477 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] if defined $^S && !$^S };
1311 1478
1312 CFClient::read_cfg "$Crossfire::VARDIR/pclientrc"; 1479 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1480 CFClient::UI::set_layout ($::CFG->{layout});
1313 1481
1314 my %DEF_CFG = ( 1482 my %DEF_CFG = (
1315 sdl_mode => 0, 1483 sdl_mode => 0,
1316 width => 640, 1484 width => 640,
1317 height => 480, 1485 height => 480,
… …
1394 1562
1395END { CFClient::SDL_Quit } 1563END { CFClient::SDL_Quit }
1396 1564
1397=head1 NAME 1565=head1 NAME
1398 1566
1399pclient - A Crossfire+ and Crossfire game client 1567cfplus - A Crossfire+ and Crossfire game client
1400 1568
1401=head1 SYNOPSIS 1569=head1 SYNOPSIS
1402 1570
1403Just run it - no commandline arguments are supported. 1571Just run it - no commandline arguments are supported.
1404 1572
1405=head1 USAGE 1573=head1 USAGE
1406 1574
1407Pclient utilises OpenGL for all UI elements and the game. It is supposed to be used 1575cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used
1408fullscreen and interactively. 1576fullscreen and interactively.
1409 1577
1578=head1 DEBUGGING
1579
1580
1581CFPLUS_DEBUG - environment variable
1582
1583 1 draw borders around widgets
1584 2 add low-level widget info to tooltips
1585 4 show fps
1586 8 suppress tooltips
1587
1410=head1 AUTHOR 1588=head1 AUTHOR
1411 1589
1412Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 1590Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
1413 1591
1414 1592

Diff Legend

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