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

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.20 by root, Sun May 28 00:40:52 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_x => 0,	397	force_x => 0,
391	req_y => -1,	398	force_y => "max",
392	def_w => $WIDTH,	399	force_w => $WIDTH,
393	def_h => $gh,	400	force_h => $gh,
394	);	401	);
395		402
396	$win->add (my $hbox = new CFClient::UI::HBox	403	$win->add (my $hbox = new CFClient::UI::HBox
397	children => [	404	children => [
398	(new CFClient::UI::HBox expand => 1),	405	(new CFClient::UI::HBox expand => 1),
…		…
434	&set_gauge_window_fontsize;	441	&set_gauge_window_fontsize;
435		442
436	$win	443	$win
437	}	444	}
438		445
		446
439	sub make_stats_window {	447	sub make_stats_window {
440	my $tgw = new CFClient::UI::FancyFrame	448	my $tgw = new CFClient::UI::FancyFrame
441	req_y => $HEIGHT * (2/8),	449	y => $HEIGHT * (2/8),
442	req_x => -1,	450	x => "max",
443	title => "Stats",	451	title => "Stats",
444	name => "stats_window";	452	name => "stats_window";
445		453
446	$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);
447	$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,
448	can_hover => 1, can_events => 1,	456	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.");	457	tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
…		…
621		629
622	$STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})	630	$STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
623	for keys %tbl;	631	for keys %tbl;
624	}	632	}
625		633
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;	634	my $METASERVER_ATIME;
637		635
638	sub update_metaserver {	636	sub update_metaserver {
639	my ($HOST) = @_;
640
641	return if $METASERVER_ATIME > time;	637	return if $METASERVER_ATIME > time;
642	$METASERVER_ATIME = time + 60;	638	$METASERVER_ATIME = time + 60;
643		639
644	my $table = $METASERVER->{table};	640	my $table = $METASERVER->{table};
645	$table->clear;	641	$table->clear;
…		…
697		693
698	$y++;	694	$y++;
699		695
700	$table->add (0, $y, new CFClient::UI::VBox children => [	696	$table->add (0, $y, new CFClient::UI::VBox children => [
701	(new CFClient::UI::Button text => "Use", on_activate => sub {	697	(new CFClient::UI::Button text => "Use", on_activate => sub {
702	$HOST->set_text ($CFG->{host} = $host);	698	$HOST_ENTRY->set_text ($CFG->{host} = $host);
		699	$METASERVER->toggle_visibility;
703	}),	700	}),
704	(new CFClient::UI::Empty expand => 1),	701	(new CFClient::UI::Empty expand => 1),
705	]);	702	]);
706		703
707	$table->add ($_ + 1, $y, new CFClient::UI::Label	704	$table->add ($_ + 1, $y, new CFClient::UI::Label
…		…
710	}	707	}
711	}	708	}
712	});	709	});
713	}	710	}
714		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
715	sub server_setup {	729	sub server_setup {
716	my $dialog = new CFClient::UI::FancyFrame	730	my $dialog = $SERVER_SETUP = new CFClient::UI::FancyFrame
717	x => $WIDTH * (1/3),	731	x => "center",
718	y => $HEIGHT * (1/8),	732	y => "center",
719	name => "server_setup",	733	name => "server_setup",
720	title => "Server Setup",	734	title => "Server Setup",
721	child => (my $vbox = new CFClient::UI::VBox),	735	child => (my $vbox = new CFClient::UI::VBox),
722	on_visibility_change => sub {	736	;
723	$_[0]->show_centered if $_[1]
724	};
725		737
726	$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]);
727	$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");
728		740
729	{	741	{
730	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);	742	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);
731		743
732	$vbox->add (	744	$vbox->add (
733	my $HOST = new CFClient::UI::Entry	745	$HOST_ENTRY = new CFClient::UI::Entry
734	expand => 1,	746	expand => 1,
735	text => $CFG->{host},	747	text => $CFG->{host},
736	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",
737	on_changed => sub {	749	on_changed => sub {
738	my ($self, $value) = @_;	750	my ($self, $value) = @_;
…		…
740	}	752	}
741	);	753	);
742		754
743	$METASERVER = metaserver_dialog;	755	$METASERVER = metaserver_dialog;
744		756
745	$vbox->add (new CFClient::UI::Flopper	757	$vbox->add (new CFClient::UI::Button
746	expand => 1,	758	expand => 1,
747	text => "Server List",	759	text => "Server List",
748	other => $METASERVER,	760	other => $METASERVER,
749	tooltip => "Show a list of available crossfire servers",	761	tooltip => "Show a list of available crossfire servers",
750	on_open => sub {	762	on_activate => sub { $METASERVER->toggle_visibility },
751	update_metaserver $HOST;
752	}
753	);	763	);
754	}	764	}
755		765
756	$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");
757	$table->add (1, 4, new CFClient::UI::Entry	767	$table->add (1, 4, new CFClient::UI::Entry
…		…
774	}	784	}
775	);	785	);
776		786
777	$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");
778	$table->add (1, 7, new CFClient::UI::Slider	788	$table->add (1, 7, new CFClient::UI::Slider
779	req_w => 100,	789	force_w => 100,
780	range => [$CFG->{mapsize}, 10, 100, 0, 1],	790	range => [$CFG->{mapsize}, 10, 100, 0, 1],
781	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. "
782	. "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, "
783	. "but you also increase bandwidth requirements and latency. "	793	. "but you also increase bandwidth requirements and latency. "
784	. "This option is only used once at log-in.",	794	. "This option is only used once at log-in.",
…		…
833	my $window = new CFClient::UI::FancyFrame	843	my $window = new CFClient::UI::FancyFrame
834	name => "message_window",	844	name => "message_window",
835	title => "Messages",	845	title => "Messages",
836	border_bg => [1, 1, 1, 1],	846	border_bg => [1, 1, 1, 1],
837	bg => [0, 0, 0, 0.75],	847	bg => [0, 0, 0, 0.75],
838	req_x => -1,	848	x => "max",
839	req_y => 0,	849	y => 0,
840	def_w => int $::WIDTH / 3,	850	force_w => $::WIDTH / 3,
841	def_h => int $::HEIGHT / 5,	851	force_h => $::HEIGHT / 5,
842	child => (my $vbox = new CFClient::UI::VBox);	852	child => (my $vbox = new CFClient::UI::VBox);
843		853
844	$vbox->add ($LOGVIEW);	854	$vbox->add ($LOGVIEW);
845		855
846	$vbox->add (my $input = new CFClient::UI::Entry	856	$vbox->add (my $input = new CFClient::UI::Entry
…		…
860	},	870	},
861	on_activate => sub {	871	on_activate => sub {
862	my ($input, $text) = @_;	872	my ($input, $text) = @_;
863	$input->set_text ('');	873	$input->set_text ('');
864		874
		875	if ($text =~ /^\/bind\s+(.*)$/) {
		876	CFClient::Binder::open_binding_dialog (sub {
		877	my ($mod, $sym) = @_;
		878	$::CFG->{bindings}->{$mod}->{$sym} = [$1];
		879	});
865	if ($text =~ /^\/(.*)/) {	880	} elsif ($text =~ /^\/(.*)/) {
866	$::CONN->user_send ($1);	881	$::CONN->user_send ($1);
867	} else {	882	} else {
868	my $say_cmd = $::CFG->{say_command} \|\| 'say';	883	my $say_cmd = $::CFG->{say_command} \|\| 'say';
869	$::CONN->user_send ("$say_cmd $text");	884	$::CONN->user_send ("$say_cmd $text");
870	}	885	}
…		…
878	},	893	},
879	);	894	);
880		895
881	$CONSOLE = {	896	$CONSOLE = {
882	window => $window,	897	window => $window,
883	input => $input	898	input => $input,
884	};	899	};
885		900
886	$window	901	$window
887	}	902	}
888		903
889	sub open_quit_dialog {	904	sub open_quit_dialog {
890	unless ($QUIT_DIALOG) {	905	unless ($QUIT_DIALOG) {
891
892	$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	;
893		911
894	$QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);	912	$QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
895		913
896	$vb->add (new CFClient::UI::Label	914	$vb->add (new CFClient::UI::Label
897	text => "You should find a savebed and apply it first!",	915	text => "You should find a savebed and apply it first!",
…		…
907	$hb->add (new CFClient::UI::Button	925	$hb->add (new CFClient::UI::Button
908	text => "Quit anyway",	926	text => "Quit anyway",
909	expand => 1,	927	expand => 1,
910	on_activate => sub { exit },	928	on_activate => sub { exit },
911	);	929	);
		930	}
912		931
913	$QUIT_DIALOG->show_centered;	932	$QUIT_DIALOG->show;
914	} else {
915	$QUIT_DIALOG->show_centered;
916	}
917	}	933	}
918		934
919	sub make_inventory_window {	935	sub make_inventory_window {
920	my $invwin = new CFClient::UI::FancyFrame	936	my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
		937	x => "center",
		938	y => "center",
921	def_w => $WIDTH * (7/8),	939	force_w => $WIDTH * 9/10,
922	def_h => $HEIGHT * (7/8),	940	force_h => $HEIGHT * 9/10,
923	title => "Inventory",	941	title => "Inventory",
924	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,
925	on_visibility_change => sub {	1024	on_visibility_change => sub {
926	$_[0]->show_centered if $_[1]	1025	my ($self, $visible) = @_;
		1026	$refresh->() if $visible;
927	};	1027	};
928		1028
929	$invwin->add (my $hb = new CFClient::UI::HBox expand => 1);
930
931	$hb->add (my $vb1 = new CFClient::UI::VBox expand => 1);	1029	$BIND_WINDOW->add (my $vb = new CFClient::UI::VBox);
932	$vb1->add (my $lbl = new CFClient::UI::Label align => 0);	1030	$vb->add ($binding_list);
933	$lbl->set_text ("Player");
934	$vb1->add ($INV = new CFClient::UI::Inventory expand => 1);
935
936	$hb->add (my $vb2 = new CFClient::UI::VBox expand => 1);
937
938	$vb2->add (my $hb2 = new CFClient::UI::HBox);	1031	$vb->add (my $hb = new CFClient::UI::HBox);
939	$hb2->add ($INVR_LBL = new CFClient::UI::Label align => 0, expand => 1);
940	$hb2->add (new CFClient::UI::Button	1032	$hb->add (new CFClient::UI::Button
941	text => "Close",	1033	text => "record new",
942	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.",
943	on_activate => sub {	1036	on_activate => sub {
944	$CONN->send ("apply $CONN->{open_container}")	1037	$::BIND_EDITOR->set_binding (undef, undef, [],
945	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;
946	},	1049	},
947	);	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	);
948		1059
949	$INVR_LBL->set_text ("Floor");	1060	$refresh->();
950	$vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);	1061	$BIND_WINDOW
951
952	$invwin
953	}	1062	}
954		1063
955	sub make_help_window {	1064	sub make_help_window {
956	my $win = new CFClient::UI::FancyFrame	1065	my $win = new CFClient::UI::FancyFrame
		1066	x => 'center',
		1067	y => 'center',
		1068	name => 'doc_browser',
957	def_w => int $WIDTH * 7/8,	1069	force_w => int $WIDTH * 7/8,
958	def_h => int $HEIGHT * 7/8,	1070	force_h => int $HEIGHT * 7/8,
959	title => "Documentation";	1071	title => "Documentation";
960		1072
961	$win->add (my $vbox = new CFClient::UI::VBox);	1073	$win->add (my $vbox = new CFClient::UI::VBox);
962		1074
963	$vbox->add (my $buttons = new CFClient::UI::HBox);	1075	$vbox->add (my $buttons = new CFClient::UI::HBox);
964	$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);
…		…
1025	if ($DEBUG_STATUS) {	1137	if ($DEBUG_STATUS) {
1026	CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;	1138	CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1027	} else {	1139	} else {
1028	# create the widgets	1140	# create the widgets
1029		1141
1030	$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;
1031	$DEBUG_STATUS->show;	1147	$DEBUG_STATUS->show;
1032		1148
		1149	$BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);
		1150
1033	$STATUSBOX = new CFClient::UI::Statusbox;	1151	$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]);	1152	$STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]);
1035		1153
1036	(new CFClient::UI::Frame	1154	(new CFClient::UI::Frame
1037	bg => [0, 0, 0, 0.4],	1155	bg => [0, 0, 0, 0.4],
1038	req_y => -1,	1156	force_x => 0,
		1157	force_y => "max",
1039	child => $STATUSBOX,	1158	child => $STATUSBOX,
1040	)->show;	1159	)->show;
1041		1160
1042	CFClient::UI::FancyFrame->new (	1161	CFClient::UI::FancyFrame->new (
		1162	title => "Mini Map",
		1163	name => "mapmap",
		1164	x => 0,
		1165	y => $FONTSIZE + 8,
1043	border_bg => [1, 1, 1, 192/255],	1166	border_bg => [1, 1, 1, 192/255],
1044	bg => [1, 1, 1, 0],	1167	bg => [1, 1, 1, 0],
1045	child => ($MAPMAP = new CFClient::MapWidget::MapMap	1168	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.",	1169	tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
1047	),	1170	),
…		…
1070	can_hover => 1,	1193	can_hover => 1,
1071	can_events => 1,	1194	can_events => 1,
1072	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.",
1073	;	1196	;
1074		1197
1075	$BUTTONBAR = new CFClient::UI::HBox;	1198	$BUTTONBAR = new CFClient::UI::HBox x => 0, y => 0;
1076		1199
1077	$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,
1078	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.");
1079	$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,
1080	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.");
…		…
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	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
1085		1208
1086	$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,
1087	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.");
1088	$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,
1089	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.");
1090		1214
1091	$BUTTONBAR->add (new CFClient::UI::Button	1215	$BUTTONBAR->add (new CFClient::UI::Button
1092	text => "Save Config",	1216	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.",	1217	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 {	1218	on_activate => sub {
1095	$::CFG->{layout} = CFClient::UI::get_layout;	1219	$::CFG->{layout} = CFClient::UI::get_layout;
1096	CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";	1220	CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1097	status "Configuration Saved";	1221	status "Configuration Saved";
1098	},	1222	},
1099	);	1223	);
1100		1224
1101	$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,
1102	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");
1103		1243
1104	$BUTTONBAR->add (new CFClient::UI::Button	1244	$BUTTONBAR->add (new CFClient::UI::Button
1105	text => "Quit",	1245	text => "Quit",
1106	tooltip => "Terminates the program",	1246	tooltip => "Terminates the program",
1107	on_activate => sub {	1247	on_activate => sub {
…		…
1112	}	1252	}
1113	},	1253	},
1114	);	1254	);
1115		1255
1116	$BUTTONBAR->show;	1256	$BUTTONBAR->show;
		1257	$SERVER_SETUP->show;
1117		1258
1118	$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]);
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	}	1260	}
1128	}	1261	}
1129		1262
1130	sub video_shutdown {	1263	sub video_shutdown {
1131	undef $SDL_ACTIVE;	1264	undef $SDL_ACTIVE;
…		…
1199		1332
1200	my %demo;#d#	1333	my %demo;#d#
1201		1334
1202	sub force_refresh {	1335	sub force_refresh {
1203	$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;
1204	debug sprintf "%3.2f", $fps;	1337	debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1205		1338
1206	$CFClient::UI::ROOT->draw;	1339	$CFClient::UI::ROOT->draw;
1207		1340
1208	$WANT_REFRESH = 0;	1341	$WANT_REFRESH = 0;
1209	$CAN_REFRESH = 0;	1342	$CAN_REFRESH = 0;
…		…
1341	#############################################################################	1474	#############################################################################
1342		1475
1343	$SIG{INT} = $SIG{TERM} = sub { exit };	1476	$SIG{INT} = $SIG{TERM} = sub { exit };
1344		1477
1345	{	1478	{
1346	local $SIG{__DIE__} = sub { CFClient::fatal $_[0] };	1479	local $SIG{__DIE__} = sub { CFClient::fatal $_[0] if defined $^S && !$^S };
1347		1480
1348	CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";	1481	CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1349	CFClient::UI::set_layout ($::CFG->{layout});	1482	CFClient::UI::set_layout ($::CFG->{layout});
1350		1483
1351	my %DEF_CFG = (	1484	my %DEF_CFG = (
1352	sdl_mode => 0,	1485	sdl_mode => 0,
1353	width => 640,	1486	width => 640,
…		…
1431		1564
1432	END { CFClient::SDL_Quit }	1565	END { CFClient::SDL_Quit }
1433		1566
1434	=head1 NAME	1567	=head1 NAME
1435		1568
1436	pclient - A Crossfire+ and Crossfire game client	1569	cfplus - A Crossfire+ and Crossfire game client
1437		1570
1438	=head1 SYNOPSIS	1571	=head1 SYNOPSIS
1439		1572
1440	Just run it - no commandline arguments are supported.	1573	Just run it - no commandline arguments are supported.
1441		1574
1442	=head1 USAGE	1575	=head1 USAGE
1443		1576
1444	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
1445	fullscreen and interactively.	1578	fullscreen and interactively.
1446		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
1447	=head1 AUTHOR	1590	=head1 AUTHOR
1448		1591
1449	Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>	1592	Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
1450		1593
1451		1594

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents): Revision 1.20 by root, Sun May 28 00:40:52 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.20 by root, Sun May 28 00:40:52 2006 UTC vs.
Revision 1.42 by root, Fri Jun 2 06:22:55 2006 UTC