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

Diff Legend

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