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

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.23 by root, Sun May 28 02:31:04 2006 UTC vs.
Revision 1.41 by root, Fri Jun 2 02:21:48 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;
86	our $SERVER_SETUP;	87	our $SERVER_SETUP;
87		88
88	our $FLOORBOX;	89	our $FLOORBOX;
89	our $GAUGES;	90	our $GAUGES;
90	our $STATWIDS;	91	our $STATWIDS;
…		…
101	our $DEBUG_STATUS;	102	our $DEBUG_STATUS;
102		103
103	our $INV_WINDOW;	104	our $INV_WINDOW;
104	our $INV;	105	our $INV;
105	our $INVR;	106	our $INVR;
106	our $INVR_LBL;	107	our $INV_RIGHT_HB;
		108
		109	our $BIND_WINDOW;
		110	our $BIND_EDITOR;
		111
		112	our $SPELL_LIST;
107		113
108	sub status {	114	sub status {
109	$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]);
110	}	116	}
111		117
112	sub debug {	118	sub debug {
113	$DEBUG_STATUS->set_text ($_[0]);	119	$DEBUG_STATUS->set_text ($_[0]);
114	my ($w, $h) = $DEBUG_STATUS->size_request;
115	$DEBUG_STATUS->move ($WIDTH - $w, 0);
116	}	120	}
117		121
118	sub start_game {	122	sub start_game {
119	status "logging in...";	123	status "logging in...";
120		124
…		…
179	$CONN = 0; # false, does not autovivify	183	$CONN = 0; # false, does not autovivify
180	}	184	}
181		185
182	sub client_setup {	186	sub client_setup {
183	my $dialog = new CFClient::UI::FancyFrame	187	my $dialog = new CFClient::UI::FancyFrame
184	req_x => 1,	188	x => 1,
185	req_y => $HEIGHT * (1/8),	189	y => $HEIGHT * (1/8),
186	name => "client_setup",	190	name => "client_setup",
187	title => "Client Setup",	191	title => "Client Setup",
188	child => (my $vbox = new CFClient::UI::VBox);	192	child => (my $vbox = new CFClient::UI::VBox);
		193
189	$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]);
190		195
191	$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");
192	$table->add (1, 0, my $hbox = new CFClient::UI::HBox);	197	$table->add (1, 0, my $hbox = new CFClient::UI::HBox);
193		198
194	$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]);
195	$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");
196		201
197	$mode_slider->connect (changed => sub {	202	$mode_slider->connect (changed => sub {
198	my ($self, $value) = @_;	203	my ($self, $value) = @_;
199		204
…		…
387		392
388	sub make_gauge_window {	393	sub make_gauge_window {
389	my $gh = int $HEIGHT * $CFG->{gauge_size};	394	my $gh = int $HEIGHT * $CFG->{gauge_size};
390		395
391	my $win = new CFClient::UI::Frame (	396	my $win = new CFClient::UI::Frame (
392	req_x => 0,	397	force_x => 0,
393	req_y => -1,	398	force_y => "max",
394	def_w => $WIDTH,	399	force_w => $WIDTH,
395	def_h => $gh,	400	force_h => $gh,
396	);	401	);
397		402
398	$win->add (my $hbox = new CFClient::UI::HBox	403	$win->add (my $hbox = new CFClient::UI::HBox
399	children => [	404	children => [
400	(new CFClient::UI::HBox expand => 1),	405	(new CFClient::UI::HBox expand => 1),
…		…
436	&set_gauge_window_fontsize;	441	&set_gauge_window_fontsize;
437		442
438	$win	443	$win
439	}	444	}
440		445
		446
441	sub make_stats_window {	447	sub make_stats_window {
442	my $tgw = new CFClient::UI::FancyFrame	448	my $tgw = new CFClient::UI::FancyFrame
443	req_y => $HEIGHT * (2/8),	449	y => $HEIGHT * (2/8),
444	req_x => -1,	450	x => "max",
445	title => "Stats",	451	title => "Stats",
446	name => "stats_window";	452	name => "stats_window";
447		453
448	$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);
449	$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,
450	can_hover => 1, can_events => 1,	456	can_hover => 1, can_events => 1,
451	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.");
…		…
623		629
624	$STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})	630	$STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
625	for keys %tbl;	631	for keys %tbl;
626	}	632	}
627		633
628	sub metaserver_dialog {
629	my $dialog = new CFClient::UI::FancyFrame
630	title => "Server List",
631	child => (my $vbox = new CFClient::UI::VBox);
632
633	$vbox->add ($dialog->{table} = new CFClient::UI::Table);
634
635	$dialog
636	}
637
638	my $METASERVER_ATIME;	634	my $METASERVER_ATIME;
639		635
640	sub update_metaserver {	636	sub update_metaserver {
641	my ($HOST) = @_;
642
643	return if $METASERVER_ATIME > time;	637	return if $METASERVER_ATIME > time;
644	$METASERVER_ATIME = time + 60;	638	$METASERVER_ATIME = time + 60;
645		639
646	my $table = $METASERVER->{table};	640	my $table = $METASERVER->{table};
647	$table->clear;	641	$table->clear;
…		…
699		693
700	$y++;	694	$y++;
701		695
702	$table->add (0, $y, new CFClient::UI::VBox children => [	696	$table->add (0, $y, new CFClient::UI::VBox children => [
703	(new CFClient::UI::Button text => "Use", on_activate => sub {	697	(new CFClient::UI::Button text => "Use", on_activate => sub {
704	$HOST->set_text ($CFG->{host} = $host);	698	$HOST_ENTRY->set_text ($CFG->{host} = $host);
		699	$METASERVER->toggle_visibility;
705	}),	700	}),
706	(new CFClient::UI::Empty expand => 1),	701	(new CFClient::UI::Empty expand => 1),
707	]);	702	]);
708		703
709	$table->add ($_ + 1, $y, new CFClient::UI::Label	704	$table->add ($_ + 1, $y, new CFClient::UI::Label
…		…
712	}	707	}
713	}	708	}
714	});	709	});
715	}	710	}
716		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
717	sub server_setup {	729	sub server_setup {
718	my $dialog = $SERVER_SETUP = new CFClient::UI::FancyFrame	730	my $dialog = $SERVER_SETUP = new CFClient::UI::FancyFrame
719	x => $WIDTH * (1/3),	731	x => "center",
720	y => $HEIGHT * (1/8),	732	y => "center",
721	name => "server_setup",	733	name => "server_setup",
722	title => "Server Setup",	734	title => "Server Setup",
723	child => (my $vbox = new CFClient::UI::VBox),	735	child => (my $vbox = new CFClient::UI::VBox),
724	on_visibility_change => sub {
725	my ($self, $visible) = @_;
726	$self->center if $visible;
727	},
728	;	736	;
729		737
730	$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]);
731	$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");
732		740
733	{	741	{
734	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);	742	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);
735		743
736	$vbox->add (	744	$vbox->add (
737	my $HOST = new CFClient::UI::Entry	745	$HOST_ENTRY = new CFClient::UI::Entry
738	expand => 1,	746	expand => 1,
739	text => $CFG->{host},	747	text => $CFG->{host},
740	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",
741	on_changed => sub {	749	on_changed => sub {
742	my ($self, $value) = @_;	750	my ($self, $value) = @_;
…		…
744	}	752	}
745	);	753	);
746		754
747	$METASERVER = metaserver_dialog;	755	$METASERVER = metaserver_dialog;
748		756
749	$vbox->add (new CFClient::UI::Flopper	757	$vbox->add (new CFClient::UI::Button
750	expand => 1,	758	expand => 1,
751	text => "Server List",	759	text => "Server List",
752	other => $METASERVER,	760	other => $METASERVER,
753	tooltip => "Show a list of available crossfire servers",	761	tooltip => "Show a list of available crossfire servers",
754	on_open => sub {	762	on_activate => sub { $METASERVER->toggle_visibility },
755	update_metaserver $HOST;
756	}
757	);	763	);
758	}	764	}
759		765
760	$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");
761	$table->add (1, 4, new CFClient::UI::Entry	767	$table->add (1, 4, new CFClient::UI::Entry
…		…
778	}	784	}
779	);	785	);
780		786
781	$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");
782	$table->add (1, 7, new CFClient::UI::Slider	788	$table->add (1, 7, new CFClient::UI::Slider
783	req_w => 100,	789	force_w => 100,
784	range => [$CFG->{mapsize}, 10, 100, 0, 1],	790	range => [$CFG->{mapsize}, 10, 100, 0, 1],
785	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. "
786	. "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, "
787	. "but you also increase bandwidth requirements and latency. "	793	. "but you also increase bandwidth requirements and latency. "
788	. "This option is only used once at log-in.",	794	. "This option is only used once at log-in.",
…		…
837	my $window = new CFClient::UI::FancyFrame	843	my $window = new CFClient::UI::FancyFrame
838	name => "message_window",	844	name => "message_window",
839	title => "Messages",	845	title => "Messages",
840	border_bg => [1, 1, 1, 1],	846	border_bg => [1, 1, 1, 1],
841	bg => [0, 0, 0, 0.75],	847	bg => [0, 0, 0, 0.75],
842	req_x => -1,	848	x => "max",
843	req_y => 0,	849	y => 0,
844	def_w => int $::WIDTH / 3,	850	force_w => $::WIDTH / 3,
845	def_h => int $::HEIGHT / 5,	851	force_h => $::HEIGHT / 5,
846	child => (my $vbox = new CFClient::UI::VBox);	852	child => (my $vbox = new CFClient::UI::VBox);
847		853
848	$vbox->add ($LOGVIEW);	854	$vbox->add ($LOGVIEW);
849		855
850	$vbox->add (my $input = new CFClient::UI::Entry	856	$vbox->add (my $input = new CFClient::UI::Entry
…		…
864	},	870	},
865	on_activate => sub {	871	on_activate => sub {
866	my ($input, $text) = @_;	872	my ($input, $text) = @_;
867	$input->set_text ('');	873	$input->set_text ('');
868		874
		875	if ($text =~ /^\/bind\s+(.*)$/) {
		876	CFClient::Binder::open_binding_dialog (sub {
		877	my ($mod, $sym) = @_;
		878	$::CFG->{bindings}->{$mod}->{$sym} = [$1];
		879	});
869	if ($text =~ /^\/(.*)/) {	880	} elsif ($text =~ /^\/(.*)/) {
870	$::CONN->user_send ($1);	881	$::CONN->user_send ($1);
871	} else {	882	} else {
872	my $say_cmd = $::CFG->{say_command} \|\| 'say';	883	my $say_cmd = $::CFG->{say_command} \|\| 'say';
873	$::CONN->user_send ("$say_cmd $text");	884	$::CONN->user_send ("$say_cmd $text");
874	}	885	}
…		…
882	},	893	},
883	);	894	);
884		895
885	$CONSOLE = {	896	$CONSOLE = {
886	window => $window,	897	window => $window,
887	input => $input	898	input => $input,
888	};	899	};
889		900
890	$window	901	$window
891	}	902	}
892		903
893	sub open_quit_dialog {	904	sub open_quit_dialog {
894	unless ($QUIT_DIALOG) {	905	unless ($QUIT_DIALOG) {
895	$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	;
896		911
897	$QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);	912	$QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
898		913
899	$vb->add (new CFClient::UI::Label	914	$vb->add (new CFClient::UI::Label
900	text => "You should find a savebed and apply it first!",	915	text => "You should find a savebed and apply it first!",
…		…
913	on_activate => sub { exit },	928	on_activate => sub { exit },
914	);	929	);
915	}	930	}
916		931
917	$QUIT_DIALOG->show;	932	$QUIT_DIALOG->show;
918	$QUIT_DIALOG->center;
919	}	933	}
920		934
921	sub make_inventory_window {	935	sub make_inventory_window {
922	my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame	936	my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
		937	x => "center",
		938	y => "center",
923	def_w => $WIDTH * 7/8,	939	force_w => $WIDTH * 9/10,
924	def_h => $HEIGHT * 7/8,	940	force_h => $HEIGHT * 9/10,
925	title => "Inventory",	941	title => "Inventory",
926	name => "inventory_window",
927	on_visibility_change => sub {
928	my ($self, $visible) = @_;
929	$self->center if $visible;
930	},
931	;	942	;
932		943
933	$invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);	944	$invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);
934		945
935	$hb->add (my $vb1 = new CFClient::UI::VBox);	946	$hb->add (my $vb1 = new CFClient::UI::VBox);
936	$vb1->add (new CFClient::UI::Label align => 0, text => "Player");	947	$vb1->add (new CFClient::UI::Label align => 0, text => "Player");
937	$vb1->add ($INV = new CFClient::UI::Inventory expand => 1);	948	$vb1->add ($INV = new CFClient::UI::Inventory expand => 1);
938		949
939	$hb->add (my $vb2 = new CFClient::UI::VBox);	950	$hb->add (my $vb2 = new CFClient::UI::VBox);
940		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,
		1024	on_visibility_change => sub {
		1025	my ($self, $visible) = @_;
		1026	$refresh->() if $visible;
		1027	};
		1028
		1029	$BIND_WINDOW->add (my $vb = new CFClient::UI::VBox);
		1030	$vb->add ($binding_list);
941	$vb2->add (my $hb2 = new CFClient::UI::HBox);	1031	$vb->add (my $hb = new CFClient::UI::HBox);
942	$hb2->add ($INVR_LBL = new CFClient::UI::Label align => 0, expand => 1, text => "Floor");
943	$hb2->add (new CFClient::UI::Button	1032	$hb->add (new CFClient::UI::Button
944	text => "Close",	1033	text => "record new",
945	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.",
946	on_activate => sub {	1036	on_activate => sub {
947	$CONN->send ("apply $CONN->{open_container}")	1037	$::BIND_EDITOR->set_binding (undef, undef, [],
948	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;
949	},	1049	},
950	);	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	);
951		1059
952	$vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);	1060	$refresh->();
953		1061	$BIND_WINDOW
954	$invwin
955	}	1062	}
956		1063
957	sub make_help_window {	1064	sub make_help_window {
958	my $win = new CFClient::UI::FancyFrame	1065	my $win = new CFClient::UI::FancyFrame
		1066	x => 'center',
		1067	y => 'center',
		1068	name => 'doc_browser',
959	def_w => int $WIDTH * 7/8,	1069	force_w => int $WIDTH * 7/8,
960	def_h => int $HEIGHT * 7/8,	1070	force_h => int $HEIGHT * 7/8,
961	title => "Documentation";	1071	title => "Documentation";
962		1072
963	$win->add (my $vbox = new CFClient::UI::VBox);	1073	$win->add (my $vbox = new CFClient::UI::VBox);
964		1074
965	$vbox->add (my $buttons = new CFClient::UI::HBox);	1075	$vbox->add (my $buttons = new CFClient::UI::HBox);
966	$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);
…		…
1027	if ($DEBUG_STATUS) {	1137	if ($DEBUG_STATUS) {
1028	CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;	1138	CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1029	} else {	1139	} else {
1030	# create the widgets	1140	# create the widgets
1031		1141
1032	$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;
1033	$DEBUG_STATUS->show;	1147	$DEBUG_STATUS->show;
1034		1148
		1149	$BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);
		1150
1035	$STATUSBOX = new CFClient::UI::Statusbox;	1151	$STATUSBOX = new CFClient::UI::Statusbox;
1036	$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]);
1037		1153
1038	(new CFClient::UI::Frame	1154	(new CFClient::UI::Frame
1039	bg => [0, 0, 0, 0.4],	1155	bg => [0, 0, 0, 0.4],
1040	req_y => -1,	1156	force_x => 0,
		1157	force_y => "max",
1041	child => $STATUSBOX,	1158	child => $STATUSBOX,
1042	)->show;	1159	)->show;
1043		1160
1044	CFClient::UI::FancyFrame->new (	1161	CFClient::UI::FancyFrame->new (
		1162	x => 0,
		1163	y => $FONTSIZE + 8,
1045	border_bg => [1, 1, 1, 192/255],	1164	border_bg => [1, 1, 1, 192/255],
1046	bg => [1, 1, 1, 0],	1165	bg => [1, 1, 1, 0],
1047	child => ($MAPMAP = new CFClient::MapWidget::MapMap	1166	child => ($MAPMAP = new CFClient::MapWidget::MapMap
1048	tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",	1167	tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
1049	),	1168	),
…		…
1072	can_hover => 1,	1191	can_hover => 1,
1073	can_events => 1,	1192	can_events => 1,
1074	tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",	1193	tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1075	;	1194	;
1076		1195
1077	$BUTTONBAR = new CFClient::UI::HBox;	1196	$BUTTONBAR = new CFClient::UI::HBox x => 0, y => 0;
1078		1197
1079	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup,	1198	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup,
1080	tooltip => "Toggles a dialog where you can configure various aspects of the client, such as graphics mode, performance, and audio options.");	1199	tooltip => "Toggles a dialog where you can configure various aspects of the client, such as graphics mode, performance, and audio options.");
1081	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup,	1200	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup,
1082	tooltip => "Toggles a dialog where you can configure the server to play on, your username, password and other server-related options.");	1201	tooltip => "Toggles a dialog where you can configure the server to play on, your username, password and other server-related options.");
…		…
1086	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	1205	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
1087		1206
1088	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window,	1207	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window,
1089	tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");	1208	tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1090	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window,	1209	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window,
1091	tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :).");	1210	tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :)."
		1211	."You can also hit the Tab-key to show/hide the Inventory.");
1092		1212
1093	$BUTTONBAR->add (new CFClient::UI::Button	1213	$BUTTONBAR->add (new CFClient::UI::Button
1094	text => "Save Config",	1214	text => "Save Config",
1095	tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",	1215	tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1096	on_activate => sub {	1216	on_activate => sub {
1097	$::CFG->{layout} = CFClient::UI::get_layout;	1217	$::CFG->{layout} = CFClient::UI::get_layout;
1098	CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";	1218	CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1099	status "Configuration Saved";	1219	status "Configuration Saved";
1100	},	1220	},
1101	);	1221	);
1102		1222
1103	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window,	1223	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window,
1104	tooltip => "View Documentation");	1224	tooltip => "View Documentation");
		1225
		1226	$BUTTONBAR->add (new CFClient::UI::Flopper
		1227	text => "Bindings",
		1228	other => make_binding_window,
		1229	tooltip =>
		1230	"Lets you define, edit and delete bindings."
		1231	."There is a shortcut for making bindings: LCTRL+Insert opens the binding editor "
		1232	."with nothing set and the recording started. After doing the actions you "
		1233	."want to record press Insert and you will be asked to press a key-combo."
		1234	."After pressing the combo the binding will be saved automatically and the "
		1235	."binding editor closes");
		1236
		1237	$BUTTONBAR->add (new CFClient::UI::Flopper
		1238	text => "Spells",
		1239	other => make_spell_list,
		1240	tooltip => "The spell list");
1105		1241
1106	$BUTTONBAR->add (new CFClient::UI::Button	1242	$BUTTONBAR->add (new CFClient::UI::Button
1107	text => "Quit",	1243	text => "Quit",
1108	tooltip => "Terminates the program",	1244	tooltip => "Terminates the program",
1109	on_activate => sub {	1245	on_activate => sub {
…		…
1114	}	1250	}
1115	},	1251	},
1116	);	1252	);
1117		1253
1118	$BUTTONBAR->show;	1254	$BUTTONBAR->show;
		1255	$SERVER_SETUP->show;
1119		1256
1120	$STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);	1257	$STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1121
1122	$SERVER_SETUP->show;
1123	}	1258	}
1124	}	1259	}
1125		1260
1126	sub video_shutdown {	1261	sub video_shutdown {
1127	undef $SDL_ACTIVE;	1262	undef $SDL_ACTIVE;
…		…
1195		1330
1196	my %demo;#d#	1331	my %demo;#d#
1197		1332
1198	sub force_refresh {	1333	sub force_refresh {
1199	$fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) \|\| 0.1) * 0.05;	1334	$fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) \|\| 0.1) * 0.05;
1200	debug sprintf "%3.2f", $fps;	1335	debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1201		1336
1202	$CFClient::UI::ROOT->draw;	1337	$CFClient::UI::ROOT->draw;
1203		1338
1204	$WANT_REFRESH = 0;	1339	$WANT_REFRESH = 0;
1205	$CAN_REFRESH = 0;	1340	$CAN_REFRESH = 0;
…		…
1337	#############################################################################	1472	#############################################################################
1338		1473
1339	$SIG{INT} = $SIG{TERM} = sub { exit };	1474	$SIG{INT} = $SIG{TERM} = sub { exit };
1340		1475
1341	{	1476	{
1342	local $SIG{__DIE__} = sub { CFClient::fatal $_[0] };	1477	local $SIG{__DIE__} = sub { CFClient::fatal $_[0] if defined $^S && !$^S };
1343		1478
1344	CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";	1479	CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1345	CFClient::UI::set_layout ($::CFG->{layout});	1480	CFClient::UI::set_layout ($::CFG->{layout});
1346		1481
1347	my %DEF_CFG = (	1482	my %DEF_CFG = (
1348	sdl_mode => 0,	1483	sdl_mode => 0,
1349	width => 640,	1484	width => 640,
…		…
1427		1562
1428	END { CFClient::SDL_Quit }	1563	END { CFClient::SDL_Quit }
1429		1564
1430	=head1 NAME	1565	=head1 NAME
1431		1566
1432	pclient - A Crossfire+ and Crossfire game client	1567	cfplus - A Crossfire+ and Crossfire game client
1433		1568
1434	=head1 SYNOPSIS	1569	=head1 SYNOPSIS
1435		1570
1436	Just run it - no commandline arguments are supported.	1571	Just run it - no commandline arguments are supported.
1437		1572
1438	=head1 USAGE	1573	=head1 USAGE
1439		1574
1440	Pclient utilises OpenGL for all UI elements and the game. It is supposed to be used	1575	cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used
1441	fullscreen and interactively.	1576	fullscreen and interactively.
1442		1577
		1578	=head1 DEBUGGING
		1579
		1580
		1581	CFPLUS_DEBUG - environment variable
		1582
		1583	1 draw borders around widgets
		1584	2 add low-level widget info to tooltips
		1585	4 show fps
		1586	8 suppress tooltips
		1587
1443	=head1 AUTHOR	1588	=head1 AUTHOR
1444		1589
1445	Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>	1590	Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
1446		1591
1447		1592

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents): Revision 1.23 by root, Sun May 28 02:31:04 2006 UTC vs. Revision 1.41 by root, Fri Jun 2 02:21:48 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.23 by root, Sun May 28 02:31:04 2006 UTC vs.
Revision 1.41 by root, Fri Jun 2 02:21:48 2006 UTC