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.19 by elmex, Sat May 27 21:15:57 2006 UTC vs.
Revision 1.72 by elmex, Tue Jun 13 18:14:03 2006 UTC

25# need to do it again because that pile of garbage called PAR nukes it before main 25# need to do it again because that pile of garbage called PAR nukes it before main
26unshift @INC, $ENV{PAR_TEMP} 26unshift @INC, $ENV{PAR_TEMP}
27 if %PAR::LibCache; 27 if %PAR::LibCache;
28 28
29use Time::HiRes 'time'; 29use Time::HiRes 'time';
30use Pod::POM;
31use Event; 30use Event;
32 31
33use Crossfire; 32use Crossfire;
34use Crossfire::Protocol::Constants; 33use Crossfire::Protocol::Constants;
35 34
39use CFClient::OpenGL (); 38use CFClient::OpenGL ();
40use CFClient::Protocol; 39use CFClient::Protocol;
41use CFClient::UI; 40use CFClient::UI;
42use CFClient::MapWidget; 41use CFClient::MapWidget;
43 42
43$SIG{QUIT} = sub { Carp::cluck "QUIT" };
44
44$Event::DIED = sub { 45$Event::DIED = sub {
45 # TODO: display dialog box or so 46 # TODO: display dialog box or so
47 Carp::confess $_[1];#d#TODO: remove when stable
46 CFClient::error $_[1]; 48 CFClient::error $_[1];
47}; 49};
48 50
49#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d# 51#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d#
50 52
81our $LOGVIEW; 83our $LOGVIEW;
82our $CONSOLE; 84our $CONSOLE;
83our $METASERVER; 85our $METASERVER;
84our $LOGIN_BUTTON; 86our $LOGIN_BUTTON;
85our $QUIT_DIALOG; 87our $QUIT_DIALOG;
88our $HOST_ENTRY;
89our $SERVER_INFO;
86 90
91our $SETUP_DIALOG;
92our $SETUP_NOTEBOOK;
93our $SETUP_SERVER;
94our $SETUP_KEYBOARD;
95our $SETUP_SPELLS;
96
97our $STATS_WINDOW;
98our $MESSAGE_WINDOW;
87our $FLOORBOX; 99our $FLOORBOX;
88our $GAUGES; 100our $GAUGES;
89our $STATWIDS; 101our $STATWIDS;
90 102
91our $SDL_ACTIVE; 103our $SDL_ACTIVE;
97 109
98our $ALT_ENTER_MESSAGE; 110our $ALT_ENTER_MESSAGE;
99our $STATUSBOX; 111our $STATUSBOX;
100our $DEBUG_STATUS; 112our $DEBUG_STATUS;
101 113
114our $INV_WINDOW;
102our $INV; 115our $INV;
103our $INVR; 116our $INVR;
104our $INVR_LBL; 117our $INV_RIGHT_HB;
118
119our $BIND_EDITOR;
120
121our $PICKUP_CFG;
105 122
106sub status { 123sub status {
107 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 124 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
108} 125}
109 126
110sub debug { 127sub debug {
111 $DEBUG_STATUS->set_text ($_[0]); 128 $DEBUG_STATUS->set_text ($_[0]);
112 my ($w, $h) = $DEBUG_STATUS->size_request; 129}
113 $DEBUG_STATUS->move ($WIDTH - $w, 0); 130
131sub destroy_query_dialog {
132 (delete $_[0]{query_dialog})->destroy
133 if $_[0]{query_dialog};
134}
135
136# server query dialog
137sub server_query {
138 my ($conn, $flags, $prompt) = @_;
139
140 $conn->{query_dialog} = my $dialog = new CFClient::UI::FancyFrame
141 x => "center",
142 y => "center",
143 title => "Server Query",
144 child => my $vbox = new CFClient::UI::VBox,
145 ;
146
147 my @dialog = my $label = new CFClient::UI::Label
148 max_w => $::WIDTH * 0.4,
149 ellipsise => 0,
150 text => $prompt;
151
152 if ($flags & CS_QUERY_YESNO) {
153 push @dialog, my $hbox = new CFClient::UI::HBox;
154
155 $hbox->add (new CFClient::UI::Button
156 text => "No",
157 on_activate => sub {
158 $conn->send ("reply n");
159 $dialog->destroy;
160 }
161 );
162 $hbox->add (new CFClient::UI::Button
163 text => "Yes",
164 on_activate => sub {
165 $conn->send ("reply y");
166 destroy_query_dialog $conn;
167 },
168 );
169
170 $dialog->focus_in;
171
172 } elsif ($flags & CS_QUERY_SINGLECHAR) {
173 $dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)";
174
175 if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
176 $MESSAGE_WINDOW->show;
177
178 unshift @dialog, new CFClient::UI::Label
179 max_w => $::WIDTH * 0.4,
180 ellipsise => 0,
181 markup => "\nOr use your keyboard:\n";
182
183 unshift @dialog, my $table = new CFClient::UI::Table;
184
185 $table->add (0, 0, new CFClient::UI::Button
186 text => "Next Race",
187 on_activate => sub {
188 $conn->send ("reply n");
189 destroy_query_dialog $conn;
190 },
191 );
192 $table->add (2, 0, new CFClient::UI::Button
193 text => "Accept",
194 on_activate => sub {
195 $conn->send ("reply d");
196 destroy_query_dialog $conn;
197 },
198 );
199
200 unshift @dialog, new CFClient::UI::Label
201 max_w => $::WIDTH * 0.4,
202 ellipsise => 0,
203 markup =>
204 "<big><b>Character Creation: Race</b></big>\n\n"
205 . "Look at the <b>Messages</b> window to see a description of this race "
206 . "(<small>or hover with your mouse over the bottommost entry in the status area in the lower left area of the screen</small>) "
207 . "and the center of the screen to see how this race looks like "
208 . "(<small>this is below this dialog window, you may need to click on the display area to make it visible</small>).\n\n"
209 . "You can look at another race, or accept this race (you will come back to this race eventually, "
210 . "so you can take your time making this important choice."
211 ;
212
213 } elsif ($prompt =~ /roll new stats/) {
214 if (my $stat = delete $conn->{stat_change_with}) {
215 $conn->send ("reply $stat");
216 destroy_query_dialog $conn;
217 return;
218 }
219
220 $STATS_WINDOW->show;
221 $MESSAGE_WINDOW->hide;
222
223 unshift @dialog, new CFClient::UI::Label
224 max_w => $::WIDTH * 0.4,
225 ellipsise => 0,
226 markup => "\nOr use your keyboard:\n";
227
228 unshift @dialog, my $table = new CFClient::UI::Table;
229
230 # left: re-roll
231 $table->add (0, 0, new CFClient::UI::Button
232 text => "Roll Again",
233 on_activate => sub {
234 $conn->send ("reply y");
235 destroy_query_dialog $conn;
236 },
237 );
238
239 # center: swap stats
240 my ($sw1, $sw2) = map +(new CFClient::UI::Combobox
241 value => $_,
242 options => [
243 [1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"],
244 [2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],
245 [3 => "Con", "Constitution ($conn->{stat}{+CS_STAT_CON})"],
246 [4 => "Int", "Intelligence ($conn->{stat}{+CS_STAT_INT})"],
247 [5 => "Wis", "Wisdom ($conn->{stat}{+CS_STAT_WIS})"],
248 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
249 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
250 ],
251 ), 1 .. 2;
252
253 $table->add (2, 0, new CFClient::UI::Button
254 text => "Swap Stats",
255 on_activate => sub {
256 $conn->{stat_change_with} = $sw2->{value};
257 $conn->send ("reply $sw1->{value}");
258 destroy_query_dialog $conn;
259 },
260 );
261 $table->add (2, 1, new CFClient::UI::HBox children => [$sw1, $sw2]);
262
263 # right: accept
264 $table->add (4, 0, new CFClient::UI::Button
265 text => "Accept",
266 on_activate => sub {
267 $conn->send ("reply n");
268 $STATS_WINDOW->hide;
269 destroy_query_dialog $conn;
270 },
271 );
272
273 unshift @dialog, new CFClient::UI::Label
274 max_w => $::WIDTH * 0.4,
275 ellipsise => 0,
276 markup =>
277 "<big><b>Character Creation: Stats</b></big>\n\n"
278 . "Look at the <b>Stats</b> window to see your basic stats "
279 . "(first column: 1 strength, 2 dexterity, 3 constitution, 4 intelligence, 5 wisdom, 6 power and 7 charisma).\n\n"
280 . "You can create another set of stats, swap two stat values with each other or accept the stats as they are now and continue. "
281 . "Race selection will influence those values later on."
282 ;
283 }
284
285 push @dialog, my $entry = new CFClient::UI::Entry
286 on_changed => sub {
287 $conn->send ("reply $_[1]");
288 destroy_query_dialog $conn;
289 },
290 ;
291
292 $entry->focus_in;
293
294 } else {
295 $dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";
296
297 push @dialog, my $entry = new CFClient::UI::Entry
298 $flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (),
299 on_activate => sub {
300 $conn->send ("reply $_[1]");
301 destroy_query_dialog $conn;
302 },
303 ;
304
305 $entry->focus_in;
306 }
307
308 $vbox->add (@dialog);
309 $dialog->show;
114} 310}
115 311
116sub start_game { 312sub start_game {
117 status "logging in..."; 313 status "logging in...";
314
315 $LOGIN_BUTTON->set_text ("Logout");
316 $SETUP_DIALOG->hide;
118 317
119 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 318 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
120 319
121 my ($host, $port) = split /:/, $CFG->{host}; 320 my ($host, $port) = split /:/, $CFG->{host};
122 321
134 map_widget => $MAPWIDGET, 333 map_widget => $MAPWIDGET,
135 logview => $LOGVIEW, 334 logview => $LOGVIEW,
136 statusbox => $STATUSBOX, 335 statusbox => $STATUSBOX,
137 map => $MAP, 336 map => $MAP,
138 mapmap => $MAPMAP, 337 mapmap => $MAPMAP,
338 query => \&server_query,
139 339
140 sound_play => sub { 340 sound_play => sub {
141 my ($x, $y, $soundnum, $type) = @_; 341 my ($x, $y, $soundnum, $type) = @_;
142 342
143 $SDL_MIXER 343 $SDL_MIXER
151 }; 351 };
152 352
153 if ($CONN) { 353 if ($CONN) {
154 CFClient::lowdelay fileno $CONN->{fh}; 354 CFClient::lowdelay fileno $CONN->{fh};
155 355
156 $LOGIN_BUTTON->set_text ("Logout");
157 status "login successful"; 356 status "login successful";
158
159 $BUTTONBAR->{children}[1]->emit ("activate")
160 if $BUTTONBAR->{children}[1]->{state};
161
162 } else { 357 } else {
163 status "unable to connect"; 358 status "unable to connect";
164 stop_game(); 359 stop_game();
165 } 360 }
166} 361}
167 362
168sub stop_game { 363sub stop_game {
364 $LOGIN_BUTTON->set_text ("Login");
365 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
366 $SETUP_DIALOG->show;
367 $INV_WINDOW->hide;
368 $SETUP_SPELLS->clear_spells;
369
169 return unless $CONN; 370 return unless $CONN;
170 371
171 status "connection closed"; 372 status "connection closed";
172 $LOGIN_BUTTON->set_text ("Login"); 373
374 destroy_query_dialog $CONN;
173 $CONN->destroy; 375 $CONN->destroy;
174 $CONN = 0; # false, does not autovivify 376 $CONN = 0; # false, does not autovivify
175
176 $BUTTONBAR->{children}[1]->emit ("activate")
177 unless $BUTTONBAR->{children}[1]->{state};
178} 377}
179 378
180sub client_setup { 379sub graphics_setup {
181 my $dialog = new CFClient::UI::FancyFrame
182 req_x => 1,
183 req_y => $HEIGHT * (1/8),
184 name => "client_setup",
185 title => "Client Setup",
186 child => (my $vbox = new CFClient::UI::VBox); 380 my $vbox = new CFClient::UI::VBox;
381
187 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 382 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
188 383
189 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode"); 384 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode");
190 $table->add (1, 0, my $hbox = new CFClient::UI::HBox); 385 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
191 386
192 $hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]); 387 $hbox->add (my $mode_slider = new CFClient::UI::Slider force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]);
193 $hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999"); 388 $hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
194 389
195 $mode_slider->connect (changed => sub { 390 $mode_slider->connect (changed => sub {
196 my ($self, $value) = @_; 391 my ($self, $value) = @_;
197 392
314 on_activate => sub { 509 on_activate => sub {
315 video_shutdown (); 510 video_shutdown ();
316 video_init (); 511 video_init ();
317 } 512 }
318 ); 513 );
514
515 $vbox
516}
517
518sub audio_setup {
519 my $vbox = new CFClient::UI::VBox;
520
521 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
522
523 my $row = 0;
319 524
320 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable"); 525 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");
321 $table->add (1, $row++, new CFClient::UI::CheckBox 526 $table->add (1, $row++, new CFClient::UI::CheckBox
322 state => $CFG->{audio_enable}, 527 state => $CFG->{audio_enable},
323 tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.", 528 tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.",
354 audio_shutdown (); 559 audio_shutdown ();
355 audio_init (); 560 audio_init ();
356 } 561 }
357 ); 562 );
358 563
359 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command"); 564 $vbox
360 $table->add (1, $row++, my $saycmd = new CFClient::UI::Entry
361 text => $CFG->{say_command},
362 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. "
363 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
364 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
365 on_changed => sub {
366 my ($self, $value) = @_;
367 $CFG->{say_command} = $value;
368 }
369 );
370
371 $dialog
372} 565}
373 566
374sub set_stats_window_fontsize { 567sub set_stats_window_fontsize {
375 for (values %{$STATWIDS}) { 568 for (values %{$STATWIDS}) {
376 $_->set_fontsize ($::CFG->{stat_fontsize}); 569 $_->set_fontsize ($::CFG->{stat_fontsize});
385 578
386sub make_gauge_window { 579sub make_gauge_window {
387 my $gh = int $HEIGHT * $CFG->{gauge_size}; 580 my $gh = int $HEIGHT * $CFG->{gauge_size};
388 581
389 my $win = new CFClient::UI::Frame ( 582 my $win = new CFClient::UI::Frame (
390 req_y => -1, 583 force_x => 0,
584 force_y => "max",
391 user_w => $WIDTH, 585 force_w => $WIDTH,
392 user_h => $gh, 586 force_h => $gh,
393 ); 587 );
394 588
395 $win->add (my $hbox = new CFClient::UI::HBox 589 $win->add (my $hbox = new CFClient::UI::HBox
396 children => [ 590 children => [
397 (new CFClient::UI::HBox expand => 1), 591 (new CFClient::UI::HBox expand => 1),
433 &set_gauge_window_fontsize; 627 &set_gauge_window_fontsize;
434 628
435 $win 629 $win
436} 630}
437 631
632sub debug_setup {
633 my $table = new CFClient::UI::Table;
634
635 $table->add (0, 0, new CFClient::UI::Label text => "Widget Borders");
636 $table->add (1, 0, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1 });
637 $table->add (0, 1, new CFClient::UI::Label text => "Tooltip Widget Info");
638 $table->add (1, 1, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2 });
639 $table->add (0, 2, new CFClient::UI::Label text => "Show FPS");
640 $table->add (1, 2, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4 });
641 $table->add (0, 3, new CFClient::UI::Label text => "Suppress Tooltips");
642 $table->add (1, 3, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8 });
643
644 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
645
646 for my $x (0..2) {
647 for my $y (0 .. 2) {
648 $table->add ($x + 3, $y,
649 new CFClient::UI::Entry
650 text => $default_smooth[$x * 3 + $y],
651 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
652 );
653 }
654 }
655
656
657 $table
658}
659
438sub make_stats_window { 660sub stats_window {
439 my $tgw = new CFClient::UI::FancyFrame 661 my $tgw = new CFClient::UI::FancyFrame
440 req_y => $HEIGHT * (2/8), 662 y => $HEIGHT * (2/8),
441 req_x => -1, 663 x => "max",
442 title => "Stats", 664 title => "Stats",
443 name => "stats_window"; 665 name => "stats_window";
444 666
445 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox); 667 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);
446 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1, 668 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
447 can_hover => 1, can_events => 1, 669 can_hover => 1, can_events => 1,
448 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server."); 670 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
547 update_stats_window ({}); 769 update_stats_window ({});
548 770
549 $tgw 771 $tgw
550} 772}
551 773
552sub formsep { 774sub formsep($) {
553 reverse join ",", grep length, split /(...)/, reverse $_[0] * 1 775 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
554} 776}
555 777
556sub update_stats_window { 778sub update_stats_window {
557 my ($stats) = @_; 779 my ($stats) = @_;
558 780
594 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED}); 816 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
595 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP}); 817 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
596 818
597 $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000); 819 $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000);
598 820
599 # TODO: replace by CS_STAT_RES_xxx constants
600 my %tbl = ( 821 my %tbl = (
601 phys => 100, 822 phys => CS_STAT_RES_PHYS,
602 magic => 101, 823 magic => CS_STAT_RES_MAG,
603 fire => 102, 824 fire => CS_STAT_RES_FIRE,
604 elec => 103, 825 elec => CS_STAT_RES_ELEC,
605 cold => 104, 826 cold => CS_STAT_RES_COLD,
606 conf => 105, 827 conf => CS_STAT_RES_CONF,
607 acid => 106, 828 acid => CS_STAT_RES_ACID,
608 drain => 107, 829 drain => CS_STAT_RES_DRAIN,
609 ghit => 108, 830 ghit => CS_STAT_RES_GHOSTHIT,
610 pois => 109, 831 pois => CS_STAT_RES_POISON,
611 slow => 110, 832 slow => CS_STAT_RES_SLOW,
612 para => 111, 833 para => CS_STAT_RES_PARA,
613 tund => 112, 834 tund => CS_STAT_TURN_UNDEAD,
614 fear => 113, 835 fear => CS_STAT_RES_FEAR,
615 depl => 113, 836 depl => CS_STAT_RES_DEPLETE,
616 deat => 115, 837 deat => CS_STAT_RES_DEATH,
617 holyw => 116, 838 holyw => CS_STAT_RES_HOLYWORD,
618 blind => 117, 839 blind => CS_STAT_RES_BLIND,
619 ); 840 );
620 841
621 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}}) 842 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
622 for keys %tbl; 843 for keys %tbl;
623} 844}
624 845
625sub metaserver_dialog {
626 my $dialog = new CFClient::UI::FancyFrame
627 title => "Server List",
628 child => (my $vbox = new CFClient::UI::VBox);
629
630 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
631
632 $dialog
633}
634
635my $METASERVER_ATIME; 846my $METASERVER_ATIME;
636 847
637sub update_metaserver { 848sub update_metaserver {
638 my ($HOST) = @_;
639
640 return if $METASERVER_ATIME > time; 849 return if $METASERVER_ATIME > time;
641 $METASERVER_ATIME = time + 60; 850 $METASERVER_ATIME = time + 60;
642 851
643 my $table = $METASERVER->{table}; 852 my $table = $METASERVER->{table};
644 $table->clear; 853 $table->clear;
665 874
666 utf8::decode $buf if utf8::valid $buf; 875 utf8::decode $buf if utf8::valid $buf;
667 876
668 $table->clear; 877 $table->clear;
669 878
879 my @tip = (
880 "The current number of users logged in on the server.",
881 "The hostname of the server.",
882 "The time this server has been running without being restarted.",
883 "The server software version - a '+' indicates a Crossfire+ server.",
884 "Short information about this server provided by its admins.",
885 );
670 my @col = qw(Use #Users Host Uptime Version Description); 886 my @col = qw(#Users Host Uptime Version Description);
671 $table->add ($_, 0, new CFClient::UI::Label align => 0, fg => [1, 1, 0], text => $col[$_]) 887 $table->add ($_, 0, new CFClient::UI::Label
888 can_hover => 1, can_events => 1,
889 align => 0, fg => [1, 1, 0],
890 text => $col[$_], tooltip => $tip[$_])
672 for 0 .. $#col; 891 for 0 .. $#col;
673 892
674 my @align = qw(1 0 1 1 -1); 893 my @align = qw(1 0 1 1 -1);
675 894
676 my $y = 0; 895 my $y = 0;
677 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) { 896 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) {
694 913
695 $m = [$users, $host, $uptime, $version, $desc]; 914 $m = [$users, $host, $uptime, $version, $desc];
696 915
697 $y++; 916 $y++;
698 917
699 $table->add (0, $y, new CFClient::UI::VBox children => [ 918 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [
700 (new CFClient::UI::Button text => "Use", on_activate => sub { 919 (new CFClient::UI::Button
920 text => "Use",
921 tooltip => "Put this server into the <b>Host:Port</b> field",
922 on_activate => sub {
701 $HOST->set_text ($CFG->{host} = $host); 923 $HOST_ENTRY->set_text ($CFG->{host} = $host);
924 $METASERVER->hide;
925 },
702 }), 926 ),
703 (new CFClient::UI::Empty expand => 1), 927 (new CFClient::UI::Empty expand => 1),
704 ]); 928 ]);
705 929
706 $table->add ($_ + 1, $y, new CFClient::UI::Label 930 $table->add ($_, $y, new CFClient::UI::Label
707 ellipsise => 0, align => $align[$_], text => $m->[$_], fontsize => 0.8) 931 ellipsise => 0,
932 align => $align[$_],
933 text => $m->[$_],
934 tooltip => $tip[$_],
935 can_hover => 1,
936 can_events => 1,
937 fontsize => 0.8)
708 for 0 .. $#$m; 938 for 0 .. $#$m;
709 } 939 }
710 } 940 }
711 }); 941 });
712} 942}
713 943
944sub metaserver_dialog {
945 my $dialog = new CFClient::UI::FancyFrame
946 title => "Server List",
947 name => 'metaserver_dialog',
948 x => 'center',
949 y => 'center',
950 z => 3,
951 force_h => $::HEIGHT * 0.4,
952 child => (my $vbox = new CFClient::UI::VBox),
953 on_visibility_change => sub {
954 update_metaserver if $_[1];
955 },
956 ;
957
958 $dialog->{table} = new CFClient::UI::Table;
959
960 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $dialog->{table});
961
962 $dialog
963}
964
714sub server_setup { 965sub server_setup {
715 my $dialog = new CFClient::UI::FancyFrame 966 my $vbox = new CFClient::UI::VBox;
716 x => $WIDTH * (1/3),
717 y => $HEIGHT * (1/8),
718 name => "server_setup",
719 title => "Server Setup",
720 child => (my $vbox = new CFClient::UI::VBox),
721 on_visibility_change => sub {
722 $_[0]->show_centered if $_[1]
723 };
724 967
725 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 968 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
726 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port"); 969 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");
727 970
728 { 971 {
729 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 972 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
730 973
731 $vbox->add ( 974 $vbox->add (
732 my $HOST = new CFClient::UI::Entry 975 $HOST_ENTRY = new CFClient::UI::Entry
733 expand => 1, 976 expand => 1,
734 text => $CFG->{host}, 977 text => $CFG->{host},
735 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 978 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
736 on_changed => sub { 979 on_changed => sub {
737 my ($self, $value) = @_; 980 my ($self, $value) = @_;
739 } 982 }
740 ); 983 );
741 984
742 $METASERVER = metaserver_dialog; 985 $METASERVER = metaserver_dialog;
743 986
744 $vbox->add (new CFClient::UI::Flopper 987 $vbox->add (new CFClient::UI::Button
745 expand => 1, 988 expand => 1,
746 text => "Server List", 989 text => "Server List",
747 other => $METASERVER, 990 other => $METASERVER,
748 tooltip => "Show a list of available crossfire servers", 991 tooltip => "Show a list of available crossfire servers",
749 on_open => sub { 992 on_activate => sub { $METASERVER->toggle_visibility },
750 update_metaserver $HOST; 993 on_visibility_change => sub { $METASERVER->hide unless $_[1] },
751 }
752 ); 994 );
753 } 995 }
754 996
755 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username"); 997 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
756 $table->add (1, 4, new CFClient::UI::Entry 998 $table->add (1, 4, new CFClient::UI::Entry
773 } 1015 }
774 ); 1016 );
775 1017
776 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size"); 1018 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
777 $table->add (1, 7, new CFClient::UI::Slider 1019 $table->add (1, 7, new CFClient::UI::Slider
778 req_w => 100, 1020 force_w => 100,
779 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1021 range => [$CFG->{mapsize}, 10, 100, 0, 1],
780 tooltip => "This is the size of the portion of the map update the server sends you. " 1022 tooltip => "This is the size of the portion of the map update the server sends you. "
781 . "If you set this to a high value you will be able to see further, " 1023 . "If you set this to a high value you will be able to see further, "
782 . "but you also increase bandwidth requirements and latency. " 1024 . "but you also increase bandwidth requirements and latency. "
783 . "This option is only used once at log-in.", 1025 . "This option is only used once at log-in.",
823 $CONN ? stop_game 1065 $CONN ? stop_game
824 : start_game; 1066 : start_game;
825 }, 1067 },
826 ); 1068 );
827 1069
828 $dialog 1070 $table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command");
1071 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry
1072 text => $CFG->{say_command},
1073 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. "
1074 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1075 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1076 on_changed => sub {
1077 my ($self, $value) = @_;
1078 $CFG->{say_command} = $value;
1079 }
1080 );
1081
1082 $vbox->add (new CFClient::UI::Label
1083 text => "Server Info",
1084 fontsize => 1.2,
1085 padding_y => 8,
1086 fg => [1, 1, 0, 1],
1087 );
1088
1089 $vbox->add ($SERVER_INFO = new CFClient::UI::Label ellipsise => 0);
1090
1091 $vbox
829} 1092}
830 1093
831sub message_window { 1094sub message_window {
832 my $window = new CFClient::UI::FancyFrame 1095 my $window = new CFClient::UI::FancyFrame
833 name => "message_window", 1096 name => "message_window",
834 title => "Messages", 1097 title => "Messages",
835 border_bg => [1, 1, 1, 1], 1098 border_bg => [1, 1, 1, 1],
836 bg => [0, 0, 0, 0.75], 1099 bg => [0, 0, 0, 0.75],
837 req_x => -1, 1100 x => "max",
838 user_w => int $::WIDTH / 3, 1101 y => 0,
1102 force_w => $::WIDTH * 0.4,
839 user_h => int $::HEIGHT / 5, 1103 force_h => $::HEIGHT * 0.5,
840 child => (my $vbox = new CFClient::UI::VBox); 1104 child => (my $vbox = new CFClient::UI::VBox);
841 1105
842 $vbox->add ($LOGVIEW); 1106 $vbox->add ($LOGVIEW);
843 1107
844 $vbox->add (my $input = new CFClient::UI::Entry 1108 $vbox->add (my $input = new CFClient::UI::Entry
876 }, 1140 },
877 ); 1141 );
878 1142
879 $CONSOLE = { 1143 $CONSOLE = {
880 window => $window, 1144 window => $window,
881 input => $input 1145 input => $input,
882 }; 1146 };
883 1147
884 $window 1148 $window
885} 1149}
886 1150
887sub open_quit_dialog { 1151sub open_quit_dialog {
888 unless ($QUIT_DIALOG) { 1152 unless ($QUIT_DIALOG) {
889
890 $QUIT_DIALOG = new CFClient::UI::FancyFrame title => "Really Quit?"; 1153 $QUIT_DIALOG = new CFClient::UI::FancyFrame
1154 x => "center",
1155 y => "center",
1156 z => 50,
1157 title => "Really Quit?",
1158 ;
891 1159
892 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1); 1160 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
893 1161
894 $vb->add (new CFClient::UI::Label 1162 $vb->add (new CFClient::UI::Label
895 text => "You should find a savebed and apply it first!", 1163 text => "You should find a savebed and apply it first!",
905 $hb->add (new CFClient::UI::Button 1173 $hb->add (new CFClient::UI::Button
906 text => "Quit anyway", 1174 text => "Quit anyway",
907 expand => 1, 1175 expand => 1,
908 on_activate => sub { exit }, 1176 on_activate => sub { exit },
909 ); 1177 );
910
911 $QUIT_DIALOG->show_centered;
912 } else {
913 $QUIT_DIALOG->show_centered;
914 } 1178 }
915}
916 1179
1180 $QUIT_DIALOG->show;
1181}
1182
1183sub autopickup_setup {
1184 my $table = new CFClient::UI::Table;
1185
1186 for (
1187 ["General", 0, 0,
1188 ["Enable autopickup" => PICKUP_NEWMODE],
1189 ["Inhibit autopickup" => PICKUP_INHIBIT],
1190 ["Stop before pickup" => PICKUP_STOP],
1191 ["Debug autopickup" => PICKUP_DEBUG],
1192 ],
1193 ["Weapons", 0, 6,
1194 ["All weapons" => PICKUP_ALLWEAPON],
1195 ["Missile weapons" => PICKUP_MISSILEWEAPON],
1196 ["Bows" => PICKUP_BOW],
1197 ["Arrows" => PICKUP_ARROW],
1198 ],
1199 ["Armour", 0, 12,
1200 ["Helmets" => PICKUP_HELMET],
1201 ["Shields" => PICKUP_SHIELD],
1202 ["Body Armour" => PICKUP_ARMOUR],
1203 ["Boots" => PICKUP_BOOTS],
1204 ["Gloves" => PICKUP_GLOVES],
1205 ["Cloaks" => PICKUP_CLOAK],
1206 ],
1207
1208 ["Readables", 2, 2,
1209 ["Spellbooks" => PICKUP_SPELLBOOK],
1210 ["Skillscrolls" => PICKUP_SKILLSCROLL],
1211 ["Normal Books/Scrolls" => PICKUP_READABLES],
1212 ],
1213 ["Misc", 2, 7,
1214 ["Food" => PICKUP_FOOD],
1215 ["Drinks" => PICKUP_DRINK],
1216 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
1217 ["Keys" => PICKUP_KEY],
1218 ["Magical Items" => PICKUP_MAGICAL],
1219 ["Potions" => PICKUP_POTION],
1220 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1221 ["Ignore cursed" => PICKUP_NOT_CURSED],
1222 ["Jewelery" => PICKUP_JEWELS],
1223 ],
1224 ["Weight/Value ratio", 2, 17]
1225 )
1226 {
1227 my ($title, $x, $y, @bits) = @$_;
1228 $table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1229
1230 for (@bits) {
1231 ++$y;
1232
1233 my $mask = $_->[1];
1234 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);
1235 $table->add ($x+1, $y, new CFClient::UI::CheckBox
1236 state => $CFG->{pickup} & $mask,
1237 on_changed => sub {
1238 my ($box, $value) = @_;
1239
1240 if ($value) {
1241 $::CFG->{pickup} |= $mask;
1242 } else {
1243 $::CFG->{pickup} &= ~$mask;
1244 }
1245
1246 $::CONN->send_command ("pickup $::CFG->{pickup}")
1247 if defined $::CONN;
1248 });
1249 }
1250 }
1251
1252 $table->add (2, 18, new CFClient::UI::ValSlider
1253 range => [0, 0, 16, 1, 1],
1254 to_value => sub { ">= " . 5 * $_[0] },
1255 on_changed => sub {
1256 my ($slider, $value) = @_;
1257
1258 $::CFG->{pickup} &= ~0x7;
1259 $::CFG->{pickup} |= int $value
1260 if $value;
1261 1;
1262 });
1263 $table->add (3, 18, new CFClient::UI::Button
1264 text => "set",
1265 on_activate => sub {
1266 $::CONN->send_command ("pickup $::CFG->{pickup}")
1267 if defined $::CONN;
1268 1;
1269 });
1270
1271 $table
1272}
1273
917sub make_inventory_window { 1274sub inventory_window {
1275 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
1276 x => "center",
1277 y => "center",
1278 force_w => $WIDTH * 9/10,
1279 force_h => $HEIGHT * 9/10,
1280 title => "Inventory",
1281 ;
1282
1283 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);
1284
1285 $hb->add (my $vb1 = new CFClient::UI::VBox);
1286 $vb1->add (new CFClient::UI::Label align => 0, text => "Player");
1287 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1);
1288
1289 $hb->add (my $vb2 = new CFClient::UI::VBox);
1290
1291 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
1292
1293 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
1294
1295 # XXX: Call after $INVR = ... because set_opencont sets the items
1296 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1297
1298 $invwin
1299}
1300
1301sub spell_setup {
1302 new CFClient::UI::SpellList
1303}
1304
1305sub keyboard_setup {
1306 my $binding_list = new CFClient::UI::VBox;
1307
1308 my $refresh;
1309 $refresh = sub {
1310 $binding_list->clear ();
1311
1312 for my $mod (keys %{$::CFG->{bindings}}) {
1313 for my $sym (keys %{$::CFG->{bindings}->{$mod}}) {
1314 my $cmds = $::CFG->{bindings}->{$mod}->{$sym};
1315 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1316
1317 my $lbl = join "; ", @$cmds;
1318 my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym);
1319 $binding_list->add (my $hb = new CFClient::UI::HBox);
1320 $hb->add (new CFClient::UI::Button
1321 text => "delete",
1322 tooltip => "Deletes the binding",
1323 on_activate => sub {
1324 $binding_list->remove ($hb);
1325 delete $::CFG->{bindings}->{$mod}->{$sym};
1326 });
1327
1328 $hb->add (new CFClient::UI::Button
1329 text => "edit",
1330 tooltip => "Edits the binding",
1331 on_activate => sub {
1332 $::BIND_EDITOR->set_binding (
1333 $mod, $sym, $::CFG->{bindings}->{$mod}->{$sym},
1334 sub {
1335 my ($nmod, $nsym, $ncmds) = @_;
1336 delete $::CFG->{bindings}->{$mod}->{$sym};
1337 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds;
1338 $refresh->();
1339 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1340 $SETUP_DIALOG->show;
1341 },
1342 sub {
1343 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1344 $SETUP_DIALOG->show;
1345 });
1346 $::BIND_EDITOR->show;
1347 $SETUP_DIALOG->hide;
1348 });
1349
1350 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
1351 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
1352 }
1353 }
1354 };
1355
1356 my $vb = new CFClient::UI::VBox;
1357 $vb->add (my $hb = new CFClient::UI::HBox);
1358 $hb->add (new CFClient::UI::Label text => "only shift-up stops fire");
1359 $hb->add (new CFClient::UI::CheckBox
1360 expand => 1,
1361 state => $CFG->{shift_fire_stop},
1362 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
1363 on_changed => sub {
1364 my ($cbox, $value) = @_;
1365 $CFG->{shift_fire_stop} = $value;
1366 });
1367
1368 $vb->add ($binding_list);
1369 $vb->add (my $hb = new CFClient::UI::HBox);
1370
1371 $hb->add (new CFClient::UI::Button
1372 text => "record new",
1373 expand => 1,
1374 tooltip => "This button opens the binding editor with an empty binding.",
1375 on_activate => sub {
1376 $::BIND_EDITOR->set_binding (undef, undef, [],
1377 sub {
1378 my ($mod, $sym, $cmds) = @_;
1379 $::CFG->{bindings}->{$mod}->{$sym} = $cmds;
1380 $refresh->();
1381 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1382 $SETUP_DIALOG->show;
1383 },
1384 sub {
1385 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1386 $SETUP_DIALOG->show;
1387 },
1388 );
1389 $SETUP_DIALOG->hide;
1390 $::BIND_EDITOR->show;
1391 },
1392 );
1393
1394 $hb->add (new CFClient::UI::Button
1395 text => "close",
1396 tooltip => "Closes the binding window",
1397 expand => 1,
1398 on_activate => sub {
1399 $SETUP_DIALOG->hide;
1400 }
1401 );
1402
1403 $refresh->();
1404
1405 $vb
1406}
1407
1408sub help_window {
918 my $invwin = new CFClient::UI::FancyFrame 1409 my $win = new CFClient::UI::FancyFrame
1410 x => 'center',
1411 y => 'center',
1412 z => 2,
1413 name => 'doc_browser',
919 user_w => $WIDTH * (7/8), 1414 force_w => int $WIDTH * 7/8,
920 user_h => $HEIGHT * (7/8), 1415 force_h => int $HEIGHT * 7/8,
921 title => "Inventory", 1416 title => "Documentation";
922 name => "inventory_window", 1417
1418 $win->add (my $vbox = new CFClient::UI::VBox);
1419
1420 $vbox->add (my $buttons = new CFClient::UI::HBox);
1421 $vbox->add (my $viewer = new CFClient::UI::TextScroller
1422 expand => 1, fontsize => 0.8, padding_x => 4);
1423
1424 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: ");
1425 $buttons->add (my $combo = new CFClient::UI::Combobox
1426 value => undef,
1427 options => [
1428 [intro => "Introduction"],
1429 [manual => "Manual"],
1430 [skill_help => "Skills"],
1431 [command_help => "Commands"],
1432 [dmcommand_help => "DM Commands"],
1433 [COPYING => "License Terms"],
1434 ],
1435 on_changed => sub {
1436 my ($self, $pod) = @_;
1437
1438 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
1439 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };
1440
1441 $viewer->clear;
1442
1443 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
1444 for @$pom;
1445
1446 $viewer->set_offset (0);
1447 },
923 on_visibility_change => sub { 1448 on_visibility_change => sub {
924 $_[0]->show_centered if $_[1] 1449 my ($self, $visible) = @_;
925 }; 1450 return unless $visible;
926 1451 return if $self->{value};
927 $invwin->add (my $hb = new CFClient::UI::HBox expand => 1); 1452 $self->set_value ("intro");
928
929 $hb->add (my $vb1 = new CFClient::UI::VBox expand => 1);
930 $vb1->add (my $lbl = new CFClient::UI::Label align => 0);
931 $lbl->set_text ("Player");
932 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1);
933
934 $hb->add (my $vb2 = new CFClient::UI::VBox expand => 1);
935
936 $vb2->add (my $hb2 = new CFClient::UI::HBox);
937 $hb2->add ($INVR_LBL = new CFClient::UI::Label align => 0, expand => 1);
938 $hb2->add (new CFClient::UI::Button
939 text => "Close",
940 tooltip => "Close the currently open container (if one is open)",
941 on_activate => sub {
942 $CONN->send ("apply $CONN->{open_container}")
943 if $CONN->{open_container} != 0;
944 }, 1453 },
945 ); 1454 );
946
947 $INVR_LBL->set_text ("Floor");
948 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
949
950 $invwin
951}
952
953sub make_help_window {
954 my $win = new CFClient::UI::FancyFrame
955 user_w => $WIDTH * (7/8), user_h => $HEIGHT * (7/8), title => "Documentation";
956
957 $win->add (my $vbox = new CFClient::UI::VBox);
958
959 $vbox->add (my $buttons = new CFClient::UI::HBox);
960 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8);
961
962 for (
963 [intro => "Introduction"],
964 [manual => "Manual"],
965 [command_help => "Commands"],
966 [skill_help => "Skills"],
967 ) {
968 my ($pod, $label) = @$_;
969
970 $buttons->add (new CFClient::UI::Button
971 text => $label,
972 on_activate => sub {
973 my $parser = new Pod::POM;
974 my $pom = $parser->parse_file (CFClient::find_rcfile "pod/$pod.pod");
975
976 $viewer->clear;
977
978 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
979 for @{ CFClient::pod_to_pango_list $pom };
980
981 $viewer->set_offset (0);
982 },
983 );
984 }
985
986 $viewer->add_paragraph ([1, 1, 0, 1], "<big>Use one of the buttons above to display a document.</big>");
987 1455
988 $win 1456 $win
989} 1457}
990 1458
991sub sdl_init { 1459sub sdl_init {
1021 if ($DEBUG_STATUS) { 1489 if ($DEBUG_STATUS) {
1022 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 1490 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1023 } else { 1491 } else {
1024 # create the widgets 1492 # create the widgets
1025 1493
1026 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, req_x => -1; 1494 $DEBUG_STATUS = new CFClient::UI::Label
1495 padding => 0,
1496 z => 100,
1497 force_x => "max",
1498 force_y => 0;
1027 $DEBUG_STATUS->show; 1499 $DEBUG_STATUS->show;
1028 1500
1501 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);
1502
1029 $STATUSBOX = new CFClient::UI::Statusbox; 1503 $STATUSBOX = new CFClient::UI::Statusbox;
1030 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]); 1504 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1031 1505
1032 (new CFClient::UI::Frame 1506 (new CFClient::UI::Frame
1033 bg => [0, 0, 0, 0.4], 1507 bg => [0, 0, 0, 0.4],
1034 req_y => -1, 1508 force_x => 0,
1509 force_y => "max",
1035 child => $STATUSBOX, 1510 child => $STATUSBOX,
1036 )->show; 1511 )->show;
1037 1512
1038 CFClient::UI::FancyFrame->new ( 1513 CFClient::UI::FancyFrame->new (
1514 title => "Map",
1515 name => "mapmap",
1516 x => 0,
1517 y => $FONTSIZE + 8,
1039 border_bg => [1, 1, 1, 192/255], 1518 border_bg => [1, 1, 1, 192/255],
1040 bg => [1, 1, 1, 0], 1519 bg => [1, 1, 1, 0],
1520 no_close_button => 1,
1041 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1521 child => ($MAPMAP = new CFClient::MapWidget::MapMap
1042 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.", 1522 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
1043 ), 1523 ),
1044 )->show; 1524 )->show;
1045 1525
1057 } 1537 }
1058 }); 1538 });
1059 $MAPWIDGET->show; 1539 $MAPWIDGET->show;
1060 $MAPWIDGET->focus_in; 1540 $MAPWIDGET->focus_in;
1061 1541
1062 $LOGVIEW = new CFClient::UI::TextView 1542 $LOGVIEW = new CFClient::UI::TextScroller
1063 expand => 1, 1543 expand => 1,
1064 font => $FONT_FIXED, 1544 font => $FONT_FIXED,
1065 fontsize => $::CFG->{log_fontsize}, 1545 fontsize => $::CFG->{log_fontsize},
1546 indent => -4,
1066 can_hover => 1, 1547 can_hover => 1,
1067 can_events => 1, 1548 can_events => 1,
1068 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1549 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1069 ; 1550 ;
1070 1551
1071 $BUTTONBAR = new CFClient::UI::HBox; 1552 $SETUP_DIALOG = new CFClient::UI::FancyFrame
1553 title => "Setup",
1554 name => "setup_dialog",
1555 x => 'center',
1556 y => 'center',
1557 z => 2,
1558 force_w => $::WIDTH * 0.6,
1559 force_h => $::HEIGHT * 0.6,
1560 ;
1072 1561
1562 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,
1563 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1564
1565 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1566 "Configure the server to play on, your username, password and other server-related options.");
1567 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1568 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1569 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1570 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1571 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1572 "Configure the use of audio, sound effects and background music.");
1573 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1574 "Lets you define, edit and delete bindings."
1575 . "There is a shortcut for making bindings: <b>Left Control + Insert</b> opens the binding editor "
1576 . "with nothing set and the recording started. After doing the actions you "
1577 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1578 . "After pressing the combo the binding will be saved automatically and the "
1579 . "binding editor closes");
1580 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup,
1581 "Displays all spells you have and lets you edit keyboard shortcuts for them.");
1582 $SETUP_NOTEBOOK->add (Debug => debug_setup,
1583 "Some debuggign options. Do not ask.");
1584
1585 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1586
1073 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup, 1587 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1074 tooltip => "Toggles a dialog where you can configure various aspects of the client, such as graphics mode, performance, and audio options."); 1588 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1075 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup, 1589
1076 tooltip => "Toggles a dialog where you can configure the server to play on, your username, password and other server-related options.");
1077 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window, 1590 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,
1078 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 1591 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1079 1592
1080 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 1593 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
1081 1594
1082 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window, 1595 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => $STATS_WINDOW = stats_window,
1083 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times."); 1596 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1084 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window, 1597 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => inventory_window,
1085 tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :)."); 1598 tooltip => "Toggles the inventory window, where you can manage your loot (or treasures :). "
1599 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1086 1600
1087 $BUTTONBAR->add (new CFClient::UI::Button 1601 $BUTTONBAR->add (new CFClient::UI::Button
1088 text => "Save Config", 1602 text => "Save Config",
1089 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 1603 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1090 on_activate => sub { 1604 on_activate => sub {
1091 $::CFG->{layout} = CFClient::UI::get_layout; 1605 $::CFG->{layout} = CFClient::UI::get_layout;
1092 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 1606 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1093 status "Configuration Saved"; 1607 status "Configuration Saved";
1094 }, 1608 },
1095 ); 1609 );
1096 1610
1097 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window, 1611 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => help_window,
1098 tooltip => "View Documentation"); 1612 tooltip => "View Documentation");
1099 1613
1100 $BUTTONBAR->add (new CFClient::UI::Button 1614 $BUTTONBAR->add (new CFClient::UI::Button
1101 text => "Quit", 1615 text => "Quit",
1102 tooltip => "Terminates the program", 1616 tooltip => "Terminates the program",
1108 } 1622 }
1109 }, 1623 },
1110 ); 1624 );
1111 1625
1112 $BUTTONBAR->show; 1626 $BUTTONBAR->show;
1113 1627 $SETUP_DIALOG->show;
1114 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1115
1116 # delay till geometry is constant
1117 $CFClient::UI::ROOT->on_post_alloc (startup => sub {
1118 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
1119 my $widget = $GAUGES->{win};
1120 $widget->move (0, $HEIGHT - $widget->{h});#d# to in toplevel
1121 });
1122 force_refresh ();
1123 } 1628 }
1629
1630 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1124} 1631}
1125 1632
1126sub video_shutdown { 1633sub video_shutdown {
1127 undef $SDL_ACTIVE; 1634 undef $SDL_ACTIVE;
1128} 1635}
1195 1702
1196my %demo;#d# 1703my %demo;#d#
1197 1704
1198sub force_refresh { 1705sub force_refresh {
1199 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 1706 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
1200 debug sprintf "%3.2f", $fps; 1707 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1201 1708
1202 $CFClient::UI::ROOT->draw; 1709 $CFClient::UI::ROOT->draw;
1203 1710
1204 $WANT_REFRESH = 0; 1711 $WANT_REFRESH = 0;
1205 $CAN_REFRESH = 0; 1712 $CAN_REFRESH = 0;
1260}; 1767};
1261 1768
1262 CFClient::SDL_GL_SwapBuffers; 1769 CFClient::SDL_GL_SwapBuffers;
1263} 1770}
1264 1771
1265my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub { 1772my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1266 $NOW = time; 1773 $NOW = time;
1267 1774
1268 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 1775 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1269 for CFClient::SDL_PollEvent; 1776 for CFClient::SDL_PollEvent;
1270 1777
1337############################################################################# 1844#############################################################################
1338 1845
1339$SIG{INT} = $SIG{TERM} = sub { exit }; 1846$SIG{INT} = $SIG{TERM} = sub { exit };
1340 1847
1341{ 1848{
1342 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] }; 1849 local $SIG{__DIE__} = sub {
1850 return unless defined $^S && !$^S;
1851 Carp::confess $_[1];#d#TODO: remove when stable
1852 CFClient::fatal $_[0];
1853 };
1343 1854
1344 CFClient::read_cfg "$Crossfire::VARDIR/pclientrc"; 1855 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1345 CFClient::UI::set_layout ($::CFG->{layout}); 1856 CFClient::UI::set_layout ($::CFG->{layout});
1346 1857
1347 my %DEF_CFG = ( 1858 my %DEF_CFG = (
1348 sdl_mode => 0, 1859 sdl_mode => 0,
1349 width => 640, 1860 width => 640,
1353 map_scale => 1, 1864 map_scale => 1,
1354 fow_enable => 1, 1865 fow_enable => 1,
1355 fow_intensity => 0.45, 1866 fow_intensity => 0.45,
1356 fow_smooth => 0, 1867 fow_smooth => 0,
1357 gui_fontsize => 1, 1868 gui_fontsize => 1,
1358 log_fontsize => 1, 1869 log_fontsize => 0.7,
1359 gauge_fontsize=> 1, 1870 gauge_fontsize=> 1,
1360 gauge_size => 0.35, 1871 gauge_size => 0.35,
1361 stat_fontsize => 1, 1872 stat_fontsize => 0.7,
1362 mapsize => 100, 1873 mapsize => 100,
1363 host => "crossfire.schmorp.de", 1874 host => "crossfire.schmorp.de",
1364 say_command => 'say', 1875 say_command => 'say',
1365 audio_enable => 1, 1876 audio_enable => 1,
1366 bgm_enable => 1, 1877 bgm_enable => 1,
1367 bgm_volume => 0.25, 1878 bgm_volume => 0.25,
1368 face_prefetch => 0, 1879 face_prefetch => 0,
1369 output_sync => 1, 1880 output_sync => 1,
1370 output_count => 1, 1881 output_count => 1,
1882 pickup => 0,
1371 ); 1883 );
1372 1884
1373 while (my ($k, $v) = each %DEF_CFG) { 1885 while (my ($k, $v) = each %DEF_CFG) {
1374 $CFG->{$k} = $v unless exists $CFG->{$k}; 1886 $CFG->{$k} = $v unless exists $CFG->{$k};
1375 } 1887 }
1422 video_init; 1934 video_init;
1423 audio_init; 1935 audio_init;
1424} 1936}
1425 1937
1426Event::loop; 1938Event::loop;
1939#CFClient::SDL_Quit;
1940#CFClient::_exit 0;
1427 1941
1428END { CFClient::SDL_Quit } 1942END { CFClient::SDL_Quit }
1429 1943
1430=head1 NAME 1944=head1 NAME
1431 1945
1432pclient - A Crossfire+ and Crossfire game client 1946cfplus - A Crossfire+ and Crossfire game client
1433 1947
1434=head1 SYNOPSIS 1948=head1 SYNOPSIS
1435 1949
1436Just run it - no commandline arguments are supported. 1950Just run it - no commandline arguments are supported.
1437 1951
1438=head1 USAGE 1952=head1 USAGE
1439 1953
1440Pclient utilises OpenGL for all UI elements and the game. It is supposed to be used 1954cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used
1441fullscreen and interactively. 1955fullscreen and interactively.
1442 1956
1957=head1 DEBUGGING
1958
1959
1960CFPLUS_DEBUG - environment variable
1961
1962 1 draw borders around widgets
1963 2 add low-level widget info to tooltips
1964 4 show fps
1965 8 suppress tooltips
1966
1443=head1 AUTHOR 1967=head1 AUTHOR
1444 1968
1445Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 1969Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
1446 1970
1447 1971

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines