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.16 by elmex, Sat May 27 20:00:40 2006 UTC vs.
Revision 1.51 by root, Sat Jun 3 21:59:55 2006 UTC

… …
41use CFClient::UI; 41use CFClient::UI;
42use CFClient::MapWidget; 42use CFClient::MapWidget;
43 43
44$Event::DIED = sub { 44$Event::DIED = sub {
45 # TODO: display dialog box or so 45 # TODO: display dialog box or so
46 Carp::confess $_[1];#d#TODO: remove when stable
46 CFClient::error $_[1]; 47 CFClient::error $_[1];
47}; 48};
48 49
49#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d# 50#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d#
50 51
… …
81our $LOGVIEW; 82our $LOGVIEW;
82our $CONSOLE; 83our $CONSOLE;
83our $METASERVER; 84our $METASERVER;
84our $LOGIN_BUTTON; 85our $LOGIN_BUTTON;
85our $QUIT_DIALOG; 86our $QUIT_DIALOG;
87our $HOST_ENTRY;
88
89our $SETUP_DIALOG;
90our $SETUP_NOTEBOOK;
91our $SETUP_SERVER;
92our $SETUP_KEYBOARD;
93our $SETUP_SPELLS;
86 94
87our $FLOORBOX; 95our $FLOORBOX;
88our $GAUGES; 96our $GAUGES;
89our $STATWIDS; 97our $STATWIDS;
90 98
… …
97 105
98our $ALT_ENTER_MESSAGE; 106our $ALT_ENTER_MESSAGE;
99our $STATUSBOX; 107our $STATUSBOX;
100our $DEBUG_STATUS; 108our $DEBUG_STATUS;
101 109
110our $INV_WINDOW;
102our $INV; 111our $INV;
103our $INVR; 112our $INVR;
104our $INVR_LBL; 113our $INV_RIGHT_HB;
114
115our $BIND_EDITOR;
116
117our $PICKUP_CFG;
105 118
106sub status { 119sub status {
107 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 120 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
108} 121}
109 122
110sub debug { 123sub debug {
111 $DEBUG_STATUS->set_text ($_[0]); 124 $DEBUG_STATUS->set_text ($_[0]);
112 my ($w, $h) = $DEBUG_STATUS->size_request;
113 $DEBUG_STATUS->move ($WIDTH - $w, 0);
114} 125}
115 126
116sub start_game { 127sub start_game {
117 status "logging in..."; 128 status "logging in...";
129
130 $LOGIN_BUTTON->set_text ("Logout");
131 $SETUP_DIALOG->hide;
118 132
119 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 133 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
120 134
121 my ($host, $port) = split /:/, $CFG->{host}; 135 my ($host, $port) = split /:/, $CFG->{host};
122 136
… …
151 }; 165 };
152 166
153 if ($CONN) { 167 if ($CONN) {
154 CFClient::lowdelay fileno $CONN->{fh}; 168 CFClient::lowdelay fileno $CONN->{fh};
155 169
156 $LOGIN_BUTTON->set_text ("Logout");
157 status "login successful"; 170 status "login successful";
158
159 $BUTTONBAR->{children}[1]->emit ("activate")
160 if $BUTTONBAR->{children}[1]->{state};
161
162 } else { 171 } else {
163 status "unable to connect"; 172 status "unable to connect";
164 stop_game(); 173 stop_game();
165 } 174 }
166} 175}
167 176
168sub stop_game { 177sub stop_game {
178 $LOGIN_BUTTON->set_text ("Login");
179 $SETUP_DIALOG->show;
180 $INV_WINDOW->hide;
181 $LOGVIEW->hide;
182
169 return unless $CONN; 183 return unless $CONN;
170 184
171 status "connection closed"; 185 status "connection closed";
172 $LOGIN_BUTTON->set_text ("Login"); 186
173 $CONN->destroy; 187 $CONN->destroy;
174 $CONN = 0; # false, does not autovivify 188 $CONN = 0; # false, does not autovivify
175
176 $BUTTONBAR->{children}[1]->emit ("activate")
177 unless $BUTTONBAR->{children}[1]->{state};
178} 189}
179 190
180sub client_setup { 191sub graphics_setup {
181 my $dialog = new CFClient::UI::FancyFrame
182 name => "client_setup",
183 title => "Client Setup",
184 child => (my $vbox = new CFClient::UI::VBox); 192 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::OpenGL::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 );
326
327 $vbox
328}
329
330sub audio_setup {
331 my $vbox = new CFClient::UI::VBox;
332
333 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
334
335 my $row = 0;
317 336
318 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable"); 337 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");
319 $table->add (1, $row++, new CFClient::UI::CheckBox 338 $table->add (1, $row++, new CFClient::UI::CheckBox
320 state => $CFG->{audio_enable}, 339 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.", 340 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 { 341 on_changed => sub {
323 $CFG->{audio_enable} = $_[1]; 342 $CFG->{audio_enable} = $_[1];
324 } 343 }
325 ); 344 );
326# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume"); 345# $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 { 346# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
328# $CFG->{effects_volume} = $_[1]; 347# $CFG->{effects_volume} = $_[1];
329# }); 348# });
330 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music"); 349 $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); 350 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox);
332 $hbox->add (new CFClient::UI::CheckBox 351 $hbox->add (new CFClient::UI::CheckBox
333 expand => 1, state => $CFG->{bgm_enable}, 352 expand => 1, state => $CFG->{bgm_enable},
334 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 353 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
335 connect_changed => sub { 354 on_changed => sub {
336 $CFG->{bgm_enable} = $_[1]; 355 $CFG->{bgm_enable} = $_[1];
337 } 356 }
338 ); 357 );
339 $hbox->add (new CFClient::UI::Slider 358 $hbox->add (new CFClient::UI::Slider
340 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 359 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
341 tooltip => "The volume of the background music. Changes are instant.", 360 tooltip => "The volume of the background music. Changes are instant.",
342 connect_changed => sub { 361 on_changed => sub {
343 $CFG->{bgm_volume} = $_[1]; 362 $CFG->{bgm_volume} = $_[1];
344 CFClient::MixMusic::volume $_[1] * 128; 363 CFClient::MixMusic::volume $_[1] * 128;
345 } 364 }
346 ); 365 );
347 366
348 $table->add (1, $row++, new CFClient::UI::Button 367 $table->add (1, $row++, new CFClient::UI::Button
349 expand => 1, align => 0, text => "Apply", 368 expand => 1, align => 0, text => "Apply",
350 tooltip => "Apply the audio settings", 369 tooltip => "Apply the audio settings",
351 connect_activate => sub { 370 on_activate => sub {
352 audio_shutdown (); 371 audio_shutdown ();
353 audio_init (); 372 audio_init ();
354 } 373 }
355 ); 374 );
356 375
357 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command"); 376 $vbox
358 $table->add (1, $row++, my $saycmd = new CFClient::UI::Entry
359 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. "
361 . "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.",
363 connect_changed => sub {
364 my ($self, $value) = @_;
365 $CFG->{say_command} = $value;
366 }
367 );
368
369 $dialog
370} 377}
371 378
372sub set_stats_window_fontsize { 379sub set_stats_window_fontsize {
373 for (values %{$STATWIDS}) { 380 for (values %{$STATWIDS}) {
374 $_->set_fontsize ($::CFG->{stat_fontsize}); 381 $_->set_fontsize ($::CFG->{stat_fontsize});
… …
383 390
384sub make_gauge_window { 391sub make_gauge_window {
385 my $gh = int $HEIGHT * $CFG->{gauge_size}; 392 my $gh = int $HEIGHT * $CFG->{gauge_size};
386 393
387 my $win = new CFClient::UI::Frame ( 394 my $win = new CFClient::UI::Frame (
388 req_y => -1, 395 force_x => 0,
396 force_y => "max",
389 user_w => $WIDTH, 397 force_w => $WIDTH,
390 user_h => $gh, 398 force_h => $gh,
391 ); 399 );
392 400
393 $win->add (my $hbox = new CFClient::UI::HBox 401 $win->add (my $hbox = new CFClient::UI::HBox
394 children => [ 402 children => [
395 (new CFClient::UI::HBox expand => 1), 403 (new CFClient::UI::HBox expand => 1),
… …
431 &set_gauge_window_fontsize; 439 &set_gauge_window_fontsize;
432 440
433 $win 441 $win
434} 442}
435 443
444
436sub make_stats_window { 445sub make_stats_window {
437 my $tgw = new CFClient::UI::FancyFrame title => "Stats", name => "stats_window"; 446 my $tgw = new CFClient::UI::FancyFrame
447 y => $HEIGHT * (2/8),
448 x => "max",
449 title => "Stats",
450 name => "stats_window";
438 451
439 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox); 452 $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, 453 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
441 can_hover => 1, can_events => 1, 454 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."); 455 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
… …
541 update_stats_window ({}); 554 update_stats_window ({});
542 555
543 $tgw 556 $tgw
544} 557}
545 558
546sub formsep { 559sub formsep($) {
547 reverse join ",", grep length, split /(...)/, reverse $_[0] * 1 560 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
548} 561}
549 562
550sub update_stats_window { 563sub update_stats_window {
551 my ($stats) = @_; 564 my ($stats) = @_;
552 565
… …
614 627
615 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}}) 628 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
616 for keys %tbl; 629 for keys %tbl;
617} 630}
618 631
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}
628
629my $METASERVER_ATIME; 632my $METASERVER_ATIME;
630 633
631sub update_metaserver { 634sub update_metaserver {
632 my ($HOST) = @_;
633
634 return if $METASERVER_ATIME > time; 635 return if $METASERVER_ATIME > time;
635 $METASERVER_ATIME = time + 60; 636 $METASERVER_ATIME = time + 60;
636 637
637 my $table = $METASERVER->{table}; 638 my $table = $METASERVER->{table};
638 $table->clear; 639 $table->clear;
… …
689 $m = [$users, $host, $uptime, $version, $desc]; 690 $m = [$users, $host, $uptime, $version, $desc];
690 691
691 $y++; 692 $y++;
692 693
693 $table->add (0, $y, new CFClient::UI::VBox children => [ 694 $table->add (0, $y, new CFClient::UI::VBox children => [
694 (new CFClient::UI::Button text => "Use", connect_activate => sub { 695 (new CFClient::UI::Button text => "Use", on_activate => sub {
695 $HOST->set_text ($CFG->{host} = $host); 696 $HOST_ENTRY->set_text ($CFG->{host} = $host);
697 $METASERVER->toggle_visibility;
696 }), 698 }),
697 (new CFClient::UI::Empty expand => 1), 699 (new CFClient::UI::Empty expand => 1),
698 ]); 700 ]);
699 701
700 $table->add ($_ + 1, $y, new CFClient::UI::Label 702 $table->add ($_ + 1, $y, new CFClient::UI::Label
… …
703 } 705 }
704 } 706 }
705 }); 707 });
706} 708}
707 709
710sub metaserver_dialog {
711 my $dialog = new CFClient::UI::FancyFrame
712 title => "Server List",
713 name => 'metaserver_dialog',
714 x => 'center',
715 y => 'center',
716 child => (my $vbox = new CFClient::UI::VBox),
717 on_visibility_change => sub {
718 update_metaserver if $_[1];
719 },
720 ;
721
722 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
723
724 $dialog
725}
726
708sub server_setup { 727sub server_setup {
709 my $dialog = new CFClient::UI::FancyFrame
710 name => "server_setup",
711 title => "Server Setup",
712 child => (my $vbox = new CFClient::UI::VBox); 728 my $vbox = new CFClient::UI::VBox;
713 729
714 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 730 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
715 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port"); 731 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");
716 732
717 { 733 {
718 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 734 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
719 735
720 $vbox->add ( 736 $vbox->add (
721 my $HOST = new CFClient::UI::Entry 737 $HOST_ENTRY = new CFClient::UI::Entry
722 expand => 1, 738 expand => 1,
723 text => $CFG->{host}, 739 text => $CFG->{host},
724 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 740 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
725 connect_changed => sub { 741 on_changed => sub {
726 my ($self, $value) = @_; 742 my ($self, $value) = @_;
727 $CFG->{host} = $value; 743 $CFG->{host} = $value;
728 } 744 }
729 ); 745 );
730 746
731 $METASERVER = metaserver_dialog; 747 $METASERVER = metaserver_dialog;
732 748
733 $vbox->add (new CFClient::UI::Flopper 749 $vbox->add (new CFClient::UI::Button
734 expand => 1, 750 expand => 1,
735 text => "Server List", 751 text => "Server List",
736 other => $METASERVER, 752 other => $METASERVER,
737 tooltip => "Show a list of available crossfire servers", 753 tooltip => "Show a list of available crossfire servers",
738 connect_open => sub { 754 on_activate => sub { $METASERVER->toggle_visibility },
739 update_metaserver $HOST;
740 }
741 ); 755 );
742 } 756 }
743 757
744 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username"); 758 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
745 $table->add (1, 4, new CFClient::UI::Entry 759 $table->add (1, 4, new CFClient::UI::Entry
746 text => $CFG->{user}, 760 text => $CFG->{user},
747 tooltip => "The name of your character on the server", 761 tooltip => "The name of your character on the server",
748 connect_changed => sub { 762 on_changed => sub {
749 my ($self, $value) = @_; 763 my ($self, $value) = @_;
750 $CFG->{user} = $value; 764 $CFG->{user} = $value;
751 } 765 }
752 ); 766 );
753 767
754 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password"); 768 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password");
755 $table->add (1, 5, new CFClient::UI::Entry 769 $table->add (1, 5, new CFClient::UI::Entry
756 text => $CFG->{password}, 770 text => $CFG->{password},
757 hidden => 1, 771 hidden => 1,
758 tooltip => "The password for your character", 772 tooltip => "The password for your character",
759 connect_changed => sub { 773 on_changed => sub {
760 my ($self, $value) = @_; 774 my ($self, $value) = @_;
761 $CFG->{password} = $value; 775 $CFG->{password} = $value;
762 } 776 }
763 ); 777 );
764 778
765 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size"); 779 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
766 $table->add (1, 7, new CFClient::UI::Slider 780 $table->add (1, 7, new CFClient::UI::Slider
767 req_w => 100, 781 force_w => 100,
768 range => [$CFG->{mapsize}, 10, 100, 0, 1], 782 range => [$CFG->{mapsize}, 10, 100, 0, 1],
769 tooltip => "This is the size of the portion of the map update the server sends you. " 783 tooltip => "This is the size of the portion of the map update the server sends you. "
770 . "If you set this to a high value you will be able to see further, " 784 . "If you set this to a high value you will be able to see further, "
771 . "but you also increase bandwidth requirements and latency. " 785 . "but you also increase bandwidth requirements and latency. "
772 . "This option is only used once at log-in.", 786 . "This option is only used once at log-in.",
773 connect_changed => sub { 787 on_changed => sub {
774 my ($self, $value) = @_; 788 my ($self, $value) = @_;
775 789
776 $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 790 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
777 }, 791 },
778 ); 792 );
… …
785 . "This might increase or create lag, but increases the chances " 799 . "This might increase or create lag, but increases the chances "
786 . "of faces being ready for display when you encounter them. " 800 . "of faces being ready for display when you encounter them. "
787 . "It also uses up server bandwidth on every connect, " 801 . "It also uses up server bandwidth on every connect, "
788 . "so only set it if you really need to prefetch images. " 802 . "so only set it if you really need to prefetch images. "
789 . "This option can be set and unset any time.", 803 . "This option can be set and unset any time.",
790 connect_changed => sub { $CFG->{face_prefetch} = $_[1] }, 804 on_changed => sub { $CFG->{face_prefetch} = $_[1] },
791 ); 805 );
792 806
793 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count"); 807 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count");
794 $table->add (1, 9, new CFClient::UI::Entry 808 $table->add (1, 9, new CFClient::UI::Entry
795 text => $CFG->{output_count}, 809 text => $CFG->{output_count},
796 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 810 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
797 connect_changed => sub { $CFG->{output_count} = $_[1] }, 811 on_changed => sub { $CFG->{output_count} = $_[1] },
798 ); 812 );
799 813
800 $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync"); 814 $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync");
801 $table->add (1, 10, new CFClient::UI::Entry 815 $table->add (1, 10, new CFClient::UI::Entry
802 text => $CFG->{output_sync}, 816 text => $CFG->{output_sync},
803 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 817 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
804 connect_changed => sub { $CFG->{output_sync} = $_[1] }, 818 on_changed => sub { $CFG->{output_sync} = $_[1] },
805 ); 819 );
806 820
807 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button 821 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button
808 expand => 1, 822 expand => 1,
809 align => 0, 823 align => 0,
810 text => "Login", 824 text => "Login",
811 connect_activate => sub { 825 on_activate => sub {
812 $CONN ? stop_game 826 $CONN ? stop_game
813 : start_game; 827 : start_game;
814 }, 828 },
815 ); 829 );
816 830
817 $dialog 831 $table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command");
832 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry
833 text => $CFG->{say_command},
834 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. "
835 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
836 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
837 on_changed => sub {
838 my ($self, $value) = @_;
839 $CFG->{say_command} = $value;
840 }
841 );
842
843 $vbox
818} 844}
819 845
820sub message_window { 846sub message_window {
821 my $window = new CFClient::UI::FancyFrame 847 my $window = new CFClient::UI::FancyFrame
822 name => "message_window", 848 name => "message_window",
823 title => "Messages", 849 title => "Messages",
824 border_bg => [1, 1, 1, 1], 850 border_bg => [1, 1, 1, 1],
825 bg => [0, 0, 0, 0.75], 851 bg => [0, 0, 0, 0.75],
852 x => "max",
853 y => 0,
826 user_w => int $::WIDTH / 3, 854 force_w => $::WIDTH / 3,
827 user_h => int $::HEIGHT / 5, 855 force_h => $::HEIGHT / 5,
828 child => (my $vbox = new CFClient::UI::VBox); 856 child => (my $vbox = new CFClient::UI::VBox);
829 857
830 $vbox->add ($LOGVIEW); 858 $vbox->add ($LOGVIEW);
831 859
832 $vbox->add (my $input = new CFClient::UI::Entry 860 $vbox->add (my $input = new CFClient::UI::Entry
833 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> " 861 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
834 . "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). " 862 . "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "
835 . "If you prepend a slash (/), you will submit a command instead (similar to IRC). " 863 . "If you prepend a slash (/), you will submit a command instead (similar to IRC). "
836 . "A better way to submit commands (and the occasional chat command) is often the map command completer.", 864 . "A better way to submit commands (and the occasional chat command) is often the map command completer.",
837 connect_focus_in => sub { 865 on_focus_in => sub {
838 my ($input, $prev_focus) = @_; 866 my ($input, $prev_focus) = @_;
839 867
840 delete $input->{refocus_map}; 868 delete $input->{refocus_map};
841 869
842 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) { 870 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
843 $input->{refocus_map} = 1; 871 $input->{refocus_map} = 1;
844 } 872 }
845 delete $input->{auto_activated}; 873 delete $input->{auto_activated};
846 }, 874 },
847 connect_activate => sub { 875 on_activate => sub {
848 my ($input, $text) = @_; 876 my ($input, $text) = @_;
849 $input->set_text (''); 877 $input->set_text ('');
850 878
851 if ($text =~ /^\/(.*)/) { 879 if ($text =~ /^\/(.*)/) {
852 $::CONN->user_send ($1); 880 $::CONN->user_send ($1);
… …
857 if ($input->{refocus_map}) { 885 if ($input->{refocus_map}) {
858 delete $input->{refocus_map}; 886 delete $input->{refocus_map};
859 $MAPWIDGET->focus_in 887 $MAPWIDGET->focus_in
860 } 888 }
861 }, 889 },
862 connect_escape => sub { 890 on_escape => sub {
863 $MAPWIDGET->focus_in 891 $MAPWIDGET->focus_in
864 }, 892 },
865 ); 893 );
866 894
867 $CONSOLE = { 895 $CONSOLE = {
868 window => $window, 896 window => $window,
869 input => $input 897 input => $input,
870 }; 898 };
871 899
872 $window 900 $window
873} 901}
874 902
875sub open_quit_dialog { 903sub open_quit_dialog {
876 unless ($QUIT_DIALOG) { 904 unless ($QUIT_DIALOG) {
877
878 $QUIT_DIALOG = new CFClient::UI::FancyFrame title => "Really Quit?"; 905 $QUIT_DIALOG = new CFClient::UI::FancyFrame
906 x => "center",
907 y => "center",
908 title => "Really Quit?",
909 ;
879 910
880 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1); 911 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
881 912
882 $vb->add (new CFClient::UI::Label 913 $vb->add (new CFClient::UI::Label
883 text => "You should find a savebed and apply it first!", 914 text => "You should find a savebed and apply it first!",
… …
886 ); 917 );
887 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 918 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
888 $hb->add (new CFClient::UI::Button 919 $hb->add (new CFClient::UI::Button
889 text => "Ok", 920 text => "Ok",
890 expand => 1, 921 expand => 1,
891 connect_activate => sub { $QUIT_DIALOG->hide }, 922 on_activate => sub { $QUIT_DIALOG->hide },
892 ); 923 );
893 $hb->add (new CFClient::UI::Button 924 $hb->add (new CFClient::UI::Button
894 text => "Quit anyway", 925 text => "Quit anyway",
895 expand => 1, 926 expand => 1,
896 connect_activate => sub { exit }, 927 on_activate => sub { exit },
897 ); 928 );
929 }
898 930
899 $QUIT_DIALOG->show_centered; 931 $QUIT_DIALOG->show;
900 } else { 932}
901 $QUIT_DIALOG->show_centered; 933
934sub autopickup_setup {
935 my $table = new CFClient::UI::Table;
936
937 for (
938 ["General", 0, 0,
939 ["Enable autopickup" => CFClient::Pickup::PU_NEWMODE],
940 ["Inhibit autopickup" => CFClient::Pickup::PU_INHIBIT],
941 ["Stop before pickup" => CFClient::Pickup::PU_STOP],
942 ["Debug autopickup" => CFClient::Pickup::PU_DEBUG],
943 ],
944 ["Weapons", 0, 6,
945 ["All weapons" => CFClient::Pickup::PU_ALLWEAPON],
946 ["Missile weapons" => CFClient::Pickup::PU_MISSILEWEAPON],
947 ["Bows" => CFClient::Pickup::PU_BOW],
948 ["Arrows" => CFClient::Pickup::PU_ARROW],
949 ],
950 ["Armour", 0, 12,
951 ["Helmets" => CFClient::Pickup::PU_HELMET],
952 ["Shields" => CFClient::Pickup::PU_SHIELD],
953 ["Body Armour" => CFClient::Pickup::PU_ARMOUR],
954 ["Boots" => CFClient::Pickup::PU_BOOTS],
955 ["Gloves" => CFClient::Pickup::PU_GLOVES],
956 ["Cloaks" => CFClient::Pickup::PU_CLOAK],
957 ],
958
959 ["Readables", 2, 2,
960 ["Spellbooks" => CFClient::Pickup::PU_SPELLBOOK],
961 ["Skillscrolls" => CFClient::Pickup::PU_SKILLSCROLL],
962 ["Normal Books/Scrolls" => CFClient::Pickup::PU_READABLES],
963 ],
964 ["Misc", 2, 7,
965 ["Food" => CFClient::Pickup::PU_FOOD],
966 ["Drinks" => CFClient::Pickup::PU_DRINK],
967 ["Valuables (Money, Gems)" => CFClient::Pickup::PU_VALUABLES],
968 ["Keys" => CFClient::Pickup::PU_KEY],
969 ["Magical Items" => CFClient::Pickup::PU_MAGICAL],
970 ["Potions" => CFClient::Pickup::PU_POTION],
971 ["Magic Devices" => CFClient::Pickup::PU_MAGIC_DEVICE],
972 ["Ignore cursed" => CFClient::Pickup::PU_NOT_CURSED],
973 ["Jewelery" => CFClient::Pickup::PU_JEWELS],
974 ],
975 )
902 } 976 {
977 my ($title, $x, $y, @bits) = @$_;
978 $table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
979
980 for (@bits) {
981 ++$y;
982
983 my $mask = $_->[1];
984 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);
985 $table->add ($x+1, $y, new CFClient::UI::CheckBox
986 state => $CFG->{pickup} & $mask,
987 on_changed => sub {
988 my ($box, $value) = @_;
989 if ($value) {
990 $::CFG->{pickup} |= $mask;
991 } else {
992 $::CFG->{pickup} = $::CFG->{pickup} & ~$mask;
993 }
994 $::CONN->send (sprintf "command pickup %u", $::CFG->{pickup})
995 if defined $::CONN;
996 });
997 }
998 }
999
1000 $table
903} 1001}
904 1002
905sub make_inventory_window { 1003sub make_inventory_window {
906 my $invwin = new CFClient::UI::FancyFrame 1004 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
907 user_w => $WIDTH * (7/8), user_h => $HEIGHT * (7/8), title => "Inventory", name => "inventory_window"; 1005 x => "center",
1006 y => "center",
1007 force_w => $WIDTH * 9/10,
1008 force_h => $HEIGHT * 9/10,
1009 title => "Inventory",
1010 ;
908 1011
909 $invwin->add (my $hb = new CFClient::UI::HBox expand => 1); 1012 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);
910 1013
911 $hb->add (my $vb1 = new CFClient::UI::VBox expand => 1); 1014 $hb->add (my $vb1 = new CFClient::UI::VBox);
912 $vb1->add (my $lbl = new CFClient::UI::Label align => 0); 1015 $vb1->add (new CFClient::UI::Label align => 0, text => "Player");
913 $lbl->set_text ("Player");
914 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1); 1016 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1);
915 1017
916 $hb->add (my $vb2 = new CFClient::UI::VBox expand => 1); 1018 $hb->add (my $vb2 = new CFClient::UI::VBox);
1019
1020 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
1021
1022 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
1023
1024 # XXX: Call after $INVR = ... because set_opencont sets the items
1025 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1026
1027 $invwin
1028}
1029
1030sub spell_setup {
1031 new CFClient::UI::SpellList
1032}
1033
1034sub keyboard_setup {
1035 my $binding_list = new CFClient::UI::VBox;
1036
1037 my $refresh;
1038 $refresh = sub {
1039 $binding_list->clear ();
1040
1041 for my $mod (keys %{$::CFG->{bindings}}) {
1042 for my $sym (keys %{$::CFG->{bindings}->{$mod}}) {
1043 my $cmds = $::CFG->{bindings}->{$mod}->{$sym};
1044 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1045
1046 my $lbl = join "; ", @$cmds;
1047 my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym);
1048 $binding_list->add (my $hb = new CFClient::UI::HBox);
1049 $hb->add (new CFClient::UI::Button
1050 text => "delete",
1051 tooltip => "Deletes the binding",
1052 on_activate => sub {
1053 $binding_list->remove ($hb);
1054 delete $::CFG->{bindings}->{$mod}->{$sym};
1055 });
1056
1057 $hb->add (new CFClient::UI::Button
1058 text => "edit",
1059 tooltip => "Edits the binding",
1060 on_activate => sub {
1061 $::BIND_EDITOR->set_binding (
1062 $mod, $sym, $::CFG->{bindings}->{$mod}->{$sym},
1063 sub {
1064 my ($nmod, $nsym, $ncmds) = @_;
1065 delete $::CFG->{bindings}->{$mod}->{$sym};
1066 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds;
1067 $refresh->();
1068 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1069 $SETUP_DIALOG->show;
1070 },
1071 sub {
1072 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1073 $SETUP_DIALOG->show;
1074 });
1075 $::BIND_EDITOR->show;
1076 $SETUP_DIALOG->hide;
1077 });
1078
1079 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
1080 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
1081 }
1082 }
1083 };
1084
1085 my $vb = new CFClient::UI::VBox;
1086 $vb->add ($binding_list);
917 $vb2->add (my $hb2 = new CFClient::UI::HBox); 1087 $vb->add (my $hb = new CFClient::UI::HBox);
1088
918 $hb2->add (new CFClient::UI::Button 1089 $hb->add (new CFClient::UI::Button
919 text => "Close", 1090 text => "record new",
920 tooltip => "Close the currently open container (if one is open)", 1091 expand => 1,
1092 tooltip => "This button opens the binding editor with an empty binding.",
921 connect_activate => sub { 1093 on_activate => sub {
922 $CONN->send ("apply $CONN->{open_container}") 1094 $::BIND_EDITOR->set_binding (undef, undef, [],
923 if $CONN->{open_container} != 0; 1095 sub {
1096 my ($mod, $sym, $cmds) = @_;
1097 $::CFG->{bindings}->{$mod}->{$sym} = $cmds;
1098 $refresh->();
1099 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1100 $SETUP_DIALOG->show;
1101 },
1102 sub {
1103 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1104 $SETUP_DIALOG->show;
1105 });
1106 $SETUP_DIALOG->hide;
1107 $::BIND_EDITOR->show;
924 }, 1108 },
925 ); 1109 );
926 $hb2->add ($INVR_LBL = new CFClient::UI::Label align => 0);
927 1110
928 $INVR_LBL->set_text ("Floor"); 1111 $hb->add (new CFClient::UI::Button
929 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1); 1112 text => "close",
1113 tooltip => "Closes the binding window",
1114 expand => 1,
1115 on_activate => sub {
1116 $SETUP_DIALOG->hide;
1117 }
1118 );
930 1119
931 $invwin 1120 $refresh->();
1121
1122 $vb
932} 1123}
933 1124
934sub make_help_window { 1125sub make_help_window {
935 my $win = new CFClient::UI::FancyFrame 1126 my $win = new CFClient::UI::FancyFrame
936 user_w => $WIDTH * (7/8), user_h => $HEIGHT * (7/8), title => "Documentation"; 1127 x => 'center',
1128 y => 'center',
1129 name => 'doc_browser',
1130 force_w => int $WIDTH * 7/8,
1131 force_h => int $HEIGHT * 7/8,
1132 title => "Documentation";
937 1133
938 $win->add (my $vbox = new CFClient::UI::VBox); 1134 $win->add (my $vbox = new CFClient::UI::VBox);
939 1135
940 $vbox->add (my $buttons = new CFClient::UI::HBox); 1136 $vbox->add (my $buttons = new CFClient::UI::HBox);
941 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8); 1137 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8);
… …
948 ) { 1144 ) {
949 my ($pod, $label) = @$_; 1145 my ($pod, $label) = @$_;
950 1146
951 $buttons->add (new CFClient::UI::Button 1147 $buttons->add (new CFClient::UI::Button
952 text => $label, 1148 text => $label,
953 connect_activate => sub { 1149 on_activate => sub {
954 my $parser = new Pod::POM; 1150 my $parser = new Pod::POM;
955 my $pom = $parser->parse_file (CFClient::find_rcfile "pod/$pod.pod"); 1151 my $pom = $parser->parse_file (CFClient::find_rcfile "pod/$pod.pod");
956 1152
957 $viewer->clear; 1153 $viewer->clear;
958 1154
… …
1002 if ($DEBUG_STATUS) { 1198 if ($DEBUG_STATUS) {
1003 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 1199 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1004 } else { 1200 } else {
1005 # create the widgets 1201 # create the widgets
1006 1202
1007 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, req_x => -1; 1203 $DEBUG_STATUS = new CFClient::UI::Label
1204 padding => 0,
1205 z => 100,
1206 force_x => "max",
1207 force_y => 0;
1008 $DEBUG_STATUS->show; 1208 $DEBUG_STATUS->show;
1009 1209
1210 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);
1211
1010 $STATUSBOX = new CFClient::UI::Statusbox; 1212 $STATUSBOX = new CFClient::UI::Statusbox;
1011 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]); 1213 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]);
1012 1214
1013 (new CFClient::UI::Frame 1215 (new CFClient::UI::Frame
1014 bg => [0, 0, 0, 0.4], 1216 bg => [0, 0, 0, 0.4],
1015 req_y => -1, 1217 force_x => 0,
1218 force_y => "max",
1016 child => $STATUSBOX, 1219 child => $STATUSBOX,
1017 )->show; 1220 )->show;
1018 1221
1019 CFClient::UI::FancyFrame->new ( 1222 CFClient::UI::FancyFrame->new (
1223 title => "Map",
1224 name => "mapmap",
1225 x => 0,
1226 y => $FONTSIZE + 8,
1020 border_bg => [1, 1, 1, 192/255], 1227 border_bg => [1, 1, 1, 192/255],
1021 bg => [1, 1, 1, 0], 1228 bg => [1, 1, 1, 0],
1022 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1229 child => ($MAPMAP = new CFClient::MapWidget::MapMap
1023 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.", 1230 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
1024 ), 1231 ),
… …
1047 can_hover => 1, 1254 can_hover => 1,
1048 can_events => 1, 1255 can_events => 1,
1049 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1256 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1050 ; 1257 ;
1051 1258
1259 $SETUP_DIALOG = new CFClient::UI::FancyFrame
1260 title => "Setup",
1261 name => "setup_dialog",
1262 x => 'center',
1263 y => 'center',
1264 force_w => $::WIDTH * 0.6,
1265 force_h => $::HEIGHT * 0.6,
1266 ;
1267
1268 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,
1269 filter => new CFClient::UI::ScrolledWindow xxx => 1, expand => 1, scroll_y => 1);
1270
1271 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1272 "Configure the server to play on, your username, password and other server-related options.");
1273 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1274 "Configure autopicking stetings, i.e. which items you will pick up automatically when walking over them.");
1275 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1276 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1277 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1278 "Configure the use of audio, sound effects and background music.");
1279 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1280 "Lets you define, edit and delete bindings."
1281 . "There is a shortcut for making bindings: Left Control + Insert opens the binding editor "
1282 . "with nothing set and the recording started. After doing the actions you "
1283 . "want to record press Insert and you will be asked to press a key-combo."
1284 . "After pressing the combo the binding will be saved automatically and the "
1285 . "binding editor closes");
1286 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup,
1287 "Displays all spells you have and lets you edit keyboard shortcuts for them.");
1288
1052 $BUTTONBAR = new CFClient::UI::HBox; 1289 $BUTTONBAR = new CFClient::UI::HBox x => 0, y => 0;
1053 1290
1054 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup, 1291 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1055 tooltip => "Toggles a dialog where you can configure various aspects of the client, such as graphics mode, performance, and audio options."); 1292 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1056 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup, 1293
1057 tooltip => "Toggles a dialog where you can configure the server to play on, your username, password and other server-related options.");
1058 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window, 1294 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window,
1059 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 1295 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1060 1296
1061 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 1297 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
1062 1298
1063 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window, 1299 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window,
1064 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times."); 1300 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1065 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window, 1301 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window,
1066 tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :)."); 1302 tooltip => "Toggles the inventory window, where you can manage your loot (or treasures :). "
1303 ."You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1067 1304
1068 $BUTTONBAR->add (new CFClient::UI::Button 1305 $BUTTONBAR->add (new CFClient::UI::Button
1069 text => "Save Config", 1306 text => "Save Config",
1070 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 1307 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1071 connect_activate => sub { 1308 on_activate => sub {
1072 $::CFG->{layout} = CFClient::UI::get_layout; 1309 $::CFG->{layout} = CFClient::UI::get_layout;
1073 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 1310 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1074 status "Configuration Saved"; 1311 status "Configuration Saved";
1075 }, 1312 },
1076 ); 1313 );
1077 1314
1078 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window, 1315 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window,
1079 tooltip => "View Documentation"); 1316 tooltip => "View Documentation");
1080 1317
1081 $BUTTONBAR->add (new CFClient::UI::Button 1318 $BUTTONBAR->add (new CFClient::UI::Button
1082 text => "Quit", 1319 text => "Quit",
1083 tooltip => "Terminates the program", 1320 tooltip => "Terminates the program",
1084 connect_activate => sub { 1321 on_activate => sub {
1085 if ($CONN) { 1322 if ($CONN) {
1086 open_quit_dialog; 1323 open_quit_dialog;
1087 } else { 1324 } else {
1088 exit; 1325 exit;
1089 } 1326 }
1090 }, 1327 },
1091 ); 1328 );
1092 1329
1093 $BUTTONBAR->show; 1330 $BUTTONBAR->show;
1331 $SETUP_DIALOG->show;
1332 }
1094 1333
1095 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1334 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1096
1097 # delay till geometry is constant
1098 $CFClient::UI::ROOT->on_post_alloc (startup => sub {
1099 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
1100 my $widget = $GAUGES->{win};
1101 $widget->move (0, $HEIGHT - $widget->{h});#d# to in toplevel
1102 });
1103 force_refresh ();
1104 }
1105} 1335}
1106 1336
1107sub video_shutdown { 1337sub video_shutdown {
1108 undef $SDL_ACTIVE; 1338 undef $SDL_ACTIVE;
1109} 1339}
… …
1176 1406
1177my %demo;#d# 1407my %demo;#d#
1178 1408
1179sub force_refresh { 1409sub force_refresh {
1180 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 1410 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
1181 debug sprintf "%3.2f", $fps; 1411 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1182 1412
1183 $CFClient::UI::ROOT->draw; 1413 $CFClient::UI::ROOT->draw;
1184 1414
1185 $WANT_REFRESH = 0; 1415 $WANT_REFRESH = 0;
1186 $CAN_REFRESH = 0; 1416 $CAN_REFRESH = 0;
… …
1241}; 1471};
1242 1472
1243 CFClient::SDL_GL_SwapBuffers; 1473 CFClient::SDL_GL_SwapBuffers;
1244} 1474}
1245 1475
1246my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub { 1476my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1247 $NOW = time; 1477 $NOW = time;
1248 1478
1249 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 1479 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1250 for CFClient::SDL_PollEvent; 1480 for CFClient::SDL_PollEvent;
1251 1481
… …
1318############################################################################# 1548#############################################################################
1319 1549
1320$SIG{INT} = $SIG{TERM} = sub { exit }; 1550$SIG{INT} = $SIG{TERM} = sub { exit };
1321 1551
1322{ 1552{
1323 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] }; 1553 local $SIG{__DIE__} = sub {
1554 return unless defined $^S && !$^S;
1555 Carp::confess $_[1];#d#TODO: remove when stable
1556 CFClient::fatal $_[0];
1557 };
1324 1558
1325 CFClient::read_cfg "$Crossfire::VARDIR/pclientrc"; 1559 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1326 CFClient::UI::set_layout ($::CFG->{layout}); 1560 CFClient::UI::set_layout ($::CFG->{layout});
1327 1561
1328 my %DEF_CFG = ( 1562 my %DEF_CFG = (
1329 sdl_mode => 0, 1563 sdl_mode => 0,
1330 width => 640, 1564 width => 640,
… …
1408 1642
1409END { CFClient::SDL_Quit } 1643END { CFClient::SDL_Quit }
1410 1644
1411=head1 NAME 1645=head1 NAME
1412 1646
1413pclient - A Crossfire+ and Crossfire game client 1647cfplus - A Crossfire+ and Crossfire game client
1414 1648
1415=head1 SYNOPSIS 1649=head1 SYNOPSIS
1416 1650
1417Just run it - no commandline arguments are supported. 1651Just run it - no commandline arguments are supported.
1418 1652
1419=head1 USAGE 1653=head1 USAGE
1420 1654
1421Pclient utilises OpenGL for all UI elements and the game. It is supposed to be used 1655cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used
1422fullscreen and interactively. 1656fullscreen and interactively.
1423 1657
1658=head1 DEBUGGING
1659
1660
1661CFPLUS_DEBUG - environment variable
1662
1663 1 draw borders around widgets
1664 2 add low-level widget info to tooltips
1665 4 show fps
1666 8 suppress tooltips
1667
1424=head1 AUTHOR 1668=head1 AUTHOR
1425 1669
1426Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 1670Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
1427 1671
1428 1672

Diff Legend

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