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.17 by elmex, Sat May 27 20:26:22 2006 UTC vs.
Revision 1.26 by elmex, Mon May 29 20:12:15 2006 UTC

… …
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
103our $INV_WINDOW;
102our $INV; 104our $INV;
103our $INVR; 105our $INVR;
104our $INVR_LBL; 106our $INVR_LBL;
107
108our $BIND_WINDOW;
105 109
106sub status { 110sub status {
107 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 111 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
108} 112}
109 113
… …
113 $DEBUG_STATUS->move ($WIDTH - $w, 0); 117 $DEBUG_STATUS->move ($WIDTH - $w, 0);
114} 118}
115 119
116sub start_game { 120sub start_game {
117 status "logging in..."; 121 status "logging in...";
122
123 $LOGIN_BUTTON->set_text ("Logout");
124 $SERVER_SETUP->hide;
118 125
119 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 126 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
120 127
121 my ($host, $port) = split /:/, $CFG->{host}; 128 my ($host, $port) = split /:/, $CFG->{host};
122 129
… …
151 }; 158 };
152 159
153 if ($CONN) { 160 if ($CONN) {
154 CFClient::lowdelay fileno $CONN->{fh}; 161 CFClient::lowdelay fileno $CONN->{fh};
155 162
156 $LOGIN_BUTTON->set_text ("Logout");
157 status "login successful"; 163 status "login successful";
158
159 $BUTTONBAR->{children}[1]->emit ("activate")
160 if $BUTTONBAR->{children}[1]->{state};
161
162 } else { 164 } else {
163 status "unable to connect"; 165 status "unable to connect";
164 stop_game(); 166 stop_game();
165 } 167 }
166} 168}
167 169
168sub stop_game { 170sub stop_game {
171 $LOGIN_BUTTON->set_text ("Login");
172 $SERVER_SETUP->show;
173 $INV_WINDOW->hide;
174 $LOGVIEW->hide;
175
169 return unless $CONN; 176 return unless $CONN;
170 177
171 status "connection closed"; 178 status "connection closed";
172 $LOGIN_BUTTON->set_text ("Login"); 179
173 $CONN->destroy; 180 $CONN->destroy;
174 $CONN = 0; # false, does not autovivify 181 $CONN = 0; # false, does not autovivify
175
176 $BUTTONBAR->{children}[1]->emit ("activate")
177 unless $BUTTONBAR->{children}[1]->{state};
178} 182}
179 183
180sub client_setup { 184sub client_setup {
181 my $dialog = new CFClient::UI::FancyFrame 185 my $dialog = new CFClient::UI::FancyFrame
186 req_x => 1,
187 req_y => $HEIGHT * (1/8),
182 name => "client_setup", 188 name => "client_setup",
183 title => "Client Setup", 189 title => "Client Setup",
184 child => (my $vbox = new CFClient::UI::VBox); 190 child => (my $vbox = new CFClient::UI::VBox);
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
… …
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::OpenGL::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 (
394 req_x => 0,
388 req_y => -1, 395 req_y => -1,
389 user_w => $WIDTH, 396 def_w => $WIDTH,
390 user_h => $gh, 397 def_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", name => "stats_window"; 445 my $tgw = new CFClient::UI::FancyFrame
446 req_y => $HEIGHT * (2/8),
447 req_x => -1,
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.");
… …
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 => $WIDTH * (1/3),
723 y => $HEIGHT * (1/8),
710 name => "server_setup", 724 name => "server_setup",
711 title => "Server Setup", 725 title => "Server Setup",
712 child => (my $vbox = new CFClient::UI::VBox); 726 child => (my $vbox = new CFClient::UI::VBox),
727 on_visibility_change => sub {
728 my ($self, $visible) = @_;
729 $self->center if $visible;
730 },
713 731 ;
732
714 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 733 $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"); 734 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");
716 735
717 { 736 {
718 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 737 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
… …
720 $vbox->add ( 739 $vbox->add (
721 my $HOST = new CFClient::UI::Entry 740 my $HOST = new CFClient::UI::Entry
722 expand => 1, 741 expand => 1,
723 text => $CFG->{host}, 742 text => $CFG->{host},
724 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 743 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
725 connect_changed => sub { 744 on_changed => sub {
726 my ($self, $value) = @_; 745 my ($self, $value) = @_;
727 $CFG->{host} = $value; 746 $CFG->{host} = $value;
728 } 747 }
729 ); 748 );
730 749
… …
733 $vbox->add (new CFClient::UI::Flopper 752 $vbox->add (new CFClient::UI::Flopper
734 expand => 1, 753 expand => 1,
735 text => "Server List", 754 text => "Server List",
736 other => $METASERVER, 755 other => $METASERVER,
737 tooltip => "Show a list of available crossfire servers", 756 tooltip => "Show a list of available crossfire servers",
738 connect_open => sub { 757 on_open => sub {
739 update_metaserver $HOST; 758 update_metaserver $HOST;
740 } 759 }
741 ); 760 );
742 } 761 }
743 762
744 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username"); 763 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
745 $table->add (1, 4, new CFClient::UI::Entry 764 $table->add (1, 4, new CFClient::UI::Entry
746 text => $CFG->{user}, 765 text => $CFG->{user},
747 tooltip => "The name of your character on the server", 766 tooltip => "The name of your character on the server",
748 connect_changed => sub { 767 on_changed => sub {
749 my ($self, $value) = @_; 768 my ($self, $value) = @_;
750 $CFG->{user} = $value; 769 $CFG->{user} = $value;
751 } 770 }
752 ); 771 );
753 772
754 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password"); 773 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password");
755 $table->add (1, 5, new CFClient::UI::Entry 774 $table->add (1, 5, new CFClient::UI::Entry
756 text => $CFG->{password}, 775 text => $CFG->{password},
757 hidden => 1, 776 hidden => 1,
758 tooltip => "The password for your character", 777 tooltip => "The password for your character",
759 connect_changed => sub { 778 on_changed => sub {
760 my ($self, $value) = @_; 779 my ($self, $value) = @_;
761 $CFG->{password} = $value; 780 $CFG->{password} = $value;
762 } 781 }
763 ); 782 );
764 783
… …
768 range => [$CFG->{mapsize}, 10, 100, 0, 1], 787 range => [$CFG->{mapsize}, 10, 100, 0, 1],
769 tooltip => "This is the size of the portion of the map update the server sends you. " 788 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, " 789 . "If you set this to a high value you will be able to see further, "
771 . "but you also increase bandwidth requirements and latency. " 790 . "but you also increase bandwidth requirements and latency. "
772 . "This option is only used once at log-in.", 791 . "This option is only used once at log-in.",
773 connect_changed => sub { 792 on_changed => sub {
774 my ($self, $value) = @_; 793 my ($self, $value) = @_;
775 794
776 $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 795 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
777 }, 796 },
778 ); 797 );
… …
785 . "This might increase or create lag, but increases the chances " 804 . "This might increase or create lag, but increases the chances "
786 . "of faces being ready for display when you encounter them. " 805 . "of faces being ready for display when you encounter them. "
787 . "It also uses up server bandwidth on every connect, " 806 . "It also uses up server bandwidth on every connect, "
788 . "so only set it if you really need to prefetch images. " 807 . "so only set it if you really need to prefetch images. "
789 . "This option can be set and unset any time.", 808 . "This option can be set and unset any time.",
790 connect_changed => sub { $CFG->{face_prefetch} = $_[1] }, 809 on_changed => sub { $CFG->{face_prefetch} = $_[1] },
791 ); 810 );
792 811
793 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count"); 812 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count");
794 $table->add (1, 9, new CFClient::UI::Entry 813 $table->add (1, 9, new CFClient::UI::Entry
795 text => $CFG->{output_count}, 814 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.", 815 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] }, 816 on_changed => sub { $CFG->{output_count} = $_[1] },
798 ); 817 );
799 818
800 $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync"); 819 $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync");
801 $table->add (1, 10, new CFClient::UI::Entry 820 $table->add (1, 10, new CFClient::UI::Entry
802 text => $CFG->{output_sync}, 821 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.", 822 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] }, 823 on_changed => sub { $CFG->{output_sync} = $_[1] },
805 ); 824 );
806 825
807 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button 826 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button
808 expand => 1, 827 expand => 1,
809 align => 0, 828 align => 0,
810 text => "Login", 829 text => "Login",
811 connect_activate => sub { 830 on_activate => sub {
812 $CONN ? stop_game 831 $CONN ? stop_game
813 : start_game; 832 : start_game;
814 }, 833 },
815 ); 834 );
816 835
… …
821 my $window = new CFClient::UI::FancyFrame 840 my $window = new CFClient::UI::FancyFrame
822 name => "message_window", 841 name => "message_window",
823 title => "Messages", 842 title => "Messages",
824 border_bg => [1, 1, 1, 1], 843 border_bg => [1, 1, 1, 1],
825 bg => [0, 0, 0, 0.75], 844 bg => [0, 0, 0, 0.75],
845 req_x => -1,
846 req_y => 0,
826 user_w => int $::WIDTH / 3, 847 def_w => int $::WIDTH / 3,
827 user_h => int $::HEIGHT / 5, 848 def_h => int $::HEIGHT / 5,
828 child => (my $vbox = new CFClient::UI::VBox); 849 child => (my $vbox = new CFClient::UI::VBox);
829 850
830 $vbox->add ($LOGVIEW); 851 $vbox->add ($LOGVIEW);
831 852
832 $vbox->add (my $input = new CFClient::UI::Entry 853 $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> " 854 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>...). " 855 . "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). " 856 . "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.", 857 . "A better way to submit commands (and the occasional chat command) is often the map command completer.",
837 connect_focus_in => sub { 858 on_focus_in => sub {
838 my ($input, $prev_focus) = @_; 859 my ($input, $prev_focus) = @_;
839 860
840 delete $input->{refocus_map}; 861 delete $input->{refocus_map};
841 862
842 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) { 863 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
843 $input->{refocus_map} = 1; 864 $input->{refocus_map} = 1;
844 } 865 }
845 delete $input->{auto_activated}; 866 delete $input->{auto_activated};
846 }, 867 },
847 connect_activate => sub { 868 on_activate => sub {
848 my ($input, $text) = @_; 869 my ($input, $text) = @_;
849 $input->set_text (''); 870 $input->set_text ('');
850 871
872 if ($text =~ /^\/bind\s+(.*)$/) {
873 CFClient::Recorder::open_binding_dialog ([$1]);
851 if ($text =~ /^\/(.*)/) { 874 } elsif ($text =~ /^\/(.*)/) {
852 $::CONN->user_send ($1); 875 $::CONN->user_send ($1);
853 } else { 876 } else {
854 my $say_cmd = $::CFG->{say_command} || 'say'; 877 my $say_cmd = $::CFG->{say_command} || 'say';
855 $::CONN->user_send ("$say_cmd $text"); 878 $::CONN->user_send ("$say_cmd $text");
856 } 879 }
857 if ($input->{refocus_map}) { 880 if ($input->{refocus_map}) {
858 delete $input->{refocus_map}; 881 delete $input->{refocus_map};
859 $MAPWIDGET->focus_in 882 $MAPWIDGET->focus_in
860 } 883 }
861 }, 884 },
862 connect_escape => sub { 885 on_escape => sub {
863 $MAPWIDGET->focus_in 886 $MAPWIDGET->focus_in
864 }, 887 },
865 ); 888 );
866 889
867 $CONSOLE = { 890 $CONSOLE = {
… …
872 $window 895 $window
873} 896}
874 897
875sub open_quit_dialog { 898sub open_quit_dialog {
876 unless ($QUIT_DIALOG) { 899 unless ($QUIT_DIALOG) {
877
878 $QUIT_DIALOG = new CFClient::UI::FancyFrame title => "Really Quit?"; 900 $QUIT_DIALOG = new CFClient::UI::FancyFrame title => "Really Quit?";
879 901
880 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1); 902 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
881 903
882 $vb->add (new CFClient::UI::Label 904 $vb->add (new CFClient::UI::Label
… …
886 ); 908 );
887 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 909 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
888 $hb->add (new CFClient::UI::Button 910 $hb->add (new CFClient::UI::Button
889 text => "Ok", 911 text => "Ok",
890 expand => 1, 912 expand => 1,
891 connect_activate => sub { $QUIT_DIALOG->hide }, 913 on_activate => sub { $QUIT_DIALOG->hide },
892 ); 914 );
893 $hb->add (new CFClient::UI::Button 915 $hb->add (new CFClient::UI::Button
894 text => "Quit anyway", 916 text => "Quit anyway",
895 expand => 1, 917 expand => 1,
896 connect_activate => sub { exit }, 918 on_activate => sub { exit },
897 ); 919 );
920 }
898 921
922 $QUIT_DIALOG->show;
899 $QUIT_DIALOG->show_centered; 923 $QUIT_DIALOG->center;
900 } else {
901 $QUIT_DIALOG->show_centered;
902 }
903} 924}
904 925
905sub make_inventory_window { 926sub make_inventory_window {
906 my $invwin = new CFClient::UI::FancyFrame 927 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
907 user_w => $WIDTH * (7/8), user_h => $HEIGHT * (7/8), title => "Inventory", name => "inventory_window"; 928 def_w => $WIDTH * 7/8,
929 def_h => $HEIGHT * 7/8,
930 title => "Inventory",
931 name => "inventory_window",
932 on_visibility_change => sub {
933 my ($self, $visible) = @_;
934 $self->center if $visible;
935 },
936 ;
908 937
909 $invwin->add (my $hb = new CFClient::UI::HBox expand => 1); 938 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);
910 939
911 $hb->add (my $vb1 = new CFClient::UI::VBox expand => 1); 940 $hb->add (my $vb1 = new CFClient::UI::VBox);
912 $vb1->add (my $lbl = new CFClient::UI::Label align => 0); 941 $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); 942 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1);
915 943
916 $hb->add (my $vb2 = new CFClient::UI::VBox expand => 1); 944 $hb->add (my $vb2 = new CFClient::UI::VBox);
917 945
918 $vb2->add (my $hb2 = new CFClient::UI::HBox); 946 $vb2->add (my $hb2 = new CFClient::UI::HBox);
919 $hb2->add ($INVR_LBL = new CFClient::UI::Label align => 0, expand => 1); 947 $hb2->add ($INVR_LBL = new CFClient::UI::Label align => 0, expand => 1, text => "Floor");
920 $hb2->add (new CFClient::UI::Button 948 $hb2->add (new CFClient::UI::Button
921 text => "Close", 949 text => "Close container",
922 tooltip => "Close the currently open container (if one is open)", 950 tooltip => "Close the currently open container (if one is open)",
923 connect_activate => sub { 951 on_activate => sub {
924 $CONN->send ("apply $CONN->{open_container}") 952 $CONN->send ("apply $CONN->{open_container}")
925 if $CONN->{open_container} != 0; 953 if $CONN->{open_container} != 0;
926 }, 954 },
927 ); 955 );
928 956
929 $INVR_LBL->set_text ("Floor");
930 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1); 957 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
931 958
932 $invwin 959 $invwin
960}
961
962sub make_binding_window {
963 my $binding_list = new CFClient::UI::VBox;
964
965 my $refresh = sub {
966 $binding_list->clear ();
967
968 for my $mod (keys %{$::CFG->{bindings}}) {
969 for my $sym (keys %{$::CFG->{bindings}->{$mod}}) {
970 my $cmds = $::CFG->{bindings}->{$mod}->{$sym};
971 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
972
973 my $lbl = join "; ", @$cmds;
974 my $nam = CFClient::Recorder::keycombo_to_name ($mod, $sym);
975 $binding_list->add (my $hb = new CFClient::UI::HBox);
976 $hb->add (new CFClient::UI::Button
977 text => "delete",
978 on_activate => sub {
979 $binding_list->remove ($hb);
980 delete $::CFG->{bindings}->{$mod}->{$sym};
981 });
982 $hb->add (new CFClient::UI::Label text => "($nam)");
983 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
984 }
985 }
986 };
987
988 $BIND_WINDOW = new CFClient::UI::FancyFrame
989 title => "Bindings",
990 def_w => int $WIDTH * 7/8,
991 def_h => int $HEIGHT * 7/8,
992 on_visibility_change => sub {
993 my ($self, $visible) = @_;
994 if ($visible) {
995 $self->center;
996 $refresh->()
997 }
998 };
999
1000 $BIND_WINDOW->add ($binding_list);
1001 $refresh->();
1002 $BIND_WINDOW
933} 1003}
934 1004
935sub make_help_window { 1005sub make_help_window {
936 my $win = new CFClient::UI::FancyFrame 1006 my $win = new CFClient::UI::FancyFrame
937 user_w => $WIDTH * (7/8), user_h => $HEIGHT * (7/8), title => "Documentation"; 1007 def_w => int $WIDTH * 7/8,
1008 def_h => int $HEIGHT * 7/8,
1009 title => "Documentation";
938 1010
939 $win->add (my $vbox = new CFClient::UI::VBox); 1011 $win->add (my $vbox = new CFClient::UI::VBox);
940 1012
941 $vbox->add (my $buttons = new CFClient::UI::HBox); 1013 $vbox->add (my $buttons = new CFClient::UI::HBox);
942 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8); 1014 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8);
… …
949 ) { 1021 ) {
950 my ($pod, $label) = @$_; 1022 my ($pod, $label) = @$_;
951 1023
952 $buttons->add (new CFClient::UI::Button 1024 $buttons->add (new CFClient::UI::Button
953 text => $label, 1025 text => $label,
954 connect_activate => sub { 1026 on_activate => sub {
955 my $parser = new Pod::POM; 1027 my $parser = new Pod::POM;
956 my $pom = $parser->parse_file (CFClient::find_rcfile "pod/$pod.pod"); 1028 my $pom = $parser->parse_file (CFClient::find_rcfile "pod/$pod.pod");
957 1029
958 $viewer->clear; 1030 $viewer->clear;
959 1031
… …
1067 tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :)."); 1139 tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :).");
1068 1140
1069 $BUTTONBAR->add (new CFClient::UI::Button 1141 $BUTTONBAR->add (new CFClient::UI::Button
1070 text => "Save Config", 1142 text => "Save Config",
1071 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 1143 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1072 connect_activate => sub { 1144 on_activate => sub {
1073 $::CFG->{layout} = CFClient::UI::get_layout; 1145 $::CFG->{layout} = CFClient::UI::get_layout;
1074 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 1146 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
1075 status "Configuration Saved"; 1147 status "Configuration Saved";
1076 }, 1148 },
1077 ); 1149 );
1078 1150
1079 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window, 1151 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window,
1080 tooltip => "View Documentation"); 1152 tooltip => "View Documentation");
1081 1153
1154 $BUTTONBAR->add (new CFClient::UI::Flopper
1155 text => "Bindings",
1156 other => make_binding_window,
1157 tooltip => "Lets you delete bindings you have made with the recorder"
1158 );
1159 $BUTTONBAR->add (new CFClient::UI::Flopper text => "[Rec]", other => CFClient::Recorder::make_window,
1160 tooltip => "This feature lets you record a series of actions (eg. walking a path or ready a skill) and bind them to keys");
1161
1082 $BUTTONBAR->add (new CFClient::UI::Button 1162 $BUTTONBAR->add (new CFClient::UI::Button
1083 text => "Quit", 1163 text => "Quit",
1084 tooltip => "Terminates the program", 1164 tooltip => "Terminates the program",
1085 connect_activate => sub { 1165 on_activate => sub {
1086 if ($CONN) { 1166 if ($CONN) {
1087 open_quit_dialog; 1167 open_quit_dialog;
1088 } else { 1168 } else {
1089 exit; 1169 exit;
1090 } 1170 }
… …
1093 1173
1094 $BUTTONBAR->show; 1174 $BUTTONBAR->show;
1095 1175
1096 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1176 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1097 1177
1098 # delay till geometry is constant 1178 $SERVER_SETUP->show;
1099 $CFClient::UI::ROOT->on_post_alloc (startup => sub {
1100 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
1101 my $widget = $GAUGES->{win};
1102 $widget->move (0, $HEIGHT - $widget->{h});#d# to in toplevel
1103 });
1104 force_refresh ();
1105 } 1179 }
1106} 1180}
1107 1181
1108sub video_shutdown { 1182sub video_shutdown {
1109 undef $SDL_ACTIVE; 1183 undef $SDL_ACTIVE;

Diff Legend

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