[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.40 by root, Fri Jun 2 02:12:04 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;
105		113
106	sub status {	114	sub status {
107	$STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);	115	$STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
108	}	116	}
109		117
110	sub debug {	118	sub debug {
111	$DEBUG_STATUS->set_text ($_[0]);	119	$DEBUG_STATUS->set_text ($_[0]);
112	my ($w, $h) = $DEBUG_STATUS->size_request;
113	$DEBUG_STATUS->move ($WIDTH - $w, 0);
114	}	120	}
115		121
116	sub start_game {	122	sub start_game {
117	status "logging in...";	123	status "logging in...";
		124
		125	$LOGIN_BUTTON->set_text ("Logout");
		126	$SERVER_SETUP->hide;
118		127
119	my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;	128	my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
120		129
121	my ($host, $port) = split /:/, $CFG->{host};	130	my ($host, $port) = split /:/, $CFG->{host};
122		131
…		…
151	};	160	};
152		161
153	if ($CONN) {	162	if ($CONN) {
154	CFClient::lowdelay fileno $CONN->{fh};	163	CFClient::lowdelay fileno $CONN->{fh};
155		164
156	$LOGIN_BUTTON->set_text ("Logout");
157	status "login successful";	165	status "login successful";
158
159	$BUTTONBAR->{children}[1]->emit ("activate")
160	if $BUTTONBAR->{children}[1]->{state};
161
162	} else {	166	} else {
163	status "unable to connect";	167	status "unable to connect";
164	stop_game();	168	stop_game();
165	}	169	}
166	}	170	}
167		171
168	sub stop_game {	172	sub stop_game {
		173	$LOGIN_BUTTON->set_text ("Login");
		174	$SERVER_SETUP->show;
		175	$INV_WINDOW->hide;
		176	$LOGVIEW->hide;
		177
169	return unless $CONN;	178	return unless $CONN;
170		179
171	status "connection closed";	180	status "connection closed";
172	$LOGIN_BUTTON->set_text ("Login");	181
173	$CONN->destroy;	182	$CONN->destroy;
174	$CONN = 0; # false, does not autovivify	183	$CONN = 0; # false, does not autovivify
175
176	$BUTTONBAR->{children}[1]->emit ("activate")
177	unless $BUTTONBAR->{children}[1]->{state};
178	}	184	}
179		185
180	sub client_setup {	186	sub client_setup {
181	my $dialog = new CFClient::UI::FancyFrame	187	my $dialog = new CFClient::UI::FancyFrame
182	req_x => 1,	188	x => 1,
183	req_y => $HEIGHT * (1/8),	189	y => $HEIGHT * (1/8),
184	name => "client_setup",	190	name => "client_setup",
185	title => "Client Setup",	191	title => "Client Setup",
186	child => (my $vbox = new CFClient::UI::VBox);	192	child => (my $vbox = new CFClient::UI::VBox);
		193
187	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	194	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
188		195
189	$table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode");	196	$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);	197	$table->add (1, 0, my $hbox = new CFClient::UI::HBox);
191		198
192	$hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]);	199	$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");	200	$hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
194		201
195	$mode_slider->connect (changed => sub {	202	$mode_slider->connect (changed => sub {
196	my ($self, $value) = @_;	203	my ($self, $value) = @_;
197		204
…		…
385		392
386	sub make_gauge_window {	393	sub make_gauge_window {
387	my $gh = int $HEIGHT * $CFG->{gauge_size};	394	my $gh = int $HEIGHT * $CFG->{gauge_size};
388		395
389	my $win = new CFClient::UI::Frame (	396	my $win = new CFClient::UI::Frame (
390	req_y => -1,	397	force_x => 0,
		398	force_y => "max",
391	user_w => $WIDTH,	399	force_w => $WIDTH,
392	user_h => $gh,	400	force_h => $gh,
393	);	401	);
394		402
395	$win->add (my $hbox = new CFClient::UI::HBox	403	$win->add (my $hbox = new CFClient::UI::HBox
396	children => [	404	children => [
397	(new CFClient::UI::HBox expand => 1),	405	(new CFClient::UI::HBox expand => 1),
…		…
433	&set_gauge_window_fontsize;	441	&set_gauge_window_fontsize;
434		442
435	$win	443	$win
436	}	444	}
437		445
		446
438	sub make_stats_window {	447	sub make_stats_window {
439	my $tgw = new CFClient::UI::FancyFrame	448	my $tgw = new CFClient::UI::FancyFrame
440	req_y => $HEIGHT * (2/8),	449	y => $HEIGHT * (2/8),
441	req_x => -1,	450	x => "max",
442	title => "Stats",	451	title => "Stats",
443	name => "stats_window";	452	name => "stats_window";
444		453
445	$tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);	454	$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,	455	$vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
447	can_hover => 1, can_events => 1,	456	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.");	457	tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
…		…
620		629
621	$STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})	630	$STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
622	for keys %tbl;	631	for keys %tbl;
623	}	632	}
624		633
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;	634	my $METASERVER_ATIME;
636		635
637	sub update_metaserver {	636	sub update_metaserver {
638	my ($HOST) = @_;
639
640	return if $METASERVER_ATIME > time;	637	return if $METASERVER_ATIME > time;
641	$METASERVER_ATIME = time + 60;	638	$METASERVER_ATIME = time + 60;
642		639
643	my $table = $METASERVER->{table};	640	my $table = $METASERVER->{table};
644	$table->clear;	641	$table->clear;
…		…
696		693
697	$y++;	694	$y++;
698		695
699	$table->add (0, $y, new CFClient::UI::VBox children => [	696	$table->add (0, $y, new CFClient::UI::VBox children => [
700	(new CFClient::UI::Button text => "Use", on_activate => sub {	697	(new CFClient::UI::Button text => "Use", on_activate => sub {
701	$HOST->set_text ($CFG->{host} = $host);	698	$HOST_ENTRY->set_text ($CFG->{host} = $host);
		699	$METASERVER->toggle_visibility;
702	}),	700	}),
703	(new CFClient::UI::Empty expand => 1),	701	(new CFClient::UI::Empty expand => 1),
704	]);	702	]);
705		703
706	$table->add ($_ + 1, $y, new CFClient::UI::Label	704	$table->add ($_ + 1, $y, new CFClient::UI::Label
…		…
709	}	707	}
710	}	708	}
711	});	709	});
712	}	710	}
713		711
		712	sub metaserver_dialog {
		713	my $dialog = new CFClient::UI::FancyFrame
		714	title => "Server List",
		715	x => 'center',
		716	y => 'center',
		717	child => (my $vbox = new CFClient::UI::VBox),
		718	on_visibility_change => sub {
		719	update_metaserver if $_[1];
		720	},
		721	;
		722
		723	$vbox->add ($dialog->{table} = new CFClient::UI::Table);
		724
		725	$dialog
		726	}
		727
714	sub server_setup {	728	sub server_setup {
715	my $dialog = new CFClient::UI::FancyFrame	729	my $dialog = $SERVER_SETUP = new CFClient::UI::FancyFrame
716	x => $WIDTH * (1/3),	730	x => "center",
717	y => $HEIGHT * (1/8),	731	y => "center",
718	name => "server_setup",	732	name => "server_setup",
719	title => "Server Setup",	733	title => "Server Setup",
720	child => (my $vbox = new CFClient::UI::VBox),	734	child => (my $vbox = new CFClient::UI::VBox),
721	on_visibility_change => sub {	735	;
722	$_[0]->show_centered if $_[1]
723	};
724		736
725	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	737	$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");	738	$table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");
727		739
728	{	740	{
729	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);	741	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);
730		742
731	$vbox->add (	743	$vbox->add (
732	my $HOST = new CFClient::UI::Entry	744	$HOST_ENTRY = new CFClient::UI::Entry
733	expand => 1,	745	expand => 1,
734	text => $CFG->{host},	746	text => $CFG->{host},
735	tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",	747	tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
736	on_changed => sub {	748	on_changed => sub {
737	my ($self, $value) = @_;	749	my ($self, $value) = @_;
…		…
739	}	751	}
740	);	752	);
741		753
742	$METASERVER = metaserver_dialog;	754	$METASERVER = metaserver_dialog;
743		755
744	$vbox->add (new CFClient::UI::Flopper	756	$vbox->add (new CFClient::UI::Button
745	expand => 1,	757	expand => 1,
746	text => "Server List",	758	text => "Server List",
747	other => $METASERVER,	759	other => $METASERVER,
748	tooltip => "Show a list of available crossfire servers",	760	tooltip => "Show a list of available crossfire servers",
749	on_open => sub {	761	on_activate => sub { $METASERVER->toggle_visibility },
750	update_metaserver $HOST;
751	}
752	);	762	);
753	}	763	}
754		764
755	$table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");	765	$table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
756	$table->add (1, 4, new CFClient::UI::Entry	766	$table->add (1, 4, new CFClient::UI::Entry
…		…
773	}	783	}
774	);	784	);
775		785
776	$table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");	786	$table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
777	$table->add (1, 7, new CFClient::UI::Slider	787	$table->add (1, 7, new CFClient::UI::Slider
778	req_w => 100,	788	force_w => 100,
779	range => [$CFG->{mapsize}, 10, 100, 0, 1],	789	range => [$CFG->{mapsize}, 10, 100, 0, 1],
780	tooltip => "This is the size of the portion of the map update the server sends you. "	790	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, "	791	. "If you set this to a high value you will be able to see further, "
782	. "but you also increase bandwidth requirements and latency. "	792	. "but you also increase bandwidth requirements and latency. "
783	. "This option is only used once at log-in.",	793	. "This option is only used once at log-in.",
…		…
832	my $window = new CFClient::UI::FancyFrame	842	my $window = new CFClient::UI::FancyFrame
833	name => "message_window",	843	name => "message_window",
834	title => "Messages",	844	title => "Messages",
835	border_bg => [1, 1, 1, 1],	845	border_bg => [1, 1, 1, 1],
836	bg => [0, 0, 0, 0.75],	846	bg => [0, 0, 0, 0.75],
837	req_x => -1,	847	x => "max",
		848	y => 0,
838	user_w => int $::WIDTH / 3,	849	force_w => $::WIDTH / 3,
839	user_h => int $::HEIGHT / 5,	850	force_h => $::HEIGHT / 5,
840	child => (my $vbox = new CFClient::UI::VBox);	851	child => (my $vbox = new CFClient::UI::VBox);
841		852
842	$vbox->add ($LOGVIEW);	853	$vbox->add ($LOGVIEW);
843		854
844	$vbox->add (my $input = new CFClient::UI::Entry	855	$vbox->add (my $input = new CFClient::UI::Entry
…		…
858	},	869	},
859	on_activate => sub {	870	on_activate => sub {
860	my ($input, $text) = @_;	871	my ($input, $text) = @_;
861	$input->set_text ('');	872	$input->set_text ('');
862		873
		874	if ($text =~ /^\/bind\s+(.*)$/) {
		875	CFClient::Binder::open_binding_dialog (sub {
		876	my ($mod, $sym) = @_;
		877	$::CFG->{bindings}->{$mod}->{$sym} = [$1];
		878	});
863	if ($text =~ /^\/(.*)/) {	879	} elsif ($text =~ /^\/(.*)/) {
864	$::CONN->user_send ($1);	880	$::CONN->user_send ($1);
865	} else {	881	} else {
866	my $say_cmd = $::CFG->{say_command} \|\| 'say';	882	my $say_cmd = $::CFG->{say_command} \|\| 'say';
867	$::CONN->user_send ("$say_cmd $text");	883	$::CONN->user_send ("$say_cmd $text");
868	}	884	}
…		…
876	},	892	},
877	);	893	);
878		894
879	$CONSOLE = {	895	$CONSOLE = {
880	window => $window,	896	window => $window,
881	input => $input	897	input => $input,
882	};	898	};
883		899
884	$window	900	$window
885	}	901	}
886		902
887	sub open_quit_dialog {	903	sub open_quit_dialog {
888	unless ($QUIT_DIALOG) {	904	unless ($QUIT_DIALOG) {
889
890	$QUIT_DIALOG = new CFClient::UI::FancyFrame title => "Really Quit?";	905	$QUIT_DIALOG = new CFClient::UI::FancyFrame
		906	x => "center",
		907	y => "center",
		908	title => "Really Quit?",
		909	;
891		910
892	$QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);	911	$QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
893		912
894	$vb->add (new CFClient::UI::Label	913	$vb->add (new CFClient::UI::Label
895	text => "You should find a savebed and apply it first!",	914	text => "You should find a savebed and apply it first!",
…		…
905	$hb->add (new CFClient::UI::Button	924	$hb->add (new CFClient::UI::Button
906	text => "Quit anyway",	925	text => "Quit anyway",
907	expand => 1,	926	expand => 1,
908	on_activate => sub { exit },	927	on_activate => sub { exit },
909	);	928	);
		929	}
910		930
911	$QUIT_DIALOG->show_centered;	931	$QUIT_DIALOG->show;
912	} else {
913	$QUIT_DIALOG->show_centered;
914	}
915	}	932	}
916		933
917	sub make_inventory_window {	934	sub make_inventory_window {
918	my $invwin = new CFClient::UI::FancyFrame	935	my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
		936	x => "center",
		937	y => "center",
919	user_w => $WIDTH * (7/8),	938	force_w => $WIDTH * 9/10,
920	user_h => $HEIGHT * (7/8),	939	force_h => $HEIGHT * 9/10,
921	title => "Inventory",	940	title => "Inventory",
922	name => "inventory_window",	941	;
		942
		943	$invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);
		944
		945	$hb->add (my $vb1 = new CFClient::UI::VBox);
		946	$vb1->add (new CFClient::UI::Label align => 0, text => "Player");
		947	$vb1->add ($INV = new CFClient::UI::Inventory expand => 1);
		948
		949	$hb->add (my $vb2 = new CFClient::UI::VBox);
		950
		951	$vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
		952
		953	$vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
		954
		955	# XXX: Call after $INVR = ... because set_opencont sets the items
		956	CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
		957
		958	$invwin
		959	}
		960
		961	sub make_spell_list {
		962	$SPELL_LIST = new CFClient::UI::SpellList
		963	force_w => $WIDTH * (9/10),
		964	force_h => $HEIGHT * (9/10);
		965	$SPELL_LIST
		966	}
		967
		968	sub make_binding_window {
		969	my $binding_list = new CFClient::UI::VBox;
		970
		971	my $refresh;
		972	$refresh = sub {
		973	$binding_list->clear ();
		974
		975	for my $mod (keys %{$::CFG->{bindings}}) {
		976	for my $sym (keys %{$::CFG->{bindings}->{$mod}}) {
		977	my $cmds = $::CFG->{bindings}->{$mod}->{$sym};
		978	next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
		979
		980	my $lbl = join "; ", @$cmds;
		981	my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym);
		982	$binding_list->add (my $hb = new CFClient::UI::HBox);
		983	$hb->add (new CFClient::UI::Button
		984	text => "delete",
		985	tooltip => "Deletes the binding",
		986	on_activate => sub {
		987	$binding_list->remove ($hb);
		988	delete $::CFG->{bindings}->{$mod}->{$sym};
		989	});
		990
		991	$hb->add (new CFClient::UI::Button
		992	text => "edit",
		993	tooltip => "Edits the binding",
		994	on_activate => sub {
		995	$::BIND_EDITOR->set_binding (
		996	$mod, $sym, $::CFG->{bindings}->{$mod}->{$sym},
		997	sub {
		998	my ($nmod, $nsym, $ncmds) = @_;
		999	delete $::CFG->{bindings}->{$mod}->{$sym};
		1000	$::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds;
		1001	$refresh->();
		1002	$::BIND_WINDOW->show;
		1003	},
		1004	sub {
		1005	$::BIND_WINDOW->show;
		1006	});
		1007	$::BIND_EDITOR->show;
		1008	$::BIND_WINDOW->hide;
		1009	});
		1010
		1011	$hb->add (new CFClient::UI::Label text => "(Key: $nam)");
		1012	$hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
		1013	}
		1014	}
		1015	};
		1016
		1017	$BIND_WINDOW = new CFClient::UI::FancyFrame
		1018	title => "Bindings",
		1019	x => "center",
		1020	y => "center",
		1021	def_w => int $WIDTH * 9/10,
		1022	def_h => int $HEIGHT * 9/10,
923	on_visibility_change => sub {	1023	on_visibility_change => sub {
924	$_[0]->show_centered if $_[1]	1024	my ($self, $visible) = @_;
		1025	$refresh->() if $visible;
925	};	1026	};
926		1027
927	$invwin->add (my $hb = new CFClient::UI::HBox expand => 1);
928
929	$hb->add (my $vb1 = new CFClient::UI::VBox expand => 1);	1028	$BIND_WINDOW->add (my $vb = new CFClient::UI::VBox);
930	$vb1->add (my $lbl = new CFClient::UI::Label align => 0);	1029	$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);	1030	$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	1031	$hb->add (new CFClient::UI::Button
939	text => "Close",	1032	text => "record new",
940	tooltip => "Close the currently open container (if one is open)",	1033	expand => 1,
		1034	tooltip => "This button opens the binding editor with an empty binding.",
941	on_activate => sub {	1035	on_activate => sub {
942	$CONN->send ("apply $CONN->{open_container}")	1036	$::BIND_EDITOR->set_binding (undef, undef, [],
943	if $CONN->{open_container} != 0;	1037	sub {
		1038	my ($mod, $sym, $cmds) = @_;
		1039	$::CFG->{bindings}->{$mod}->{$sym} = $cmds;
		1040	$refresh->();
		1041	$::BIND_WINDOW->show;
		1042	},
		1043	sub {
		1044	$::BIND_WINDOW->show;
		1045	});
		1046	$::BIND_WINDOW->hide;
		1047	$::BIND_EDITOR->show;
944	},	1048	},
945	);	1049	);
		1050	$hb->add (new CFClient::UI::Button
		1051	text => "close",
		1052	tooltip => "Closes the binding window",
		1053	expand => 1,
		1054	on_activate => sub {
		1055	$::BIND_WINDOW->hide;
		1056	}
		1057	);
946		1058
947	$INVR_LBL->set_text ("Floor");	1059	$refresh->();
948	$vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);	1060	$BIND_WINDOW
949
950	$invwin
951	}	1061	}
952		1062
953	sub make_help_window {	1063	sub make_help_window {
954	my $win = new CFClient::UI::FancyFrame	1064	my $win = new CFClient::UI::FancyFrame
955	user_w => $WIDTH * (7/8), user_h => $HEIGHT * (7/8), title => "Documentation";	1065	def_w => int $WIDTH * 7/8,
		1066	def_h => int $HEIGHT * 7/8,
		1067	title => "Documentation";
956		1068
957	$win->add (my $vbox = new CFClient::UI::VBox);	1069	$win->add (my $vbox = new CFClient::UI::VBox);
958		1070
959	$vbox->add (my $buttons = new CFClient::UI::HBox);	1071	$vbox->add (my $buttons = new CFClient::UI::HBox);
960	$vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8);	1072	$vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8);
…		…
1021	if ($DEBUG_STATUS) {	1133	if ($DEBUG_STATUS) {
1022	CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;	1134	CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1023	} else {	1135	} else {
1024	# create the widgets	1136	# create the widgets
1025		1137
1026	$DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, req_x => -1;	1138	$DEBUG_STATUS = new CFClient::UI::Label
		1139	padding => 0,
		1140	z => 100,
		1141	force_x => "max",
		1142	force_y => 0;
1027	$DEBUG_STATUS->show;	1143	$DEBUG_STATUS->show;
1028		1144
		1145	$BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);
		1146
1029	$STATUSBOX = new CFClient::UI::Statusbox;	1147	$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]);	1148	$STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]);
1031		1149
1032	(new CFClient::UI::Frame	1150	(new CFClient::UI::Frame
1033	bg => [0, 0, 0, 0.4],	1151	bg => [0, 0, 0, 0.4],
1034	req_y => -1,	1152	force_x => 0,
		1153	force_y => "max",
1035	child => $STATUSBOX,	1154	child => $STATUSBOX,
1036	)->show;	1155	)->show;
1037		1156
1038	CFClient::UI::FancyFrame->new (	1157	CFClient::UI::FancyFrame->new (
		1158	x => 0,
		1159	y => $FONTSIZE + 8,
1039	border_bg => [1, 1, 1, 192/255],	1160	border_bg => [1, 1, 1, 192/255],
1040	bg => [1, 1, 1, 0],	1161	bg => [1, 1, 1, 0],
1041	child => ($MAPMAP = new CFClient::MapWidget::MapMap	1162	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.",	1163	tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
1043	),	1164	),
…		…
1066	can_hover => 1,	1187	can_hover => 1,
1067	can_events => 1,	1188	can_events => 1,
1068	tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",	1189	tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1069	;	1190	;
1070		1191
1071	$BUTTONBAR = new CFClient::UI::HBox;	1192	$BUTTONBAR = new CFClient::UI::HBox x => 0, y => 0;
1072		1193
1073	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup,	1194	$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.");	1195	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,	1196	$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.");	1197	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	1201	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		1202
1082	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window,	1203	$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.");	1204	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,	1205	$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 :).");	1206	tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :)."
		1207	."You can also hit the Tab-key to show/hide the Inventory.");
1086		1208
1087	$BUTTONBAR->add (new CFClient::UI::Button	1209	$BUTTONBAR->add (new CFClient::UI::Button
1088	text => "Save Config",	1210	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.",	1211	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 {	1212	on_activate => sub {
1091	$::CFG->{layout} = CFClient::UI::get_layout;	1213	$::CFG->{layout} = CFClient::UI::get_layout;
1092	CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";	1214	CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1093	status "Configuration Saved";	1215	status "Configuration Saved";
1094	},	1216	},
1095	);	1217	);
1096		1218
1097	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window,	1219	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window,
1098	tooltip => "View Documentation");	1220	tooltip => "View Documentation");
		1221
		1222	$BUTTONBAR->add (new CFClient::UI::Flopper
		1223	text => "Bindings",
		1224	other => make_binding_window,
		1225	tooltip =>
		1226	"Lets you define, edit and delete bindings."
		1227	."There is a shortcut for making bindings: LCTRL+Insert opens the binding editor "
		1228	."with nothing set and the recording started. After doing the actions you "
		1229	."want to record press Insert and you will be asked to press a key-combo."
		1230	."After pressing the combo the binding will be saved automatically and the "
		1231	."binding editor closes");
		1232
		1233	$BUTTONBAR->add (new CFClient::UI::Flopper
		1234	text => "Spells",
		1235	other => make_spell_list,
		1236	tooltip => "The spell list");
1099		1237
1100	$BUTTONBAR->add (new CFClient::UI::Button	1238	$BUTTONBAR->add (new CFClient::UI::Button
1101	text => "Quit",	1239	text => "Quit",
1102	tooltip => "Terminates the program",	1240	tooltip => "Terminates the program",
1103	on_activate => sub {	1241	on_activate => sub {
…		…
1108	}	1246	}
1109	},	1247	},
1110	);	1248	);
1111		1249
1112	$BUTTONBAR->show;	1250	$BUTTONBAR->show;
		1251	$SERVER_SETUP->show;
1113		1252
1114	$STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);	1253	$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	}	1254	}
1124	}	1255	}
1125		1256
1126	sub video_shutdown {	1257	sub video_shutdown {
1127	undef $SDL_ACTIVE;	1258	undef $SDL_ACTIVE;
…		…
1195		1326
1196	my %demo;#d#	1327	my %demo;#d#
1197		1328
1198	sub force_refresh {	1329	sub force_refresh {
1199	$fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) \|\| 0.1) * 0.05;	1330	$fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) \|\| 0.1) * 0.05;
1200	debug sprintf "%3.2f", $fps;	1331	debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1201		1332
1202	$CFClient::UI::ROOT->draw;	1333	$CFClient::UI::ROOT->draw;
1203		1334
1204	$WANT_REFRESH = 0;	1335	$WANT_REFRESH = 0;
1205	$CAN_REFRESH = 0;	1336	$CAN_REFRESH = 0;
…		…
1337	#############################################################################	1468	#############################################################################
1338		1469
1339	$SIG{INT} = $SIG{TERM} = sub { exit };	1470	$SIG{INT} = $SIG{TERM} = sub { exit };
1340		1471
1341	{	1472	{
1342	local $SIG{__DIE__} = sub { CFClient::fatal $_[0] };	1473	local $SIG{__DIE__} = sub { CFClient::fatal $_[0] if defined $^S && !$^S };
1343		1474
1344	CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";	1475	CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1345	CFClient::UI::set_layout ($::CFG->{layout});	1476	CFClient::UI::set_layout ($::CFG->{layout});
1346		1477
1347	my %DEF_CFG = (	1478	my %DEF_CFG = (
1348	sdl_mode => 0,	1479	sdl_mode => 0,
1349	width => 640,	1480	width => 640,
…		…
1427		1558
1428	END { CFClient::SDL_Quit }	1559	END { CFClient::SDL_Quit }
1429		1560
1430	=head1 NAME	1561	=head1 NAME
1431		1562
1432	pclient - A Crossfire+ and Crossfire game client	1563	cfplus - A Crossfire+ and Crossfire game client
1433		1564
1434	=head1 SYNOPSIS	1565	=head1 SYNOPSIS
1435		1566
1436	Just run it - no commandline arguments are supported.	1567	Just run it - no commandline arguments are supported.
1437		1568
1438	=head1 USAGE	1569	=head1 USAGE
1439		1570
1440	Pclient utilises OpenGL for all UI elements and the game. It is supposed to be used	1571	cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used
1441	fullscreen and interactively.	1572	fullscreen and interactively.
1442		1573
		1574	=head1 DEBUGGING
		1575
		1576
		1577	CFPLUS_DEBUG - environment variable
		1578
		1579	1 draw borders around widgets
		1580	2 add low-level widget info to tooltips
		1581	4 show fps
		1582	8 suppress tooltips
		1583
1443	=head1 AUTHOR	1584	=head1 AUTHOR
1444		1585
1445	Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>	1586	Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
1446		1587
1447		1588

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.40 by root, Fri Jun 2 02:12:04 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.40 by root, Fri Jun 2 02:12:04 2006 UTC