[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.42 by root, Fri Jun 2 06:22:55 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	name => 'metaserver_dialog',
		716	x => 'center',
		717	y => 'center',
		718	child => (my $vbox = new CFClient::UI::VBox),
		719	on_visibility_change => sub {
		720	update_metaserver if $_[1];
		721	},
		722	;
		723
		724	$vbox->add ($dialog->{table} = new CFClient::UI::Table);
		725
		726	$dialog
		727	}
		728
714	sub server_setup {	729	sub server_setup {
715	my $dialog = new CFClient::UI::FancyFrame	730	my $dialog = $SERVER_SETUP = new CFClient::UI::FancyFrame
716	x => $WIDTH * (1/3),	731	x => "center",
717	y => $HEIGHT * (1/8),	732	y => "center",
718	name => "server_setup",	733	name => "server_setup",
719	title => "Server Setup",	734	title => "Server Setup",
720	child => (my $vbox = new CFClient::UI::VBox),	735	child => (my $vbox = new CFClient::UI::VBox),
721	on_visibility_change => sub {	736	;
722	$_[0]->show_centered if $_[1]
723	};
724		737
725	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	738	$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");	739	$table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");
727		740
728	{	741	{
729	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);	742	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);
730		743
731	$vbox->add (	744	$vbox->add (
732	my $HOST = new CFClient::UI::Entry	745	$HOST_ENTRY = new CFClient::UI::Entry
733	expand => 1,	746	expand => 1,
734	text => $CFG->{host},	747	text => $CFG->{host},
735	tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",	748	tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
736	on_changed => sub {	749	on_changed => sub {
737	my ($self, $value) = @_;	750	my ($self, $value) = @_;
…		…
739	}	752	}
740	);	753	);
741		754
742	$METASERVER = metaserver_dialog;	755	$METASERVER = metaserver_dialog;
743		756
744	$vbox->add (new CFClient::UI::Flopper	757	$vbox->add (new CFClient::UI::Button
745	expand => 1,	758	expand => 1,
746	text => "Server List",	759	text => "Server List",
747	other => $METASERVER,	760	other => $METASERVER,
748	tooltip => "Show a list of available crossfire servers",	761	tooltip => "Show a list of available crossfire servers",
749	on_open => sub {	762	on_activate => sub { $METASERVER->toggle_visibility },
750	update_metaserver $HOST;
751	}
752	);	763	);
753	}	764	}
754		765
755	$table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");	766	$table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
756	$table->add (1, 4, new CFClient::UI::Entry	767	$table->add (1, 4, new CFClient::UI::Entry
…		…
773	}	784	}
774	);	785	);
775		786
776	$table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");	787	$table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
777	$table->add (1, 7, new CFClient::UI::Slider	788	$table->add (1, 7, new CFClient::UI::Slider
778	req_w => 100,	789	force_w => 100,
779	range => [$CFG->{mapsize}, 10, 100, 0, 1],	790	range => [$CFG->{mapsize}, 10, 100, 0, 1],
780	tooltip => "This is the size of the portion of the map update the server sends you. "	791	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, "	792	. "If you set this to a high value you will be able to see further, "
782	. "but you also increase bandwidth requirements and latency. "	793	. "but you also increase bandwidth requirements and latency. "
783	. "This option is only used once at log-in.",	794	. "This option is only used once at log-in.",
…		…
832	my $window = new CFClient::UI::FancyFrame	843	my $window = new CFClient::UI::FancyFrame
833	name => "message_window",	844	name => "message_window",
834	title => "Messages",	845	title => "Messages",
835	border_bg => [1, 1, 1, 1],	846	border_bg => [1, 1, 1, 1],
836	bg => [0, 0, 0, 0.75],	847	bg => [0, 0, 0, 0.75],
837	req_x => -1,	848	x => "max",
		849	y => 0,
838	user_w => int $::WIDTH / 3,	850	force_w => $::WIDTH / 3,
839	user_h => int $::HEIGHT / 5,	851	force_h => $::HEIGHT / 5,
840	child => (my $vbox = new CFClient::UI::VBox);	852	child => (my $vbox = new CFClient::UI::VBox);
841		853
842	$vbox->add ($LOGVIEW);	854	$vbox->add ($LOGVIEW);
843		855
844	$vbox->add (my $input = new CFClient::UI::Entry	856	$vbox->add (my $input = new CFClient::UI::Entry
…		…
858	},	870	},
859	on_activate => sub {	871	on_activate => sub {
860	my ($input, $text) = @_;	872	my ($input, $text) = @_;
861	$input->set_text ('');	873	$input->set_text ('');
862		874
		875	if ($text =~ /^\/bind\s+(.*)$/) {
		876	CFClient::Binder::open_binding_dialog (sub {
		877	my ($mod, $sym) = @_;
		878	$::CFG->{bindings}->{$mod}->{$sym} = [$1];
		879	});
863	if ($text =~ /^\/(.*)/) {	880	} elsif ($text =~ /^\/(.*)/) {
864	$::CONN->user_send ($1);	881	$::CONN->user_send ($1);
865	} else {	882	} else {
866	my $say_cmd = $::CFG->{say_command} \|\| 'say';	883	my $say_cmd = $::CFG->{say_command} \|\| 'say';
867	$::CONN->user_send ("$say_cmd $text");	884	$::CONN->user_send ("$say_cmd $text");
868	}	885	}
…		…
876	},	893	},
877	);	894	);
878		895
879	$CONSOLE = {	896	$CONSOLE = {
880	window => $window,	897	window => $window,
881	input => $input	898	input => $input,
882	};	899	};
883		900
884	$window	901	$window
885	}	902	}
886		903
887	sub open_quit_dialog {	904	sub open_quit_dialog {
888	unless ($QUIT_DIALOG) {	905	unless ($QUIT_DIALOG) {
889
890	$QUIT_DIALOG = new CFClient::UI::FancyFrame title => "Really Quit?";	906	$QUIT_DIALOG = new CFClient::UI::FancyFrame
		907	x => "center",
		908	y => "center",
		909	title => "Really Quit?",
		910	;
891		911
892	$QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);	912	$QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
893		913
894	$vb->add (new CFClient::UI::Label	914	$vb->add (new CFClient::UI::Label
895	text => "You should find a savebed and apply it first!",	915	text => "You should find a savebed and apply it first!",
…		…
905	$hb->add (new CFClient::UI::Button	925	$hb->add (new CFClient::UI::Button
906	text => "Quit anyway",	926	text => "Quit anyway",
907	expand => 1,	927	expand => 1,
908	on_activate => sub { exit },	928	on_activate => sub { exit },
909	);	929	);
		930	}
910		931
911	$QUIT_DIALOG->show_centered;	932	$QUIT_DIALOG->show;
912	} else {
913	$QUIT_DIALOG->show_centered;
914	}
915	}	933	}
916		934
917	sub make_inventory_window {	935	sub make_inventory_window {
918	my $invwin = new CFClient::UI::FancyFrame	936	my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
		937	x => "center",
		938	y => "center",
919	user_w => $WIDTH * (7/8),	939	force_w => $WIDTH * 9/10,
920	user_h => $HEIGHT * (7/8),	940	force_h => $HEIGHT * 9/10,
921	title => "Inventory",	941	title => "Inventory",
922	name => "inventory_window",	942	;
		943
		944	$invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);
		945
		946	$hb->add (my $vb1 = new CFClient::UI::VBox);
		947	$vb1->add (new CFClient::UI::Label align => 0, text => "Player");
		948	$vb1->add ($INV = new CFClient::UI::Inventory expand => 1);
		949
		950	$hb->add (my $vb2 = new CFClient::UI::VBox);
		951
		952	$vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
		953
		954	$vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
		955
		956	# XXX: Call after $INVR = ... because set_opencont sets the items
		957	CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
		958
		959	$invwin
		960	}
		961
		962	sub make_spell_list {
		963	$SPELL_LIST = new CFClient::UI::SpellList
		964	force_w => $WIDTH * (9/10),
		965	force_h => $HEIGHT * (9/10);
		966	$SPELL_LIST
		967	}
		968
		969	sub make_binding_window {
		970	my $binding_list = new CFClient::UI::VBox;
		971
		972	my $refresh;
		973	$refresh = sub {
		974	$binding_list->clear ();
		975
		976	for my $mod (keys %{$::CFG->{bindings}}) {
		977	for my $sym (keys %{$::CFG->{bindings}->{$mod}}) {
		978	my $cmds = $::CFG->{bindings}->{$mod}->{$sym};
		979	next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
		980
		981	my $lbl = join "; ", @$cmds;
		982	my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym);
		983	$binding_list->add (my $hb = new CFClient::UI::HBox);
		984	$hb->add (new CFClient::UI::Button
		985	text => "delete",
		986	tooltip => "Deletes the binding",
		987	on_activate => sub {
		988	$binding_list->remove ($hb);
		989	delete $::CFG->{bindings}->{$mod}->{$sym};
		990	});
		991
		992	$hb->add (new CFClient::UI::Button
		993	text => "edit",
		994	tooltip => "Edits the binding",
		995	on_activate => sub {
		996	$::BIND_EDITOR->set_binding (
		997	$mod, $sym, $::CFG->{bindings}->{$mod}->{$sym},
		998	sub {
		999	my ($nmod, $nsym, $ncmds) = @_;
		1000	delete $::CFG->{bindings}->{$mod}->{$sym};
		1001	$::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds;
		1002	$refresh->();
		1003	$::BIND_WINDOW->show;
		1004	},
		1005	sub {
		1006	$::BIND_WINDOW->show;
		1007	});
		1008	$::BIND_EDITOR->show;
		1009	$::BIND_WINDOW->hide;
		1010	});
		1011
		1012	$hb->add (new CFClient::UI::Label text => "(Key: $nam)");
		1013	$hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
		1014	}
		1015	}
		1016	};
		1017
		1018	$BIND_WINDOW = new CFClient::UI::FancyFrame
		1019	title => "Bindings",
		1020	x => "center",
		1021	y => "center",
		1022	def_w => int $WIDTH * 9/10,
		1023	def_h => int $HEIGHT * 9/10,
923	on_visibility_change => sub {	1024	on_visibility_change => sub {
924	$_[0]->show_centered if $_[1]	1025	my ($self, $visible) = @_;
		1026	$refresh->() if $visible;
925	};	1027	};
926		1028
927	$invwin->add (my $hb = new CFClient::UI::HBox expand => 1);
928
929	$hb->add (my $vb1 = new CFClient::UI::VBox expand => 1);	1029	$BIND_WINDOW->add (my $vb = new CFClient::UI::VBox);
930	$vb1->add (my $lbl = new CFClient::UI::Label align => 0);	1030	$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);	1031	$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	1032	$hb->add (new CFClient::UI::Button
939	text => "Close",	1033	text => "record new",
940	tooltip => "Close the currently open container (if one is open)",	1034	expand => 1,
		1035	tooltip => "This button opens the binding editor with an empty binding.",
941	on_activate => sub {	1036	on_activate => sub {
942	$CONN->send ("apply $CONN->{open_container}")	1037	$::BIND_EDITOR->set_binding (undef, undef, [],
943	if $CONN->{open_container} != 0;	1038	sub {
		1039	my ($mod, $sym, $cmds) = @_;
		1040	$::CFG->{bindings}->{$mod}->{$sym} = $cmds;
		1041	$refresh->();
		1042	$::BIND_WINDOW->show;
		1043	},
		1044	sub {
		1045	$::BIND_WINDOW->show;
		1046	});
		1047	$::BIND_WINDOW->hide;
		1048	$::BIND_EDITOR->show;
944	},	1049	},
945	);	1050	);
		1051	$hb->add (new CFClient::UI::Button
		1052	text => "close",
		1053	tooltip => "Closes the binding window",
		1054	expand => 1,
		1055	on_activate => sub {
		1056	$::BIND_WINDOW->hide;
		1057	}
		1058	);
946		1059
947	$INVR_LBL->set_text ("Floor");	1060	$refresh->();
948	$vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);	1061	$BIND_WINDOW
949
950	$invwin
951	}	1062	}
952		1063
953	sub make_help_window {	1064	sub make_help_window {
954	my $win = new CFClient::UI::FancyFrame	1065	my $win = new CFClient::UI::FancyFrame
955	user_w => $WIDTH * (7/8), user_h => $HEIGHT * (7/8), title => "Documentation";	1066	x => 'center',
		1067	y => 'center',
		1068	name => 'doc_browser',
		1069	force_w => int $WIDTH * 7/8,
		1070	force_h => int $HEIGHT * 7/8,
		1071	title => "Documentation";
956		1072
957	$win->add (my $vbox = new CFClient::UI::VBox);	1073	$win->add (my $vbox = new CFClient::UI::VBox);
958		1074
959	$vbox->add (my $buttons = new CFClient::UI::HBox);	1075	$vbox->add (my $buttons = new CFClient::UI::HBox);
960	$vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8);	1076	$vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8);
…		…
1021	if ($DEBUG_STATUS) {	1137	if ($DEBUG_STATUS) {
1022	CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;	1138	CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1023	} else {	1139	} else {
1024	# create the widgets	1140	# create the widgets
1025		1141
1026	$DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, req_x => -1;	1142	$DEBUG_STATUS = new CFClient::UI::Label
		1143	padding => 0,
		1144	z => 100,
		1145	force_x => "max",
		1146	force_y => 0;
1027	$DEBUG_STATUS->show;	1147	$DEBUG_STATUS->show;
1028		1148
		1149	$BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);
		1150
1029	$STATUSBOX = new CFClient::UI::Statusbox;	1151	$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]);	1152	$STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]);
1031		1153
1032	(new CFClient::UI::Frame	1154	(new CFClient::UI::Frame
1033	bg => [0, 0, 0, 0.4],	1155	bg => [0, 0, 0, 0.4],
1034	req_y => -1,	1156	force_x => 0,
		1157	force_y => "max",
1035	child => $STATUSBOX,	1158	child => $STATUSBOX,
1036	)->show;	1159	)->show;
1037		1160
1038	CFClient::UI::FancyFrame->new (	1161	CFClient::UI::FancyFrame->new (
		1162	title => "Mini Map",
		1163	name => "mapmap",
		1164	x => 0,
		1165	y => $FONTSIZE + 8,
1039	border_bg => [1, 1, 1, 192/255],	1166	border_bg => [1, 1, 1, 192/255],
1040	bg => [1, 1, 1, 0],	1167	bg => [1, 1, 1, 0],
1041	child => ($MAPMAP = new CFClient::MapWidget::MapMap	1168	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.",	1169	tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
1043	),	1170	),
…		…
1066	can_hover => 1,	1193	can_hover => 1,
1067	can_events => 1,	1194	can_events => 1,
1068	tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",	1195	tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1069	;	1196	;
1070		1197
1071	$BUTTONBAR = new CFClient::UI::HBox;	1198	$BUTTONBAR = new CFClient::UI::HBox x => 0, y => 0;
1072		1199
1073	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup,	1200	$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.");	1201	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,	1202	$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.");	1203	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	1207	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		1208
1082	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window,	1209	$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.");	1210	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,	1211	$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 :).");	1212	tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :)."
		1213	."You can also hit the Tab-key to show/hide the Inventory.");
1086		1214
1087	$BUTTONBAR->add (new CFClient::UI::Button	1215	$BUTTONBAR->add (new CFClient::UI::Button
1088	text => "Save Config",	1216	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.",	1217	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 {	1218	on_activate => sub {
1091	$::CFG->{layout} = CFClient::UI::get_layout;	1219	$::CFG->{layout} = CFClient::UI::get_layout;
1092	CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";	1220	CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1093	status "Configuration Saved";	1221	status "Configuration Saved";
1094	},	1222	},
1095	);	1223	);
1096		1224
1097	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window,	1225	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window,
1098	tooltip => "View Documentation");	1226	tooltip => "View Documentation");
		1227
		1228	$BUTTONBAR->add (new CFClient::UI::Flopper
		1229	text => "Bindings",
		1230	other => make_binding_window,
		1231	tooltip =>
		1232	"Lets you define, edit and delete bindings."
		1233	."There is a shortcut for making bindings: LCTRL+Insert opens the binding editor "
		1234	."with nothing set and the recording started. After doing the actions you "
		1235	."want to record press Insert and you will be asked to press a key-combo."
		1236	."After pressing the combo the binding will be saved automatically and the "
		1237	."binding editor closes");
		1238
		1239	$BUTTONBAR->add (new CFClient::UI::Flopper
		1240	text => "Spells",
		1241	other => make_spell_list,
		1242	tooltip => "The spell list");
1099		1243
1100	$BUTTONBAR->add (new CFClient::UI::Button	1244	$BUTTONBAR->add (new CFClient::UI::Button
1101	text => "Quit",	1245	text => "Quit",
1102	tooltip => "Terminates the program",	1246	tooltip => "Terminates the program",
1103	on_activate => sub {	1247	on_activate => sub {
…		…
1108	}	1252	}
1109	},	1253	},
1110	);	1254	);
1111		1255
1112	$BUTTONBAR->show;	1256	$BUTTONBAR->show;
		1257	$SERVER_SETUP->show;
1113		1258
1114	$STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);	1259	$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	}	1260	}
1124	}	1261	}
1125		1262
1126	sub video_shutdown {	1263	sub video_shutdown {
1127	undef $SDL_ACTIVE;	1264	undef $SDL_ACTIVE;
…		…
1195		1332
1196	my %demo;#d#	1333	my %demo;#d#
1197		1334
1198	sub force_refresh {	1335	sub force_refresh {
1199	$fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) \|\| 0.1) * 0.05;	1336	$fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) \|\| 0.1) * 0.05;
1200	debug sprintf "%3.2f", $fps;	1337	debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1201		1338
1202	$CFClient::UI::ROOT->draw;	1339	$CFClient::UI::ROOT->draw;
1203		1340
1204	$WANT_REFRESH = 0;	1341	$WANT_REFRESH = 0;
1205	$CAN_REFRESH = 0;	1342	$CAN_REFRESH = 0;
…		…
1337	#############################################################################	1474	#############################################################################
1338		1475
1339	$SIG{INT} = $SIG{TERM} = sub { exit };	1476	$SIG{INT} = $SIG{TERM} = sub { exit };
1340		1477
1341	{	1478	{
1342	local $SIG{__DIE__} = sub { CFClient::fatal $_[0] };	1479	local $SIG{__DIE__} = sub { CFClient::fatal $_[0] if defined $^S && !$^S };
1343		1480
1344	CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";	1481	CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1345	CFClient::UI::set_layout ($::CFG->{layout});	1482	CFClient::UI::set_layout ($::CFG->{layout});
1346		1483
1347	my %DEF_CFG = (	1484	my %DEF_CFG = (
1348	sdl_mode => 0,	1485	sdl_mode => 0,
1349	width => 640,	1486	width => 640,
…		…
1427		1564
1428	END { CFClient::SDL_Quit }	1565	END { CFClient::SDL_Quit }
1429		1566
1430	=head1 NAME	1567	=head1 NAME
1431		1568
1432	pclient - A Crossfire+ and Crossfire game client	1569	cfplus - A Crossfire+ and Crossfire game client
1433		1570
1434	=head1 SYNOPSIS	1571	=head1 SYNOPSIS
1435		1572
1436	Just run it - no commandline arguments are supported.	1573	Just run it - no commandline arguments are supported.
1437		1574
1438	=head1 USAGE	1575	=head1 USAGE
1439		1576
1440	Pclient utilises OpenGL for all UI elements and the game. It is supposed to be used	1577	cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used
1441	fullscreen and interactively.	1578	fullscreen and interactively.
1442		1579
		1580	=head1 DEBUGGING
		1581
		1582
		1583	CFPLUS_DEBUG - environment variable
		1584
		1585	1 draw borders around widgets
		1586	2 add low-level widget info to tooltips
		1587	4 show fps
		1588	8 suppress tooltips
		1589
1443	=head1 AUTHOR	1590	=head1 AUTHOR
1444		1591
1445	Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>	1592	Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
1446		1593
1447		1594

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.42 by root, Fri Jun 2 06:22:55 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.42 by root, Fri Jun 2 06:22:55 2006 UTC