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.20 by root, Sun May 28 00:40:52 2006 UTC vs.
Revision 1.57 by root, Mon Jun 5 21:10:04 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
… …
41use CFClient::UI; 40use CFClient::UI;
42use CFClient::MapWidget; 41use CFClient::MapWidget;
43 42
44$Event::DIED = sub { 43$Event::DIED = sub {
45 # TODO: display dialog box or so 44 # TODO: display dialog box or so
45 Carp::confess $_[1];#d#TODO: remove when stable
46 CFClient::error $_[1]; 46 CFClient::error $_[1];
47}; 47};
48 48
49#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d# 49#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d#
50 50
… …
81our $LOGVIEW; 81our $LOGVIEW;
82our $CONSOLE; 82our $CONSOLE;
83our $METASERVER; 83our $METASERVER;
84our $LOGIN_BUTTON; 84our $LOGIN_BUTTON;
85our $QUIT_DIALOG; 85our $QUIT_DIALOG;
86our $HOST_ENTRY;
87
88our $SETUP_DIALOG;
89our $SETUP_NOTEBOOK;
90our $SETUP_SERVER;
91our $SETUP_KEYBOARD;
92our $SETUP_SPELLS;
86 93
87our $FLOORBOX; 94our $FLOORBOX;
88our $GAUGES; 95our $GAUGES;
89our $STATWIDS; 96our $STATWIDS;
90 97
… …
97 104
98our $ALT_ENTER_MESSAGE; 105our $ALT_ENTER_MESSAGE;
99our $STATUSBOX; 106our $STATUSBOX;
100our $DEBUG_STATUS; 107our $DEBUG_STATUS;
101 108
109our $INV_WINDOW;
102our $INV; 110our $INV;
103our $INVR; 111our $INVR;
104our $INVR_LBL; 112our $INV_RIGHT_HB;
113
114our $BIND_EDITOR;
115
116our $PICKUP_CFG;
105 117
106sub status { 118sub status {
107 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 119 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
108} 120}
109 121
110sub debug { 122sub debug {
111 $DEBUG_STATUS->set_text ($_[0]); 123 $DEBUG_STATUS->set_text ($_[0]);
112 my ($w, $h) = $DEBUG_STATUS->size_request;
113 $DEBUG_STATUS->move ($WIDTH - $w, 0);
114} 124}
115 125
116sub start_game { 126sub start_game {
117 status "logging in..."; 127 status "logging in...";
128
129 $LOGIN_BUTTON->set_text ("Logout");
130 $SETUP_DIALOG->hide;
118 131
119 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 132 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
120 133
121 my ($host, $port) = split /:/, $CFG->{host}; 134 my ($host, $port) = split /:/, $CFG->{host};
122 135
… …
151 }; 164 };
152 165
153 if ($CONN) { 166 if ($CONN) {
154 CFClient::lowdelay fileno $CONN->{fh}; 167 CFClient::lowdelay fileno $CONN->{fh};
155 168
156 $LOGIN_BUTTON->set_text ("Logout");
157 status "login successful"; 169 status "login successful";
158
159 $BUTTONBAR->{children}[1]->emit ("activate")
160 if $BUTTONBAR->{children}[1]->{state};
161
162 } else { 170 } else {
163 status "unable to connect"; 171 status "unable to connect";
164 stop_game(); 172 stop_game();
165 } 173 }
166} 174}
167 175
168sub stop_game { 176sub stop_game {
177 $LOGIN_BUTTON->set_text ("Login");
178 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
179 $SETUP_DIALOG->show;
180 $INV_WINDOW->hide;
181
169 return unless $CONN; 182 return unless $CONN;
170 183
171 status "connection closed"; 184 status "connection closed";
172 $LOGIN_BUTTON->set_text ("Login"); 185
173 $CONN->destroy; 186 $CONN->destroy;
174 $CONN = 0; # false, does not autovivify 187 $CONN = 0; # false, does not autovivify
175
176 $BUTTONBAR->{children}[1]->emit ("activate")
177 unless $BUTTONBAR->{children}[1]->{state};
178} 188}
179 189
180sub client_setup { 190sub 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); 191 my $vbox = new CFClient::UI::VBox;
192
187 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 193 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
188 194
189 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode"); 195 $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); 196 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
191 197
192 $hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]); 198 $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"); 199 $hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
194 200
195 $mode_slider->connect (changed => sub { 201 $mode_slider->connect (changed => sub {
196 my ($self, $value) = @_; 202 my ($self, $value) = @_;
197 203
… …
314 on_activate => sub { 320 on_activate => sub {
315 video_shutdown (); 321 video_shutdown ();
316 video_init (); 322 video_init ();
317 } 323 }
318 ); 324 );
325
326 $vbox
327}
328
329sub audio_setup {
330 my $vbox = new CFClient::UI::VBox;
331
332 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
333
334 my $row = 0;
319 335
320 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable"); 336 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");
321 $table->add (1, $row++, new CFClient::UI::CheckBox 337 $table->add (1, $row++, new CFClient::UI::CheckBox
322 state => $CFG->{audio_enable}, 338 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.", 339 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 (); 370 audio_shutdown ();
355 audio_init (); 371 audio_init ();
356 } 372 }
357 ); 373 );
358 374
359 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command"); 375 $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} 376}
373 377
374sub set_stats_window_fontsize { 378sub set_stats_window_fontsize {
375 for (values %{$STATWIDS}) { 379 for (values %{$STATWIDS}) {
376 $_->set_fontsize ($::CFG->{stat_fontsize}); 380 $_->set_fontsize ($::CFG->{stat_fontsize});
… …
385 389
386sub make_gauge_window { 390sub make_gauge_window {
387 my $gh = int $HEIGHT * $CFG->{gauge_size}; 391 my $gh = int $HEIGHT * $CFG->{gauge_size};
388 392
389 my $win = new CFClient::UI::Frame ( 393 my $win = new CFClient::UI::Frame (
390 req_x => 0, 394 force_x => 0,
391 req_y => -1, 395 force_y => "max",
392 def_w => $WIDTH, 396 force_w => $WIDTH,
393 def_h => $gh, 397 force_h => $gh,
394 ); 398 );
395 399
396 $win->add (my $hbox = new CFClient::UI::HBox 400 $win->add (my $hbox = new CFClient::UI::HBox
397 children => [ 401 children => [
398 (new CFClient::UI::HBox expand => 1), 402 (new CFClient::UI::HBox expand => 1),
… …
434 &set_gauge_window_fontsize; 438 &set_gauge_window_fontsize;
435 439
436 $win 440 $win
437} 441}
438 442
443
439sub make_stats_window { 444sub make_stats_window {
440 my $tgw = new CFClient::UI::FancyFrame 445 my $tgw = new CFClient::UI::FancyFrame
441 req_y => $HEIGHT * (2/8), 446 y => $HEIGHT * (2/8),
442 req_x => -1, 447 x => "max",
443 title => "Stats", 448 title => "Stats",
444 name => "stats_window"; 449 name => "stats_window";
445 450
446 $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);
447 $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,
448 can_hover => 1, can_events => 1, 453 can_hover => 1, can_events => 1,
449 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.");
… …
548 update_stats_window ({}); 553 update_stats_window ({});
549 554
550 $tgw 555 $tgw
551} 556}
552 557
553sub formsep { 558sub formsep($) {
554 reverse join ",", grep length, split /(...)/, reverse $_[0] * 1 559 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
555} 560}
556 561
557sub update_stats_window { 562sub update_stats_window {
558 my ($stats) = @_; 563 my ($stats) = @_;
559 564
… …
621 626
622 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}}) 627 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
623 for keys %tbl; 628 for keys %tbl;
624} 629}
625 630
626sub metaserver_dialog {
627 my $dialog = new CFClient::UI::FancyFrame
628 title => "Server List",
629 child => (my $vbox = new CFClient::UI::VBox);
630
631 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
632
633 $dialog
634}
635
636my $METASERVER_ATIME; 631my $METASERVER_ATIME;
637 632
638sub update_metaserver { 633sub update_metaserver {
639 my ($HOST) = @_;
640
641 return if $METASERVER_ATIME > time; 634 return if $METASERVER_ATIME > time;
642 $METASERVER_ATIME = time + 60; 635 $METASERVER_ATIME = time + 60;
643 636
644 my $table = $METASERVER->{table}; 637 my $table = $METASERVER->{table};
645 $table->clear; 638 $table->clear;
… …
697 690
698 $y++; 691 $y++;
699 692
700 $table->add (0, $y, new CFClient::UI::VBox children => [ 693 $table->add (0, $y, new CFClient::UI::VBox children => [
701 (new CFClient::UI::Button text => "Use", on_activate => sub { 694 (new CFClient::UI::Button text => "Use", on_activate => sub {
702 $HOST->set_text ($CFG->{host} = $host); 695 $HOST_ENTRY->set_text ($CFG->{host} = $host);
696 $METASERVER->toggle_visibility;
703 }), 697 }),
704 (new CFClient::UI::Empty expand => 1), 698 (new CFClient::UI::Empty expand => 1),
705 ]); 699 ]);
706 700
707 $table->add ($_ + 1, $y, new CFClient::UI::Label 701 $table->add ($_ + 1, $y, new CFClient::UI::Label
… …
710 } 704 }
711 } 705 }
712 }); 706 });
713} 707}
714 708
709sub metaserver_dialog {
710 my $dialog = new CFClient::UI::FancyFrame
711 title => "Server List",
712 name => 'metaserver_dialog',
713 x => 'center',
714 y => 'center',
715 z => 3,
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
715sub server_setup { 727sub server_setup {
716 my $dialog = new CFClient::UI::FancyFrame 728 my $vbox = new CFClient::UI::VBox;
717 x => $WIDTH * (1/3),
718 y => $HEIGHT * (1/8),
719 name => "server_setup",
720 title => "Server Setup",
721 child => (my $vbox = new CFClient::UI::VBox),
722 on_visibility_change => sub {
723 $_[0]->show_centered if $_[1]
724 };
725 729
726 $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]);
727 $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");
728 732
729 { 733 {
730 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 734 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
731 735
732 $vbox->add ( 736 $vbox->add (
733 my $HOST = new CFClient::UI::Entry 737 $HOST_ENTRY = new CFClient::UI::Entry
734 expand => 1, 738 expand => 1,
735 text => $CFG->{host}, 739 text => $CFG->{host},
736 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",
737 on_changed => sub { 741 on_changed => sub {
738 my ($self, $value) = @_; 742 my ($self, $value) = @_;
… …
740 } 744 }
741 ); 745 );
742 746
743 $METASERVER = metaserver_dialog; 747 $METASERVER = metaserver_dialog;
744 748
745 $vbox->add (new CFClient::UI::Flopper 749 $vbox->add (new CFClient::UI::Button
746 expand => 1, 750 expand => 1,
747 text => "Server List", 751 text => "Server List",
748 other => $METASERVER, 752 other => $METASERVER,
749 tooltip => "Show a list of available crossfire servers", 753 tooltip => "Show a list of available crossfire servers",
750 on_open => sub { 754 on_activate => sub { $METASERVER->toggle_visibility },
751 update_metaserver $HOST;
752 }
753 ); 755 );
754 } 756 }
755 757
756 $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");
757 $table->add (1, 4, new CFClient::UI::Entry 759 $table->add (1, 4, new CFClient::UI::Entry
… …
774 } 776 }
775 ); 777 );
776 778
777 $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");
778 $table->add (1, 7, new CFClient::UI::Slider 780 $table->add (1, 7, new CFClient::UI::Slider
779 req_w => 100, 781 force_w => 100,
780 range => [$CFG->{mapsize}, 10, 100, 0, 1], 782 range => [$CFG->{mapsize}, 10, 100, 0, 1],
781 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. "
782 . "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, "
783 . "but you also increase bandwidth requirements and latency. " 785 . "but you also increase bandwidth requirements and latency. "
784 . "This option is only used once at log-in.", 786 . "This option is only used once at log-in.",
… …
824 $CONN ? stop_game 826 $CONN ? stop_game
825 : start_game; 827 : start_game;
826 }, 828 },
827 ); 829 );
828 830
829 $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
830} 844}
831 845
832sub message_window { 846sub message_window {
833 my $window = new CFClient::UI::FancyFrame 847 my $window = new CFClient::UI::FancyFrame
834 name => "message_window", 848 name => "message_window",
835 title => "Messages", 849 title => "Messages",
836 border_bg => [1, 1, 1, 1], 850 border_bg => [1, 1, 1, 1],
837 bg => [0, 0, 0, 0.75], 851 bg => [0, 0, 0, 0.75],
838 req_x => -1, 852 x => "max",
839 req_y => 0, 853 y => 0,
840 def_w => int $::WIDTH / 3, 854 force_w => $::WIDTH / 3,
841 def_h => int $::HEIGHT / 5, 855 force_h => $::HEIGHT / 5,
842 child => (my $vbox = new CFClient::UI::VBox); 856 child => (my $vbox = new CFClient::UI::VBox);
843 857
844 $vbox->add ($LOGVIEW); 858 $vbox->add ($LOGVIEW);
845 859
846 $vbox->add (my $input = new CFClient::UI::Entry 860 $vbox->add (my $input = new CFClient::UI::Entry
… …
878 }, 892 },
879 ); 893 );
880 894
881 $CONSOLE = { 895 $CONSOLE = {
882 window => $window, 896 window => $window,
883 input => $input 897 input => $input,
884 }; 898 };
885 899
886 $window 900 $window
887} 901}
888 902
889sub open_quit_dialog { 903sub open_quit_dialog {
890 unless ($QUIT_DIALOG) { 904 unless ($QUIT_DIALOG) {
891
892 $QUIT_DIALOG = new CFClient::UI::FancyFrame title => "Really Quit?"; 905 $QUIT_DIALOG = new CFClient::UI::FancyFrame
906 x => "center",
907 y => "center",
908 z => 50,
909 title => "Really Quit?",
910 ;
893 911
894 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1); 912 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
895 913
896 $vb->add (new CFClient::UI::Label 914 $vb->add (new CFClient::UI::Label
897 text => "You should find a savebed and apply it first!", 915 text => "You should find a savebed and apply it first!",
… …
907 $hb->add (new CFClient::UI::Button 925 $hb->add (new CFClient::UI::Button
908 text => "Quit anyway", 926 text => "Quit anyway",
909 expand => 1, 927 expand => 1,
910 on_activate => sub { exit }, 928 on_activate => sub { exit },
911 ); 929 );
930 }
912 931
913 $QUIT_DIALOG->show_centered; 932 $QUIT_DIALOG->show;
914 } else { 933}
915 $QUIT_DIALOG->show_centered; 934
935sub autopickup_setup {
936 my $table = new CFClient::UI::Table;
937
938 for (
939 ["General", 0, 0,
940 ["Enable autopickup" => CFClient::Pickup::PU_NEWMODE],
941 ["Inhibit autopickup" => CFClient::Pickup::PU_INHIBIT],
942 ["Stop before pickup" => CFClient::Pickup::PU_STOP],
943 ["Debug autopickup" => CFClient::Pickup::PU_DEBUG],
944 ],
945 ["Weapons", 0, 6,
946 ["All weapons" => CFClient::Pickup::PU_ALLWEAPON],
947 ["Missile weapons" => CFClient::Pickup::PU_MISSILEWEAPON],
948 ["Bows" => CFClient::Pickup::PU_BOW],
949 ["Arrows" => CFClient::Pickup::PU_ARROW],
950 ],
951 ["Armour", 0, 12,
952 ["Helmets" => CFClient::Pickup::PU_HELMET],
953 ["Shields" => CFClient::Pickup::PU_SHIELD],
954 ["Body Armour" => CFClient::Pickup::PU_ARMOUR],
955 ["Boots" => CFClient::Pickup::PU_BOOTS],
956 ["Gloves" => CFClient::Pickup::PU_GLOVES],
957 ["Cloaks" => CFClient::Pickup::PU_CLOAK],
958 ],
959
960 ["Readables", 2, 2,
961 ["Spellbooks" => CFClient::Pickup::PU_SPELLBOOK],
962 ["Skillscrolls" => CFClient::Pickup::PU_SKILLSCROLL],
963 ["Normal Books/Scrolls" => CFClient::Pickup::PU_READABLES],
964 ],
965 ["Misc", 2, 7,
966 ["Food" => CFClient::Pickup::PU_FOOD],
967 ["Drinks" => CFClient::Pickup::PU_DRINK],
968 ["Valuables (Money, Gems)" => CFClient::Pickup::PU_VALUABLES],
969 ["Keys" => CFClient::Pickup::PU_KEY],
970 ["Magical Items" => CFClient::Pickup::PU_MAGICAL],
971 ["Potions" => CFClient::Pickup::PU_POTION],
972 ["Magic Devices" => CFClient::Pickup::PU_MAGIC_DEVICE],
973 ["Ignore cursed" => CFClient::Pickup::PU_NOT_CURSED],
974 ["Jewelery" => CFClient::Pickup::PU_JEWELS],
975 ],
976 )
916 } 977 {
978 my ($title, $x, $y, @bits) = @$_;
979 $table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
980
981 for (@bits) {
982 ++$y;
983
984 my $mask = $_->[1];
985 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);
986 $table->add ($x+1, $y, new CFClient::UI::CheckBox
987 state => $CFG->{pickup} & $mask,
988 on_changed => sub {
989 my ($box, $value) = @_;
990 if ($value) {
991 $::CFG->{pickup} |= $mask;
992 } else {
993 $::CFG->{pickup} = $::CFG->{pickup} & ~$mask;
994 }
995 $::CONN->send (sprintf "command pickup %u", $::CFG->{pickup})
996 if defined $::CONN;
997 });
998 }
999 }
1000
1001 $table
917} 1002}
918 1003
919sub make_inventory_window { 1004sub make_inventory_window {
920 my $invwin = new CFClient::UI::FancyFrame 1005 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
1006 x => "center",
1007 y => "center",
921 def_w => $WIDTH * (7/8), 1008 force_w => $WIDTH * 9/10,
922 def_h => $HEIGHT * (7/8), 1009 force_h => $HEIGHT * 9/10,
923 title => "Inventory", 1010 title => "Inventory",
924 name => "inventory_window", 1011 ;
925 on_visibility_change => sub {
926 $_[0]->show_centered if $_[1]
927 };
928 1012
929 $invwin->add (my $hb = new CFClient::UI::HBox expand => 1); 1013 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);
930 1014
931 $hb->add (my $vb1 = new CFClient::UI::VBox expand => 1); 1015 $hb->add (my $vb1 = new CFClient::UI::VBox);
932 $vb1->add (my $lbl = new CFClient::UI::Label align => 0); 1016 $vb1->add (new CFClient::UI::Label align => 0, text => "Player");
933 $lbl->set_text ("Player");
934 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1); 1017 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1);
935 1018
936 $hb->add (my $vb2 = new CFClient::UI::VBox expand => 1); 1019 $hb->add (my $vb2 = new CFClient::UI::VBox);
937 1020
1021 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
1022
1023 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
1024
1025 # XXX: Call after $INVR = ... because set_opencont sets the items
1026 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1027
1028 $invwin
1029}
1030
1031sub spell_setup {
1032 new CFClient::UI::SpellList
1033}
1034
1035sub keyboard_setup {
1036 my $binding_list = new CFClient::UI::VBox;
1037
1038 my $refresh;
1039 $refresh = sub {
1040 $binding_list->clear ();
1041
1042 for my $mod (keys %{$::CFG->{bindings}}) {
1043 for my $sym (keys %{$::CFG->{bindings}->{$mod}}) {
1044 my $cmds = $::CFG->{bindings}->{$mod}->{$sym};
1045 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1046
1047 my $lbl = join "; ", @$cmds;
1048 my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym);
1049 $binding_list->add (my $hb = new CFClient::UI::HBox);
1050 $hb->add (new CFClient::UI::Button
1051 text => "delete",
1052 tooltip => "Deletes the binding",
1053 on_activate => sub {
1054 $binding_list->remove ($hb);
1055 delete $::CFG->{bindings}->{$mod}->{$sym};
1056 });
1057
1058 $hb->add (new CFClient::UI::Button
1059 text => "edit",
1060 tooltip => "Edits the binding",
1061 on_activate => sub {
1062 $::BIND_EDITOR->set_binding (
1063 $mod, $sym, $::CFG->{bindings}->{$mod}->{$sym},
1064 sub {
1065 my ($nmod, $nsym, $ncmds) = @_;
1066 delete $::CFG->{bindings}->{$mod}->{$sym};
1067 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds;
1068 $refresh->();
1069 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1070 $SETUP_DIALOG->show;
1071 },
1072 sub {
1073 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1074 $SETUP_DIALOG->show;
1075 });
1076 $::BIND_EDITOR->show;
1077 $SETUP_DIALOG->hide;
1078 });
1079
1080 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
1081 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
1082 }
1083 }
1084 };
1085
1086 my $vb = new CFClient::UI::VBox;
1087 $vb->add ($binding_list);
938 $vb2->add (my $hb2 = new CFClient::UI::HBox); 1088 $vb->add (my $hb = new CFClient::UI::HBox);
939 $hb2->add ($INVR_LBL = new CFClient::UI::Label align => 0, expand => 1); 1089
940 $hb2->add (new CFClient::UI::Button 1090 $hb->add (new CFClient::UI::Button
941 text => "Close", 1091 text => "record new",
942 tooltip => "Close the currently open container (if one is open)", 1092 expand => 1,
1093 tooltip => "This button opens the binding editor with an empty binding.",
943 on_activate => sub { 1094 on_activate => sub {
944 $CONN->send ("apply $CONN->{open_container}") 1095 $::BIND_EDITOR->set_binding (undef, undef, [],
945 if $CONN->{open_container} != 0; 1096 sub {
1097 my ($mod, $sym, $cmds) = @_;
1098 $::CFG->{bindings}->{$mod}->{$sym} = $cmds;
1099 $refresh->();
1100 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1101 $SETUP_DIALOG->show;
1102 },
1103 sub {
1104 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1105 $SETUP_DIALOG->show;
1106 },
1107 );
1108 $SETUP_DIALOG->hide;
1109 $::BIND_EDITOR->show;
946 }, 1110 },
947 ); 1111 );
948 1112
949 $INVR_LBL->set_text ("Floor"); 1113 $hb->add (new CFClient::UI::Button
950 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1); 1114 text => "close",
1115 tooltip => "Closes the binding window",
1116 expand => 1,
1117 on_activate => sub {
1118 $SETUP_DIALOG->hide;
1119 }
1120 );
951 1121
952 $invwin 1122 $refresh->();
1123
1124 $vb
953} 1125}
954 1126
955sub make_help_window { 1127sub make_help_window {
956 my $win = new CFClient::UI::FancyFrame 1128 my $win = new CFClient::UI::FancyFrame
1129 x => 'center',
1130 y => 'center',
1131 z => 2,
1132 name => 'doc_browser',
957 def_w => int $WIDTH * 7/8, 1133 force_w => int $WIDTH * 7/8,
958 def_h => int $HEIGHT * 7/8, 1134 force_h => int $HEIGHT * 7/8,
959 title => "Documentation"; 1135 title => "Documentation";
960 1136
961 $win->add (my $vbox = new CFClient::UI::VBox); 1137 $win->add (my $vbox = new CFClient::UI::VBox);
962 1138
963 $vbox->add (my $buttons = new CFClient::UI::HBox); 1139 $vbox->add (my $buttons = new CFClient::UI::HBox);
964 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8); 1140 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8);
… …
972 my ($pod, $label) = @$_; 1148 my ($pod, $label) = @$_;
973 1149
974 $buttons->add (new CFClient::UI::Button 1150 $buttons->add (new CFClient::UI::Button
975 text => $label, 1151 text => $label,
976 on_activate => sub { 1152 on_activate => sub {
977 my $parser = new Pod::POM; 1153 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
978 my $pom = $parser->parse_file (CFClient::find_rcfile "pod/$pod.pod"); 1154 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };
979 1155
980 $viewer->clear; 1156 $viewer->clear;
981 1157
982 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0]) 1158 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
983 for @{ CFClient::pod_to_pango_list $pom }; 1159 for @$pom;
984 1160
985 $viewer->set_offset (0); 1161 $viewer->set_offset (0);
986 }, 1162 },
987 ); 1163 );
988 } 1164 }
… …
1025 if ($DEBUG_STATUS) { 1201 if ($DEBUG_STATUS) {
1026 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 1202 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1027 } else { 1203 } else {
1028 # create the widgets 1204 # create the widgets
1029 1205
1030 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, req_x => -1; 1206 $DEBUG_STATUS = new CFClient::UI::Label
1207 padding => 0,
1208 z => 100,
1209 force_x => "max",
1210 force_y => 0;
1031 $DEBUG_STATUS->show; 1211 $DEBUG_STATUS->show;
1032 1212
1213 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);
1214
1033 $STATUSBOX = new CFClient::UI::Statusbox; 1215 $STATUSBOX = new CFClient::UI::Statusbox;
1034 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]); 1216 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1035 1217
1036 (new CFClient::UI::Frame 1218 (new CFClient::UI::Frame
1037 bg => [0, 0, 0, 0.4], 1219 bg => [0, 0, 0, 0.4],
1038 req_y => -1, 1220 force_x => 0,
1221 force_y => "max",
1039 child => $STATUSBOX, 1222 child => $STATUSBOX,
1040 )->show; 1223 )->show;
1041 1224
1042 CFClient::UI::FancyFrame->new ( 1225 CFClient::UI::FancyFrame->new (
1226 title => "Map",
1227 name => "mapmap",
1228 x => 0,
1229 y => $FONTSIZE + 8,
1043 border_bg => [1, 1, 1, 192/255], 1230 border_bg => [1, 1, 1, 192/255],
1044 bg => [1, 1, 1, 0], 1231 bg => [1, 1, 1, 0],
1045 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1232 child => ($MAPMAP = new CFClient::MapWidget::MapMap
1046 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.", 1233 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
1047 ), 1234 ),
… …
1070 can_hover => 1, 1257 can_hover => 1,
1071 can_events => 1, 1258 can_events => 1,
1072 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1259 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1073 ; 1260 ;
1074 1261
1075 $BUTTONBAR = new CFClient::UI::HBox; 1262 $SETUP_DIALOG = new CFClient::UI::FancyFrame
1263 title => "Setup",
1264 name => "setup_dialog",
1265 x => 'center',
1266 y => 'center',
1267 z => 2,
1268 force_w => $::WIDTH * 0.6,
1269 force_h => $::HEIGHT * 0.6,
1270 ;
1076 1271
1272 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,
1273 filter => new CFClient::UI::ScrolledWindow xxx => 1, expand => 1, scroll_y => 1);
1274
1275 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1276 "Configure the server to play on, your username, password and other server-related options.");
1277 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1278 "Configure autopicking stetings, i.e. which items you will pick up automatically when walking over them.");
1279 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1280 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1281 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1282 "Configure the use of audio, sound effects and background music.");
1283 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1284 "Lets you define, edit and delete bindings."
1285 . "There is a shortcut for making bindings: <b>Left Control + Insert</b> opens the binding editor "
1286 . "with nothing set and the recording started. After doing the actions you "
1287 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1288 . "After pressing the combo the binding will be saved automatically and the "
1289 . "binding editor closes");
1290 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup,
1291 "Displays all spells you have and lets you edit keyboard shortcuts for them.");
1292
1293 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1294
1077 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup, 1295 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1078 tooltip => "Toggles a dialog where you can configure various aspects of the client, such as graphics mode, performance, and audio options."); 1296 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1079 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup, 1297
1080 tooltip => "Toggles a dialog where you can configure the server to play on, your username, password and other server-related options.");
1081 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window, 1298 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window,
1082 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 1299 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1083 1300
1084 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 1301 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
1085 1302
1086 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window, 1303 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window,
1087 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times."); 1304 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1088 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window, 1305 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window,
1089 tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :)."); 1306 tooltip => "Toggles the inventory window, where you can manage your loot (or treasures :). "
1307 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1090 1308
1091 $BUTTONBAR->add (new CFClient::UI::Button 1309 $BUTTONBAR->add (new CFClient::UI::Button
1092 text => "Save Config", 1310 text => "Save Config",
1093 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 1311 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1094 on_activate => sub { 1312 on_activate => sub {
1095 $::CFG->{layout} = CFClient::UI::get_layout; 1313 $::CFG->{layout} = CFClient::UI::get_layout;
1096 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 1314 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1097 status "Configuration Saved"; 1315 status "Configuration Saved";
1098 }, 1316 },
1099 ); 1317 );
1100 1318
1101 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window, 1319 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window,
… …
1112 } 1330 }
1113 }, 1331 },
1114 ); 1332 );
1115 1333
1116 $BUTTONBAR->show; 1334 $BUTTONBAR->show;
1335 $SETUP_DIALOG->show;
1336 }
1117 1337
1118 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1338 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1119
1120 # delay till geometry is constant
1121 $CFClient::UI::ROOT->on_post_alloc (startup => sub {
1122 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
1123 my $widget = $GAUGES->{win};
1124 $widget->move (0, $HEIGHT - $widget->{h});#d# to in toplevel
1125 });
1126 force_refresh ();
1127 }
1128} 1339}
1129 1340
1130sub video_shutdown { 1341sub video_shutdown {
1131 undef $SDL_ACTIVE; 1342 undef $SDL_ACTIVE;
1132} 1343}
… …
1199 1410
1200my %demo;#d# 1411my %demo;#d#
1201 1412
1202sub force_refresh { 1413sub force_refresh {
1203 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 1414 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
1204 debug sprintf "%3.2f", $fps; 1415 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1205 1416
1206 $CFClient::UI::ROOT->draw; 1417 $CFClient::UI::ROOT->draw;
1207 1418
1208 $WANT_REFRESH = 0; 1419 $WANT_REFRESH = 0;
1209 $CAN_REFRESH = 0; 1420 $CAN_REFRESH = 0;
… …
1264}; 1475};
1265 1476
1266 CFClient::SDL_GL_SwapBuffers; 1477 CFClient::SDL_GL_SwapBuffers;
1267} 1478}
1268 1479
1269my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub { 1480my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1270 $NOW = time; 1481 $NOW = time;
1271 1482
1272 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 1483 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1273 for CFClient::SDL_PollEvent; 1484 for CFClient::SDL_PollEvent;
1274 1485
… …
1341############################################################################# 1552#############################################################################
1342 1553
1343$SIG{INT} = $SIG{TERM} = sub { exit }; 1554$SIG{INT} = $SIG{TERM} = sub { exit };
1344 1555
1345{ 1556{
1346 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] }; 1557 local $SIG{__DIE__} = sub {
1558 return unless defined $^S && !$^S;
1559 Carp::confess $_[1];#d#TODO: remove when stable
1560 CFClient::fatal $_[0];
1561 };
1347 1562
1348 CFClient::read_cfg "$Crossfire::VARDIR/pclientrc"; 1563 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1349 CFClient::UI::set_layout ($::CFG->{layout}); 1564 CFClient::UI::set_layout ($::CFG->{layout});
1350 1565
1351 my %DEF_CFG = ( 1566 my %DEF_CFG = (
1352 sdl_mode => 0, 1567 sdl_mode => 0,
1353 width => 640, 1568 width => 640,
… …
1431 1646
1432END { CFClient::SDL_Quit } 1647END { CFClient::SDL_Quit }
1433 1648
1434=head1 NAME 1649=head1 NAME
1435 1650
1436pclient - A Crossfire+ and Crossfire game client 1651cfplus - A Crossfire+ and Crossfire game client
1437 1652
1438=head1 SYNOPSIS 1653=head1 SYNOPSIS
1439 1654
1440Just run it - no commandline arguments are supported. 1655Just run it - no commandline arguments are supported.
1441 1656
1442=head1 USAGE 1657=head1 USAGE
1443 1658
1444Pclient utilises OpenGL for all UI elements and the game. It is supposed to be used 1659cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used
1445fullscreen and interactively. 1660fullscreen and interactively.
1446 1661
1662=head1 DEBUGGING
1663
1664
1665CFPLUS_DEBUG - environment variable
1666
1667 1 draw borders around widgets
1668 2 add low-level widget info to tooltips
1669 4 show fps
1670 8 suppress tooltips
1671
1447=head1 AUTHOR 1672=head1 AUTHOR
1448 1673
1449Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 1674Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
1450 1675
1451 1676

Diff Legend

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