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

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.21 by root, Sun May 28 01:16:04 2006 UTC vs.
Revision 1.48 by root, Fri Jun 2 21:46:45 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_x => 0,	398	force_x => 0,
391	req_y => -1,	399	force_y => "max",
392	def_w => $WIDTH,	400	force_w => $WIDTH,
393	def_h => $gh,	401	force_h => $gh,
394	);	402	);
395		403
396	$win->add (my $hbox = new CFClient::UI::HBox	404	$win->add (my $hbox = new CFClient::UI::HBox
397	children => [	405	children => [
398	(new CFClient::UI::HBox expand => 1),	406	(new CFClient::UI::HBox expand => 1),
…		…
434	&set_gauge_window_fontsize;	442	&set_gauge_window_fontsize;
435		443
436	$win	444	$win
437	}	445	}
438		446
		447
439	sub make_stats_window {	448	sub make_stats_window {
440	my $tgw = new CFClient::UI::FancyFrame	449	my $tgw = new CFClient::UI::FancyFrame
441	req_y => $HEIGHT * (2/8),	450	y => $HEIGHT * (2/8),
442	req_x => -1,	451	x => "max",
443	title => "Stats",	452	title => "Stats",
444	name => "stats_window";	453	name => "stats_window";
445		454
446	$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);
447	$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,
448	can_hover => 1, can_events => 1,	457	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.");	458	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 ({});	557	update_stats_window ({});
549		558
550	$tgw	559	$tgw
551	}	560	}
552		561
553	sub formsep {	562	sub formsep($) {
554	reverse join ",", grep length, split /(...)/, reverse $_[0] * 1	563	scalar reverse join ",", unpack "(A3)", reverse $_[0] 1
555	}	564	}
556		565
557	sub update_stats_window {	566	sub update_stats_window {
558	my ($stats) = @_;	567	my ($stats) = @_;
559		568
…		…
621		630
622	$STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})	631	$STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
623	for keys %tbl;	632	for keys %tbl;
624	}	633	}
625		634
626	sub 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
636	my $METASERVER_ATIME;	635	my $METASERVER_ATIME;
637		636
638	sub update_metaserver {	637	sub update_metaserver {
639	my ($HOST) = @_;
640
641	return if $METASERVER_ATIME > time;	638	return if $METASERVER_ATIME > time;
642	$METASERVER_ATIME = time + 60;	639	$METASERVER_ATIME = time + 60;
643		640
644	my $table = $METASERVER->{table};	641	my $table = $METASERVER->{table};
645	$table->clear;	642	$table->clear;
…		…
697		694
698	$y++;	695	$y++;
699		696
700	$table->add (0, $y, new CFClient::UI::VBox children => [	697	$table->add (0, $y, new CFClient::UI::VBox children => [
701	(new CFClient::UI::Button text => "Use", on_activate => sub {	698	(new CFClient::UI::Button text => "Use", on_activate => sub {
702	$HOST->set_text ($CFG->{host} = $host);	699	$HOST_ENTRY->set_text ($CFG->{host} = $host);
		700	$METASERVER->toggle_visibility;
703	}),	701	}),
704	(new CFClient::UI::Empty expand => 1),	702	(new CFClient::UI::Empty expand => 1),
705	]);	703	]);
706		704
707	$table->add ($_ + 1, $y, new CFClient::UI::Label	705	$table->add ($_ + 1, $y, new CFClient::UI::Label
…		…
710	}	708	}
711	}	709	}
712	});	710	});
713	}	711	}
714		712
715	sub server_setup {	713	sub metaserver_dialog {
716	my $dialog = new CFClient::UI::FancyFrame	714	my $dialog = new CFClient::UI::FancyFrame
717	x => $WIDTH * (1/3),	715	title => "Server List",
718	y => $HEIGHT * (1/8),	716	name => 'metaserver_dialog',
719	name => "server_setup",	717	x => 'center',
720	title => "Server Setup",	718	y => 'center',
721	child => (my $vbox = new CFClient::UI::VBox),	719	child => (my $vbox = new CFClient::UI::VBox),
722	on_visibility_change => sub {	720	on_visibility_change => sub {
723	my ($self, $visible) = @_;	721	update_metaserver if $_[1];
724	$self->center if $visible;
725	},	722	},
726	;	723	;
727		724
		725	$vbox->add ($dialog->{table} = new CFClient::UI::Table);
		726
		727	$dialog
		728	}
		729
		730	sub server_setup {
		731	my $dialog = $SERVER_SETUP = new CFClient::UI::FancyFrame
		732	x => "center",
		733	y => "center",
		734	name => "server_setup",
		735	title => "Server Setup",
		736	child => (my $vbox = new CFClient::UI::VBox),
		737	;
		738
728	$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]);
729	$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");
730		741
731	{	742	{
732	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);	743	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);
733		744
734	$vbox->add (	745	$vbox->add (
735	my $HOST = new CFClient::UI::Entry	746	$HOST_ENTRY = new CFClient::UI::Entry
736	expand => 1,	747	expand => 1,
737	text => $CFG->{host},	748	text => $CFG->{host},
738	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",
739	on_changed => sub {	750	on_changed => sub {
740	my ($self, $value) = @_;	751	my ($self, $value) = @_;
…		…
742	}	753	}
743	);	754	);
744		755
745	$METASERVER = metaserver_dialog;	756	$METASERVER = metaserver_dialog;
746		757
747	$vbox->add (new CFClient::UI::Flopper	758	$vbox->add (new CFClient::UI::Button
748	expand => 1,	759	expand => 1,
749	text => "Server List",	760	text => "Server List",
750	other => $METASERVER,	761	other => $METASERVER,
751	tooltip => "Show a list of available crossfire servers",	762	tooltip => "Show a list of available crossfire servers",
752	on_open => sub {	763	on_activate => sub { $METASERVER->toggle_visibility },
753	update_metaserver $HOST;
754	}
755	);	764	);
756	}	765	}
757		766
758	$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");
759	$table->add (1, 4, new CFClient::UI::Entry	768	$table->add (1, 4, new CFClient::UI::Entry
…		…
776	}	785	}
777	);	786	);
778		787
779	$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");
780	$table->add (1, 7, new CFClient::UI::Slider	789	$table->add (1, 7, new CFClient::UI::Slider
781	req_w => 100,	790	force_w => 100,
782	range => [$CFG->{mapsize}, 10, 100, 0, 1],	791	range => [$CFG->{mapsize}, 10, 100, 0, 1],
783	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. "
784	. "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, "
785	. "but you also increase bandwidth requirements and latency. "	794	. "but you also increase bandwidth requirements and latency. "
786	. "This option is only used once at log-in.",	795	. "This option is only used once at log-in.",
…		…
835	my $window = new CFClient::UI::FancyFrame	844	my $window = new CFClient::UI::FancyFrame
836	name => "message_window",	845	name => "message_window",
837	title => "Messages",	846	title => "Messages",
838	border_bg => [1, 1, 1, 1],	847	border_bg => [1, 1, 1, 1],
839	bg => [0, 0, 0, 0.75],	848	bg => [0, 0, 0, 0.75],
840	req_x => -1,	849	x => "max",
841	req_y => 0,	850	y => 0,
842	def_w => int $::WIDTH / 3,	851	force_w => $::WIDTH / 3,
843	def_h => int $::HEIGHT / 5,	852	force_h => $::HEIGHT / 5,
844	child => (my $vbox = new CFClient::UI::VBox);	853	child => (my $vbox = new CFClient::UI::VBox);
845		854
846	$vbox->add ($LOGVIEW);	855	$vbox->add ($LOGVIEW);
847		856
848	$vbox->add (my $input = new CFClient::UI::Entry	857	$vbox->add (my $input = new CFClient::UI::Entry
…		…
880	},	889	},
881	);	890	);
882		891
883	$CONSOLE = {	892	$CONSOLE = {
884	window => $window,	893	window => $window,
885	input => $input	894	input => $input,
886	};	895	};
887		896
888	$window	897	$window
889	}	898	}
890		899
891	sub open_quit_dialog {	900	sub open_quit_dialog {
892	unless ($QUIT_DIALOG) {	901	unless ($QUIT_DIALOG) {
893	$QUIT_DIALOG = new CFClient::UI::FancyFrame title => "Really Quit?";	902	$QUIT_DIALOG = new CFClient::UI::FancyFrame
		903	x => "center",
		904	y => "center",
		905	title => "Really Quit?",
		906	;
894		907
895	$QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);	908	$QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
896		909
897	$vb->add (new CFClient::UI::Label	910	$vb->add (new CFClient::UI::Label
898	text => "You should find a savebed and apply it first!",	911	text => "You should find a savebed and apply it first!",
…		…
911	on_activate => sub { exit },	924	on_activate => sub { exit },
912	);	925	);
913	}	926	}
914		927
915	$QUIT_DIALOG->show;	928	$QUIT_DIALOG->show;
916	$QUIT_DIALOG->center;	929	}
		930
		931	sub make_pickup_cfg_window {
		932	$PICKUP_CFG = new CFClient::UI::FancyFrame
		933	title => "Autopickup configuration",
		934	x => "center",
		935	y => "center",
		936	force_w => $WIDTH * 6/10,
		937	force_h => $HEIGHT * 9/10;
		938
		939
		940	$PICKUP_CFG->add (my $vb = new CFClient::UI::VBox);
		941	$vb->add (my $gen_tbl = new CFClient::UI::Table expand => 1);
		942	$vb->add (my $hb = new CFClient::UI::HBox expand => 1);
		943	$hb->add (my $ltbl = new CFClient::UI::Table expand => 1);
		944	$hb->add (my $rtbl = new CFClient::UI::Table expand => 1);
		945
		946	my $tbl = 0;
		947	my $tblrow = 0;
		948
		949	for (
		950	["General", $gen_tbl],
		951	["Enable autopickup" => CFClient::Pickup::PU_NEWMODE],
		952	["Inhibit autopickup" => CFClient::Pickup::PU_INHIBIT],
		953	["Stop before pickup" => CFClient::Pickup::PU_STOP],
		954	["Debug autopickup" => CFClient::Pickup::PU_DEBUG],
		955	["Weapons", $ltbl],
		956	["All weapons" => CFClient::Pickup::PU_ALLWEAPON],
		957	["Missile weapons" => CFClient::Pickup::PU_MISSILEWEAPON],
		958	["Bows" => CFClient::Pickup::PU_BOW],
		959	["Arrows" => CFClient::Pickup::PU_ARROW],
		960	["Armour"],
		961	["Helmets" => CFClient::Pickup::PU_HELMET],
		962	["Shields" => CFClient::Pickup::PU_SHIELD],
		963	["Body Armour" => CFClient::Pickup::PU_ARMOUR],
		964	["Boots" => CFClient::Pickup::PU_BOOTS],
		965	["Gloves" => CFClient::Pickup::PU_GLOVES],
		966	["Cloaks" => CFClient::Pickup::PU_CLOAK],
		967	["Readables", $rtbl],
		968	["Spellbooks" => CFClient::Pickup::PU_SPELLBOOK],
		969	["Skillscrolls" => CFClient::Pickup::PU_SKILLSCROLL],
		970	["Normal Books/Scrolls" => CFClient::Pickup::PU_READABLES],
		971	["Misc"],
		972	["Food" => CFClient::Pickup::PU_FOOD],
		973	["Drinks" => CFClient::Pickup::PU_DRINK],
		974	["Valuables (Money, Gems)" => CFClient::Pickup::PU_VALUABLES],
		975	["Keys" => CFClient::Pickup::PU_KEY],
		976	["Magical Items" => CFClient::Pickup::PU_MAGICAL],
		977	["Potions" => CFClient::Pickup::PU_POTION],
		978	["Magic Devices" => CFClient::Pickup::PU_MAGIC_DEVICE],
		979	["Ignore cursed" => CFClient::Pickup::PU_NOT_CURSED],
		980	["Jewelery" => CFClient::Pickup::PU_JEWELS],
		981	)
		982	{
		983	if (ref $_->[1]) {
		984	$tbl = $_->[1];
		985	$tblrow = 0;
		986	$tbl->add (0, $tblrow++, new CFClient::UI::Label text => $_->[0], align => -1);
		987	} elsif (not defined $_->[1]) {
		988	$tbl->add (0, $tblrow++, new CFClient::UI::Label text => $_->[0], align => -1);
		989	} else {
		990	my $mask = $_->[1];
		991	$tbl->add (0, $tblrow, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);
		992	$tbl->add (1, $tblrow++, new CFClient::UI::CheckBox
		993	state => $CFG->{pickup} & $mask,
		994	on_changed => sub {
		995	my ($box, $value) = @_;
		996	if ($value) {
		997	$::CFG->{pickup} \|= $mask;
		998	} else {
		999	$::CFG->{pickup} = $::CFG->{pickup} & ~$mask;
		1000	}
		1001	$::CONN->send (sprintf "command pickup %u", $::CFG->{pickup})
		1002	if defined $::CONN;
		1003	});
		1004	}
		1005	}
		1006
		1007	$PICKUP_CFG
917	}	1008	}
918		1009
919	sub make_inventory_window {	1010	sub make_inventory_window {
920	my $invwin = new CFClient::UI::FancyFrame	1011	my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
		1012	x => "center",
		1013	y => "center",
921	def_w => $WIDTH * 7/8,	1014	force_w => $WIDTH * 9/10,
922	def_h => $HEIGHT * 7/8,	1015	force_h => $HEIGHT * 9/10,
923	title => "Inventory",	1016	title => "Inventory",
924	name => "inventory_window",
925	on_visibility_change => sub {
926	my ($self, $visible) = @_;
927	$self->center if $visible;
928	},
929	;	1017	;
930		1018
931	$invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);	1019	$invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);
932		1020
933	$hb->add (my $vb1 = new CFClient::UI::VBox);	1021	$hb->add (my $vb1 = new CFClient::UI::VBox);
934	$vb1->add (new CFClient::UI::Label align => 0, text => "Player");	1022	$vb1->add (new CFClient::UI::Label align => 0, text => "Player");
935	$vb1->add ($INV = new CFClient::UI::Inventory expand => 1);	1023	$vb1->add ($INV = new CFClient::UI::Inventory expand => 1);
936		1024
937	$hb->add (my $vb2 = new CFClient::UI::VBox);	1025	$hb->add (my $vb2 = new CFClient::UI::VBox);
938		1026
		1027	$vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
		1028
		1029	$vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
		1030
		1031	# XXX: Call after $INVR = ... because set_opencont sets the items
		1032	CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
		1033
		1034	$invwin
		1035	}
		1036
		1037	sub make_spell_list {
		1038	$SPELL_LIST = new CFClient::UI::SpellList
		1039	force_w => $WIDTH * (9/10),
		1040	force_h => $HEIGHT * (9/10);
		1041	$SPELL_LIST
		1042	}
		1043
		1044	sub make_binding_window {
		1045	my $binding_list = new CFClient::UI::VBox;
		1046
		1047	my $refresh;
		1048	$refresh = sub {
		1049	$binding_list->clear ();
		1050
		1051	for my $mod (keys %{$::CFG->{bindings}}) {
		1052	for my $sym (keys %{$::CFG->{bindings}->{$mod}}) {
		1053	my $cmds = $::CFG->{bindings}->{$mod}->{$sym};
		1054	next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
		1055
		1056	my $lbl = join "; ", @$cmds;
		1057	my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym);
		1058	$binding_list->add (my $hb = new CFClient::UI::HBox);
		1059	$hb->add (new CFClient::UI::Button
		1060	text => "delete",
		1061	tooltip => "Deletes the binding",
		1062	on_activate => sub {
		1063	$binding_list->remove ($hb);
		1064	delete $::CFG->{bindings}->{$mod}->{$sym};
		1065	});
		1066
		1067	$hb->add (new CFClient::UI::Button
		1068	text => "edit",
		1069	tooltip => "Edits the binding",
		1070	on_activate => sub {
		1071	$::BIND_EDITOR->set_binding (
		1072	$mod, $sym, $::CFG->{bindings}->{$mod}->{$sym},
		1073	sub {
		1074	my ($nmod, $nsym, $ncmds) = @_;
		1075	delete $::CFG->{bindings}->{$mod}->{$sym};
		1076	$::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds;
		1077	$refresh->();
		1078	$::BIND_WINDOW->show;
		1079	},
		1080	sub {
		1081	$::BIND_WINDOW->show;
		1082	});
		1083	$::BIND_EDITOR->show;
		1084	$::BIND_WINDOW->hide;
		1085	});
		1086
		1087	$hb->add (new CFClient::UI::Label text => "(Key: $nam)");
		1088	$hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
		1089	}
		1090	}
		1091	};
		1092
		1093	$BIND_WINDOW = new CFClient::UI::FancyFrame
		1094	title => "Bindings",
		1095	x => "center",
		1096	y => "center",
		1097	def_w => int $WIDTH * 9/10,
		1098	def_h => int $HEIGHT * 9/10,
		1099	on_visibility_change => sub {
		1100	my ($self, $visible) = @_;
		1101	$refresh->() if $visible;
		1102	};
		1103
		1104	$BIND_WINDOW->add (my $vb = new CFClient::UI::VBox);
		1105	$vb->add ($binding_list);
939	$vb2->add (my $hb2 = new CFClient::UI::HBox);	1106	$vb->add (my $hb = new CFClient::UI::HBox);
940	$hb2->add ($INVR_LBL = new CFClient::UI::Label align => 0, expand => 1, text => "Floor");
941	$hb2->add (new CFClient::UI::Button	1107	$hb->add (new CFClient::UI::Button
942	text => "Close",	1108	text => "record new",
943	tooltip => "Close the currently open container (if one is open)",	1109	expand => 1,
		1110	tooltip => "This button opens the binding editor with an empty binding.",
944	on_activate => sub {	1111	on_activate => sub {
945	$CONN->send ("apply $CONN->{open_container}")	1112	$::BIND_EDITOR->set_binding (undef, undef, [],
946	if $CONN->{open_container} != 0;	1113	sub {
		1114	my ($mod, $sym, $cmds) = @_;
		1115	$::CFG->{bindings}->{$mod}->{$sym} = $cmds;
		1116	$refresh->();
		1117	$::BIND_WINDOW->show;
		1118	},
		1119	sub {
		1120	$::BIND_WINDOW->show;
		1121	});
		1122	$::BIND_WINDOW->hide;
		1123	$::BIND_EDITOR->show;
947	},	1124	},
948	);	1125	);
		1126	$hb->add (new CFClient::UI::Button
		1127	text => "close",
		1128	tooltip => "Closes the binding window",
		1129	expand => 1,
		1130	on_activate => sub {
		1131	$::BIND_WINDOW->hide;
		1132	}
		1133	);
949		1134
950	$vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);	1135	$refresh->();
951		1136	$BIND_WINDOW
952	$invwin
953	}	1137	}
954		1138
955	sub make_help_window {	1139	sub make_help_window {
956	my $win = new CFClient::UI::FancyFrame	1140	my $win = new CFClient::UI::FancyFrame
		1141	x => 'center',
		1142	y => 'center',
		1143	name => 'doc_browser',
957	def_w => int $WIDTH * 7/8,	1144	force_w => int $WIDTH * 7/8,
958	def_h => int $HEIGHT * 7/8,	1145	force_h => int $HEIGHT * 7/8,
959	title => "Documentation";	1146	title => "Documentation";
960		1147
961	$win->add (my $vbox = new CFClient::UI::VBox);	1148	$win->add (my $vbox = new CFClient::UI::VBox);
962		1149
963	$vbox->add (my $buttons = new CFClient::UI::HBox);	1150	$vbox->add (my $buttons = new CFClient::UI::HBox);
964	$vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8);	1151	$vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8);
…		…
1025	if ($DEBUG_STATUS) {	1212	if ($DEBUG_STATUS) {
1026	CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;	1213	CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1027	} else {	1214	} else {
1028	# create the widgets	1215	# create the widgets
1029		1216
1030	$DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, req_x => -1;	1217	$DEBUG_STATUS = new CFClient::UI::Label
		1218	padding => 0,
		1219	z => 100,
		1220	force_x => "max",
		1221	force_y => 0;
1031	$DEBUG_STATUS->show;	1222	$DEBUG_STATUS->show;
1032		1223
		1224	$BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);
		1225
1033	$STATUSBOX = new CFClient::UI::Statusbox;	1226	$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]);	1227	$STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]);
1035		1228
1036	(new CFClient::UI::Frame	1229	(new CFClient::UI::Frame
1037	bg => [0, 0, 0, 0.4],	1230	bg => [0, 0, 0, 0.4],
1038	req_y => -1,	1231	force_x => 0,
		1232	force_y => "max",
1039	child => $STATUSBOX,	1233	child => $STATUSBOX,
1040	)->show;	1234	)->show;
1041		1235
1042	CFClient::UI::FancyFrame->new (	1236	CFClient::UI::FancyFrame->new (
		1237	title => "Map",
		1238	name => "mapmap",
		1239	x => 0,
		1240	y => $FONTSIZE + 8,
1043	border_bg => [1, 1, 1, 192/255],	1241	border_bg => [1, 1, 1, 192/255],
1044	bg => [1, 1, 1, 0],	1242	bg => [1, 1, 1, 0],
1045	child => ($MAPMAP = new CFClient::MapWidget::MapMap	1243	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.",	1244	tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
1047	),	1245	),
…		…
1070	can_hover => 1,	1268	can_hover => 1,
1071	can_events => 1,	1269	can_events => 1,
1072	tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",	1270	tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1073	;	1271	;
1074		1272
1075	$BUTTONBAR = new CFClient::UI::HBox;	1273	$BUTTONBAR = new CFClient::UI::HBox x => 0, y => 0;
1076		1274
1077	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup,	1275	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup,
1078	tooltip => "Toggles a dialog where you can configure various aspects of the client, such as graphics mode, performance, and audio options.");	1276	tooltip => "Toggles a dialog where you can configure various aspects of the client, such as graphics mode, performance, and audio options.");
1079	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup,	1277	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup,
1080	tooltip => "Toggles a dialog where you can configure the server to play on, your username, password and other server-related options.");	1278	tooltip => "Toggles a dialog where you can configure the server to play on, your username, password and other server-related options.");
…		…
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	1282	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		1283
1086	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window,	1284	$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.");	1285	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,	1286	$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 :).");	1287	tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :)."
		1288	."You can also hit the Tab-key to show/hide the Inventory.");
1090		1289
1091	$BUTTONBAR->add (new CFClient::UI::Button	1290	$BUTTONBAR->add (new CFClient::UI::Button
1092	text => "Save Config",	1291	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.",	1292	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 {	1293	on_activate => sub {
1095	$::CFG->{layout} = CFClient::UI::get_layout;	1294	$::CFG->{layout} = CFClient::UI::get_layout;
1096	CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";	1295	CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1097	status "Configuration Saved";	1296	status "Configuration Saved";
1098	},	1297	},
1099	);	1298	);
1100		1299
1101	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window,	1300	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window,
1102	tooltip => "View Documentation");	1301	tooltip => "View Documentation");
		1302
		1303	$BUTTONBAR->add (new CFClient::UI::Flopper
		1304	text => "Bindings",
		1305	other => make_binding_window,
		1306	tooltip =>
		1307	"Lets you define, edit and delete bindings."
		1308	."There is a shortcut for making bindings: LCTRL+Insert opens the binding editor "
		1309	."with nothing set and the recording started. After doing the actions you "
		1310	."want to record press Insert and you will be asked to press a key-combo."
		1311	."After pressing the combo the binding will be saved automatically and the "
		1312	."binding editor closes");
		1313
		1314	$BUTTONBAR->add (new CFClient::UI::Flopper
		1315	text => "Spells",
		1316	other => make_spell_list,
		1317	tooltip => "The spell list");
		1318
		1319	$BUTTONBAR->add (new CFClient::UI::Flopper
		1320	text => "Pickup",
		1321	other => make_pickup_cfg_window,
		1322	tooltip => "The pickup dialog");
		1323
1103		1324
1104	$BUTTONBAR->add (new CFClient::UI::Button	1325	$BUTTONBAR->add (new CFClient::UI::Button
1105	text => "Quit",	1326	text => "Quit",
1106	tooltip => "Terminates the program",	1327	tooltip => "Terminates the program",
1107	on_activate => sub {	1328	on_activate => sub {
…		…
1112	}	1333	}
1113	},	1334	},
1114	);	1335	);
1115		1336
1116	$BUTTONBAR->show;	1337	$BUTTONBAR->show;
		1338	$SERVER_SETUP->show;
1117		1339
1118	$STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);	1340	$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	}	1341	}
1128	}	1342	}
1129		1343
1130	sub video_shutdown {	1344	sub video_shutdown {
1131	undef $SDL_ACTIVE;	1345	undef $SDL_ACTIVE;
…		…
1199		1413
1200	my %demo;#d#	1414	my %demo;#d#
1201		1415
1202	sub force_refresh {	1416	sub force_refresh {
1203	$fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) \|\| 0.1) * 0.05;	1417	$fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) \|\| 0.1) * 0.05;
1204	debug sprintf "%3.2f", $fps;	1418	debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1205		1419
1206	$CFClient::UI::ROOT->draw;	1420	$CFClient::UI::ROOT->draw;
1207		1421
1208	$WANT_REFRESH = 0;	1422	$WANT_REFRESH = 0;
1209	$CAN_REFRESH = 0;	1423	$CAN_REFRESH = 0;
…		…
1341	#############################################################################	1555	#############################################################################
1342		1556
1343	$SIG{INT} = $SIG{TERM} = sub { exit };	1557	$SIG{INT} = $SIG{TERM} = sub { exit };
1344		1558
1345	{	1559	{
1346	local $SIG{__DIE__} = sub { CFClient::fatal $_[0] };	1560	local $SIG{__DIE__} = sub { CFClient::fatal $_[0] if defined $^S && !$^S };
1347		1561
1348	CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";	1562	CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1349	CFClient::UI::set_layout ($::CFG->{layout});	1563	CFClient::UI::set_layout ($::CFG->{layout});
1350		1564
1351	my %DEF_CFG = (	1565	my %DEF_CFG = (
1352	sdl_mode => 0,	1566	sdl_mode => 0,
1353	width => 640,	1567	width => 640,
…		…
1431		1645
1432	END { CFClient::SDL_Quit }	1646	END { CFClient::SDL_Quit }
1433		1647
1434	=head1 NAME	1648	=head1 NAME
1435		1649
1436	pclient - A Crossfire+ and Crossfire game client	1650	cfplus - A Crossfire+ and Crossfire game client
1437		1651
1438	=head1 SYNOPSIS	1652	=head1 SYNOPSIS
1439		1653
1440	Just run it - no commandline arguments are supported.	1654	Just run it - no commandline arguments are supported.
1441		1655
1442	=head1 USAGE	1656	=head1 USAGE
1443		1657
1444	Pclient utilises OpenGL for all UI elements and the game. It is supposed to be used	1658	cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used
1445	fullscreen and interactively.	1659	fullscreen and interactively.
1446		1660
		1661	=head1 DEBUGGING
		1662
		1663
		1664	CFPLUS_DEBUG - environment variable
		1665
		1666	1 draw borders around widgets
		1667	2 add low-level widget info to tooltips
		1668	4 show fps
		1669	8 suppress tooltips
		1670
1447	=head1 AUTHOR	1671	=head1 AUTHOR
1448		1672
1449	Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>	1673	Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
1450		1674
1451		1675

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents): Revision 1.21 by root, Sun May 28 01:16:04 2006 UTC vs. Revision 1.48 by root, Fri Jun 2 21:46:45 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.21 by root, Sun May 28 01:16:04 2006 UTC vs.
Revision 1.48 by root, Fri Jun 2 21:46:45 2006 UTC