[ViewVC] Diff of: cvs/deliantra/Deliantra-Client/bin/cfplus

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.19 by elmex, Sat May 27 21:15:57 2006 UTC vs.
Revision 1.43 by elmex, Fri Jun 2 16:27:28 2006 UTC

…		…
81	our $LOGVIEW;	81	our $LOGVIEW;
82	our $CONSOLE;	82	our $CONSOLE;
83	our $METASERVER;	83	our $METASERVER;
84	our $LOGIN_BUTTON;	84	our $LOGIN_BUTTON;
85	our $QUIT_DIALOG;	85	our $QUIT_DIALOG;
		86	our $HOST_ENTRY;
		87	our $SERVER_SETUP;
86		88
87	our $FLOORBOX;	89	our $FLOORBOX;
88	our $GAUGES;	90	our $GAUGES;
89	our $STATWIDS;	91	our $STATWIDS;
90		92
…		…
97		99
98	our $ALT_ENTER_MESSAGE;	100	our $ALT_ENTER_MESSAGE;
99	our $STATUSBOX;	101	our $STATUSBOX;
100	our $DEBUG_STATUS;	102	our $DEBUG_STATUS;
101		103
		104	our $INV_WINDOW;
102	our $INV;	105	our $INV;
103	our $INVR;	106	our $INVR;
104	our $INVR_LBL;	107	our $INV_RIGHT_HB;
		108
		109	our $BIND_WINDOW;
		110	our $BIND_EDITOR;
		111
		112	our $SPELL_LIST;
		113	our $PICKUP_CFG;
105		114
106	sub status {	115	sub status {
107	$STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);	116	$STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
108	}	117	}
109		118
110	sub debug {	119	sub debug {
111	$DEBUG_STATUS->set_text ($_[0]);	120	$DEBUG_STATUS->set_text ($_[0]);
112	my ($w, $h) = $DEBUG_STATUS->size_request;
113	$DEBUG_STATUS->move ($WIDTH - $w, 0);
114	}	121	}
115		122
116	sub start_game {	123	sub start_game {
117	status "logging in...";	124	status "logging in...";
		125
		126	$LOGIN_BUTTON->set_text ("Logout");
		127	$SERVER_SETUP->hide;
118		128
119	my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;	129	my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
120		130
121	my ($host, $port) = split /:/, $CFG->{host};	131	my ($host, $port) = split /:/, $CFG->{host};
122		132
…		…
151	};	161	};
152		162
153	if ($CONN) {	163	if ($CONN) {
154	CFClient::lowdelay fileno $CONN->{fh};	164	CFClient::lowdelay fileno $CONN->{fh};
155		165
156	$LOGIN_BUTTON->set_text ("Logout");
157	status "login successful";	166	status "login successful";
158
159	$BUTTONBAR->{children}[1]->emit ("activate")
160	if $BUTTONBAR->{children}[1]->{state};
161
162	} else {	167	} else {
163	status "unable to connect";	168	status "unable to connect";
164	stop_game();	169	stop_game();
165	}	170	}
166	}	171	}
167		172
168	sub stop_game {	173	sub stop_game {
		174	$LOGIN_BUTTON->set_text ("Login");
		175	$SERVER_SETUP->show;
		176	$INV_WINDOW->hide;
		177	$LOGVIEW->hide;
		178
169	return unless $CONN;	179	return unless $CONN;
170		180
171	status "connection closed";	181	status "connection closed";
172	$LOGIN_BUTTON->set_text ("Login");	182
173	$CONN->destroy;	183	$CONN->destroy;
174	$CONN = 0; # false, does not autovivify	184	$CONN = 0; # false, does not autovivify
175
176	$BUTTONBAR->{children}[1]->emit ("activate")
177	unless $BUTTONBAR->{children}[1]->{state};
178	}	185	}
179		186
180	sub client_setup {	187	sub client_setup {
181	my $dialog = new CFClient::UI::FancyFrame	188	my $dialog = new CFClient::UI::FancyFrame
182	req_x => 1,	189	x => 1,
183	req_y => $HEIGHT * (1/8),	190	y => $HEIGHT * (1/8),
184	name => "client_setup",	191	name => "client_setup",
185	title => "Client Setup",	192	title => "Client Setup",
186	child => (my $vbox = new CFClient::UI::VBox);	193	child => (my $vbox = new CFClient::UI::VBox);
		194
187	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	195	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
188		196
189	$table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode");	197	$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);	198	$table->add (1, 0, my $hbox = new CFClient::UI::HBox);
191		199
192	$hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]);	200	$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");	201	$hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
194		202
195	$mode_slider->connect (changed => sub {	203	$mode_slider->connect (changed => sub {
196	my ($self, $value) = @_;	204	my ($self, $value) = @_;
197		205
…		…
385		393
386	sub make_gauge_window {	394	sub make_gauge_window {
387	my $gh = int $HEIGHT * $CFG->{gauge_size};	395	my $gh = int $HEIGHT * $CFG->{gauge_size};
388		396
389	my $win = new CFClient::UI::Frame (	397	my $win = new CFClient::UI::Frame (
390	req_y => -1,	398	force_x => 0,
		399	force_y => "max",
391	user_w => $WIDTH,	400	force_w => $WIDTH,
392	user_h => $gh,	401	force_h => $gh,
393	);	402	);
394		403
395	$win->add (my $hbox = new CFClient::UI::HBox	404	$win->add (my $hbox = new CFClient::UI::HBox
396	children => [	405	children => [
397	(new CFClient::UI::HBox expand => 1),	406	(new CFClient::UI::HBox expand => 1),
…		…
433	&set_gauge_window_fontsize;	442	&set_gauge_window_fontsize;
434		443
435	$win	444	$win
436	}	445	}
437		446
		447
438	sub make_stats_window {	448	sub make_stats_window {
439	my $tgw = new CFClient::UI::FancyFrame	449	my $tgw = new CFClient::UI::FancyFrame
440	req_y => $HEIGHT * (2/8),	450	y => $HEIGHT * (2/8),
441	req_x => -1,	451	x => "max",
442	title => "Stats",	452	title => "Stats",
443	name => "stats_window";	453	name => "stats_window";
444		454
445	$tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);	455	$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,	456	$vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
447	can_hover => 1, can_events => 1,	457	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.");	458	tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
…		…
620		630
621	$STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})	631	$STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
622	for keys %tbl;	632	for keys %tbl;
623	}	633	}
624		634
625	sub 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
635	my $METASERVER_ATIME;	635	my $METASERVER_ATIME;
636		636
637	sub update_metaserver {	637	sub update_metaserver {
638	my ($HOST) = @_;
639
640	return if $METASERVER_ATIME > time;	638	return if $METASERVER_ATIME > time;
641	$METASERVER_ATIME = time + 60;	639	$METASERVER_ATIME = time + 60;
642		640
643	my $table = $METASERVER->{table};	641	my $table = $METASERVER->{table};
644	$table->clear;	642	$table->clear;
…		…
696		694
697	$y++;	695	$y++;
698		696
699	$table->add (0, $y, new CFClient::UI::VBox children => [	697	$table->add (0, $y, new CFClient::UI::VBox children => [
700	(new CFClient::UI::Button text => "Use", on_activate => sub {	698	(new CFClient::UI::Button text => "Use", on_activate => sub {
701	$HOST->set_text ($CFG->{host} = $host);	699	$HOST_ENTRY->set_text ($CFG->{host} = $host);
		700	$METASERVER->toggle_visibility;
702	}),	701	}),
703	(new CFClient::UI::Empty expand => 1),	702	(new CFClient::UI::Empty expand => 1),
704	]);	703	]);
705		704
706	$table->add ($_ + 1, $y, new CFClient::UI::Label	705	$table->add ($_ + 1, $y, new CFClient::UI::Label
…		…
709	}	708	}
710	}	709	}
711	});	710	});
712	}	711	}
713		712
		713	sub metaserver_dialog {
		714	my $dialog = new CFClient::UI::FancyFrame
		715	title => "Server List",
		716	name => 'metaserver_dialog',
		717	x => 'center',
		718	y => 'center',
		719	child => (my $vbox = new CFClient::UI::VBox),
		720	on_visibility_change => sub {
		721	update_metaserver if $_[1];
		722	},
		723	;
		724
		725	$vbox->add ($dialog->{table} = new CFClient::UI::Table);
		726
		727	$dialog
		728	}
		729
714	sub server_setup {	730	sub server_setup {
715	my $dialog = new CFClient::UI::FancyFrame	731	my $dialog = $SERVER_SETUP = new CFClient::UI::FancyFrame
716	x => $WIDTH * (1/3),	732	x => "center",
717	y => $HEIGHT * (1/8),	733	y => "center",
718	name => "server_setup",	734	name => "server_setup",
719	title => "Server Setup",	735	title => "Server Setup",
720	child => (my $vbox = new CFClient::UI::VBox),	736	child => (my $vbox = new CFClient::UI::VBox),
721	on_visibility_change => sub {	737	;
722	$_[0]->show_centered if $_[1]
723	};
724		738
725	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	739	$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");	740	$table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");
727		741
728	{	742	{
729	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);	743	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);
730		744
731	$vbox->add (	745	$vbox->add (
732	my $HOST = new CFClient::UI::Entry	746	$HOST_ENTRY = new CFClient::UI::Entry
733	expand => 1,	747	expand => 1,
734	text => $CFG->{host},	748	text => $CFG->{host},
735	tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",	749	tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
736	on_changed => sub {	750	on_changed => sub {
737	my ($self, $value) = @_;	751	my ($self, $value) = @_;
…		…
739	}	753	}
740	);	754	);
741		755
742	$METASERVER = metaserver_dialog;	756	$METASERVER = metaserver_dialog;
743		757
744	$vbox->add (new CFClient::UI::Flopper	758	$vbox->add (new CFClient::UI::Button
745	expand => 1,	759	expand => 1,
746	text => "Server List",	760	text => "Server List",
747	other => $METASERVER,	761	other => $METASERVER,
748	tooltip => "Show a list of available crossfire servers",	762	tooltip => "Show a list of available crossfire servers",
749	on_open => sub {	763	on_activate => sub { $METASERVER->toggle_visibility },
750	update_metaserver $HOST;
751	}
752	);	764	);
753	}	765	}
754		766
755	$table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");	767	$table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
756	$table->add (1, 4, new CFClient::UI::Entry	768	$table->add (1, 4, new CFClient::UI::Entry
…		…
773	}	785	}
774	);	786	);
775		787
776	$table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");	788	$table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
777	$table->add (1, 7, new CFClient::UI::Slider	789	$table->add (1, 7, new CFClient::UI::Slider
778	req_w => 100,	790	force_w => 100,
779	range => [$CFG->{mapsize}, 10, 100, 0, 1],	791	range => [$CFG->{mapsize}, 10, 100, 0, 1],
780	tooltip => "This is the size of the portion of the map update the server sends you. "	792	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, "	793	. "If you set this to a high value you will be able to see further, "
782	. "but you also increase bandwidth requirements and latency. "	794	. "but you also increase bandwidth requirements and latency. "
783	. "This option is only used once at log-in.",	795	. "This option is only used once at log-in.",
…		…
832	my $window = new CFClient::UI::FancyFrame	844	my $window = new CFClient::UI::FancyFrame
833	name => "message_window",	845	name => "message_window",
834	title => "Messages",	846	title => "Messages",
835	border_bg => [1, 1, 1, 1],	847	border_bg => [1, 1, 1, 1],
836	bg => [0, 0, 0, 0.75],	848	bg => [0, 0, 0, 0.75],
837	req_x => -1,	849	x => "max",
		850	y => 0,
838	user_w => int $::WIDTH / 3,	851	force_w => $::WIDTH / 3,
839	user_h => int $::HEIGHT / 5,	852	force_h => $::HEIGHT / 5,
840	child => (my $vbox = new CFClient::UI::VBox);	853	child => (my $vbox = new CFClient::UI::VBox);
841		854
842	$vbox->add ($LOGVIEW);	855	$vbox->add ($LOGVIEW);
843		856
844	$vbox->add (my $input = new CFClient::UI::Entry	857	$vbox->add (my $input = new CFClient::UI::Entry
…		…
858	},	871	},
859	on_activate => sub {	872	on_activate => sub {
860	my ($input, $text) = @_;	873	my ($input, $text) = @_;
861	$input->set_text ('');	874	$input->set_text ('');
862		875
		876	if ($text =~ /^\/bind\s+(.*)$/) {
		877	CFClient::Binder::open_binding_dialog (sub {
		878	my ($mod, $sym) = @_;
		879	$::CFG->{bindings}->{$mod}->{$sym} = [$1];
		880	});
863	if ($text =~ /^\/(.*)/) {	881	} elsif ($text =~ /^\/(.*)/) {
864	$::CONN->user_send ($1);	882	$::CONN->user_send ($1);
865	} else {	883	} else {
866	my $say_cmd = $::CFG->{say_command} \|\| 'say';	884	my $say_cmd = $::CFG->{say_command} \|\| 'say';
867	$::CONN->user_send ("$say_cmd $text");	885	$::CONN->user_send ("$say_cmd $text");
868	}	886	}
…		…
876	},	894	},
877	);	895	);
878		896
879	$CONSOLE = {	897	$CONSOLE = {
880	window => $window,	898	window => $window,
881	input => $input	899	input => $input,
882	};	900	};
883		901
884	$window	902	$window
885	}	903	}
886		904
887	sub open_quit_dialog {	905	sub open_quit_dialog {
888	unless ($QUIT_DIALOG) {	906	unless ($QUIT_DIALOG) {
889
890	$QUIT_DIALOG = new CFClient::UI::FancyFrame title => "Really Quit?";	907	$QUIT_DIALOG = new CFClient::UI::FancyFrame
		908	x => "center",
		909	y => "center",
		910	title => "Really Quit?",
		911	;
891		912
892	$QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);	913	$QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
893		914
894	$vb->add (new CFClient::UI::Label	915	$vb->add (new CFClient::UI::Label
895	text => "You should find a savebed and apply it first!",	916	text => "You should find a savebed and apply it first!",
…		…
905	$hb->add (new CFClient::UI::Button	926	$hb->add (new CFClient::UI::Button
906	text => "Quit anyway",	927	text => "Quit anyway",
907	expand => 1,	928	expand => 1,
908	on_activate => sub { exit },	929	on_activate => sub { exit },
909	);	930	);
		931	}
910		932
911	$QUIT_DIALOG->show_centered;	933	$QUIT_DIALOG->show;
		934	}
		935
		936	sub make_pickup_cfg_window {
		937	$PICKUP_CFG = new CFClient::UI::FancyFrame
		938	x => "center",
		939	y => "center",
		940	force_w => $WIDTH * 3/10,
		941	force_h => $HEIGHT * 9/10;
		942
		943	my $tbl = new CFClient::UI::Table;
		944	my $tblrow = 0;
		945	$PICKUP_CFG->add (my $sw = new CFClient::UI::ScrolledWindow scrolled => $tbl);
		946
		947	for (
		948	["General"],
		949	["Enable (new) autopickup" => CFClient::Pickup::PU_NEWMODE],
		950	["Inhibit autopickup" => CFClient::Pickup::PU_INHIBIT],
		951	["Stop before pickup" => CFClient::Pickup::PU_STOP],
		952	["Debug autopickup" => CFClient::Pickup::PU_DEBUG],
		953	["Weapons"],
		954	["All weapons" => CFClient::Pickup::PU_ALLWEAPON],
		955	["Missile weapons" => CFClient::Pickup::PU_MISSILEWEAPON],
		956	["Bows" => CFClient::Pickup::PU_BOW],
		957	["Arrows" => CFClient::Pickup::PU_ARROW],
		958	["Armour"],
		959	["Helmets" => CFClient::Pickup::PU_HELMET],
		960	["Shields" => CFClient::Pickup::PU_SHIELD],
		961	["Body Armour" => CFClient::Pickup::PU_ARMOUR],
		962	["Boots" => CFClient::Pickup::PU_BOOTS],
		963	["Gloves" => CFClient::Pickup::PU_GLOVES],
		964	["Cloaks" => CFClient::Pickup::PU_CLOAK],
		965	["Readables"],
		966	["Spellbooks" => CFClient::Pickup::PU_SPELLBOOK],
		967	["Skillscrolls" => CFClient::Pickup::PU_SKILLSCROLL],
		968	["Normal Books/Scrolls" => CFClient::Pickup::PU_READABLES],
		969	["Misc"],
		970	["Food" => CFClient::Pickup::PU_FOOD],
		971	["Drinks" => CFClient::Pickup::PU_DRINK],
		972	["Valuables (Money, Gems)" => CFClient::Pickup::PU_VALUABLES],
		973	["Keys" => CFClient::Pickup::PU_KEY],
		974	["Magical Items" => CFClient::Pickup::PU_MAGICAL],
		975	["Potions" => CFClient::Pickup::PU_POTION],
		976	["Magic Devices" => CFClient::Pickup::PU_MAGIC_DEVICE],
		977	["Ignore cursed" => CFClient::Pickup::PU_NOT_CURSED],
		978	["Jewelery" => CFClient::Pickup::PU_JEWELS],
		979	)
		980	{
		981	unless (defined $_->[1]) {
		982	$tbl->add (0, $tblrow++, new CFClient::UI::Label text => $_->[0], align => 0);
912	} else {	983	} else {
913	$QUIT_DIALOG->show_centered;	984	my $mask = $_->[1];
		985	$tbl->add (0, $tblrow, new CFClient::UI::Label text => $_->[0], align => -1);
		986	$tbl->add (1, $tblrow++, 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	});
		997	}
914	}	998	}
		999
		1000	$PICKUP_CFG
915	}	1001	}
916		1002
917	sub make_inventory_window {	1003	sub make_inventory_window {
918	my $invwin = new CFClient::UI::FancyFrame	1004	my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
		1005	x => "center",
		1006	y => "center",
919	user_w => $WIDTH * (7/8),	1007	force_w => $WIDTH * 9/10,
920	user_h => $HEIGHT * (7/8),	1008	force_h => $HEIGHT * 9/10,
921	title => "Inventory",	1009	title => "Inventory",
922	name => "inventory_window",	1010	;
		1011
		1012	$invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);
		1013
		1014	$hb->add (my $vb1 = new CFClient::UI::VBox);
		1015	$vb1->add (new CFClient::UI::Label align => 0, text => "Player");
		1016	$vb1->add ($INV = new CFClient::UI::Inventory expand => 1);
		1017
		1018	$hb->add (my $vb2 = new CFClient::UI::VBox);
		1019
		1020	$vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
		1021
		1022	$vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
		1023
		1024	# XXX: Call after $INVR = ... because set_opencont sets the items
		1025	CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
		1026
		1027	$invwin
		1028	}
		1029
		1030	sub make_spell_list {
		1031	$SPELL_LIST = new CFClient::UI::SpellList
		1032	force_w => $WIDTH * (9/10),
		1033	force_h => $HEIGHT * (9/10);
		1034	$SPELL_LIST
		1035	}
		1036
		1037	sub make_binding_window {
		1038	my $binding_list = new CFClient::UI::VBox;
		1039
		1040	my $refresh;
		1041	$refresh = sub {
		1042	$binding_list->clear ();
		1043
		1044	for my $mod (keys %{$::CFG->{bindings}}) {
		1045	for my $sym (keys %{$::CFG->{bindings}->{$mod}}) {
		1046	my $cmds = $::CFG->{bindings}->{$mod}->{$sym};
		1047	next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
		1048
		1049	my $lbl = join "; ", @$cmds;
		1050	my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym);
		1051	$binding_list->add (my $hb = new CFClient::UI::HBox);
		1052	$hb->add (new CFClient::UI::Button
		1053	text => "delete",
		1054	tooltip => "Deletes the binding",
		1055	on_activate => sub {
		1056	$binding_list->remove ($hb);
		1057	delete $::CFG->{bindings}->{$mod}->{$sym};
		1058	});
		1059
		1060	$hb->add (new CFClient::UI::Button
		1061	text => "edit",
		1062	tooltip => "Edits the binding",
		1063	on_activate => sub {
		1064	$::BIND_EDITOR->set_binding (
		1065	$mod, $sym, $::CFG->{bindings}->{$mod}->{$sym},
		1066	sub {
		1067	my ($nmod, $nsym, $ncmds) = @_;
		1068	delete $::CFG->{bindings}->{$mod}->{$sym};
		1069	$::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds;
		1070	$refresh->();
		1071	$::BIND_WINDOW->show;
		1072	},
		1073	sub {
		1074	$::BIND_WINDOW->show;
		1075	});
		1076	$::BIND_EDITOR->show;
		1077	$::BIND_WINDOW->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	$BIND_WINDOW = new CFClient::UI::FancyFrame
		1087	title => "Bindings",
		1088	x => "center",
		1089	y => "center",
		1090	def_w => int $WIDTH * 9/10,
		1091	def_h => int $HEIGHT * 9/10,
923	on_visibility_change => sub {	1092	on_visibility_change => sub {
924	$_[0]->show_centered if $_[1]	1093	my ($self, $visible) = @_;
		1094	$refresh->() if $visible;
925	};	1095	};
926		1096
927	$invwin->add (my $hb = new CFClient::UI::HBox expand => 1);
928
929	$hb->add (my $vb1 = new CFClient::UI::VBox expand => 1);	1097	$BIND_WINDOW->add (my $vb = new CFClient::UI::VBox);
930	$vb1->add (my $lbl = new CFClient::UI::Label align => 0);	1098	$vb->add ($binding_list);
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);	1099	$vb->add (my $hb = new CFClient::UI::HBox);
937	$hb2->add ($INVR_LBL = new CFClient::UI::Label align => 0, expand => 1);
938	$hb2->add (new CFClient::UI::Button	1100	$hb->add (new CFClient::UI::Button
939	text => "Close",	1101	text => "record new",
940	tooltip => "Close the currently open container (if one is open)",	1102	expand => 1,
		1103	tooltip => "This button opens the binding editor with an empty binding.",
941	on_activate => sub {	1104	on_activate => sub {
942	$CONN->send ("apply $CONN->{open_container}")	1105	$::BIND_EDITOR->set_binding (undef, undef, [],
943	if $CONN->{open_container} != 0;	1106	sub {
		1107	my ($mod, $sym, $cmds) = @_;
		1108	$::CFG->{bindings}->{$mod}->{$sym} = $cmds;
		1109	$refresh->();
		1110	$::BIND_WINDOW->show;
		1111	},
		1112	sub {
		1113	$::BIND_WINDOW->show;
		1114	});
		1115	$::BIND_WINDOW->hide;
		1116	$::BIND_EDITOR->show;
944	},	1117	},
945	);	1118	);
		1119	$hb->add (new CFClient::UI::Button
		1120	text => "close",
		1121	tooltip => "Closes the binding window",
		1122	expand => 1,
		1123	on_activate => sub {
		1124	$::BIND_WINDOW->hide;
		1125	}
		1126	);
946		1127
947	$INVR_LBL->set_text ("Floor");	1128	$refresh->();
948	$vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);	1129	$BIND_WINDOW
949
950	$invwin
951	}	1130	}
952		1131
953	sub make_help_window {	1132	sub make_help_window {
954	my $win = new CFClient::UI::FancyFrame	1133	my $win = new CFClient::UI::FancyFrame
955	user_w => $WIDTH * (7/8), user_h => $HEIGHT * (7/8), title => "Documentation";	1134	x => 'center',
		1135	y => 'center',
		1136	name => 'doc_browser',
		1137	force_w => int $WIDTH * 7/8,
		1138	force_h => int $HEIGHT * 7/8,
		1139	title => "Documentation";
956		1140
957	$win->add (my $vbox = new CFClient::UI::VBox);	1141	$win->add (my $vbox = new CFClient::UI::VBox);
958		1142
959	$vbox->add (my $buttons = new CFClient::UI::HBox);	1143	$vbox->add (my $buttons = new CFClient::UI::HBox);
960	$vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8);	1144	$vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8);
…		…
1021	if ($DEBUG_STATUS) {	1205	if ($DEBUG_STATUS) {
1022	CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;	1206	CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1023	} else {	1207	} else {
1024	# create the widgets	1208	# create the widgets
1025		1209
1026	$DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, req_x => -1;	1210	$DEBUG_STATUS = new CFClient::UI::Label
		1211	padding => 0,
		1212	z => 100,
		1213	force_x => "max",
		1214	force_y => 0;
1027	$DEBUG_STATUS->show;	1215	$DEBUG_STATUS->show;
1028		1216
		1217	$BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);
		1218
1029	$STATUSBOX = new CFClient::UI::Statusbox;	1219	$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]);	1220	$STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]);
1031		1221
1032	(new CFClient::UI::Frame	1222	(new CFClient::UI::Frame
1033	bg => [0, 0, 0, 0.4],	1223	bg => [0, 0, 0, 0.4],
1034	req_y => -1,	1224	force_x => 0,
		1225	force_y => "max",
1035	child => $STATUSBOX,	1226	child => $STATUSBOX,
1036	)->show;	1227	)->show;
1037		1228
1038	CFClient::UI::FancyFrame->new (	1229	CFClient::UI::FancyFrame->new (
		1230	title => "Mini Map",
		1231	name => "mapmap",
		1232	x => 0,
		1233	y => $FONTSIZE + 8,
1039	border_bg => [1, 1, 1, 192/255],	1234	border_bg => [1, 1, 1, 192/255],
1040	bg => [1, 1, 1, 0],	1235	bg => [1, 1, 1, 0],
1041	child => ($MAPMAP = new CFClient::MapWidget::MapMap	1236	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.",	1237	tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
1043	),	1238	),
…		…
1066	can_hover => 1,	1261	can_hover => 1,
1067	can_events => 1,	1262	can_events => 1,
1068	tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",	1263	tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1069	;	1264	;
1070		1265
1071	$BUTTONBAR = new CFClient::UI::HBox;	1266	$BUTTONBAR = new CFClient::UI::HBox x => 0, y => 0;
1072		1267
1073	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup,	1268	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup,
1074	tooltip => "Toggles a dialog where you can configure various aspects of the client, such as graphics mode, performance, and audio options.");	1269	tooltip => "Toggles a dialog where you can configure various aspects of the client, such as graphics mode, performance, and audio options.");
1075	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup,	1270	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup,
1076	tooltip => "Toggles a dialog where you can configure the server to play on, your username, password and other server-related options.");	1271	tooltip => "Toggles a dialog where you can configure the server to play on, your username, password and other server-related options.");
…		…
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	1275	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		1276
1082	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window,	1277	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window,
1083	tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");	1278	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,	1279	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window,
1085	tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :).");	1280	tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :)."
		1281	."You can also hit the Tab-key to show/hide the Inventory.");
1086		1282
1087	$BUTTONBAR->add (new CFClient::UI::Button	1283	$BUTTONBAR->add (new CFClient::UI::Button
1088	text => "Save Config",	1284	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.",	1285	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 {	1286	on_activate => sub {
1091	$::CFG->{layout} = CFClient::UI::get_layout;	1287	$::CFG->{layout} = CFClient::UI::get_layout;
1092	CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";	1288	CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1093	status "Configuration Saved";	1289	status "Configuration Saved";
1094	},	1290	},
1095	);	1291	);
1096		1292
1097	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window,	1293	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window,
1098	tooltip => "View Documentation");	1294	tooltip => "View Documentation");
		1295
		1296	$BUTTONBAR->add (new CFClient::UI::Flopper
		1297	text => "Bindings",
		1298	other => make_binding_window,
		1299	tooltip =>
		1300	"Lets you define, edit and delete bindings."
		1301	."There is a shortcut for making bindings: LCTRL+Insert opens the binding editor "
		1302	."with nothing set and the recording started. After doing the actions you "
		1303	."want to record press Insert and you will be asked to press a key-combo."
		1304	."After pressing the combo the binding will be saved automatically and the "
		1305	."binding editor closes");
		1306
		1307	$BUTTONBAR->add (new CFClient::UI::Flopper
		1308	text => "Spells",
		1309	other => make_spell_list,
		1310	tooltip => "The spell list");
		1311
		1312	$BUTTONBAR->add (new CFClient::UI::Flopper
		1313	text => "Pickup",
		1314	other => make_pickup_cfg_window,
		1315	tooltip => "The pickup dialog");
		1316
1099		1317
1100	$BUTTONBAR->add (new CFClient::UI::Button	1318	$BUTTONBAR->add (new CFClient::UI::Button
1101	text => "Quit",	1319	text => "Quit",
1102	tooltip => "Terminates the program",	1320	tooltip => "Terminates the program",
1103	on_activate => sub {	1321	on_activate => sub {
…		…
1108	}	1326	}
1109	},	1327	},
1110	);	1328	);
1111		1329
1112	$BUTTONBAR->show;	1330	$BUTTONBAR->show;
		1331	$SERVER_SETUP->show;
1113		1332
1114	$STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);	1333	$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	}	1334	}
1124	}	1335	}
1125		1336
1126	sub video_shutdown {	1337	sub video_shutdown {
1127	undef $SDL_ACTIVE;	1338	undef $SDL_ACTIVE;
…		…
1195		1406
1196	my %demo;#d#	1407	my %demo;#d#
1197		1408
1198	sub force_refresh {	1409	sub force_refresh {
1199	$fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) \|\| 0.1) * 0.05;	1410	$fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) \|\| 0.1) * 0.05;
1200	debug sprintf "%3.2f", $fps;	1411	debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1201		1412
1202	$CFClient::UI::ROOT->draw;	1413	$CFClient::UI::ROOT->draw;
1203		1414
1204	$WANT_REFRESH = 0;	1415	$WANT_REFRESH = 0;
1205	$CAN_REFRESH = 0;	1416	$CAN_REFRESH = 0;
…		…
1337	#############################################################################	1548	#############################################################################
1338		1549
1339	$SIG{INT} = $SIG{TERM} = sub { exit };	1550	$SIG{INT} = $SIG{TERM} = sub { exit };
1340		1551
1341	{	1552	{
1342	local $SIG{__DIE__} = sub { CFClient::fatal $_[0] };	1553	local $SIG{__DIE__} = sub { CFClient::fatal $_[0] if defined $^S && !$^S };
1343		1554
1344	CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";	1555	CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1345	CFClient::UI::set_layout ($::CFG->{layout});	1556	CFClient::UI::set_layout ($::CFG->{layout});
1346		1557
1347	my %DEF_CFG = (	1558	my %DEF_CFG = (
1348	sdl_mode => 0,	1559	sdl_mode => 0,
1349	width => 640,	1560	width => 640,
…		…
1427		1638
1428	END { CFClient::SDL_Quit }	1639	END { CFClient::SDL_Quit }
1429		1640
1430	=head1 NAME	1641	=head1 NAME
1431		1642
1432	pclient - A Crossfire+ and Crossfire game client	1643	cfplus - A Crossfire+ and Crossfire game client
1433		1644
1434	=head1 SYNOPSIS	1645	=head1 SYNOPSIS
1435		1646
1436	Just run it - no commandline arguments are supported.	1647	Just run it - no commandline arguments are supported.
1437		1648
1438	=head1 USAGE	1649	=head1 USAGE
1439		1650
1440	Pclient utilises OpenGL for all UI elements and the game. It is supposed to be used	1651	cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used
1441	fullscreen and interactively.	1652	fullscreen and interactively.
1442		1653
		1654	=head1 DEBUGGING
		1655
		1656
		1657	CFPLUS_DEBUG - environment variable
		1658
		1659	1 draw borders around widgets
		1660	2 add low-level widget info to tooltips
		1661	4 show fps
		1662	8 suppress tooltips
		1663
1443	=head1 AUTHOR	1664	=head1 AUTHOR
1444		1665
1445	Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>	1666	Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
1446		1667
1447		1668

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents): Revision 1.19 by elmex, Sat May 27 21:15:57 2006 UTC vs. Revision 1.43 by elmex, Fri Jun 2 16:27:28 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.19 by elmex, Sat May 27 21:15:57 2006 UTC vs.
Revision 1.43 by elmex, Fri Jun 2 16:27:28 2006 UTC