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

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.18 by root, Sat May 27 20:46:54 2006 UTC vs.
Revision 1.38 by elmex, Wed May 31 13:44:26 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 $SERVER_SETUP;
86		87
87	our $FLOORBOX;	88	our $FLOORBOX;
88	our $GAUGES;	89	our $GAUGES;
89	our $STATWIDS;	90	our $STATWIDS;
90		91
…		…
97		98
98	our $ALT_ENTER_MESSAGE;	99	our $ALT_ENTER_MESSAGE;
99	our $STATUSBOX;	100	our $STATUSBOX;
100	our $DEBUG_STATUS;	101	our $DEBUG_STATUS;
101		102
		103	our $INV_WINDOW;
102	our $INV;	104	our $INV;
103	our $INVR;	105	our $INVR;
104	our $INVR_LBL;	106	our $INV_RIGHT_HB;
		107
		108	our $BIND_WINDOW;
		109	our $BIND_EDITOR;
		110
		111	our $SPELL_LIST;
105		112
106	sub status {	113	sub status {
107	$STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);	114	$STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
108	}	115	}
109		116
110	sub debug {	117	sub debug {
111	$DEBUG_STATUS->set_text ($_[0]);	118	$DEBUG_STATUS->set_text ($_[0]);
112	my ($w, $h) = $DEBUG_STATUS->size_request;
113	$DEBUG_STATUS->move ($WIDTH - $w, 0);
114	}	119	}
115		120
116	sub start_game {	121	sub start_game {
117	status "logging in...";	122	status "logging in...";
		123
		124	$LOGIN_BUTTON->set_text ("Logout");
		125	$SERVER_SETUP->hide;
118		126
119	my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;	127	my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
120		128
121	my ($host, $port) = split /:/, $CFG->{host};	129	my ($host, $port) = split /:/, $CFG->{host};
122		130
…		…
151	};	159	};
152		160
153	if ($CONN) {	161	if ($CONN) {
154	CFClient::lowdelay fileno $CONN->{fh};	162	CFClient::lowdelay fileno $CONN->{fh};
155		163
156	$LOGIN_BUTTON->set_text ("Logout");
157	status "login successful";	164	status "login successful";
158
159	$BUTTONBAR->{children}[1]->emit ("activate")
160	if $BUTTONBAR->{children}[1]->{state};
161
162	} else {	165	} else {
163	status "unable to connect";	166	status "unable to connect";
164	stop_game();	167	stop_game();
165	}	168	}
166	}	169	}
167		170
168	sub stop_game {	171	sub stop_game {
		172	$LOGIN_BUTTON->set_text ("Login");
		173	$SERVER_SETUP->show;
		174	$INV_WINDOW->hide;
		175	$LOGVIEW->hide;
		176
169	return unless $CONN;	177	return unless $CONN;
170		178
171	status "connection closed";	179	status "connection closed";
172	$LOGIN_BUTTON->set_text ("Login");	180
173	$CONN->destroy;	181	$CONN->destroy;
174	$CONN = 0; # false, does not autovivify	182	$CONN = 0; # false, does not autovivify
175
176	$BUTTONBAR->{children}[1]->emit ("activate")
177	unless $BUTTONBAR->{children}[1]->{state};
178	}	183	}
179		184
180	sub client_setup {	185	sub client_setup {
181	my $dialog = new CFClient::UI::FancyFrame	186	my $dialog = new CFClient::UI::FancyFrame
		187	x => 1,
		188	y => $HEIGHT * (1/8),
182	name => "client_setup",	189	name => "client_setup",
183	title => "Client Setup",	190	title => "Client Setup",
184	child => (my $vbox = new CFClient::UI::VBox);	191	child => (my $vbox = new CFClient::UI::VBox);
		192
185	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	193	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
186		194
187	$table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode");	195	$table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode");
188	$table->add (1, 0, my $hbox = new CFClient::UI::HBox);	196	$table->add (1, 0, my $hbox = new CFClient::UI::HBox);
189		197
190	$hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]);	198	$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]);
191	$hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");	199	$hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
192		200
193	$mode_slider->connect (changed => sub {	201	$mode_slider->connect (changed => sub {
194	my ($self, $value) = @_;	202	my ($self, $value) = @_;
195		203
…		…
383		391
384	sub make_gauge_window {	392	sub make_gauge_window {
385	my $gh = int $HEIGHT * $CFG->{gauge_size};	393	my $gh = int $HEIGHT * $CFG->{gauge_size};
386		394
387	my $win = new CFClient::UI::Frame (	395	my $win = new CFClient::UI::Frame (
388	req_y => -1,	396	force_x => 0,
		397	force_y => "max",
389	user_w => $WIDTH,	398	force_w => $WIDTH,
390	user_h => $gh,	399	force_h => $gh,
391	);	400	);
392		401
393	$win->add (my $hbox = new CFClient::UI::HBox	402	$win->add (my $hbox = new CFClient::UI::HBox
394	children => [	403	children => [
395	(new CFClient::UI::HBox expand => 1),	404	(new CFClient::UI::HBox expand => 1),
…		…
431	&set_gauge_window_fontsize;	440	&set_gauge_window_fontsize;
432		441
433	$win	442	$win
434	}	443	}
435		444
		445
436	sub make_stats_window {	446	sub make_stats_window {
437	my $tgw = new CFClient::UI::FancyFrame title => "Stats", name => "stats_window";	447	my $tgw = new CFClient::UI::FancyFrame
		448	y => $HEIGHT * (2/8),
		449	x => "max",
		450	title => "Stats",
		451	name => "stats_window";
438		452
439	$tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);	453	$tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);
440	$vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,	454	$vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
441	can_hover => 1, can_events => 1,	455	can_hover => 1, can_events => 1,
442	tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");	456	tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
…		…
704	}	718	}
705	});	719	});
706	}	720	}
707		721
708	sub server_setup {	722	sub server_setup {
709	my $dialog = new CFClient::UI::FancyFrame	723	my $dialog = $SERVER_SETUP = new CFClient::UI::FancyFrame
		724	x => "center",
		725	y => "center",
710	name => "server_setup",	726	name => "server_setup",
711	title => "Server Setup",	727	title => "Server Setup",
712	child => (my $vbox = new CFClient::UI::VBox);	728	child => (my $vbox = new CFClient::UI::VBox),
713		729	;
		730
714	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	731	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
715	$table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");	732	$table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");
716		733
717	{	734	{
718	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);	735	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);
…		…
762	}	779	}
763	);	780	);
764		781
765	$table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");	782	$table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
766	$table->add (1, 7, new CFClient::UI::Slider	783	$table->add (1, 7, new CFClient::UI::Slider
767	req_w => 100,	784	force_w => 100,
768	range => [$CFG->{mapsize}, 10, 100, 0, 1],	785	range => [$CFG->{mapsize}, 10, 100, 0, 1],
769	tooltip => "This is the size of the portion of the map update the server sends you. "	786	tooltip => "This is the size of the portion of the map update the server sends you. "
770	. "If you set this to a high value you will be able to see further, "	787	. "If you set this to a high value you will be able to see further, "
771	. "but you also increase bandwidth requirements and latency. "	788	. "but you also increase bandwidth requirements and latency. "
772	. "This option is only used once at log-in.",	789	. "This option is only used once at log-in.",
…		…
821	my $window = new CFClient::UI::FancyFrame	838	my $window = new CFClient::UI::FancyFrame
822	name => "message_window",	839	name => "message_window",
823	title => "Messages",	840	title => "Messages",
824	border_bg => [1, 1, 1, 1],	841	border_bg => [1, 1, 1, 1],
825	bg => [0, 0, 0, 0.75],	842	bg => [0, 0, 0, 0.75],
		843	x => "max",
		844	y => 0,
826	user_w => int $::WIDTH / 3,	845	force_w => $::WIDTH / 3,
827	user_h => int $::HEIGHT / 5,	846	force_h => $::HEIGHT / 5,
828	child => (my $vbox = new CFClient::UI::VBox);	847	child => (my $vbox = new CFClient::UI::VBox);
829		848
830	$vbox->add ($LOGVIEW);	849	$vbox->add ($LOGVIEW);
831		850
832	$vbox->add (my $input = new CFClient::UI::Entry	851	$vbox->add (my $input = new CFClient::UI::Entry
…		…
846	},	865	},
847	on_activate => sub {	866	on_activate => sub {
848	my ($input, $text) = @_;	867	my ($input, $text) = @_;
849	$input->set_text ('');	868	$input->set_text ('');
850		869
		870	if ($text =~ /^\/bind\s+(.*)$/) {
		871	CFClient::Binder::open_binding_dialog (sub {
		872	my ($mod, $sym) = @_;
		873	$::CFG->{bindings}->{$mod}->{$sym} = [$1];
		874	});
851	if ($text =~ /^\/(.*)/) {	875	} elsif ($text =~ /^\/(.*)/) {
852	$::CONN->user_send ($1);	876	$::CONN->user_send ($1);
853	} else {	877	} else {
854	my $say_cmd = $::CFG->{say_command} \|\| 'say';	878	my $say_cmd = $::CFG->{say_command} \|\| 'say';
855	$::CONN->user_send ("$say_cmd $text");	879	$::CONN->user_send ("$say_cmd $text");
856	}	880	}
…		…
864	},	888	},
865	);	889	);
866		890
867	$CONSOLE = {	891	$CONSOLE = {
868	window => $window,	892	window => $window,
869	input => $input	893	input => $input,
870	};	894	};
871		895
872	$window	896	$window
873	}	897	}
874		898
875	sub open_quit_dialog {	899	sub open_quit_dialog {
876	unless ($QUIT_DIALOG) {	900	unless ($QUIT_DIALOG) {
877
878	$QUIT_DIALOG = new CFClient::UI::FancyFrame title => "Really Quit?";	901	$QUIT_DIALOG = new CFClient::UI::FancyFrame
		902	x => "center",
		903	y => "center",
		904	title => "Really Quit?",
		905	;
879		906
880	$QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);	907	$QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
881		908
882	$vb->add (new CFClient::UI::Label	909	$vb->add (new CFClient::UI::Label
883	text => "You should find a savebed and apply it first!",	910	text => "You should find a savebed and apply it first!",
…		…
893	$hb->add (new CFClient::UI::Button	920	$hb->add (new CFClient::UI::Button
894	text => "Quit anyway",	921	text => "Quit anyway",
895	expand => 1,	922	expand => 1,
896	on_activate => sub { exit },	923	on_activate => sub { exit },
897	);	924	);
		925	}
898		926
899	$QUIT_DIALOG->show_centered;	927	$QUIT_DIALOG->show;
900	} else {
901	$QUIT_DIALOG->show_centered;
902	}
903	}	928	}
904		929
905	sub make_inventory_window {	930	sub make_inventory_window {
906	my $invwin = new CFClient::UI::FancyFrame	931	my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
907	user_w => $WIDTH * (7/8), user_h => $HEIGHT * (7/8), title => "Inventory", name => "inventory_window";	932	x => "center",
		933	y => "center",
		934	force_w => $WIDTH * 9/10,
		935	force_h => $HEIGHT * 9/10,
		936	title => "Inventory",
		937	;
908		938
909	$invwin->add (my $hb = new CFClient::UI::HBox expand => 1);	939	$invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);
910		940
911	$hb->add (my $vb1 = new CFClient::UI::VBox expand => 1);	941	$hb->add (my $vb1 = new CFClient::UI::VBox);
912	$vb1->add (my $lbl = new CFClient::UI::Label align => 0);	942	$vb1->add (new CFClient::UI::Label align => 0, text => "Player");
913	$lbl->set_text ("Player");
914	$vb1->add ($INV = new CFClient::UI::Inventory expand => 1);	943	$vb1->add ($INV = new CFClient::UI::Inventory expand => 1);
915		944
916	$hb->add (my $vb2 = new CFClient::UI::VBox expand => 1);	945	$hb->add (my $vb2 = new CFClient::UI::VBox);
917		946
		947	$vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
		948
		949	$vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
		950
		951	# XXX: Call after $INVR = ... because set_opencont sets the items
		952	CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
		953
		954	$invwin
		955	}
		956
		957	sub make_spell_list {
		958	$SPELL_LIST = new CFClient::UI::SpellList
		959	force_w => $WIDTH * (9/10),
		960	force_h => $HEIGHT * (9/10);
		961	$SPELL_LIST
		962	}
		963
		964	sub make_binding_window {
		965	my $binding_list = new CFClient::UI::VBox;
		966
		967	my $refresh;
		968	$refresh = sub {
		969	$binding_list->clear ();
		970
		971	for my $mod (keys %{$::CFG->{bindings}}) {
		972	for my $sym (keys %{$::CFG->{bindings}->{$mod}}) {
		973	my $cmds = $::CFG->{bindings}->{$mod}->{$sym};
		974	next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
		975
		976	my $lbl = join "; ", @$cmds;
		977	my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym);
		978	$binding_list->add (my $hb = new CFClient::UI::HBox);
		979	$hb->add (new CFClient::UI::Button
		980	text => "delete",
		981	tooltip => "Deletes the binding",
		982	on_activate => sub {
		983	$binding_list->remove ($hb);
		984	delete $::CFG->{bindings}->{$mod}->{$sym};
		985	});
		986
		987	$hb->add (new CFClient::UI::Button
		988	text => "edit",
		989	tooltip => "Edits the binding",
		990	on_activate => sub {
		991	$::BIND_EDITOR->set_binding (
		992	$mod, $sym, $::CFG->{bindings}->{$mod}->{$sym},
		993	sub {
		994	my ($nmod, $nsym, $ncmds) = @_;
		995	delete $::CFG->{bindings}->{$mod}->{$sym};
		996	$::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds;
		997	$refresh->();
		998	$::BIND_WINDOW->show;
		999	},
		1000	sub {
		1001	$::BIND_WINDOW->show;
		1002	});
		1003	$::BIND_EDITOR->show;
		1004	$::BIND_WINDOW->hide;
		1005	});
		1006
		1007	$hb->add (new CFClient::UI::Label text => "(Key: $nam)");
		1008	$hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
		1009	}
		1010	}
		1011	};
		1012
		1013	$BIND_WINDOW = new CFClient::UI::FancyFrame
		1014	title => "Bindings",
		1015	x => "center",
		1016	y => "center",
		1017	def_w => int $WIDTH * 9/10,
		1018	def_h => int $HEIGHT * 9/10,
		1019	on_visibility_change => sub {
		1020	my ($self, $visible) = @_;
		1021	$refresh->() if $visible;
		1022	};
		1023
		1024	$BIND_WINDOW->add (my $vb = new CFClient::UI::VBox);
		1025	$vb->add ($binding_list);
918	$vb2->add (my $hb2 = new CFClient::UI::HBox);	1026	$vb->add (my $hb = new CFClient::UI::HBox);
919	$hb2->add ($INVR_LBL = new CFClient::UI::Label align => 0, expand => 1);
920	$hb2->add (new CFClient::UI::Button	1027	$hb->add (new CFClient::UI::Button
921	text => "Close",	1028	text => "record new",
922	tooltip => "Close the currently open container (if one is open)",	1029	expand => 1,
		1030	tooltip => "This button opens the binding editor with an empty binding.",
923	on_activate => sub {	1031	on_activate => sub {
924	$CONN->send ("apply $CONN->{open_container}")	1032	$::BIND_EDITOR->set_binding (undef, undef, [],
925	if $CONN->{open_container} != 0;	1033	sub {
		1034	my ($mod, $sym, $cmds) = @_;
		1035	$::CFG->{bindings}->{$mod}->{$sym} = $cmds;
		1036	$refresh->();
		1037	$::BIND_WINDOW->show;
		1038	},
		1039	sub {
		1040	$::BIND_WINDOW->show;
		1041	});
		1042	$::BIND_WINDOW->hide;
		1043	$::BIND_EDITOR->show;
926	},	1044	},
927	);	1045	);
		1046	$hb->add (new CFClient::UI::Button
		1047	text => "close",
		1048	tooltip => "Closes the binding window",
		1049	expand => 1,
		1050	on_activate => sub {
		1051	$::BIND_WINDOW->hide;
		1052	}
		1053	);
928		1054
929	$INVR_LBL->set_text ("Floor");	1055	$refresh->();
930	$vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);	1056	$BIND_WINDOW
931
932	$invwin
933	}	1057	}
934		1058
935	sub make_help_window {	1059	sub make_help_window {
936	my $win = new CFClient::UI::FancyFrame	1060	my $win = new CFClient::UI::FancyFrame
937	user_w => $WIDTH * (7/8), user_h => $HEIGHT * (7/8), title => "Documentation";	1061	def_w => int $WIDTH * 7/8,
		1062	def_h => int $HEIGHT * 7/8,
		1063	title => "Documentation";
938		1064
939	$win->add (my $vbox = new CFClient::UI::VBox);	1065	$win->add (my $vbox = new CFClient::UI::VBox);
940		1066
941	$vbox->add (my $buttons = new CFClient::UI::HBox);	1067	$vbox->add (my $buttons = new CFClient::UI::HBox);
942	$vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8);	1068	$vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8);
…		…
1003	if ($DEBUG_STATUS) {	1129	if ($DEBUG_STATUS) {
1004	CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;	1130	CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1005	} else {	1131	} else {
1006	# create the widgets	1132	# create the widgets
1007		1133
1008	$DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, req_x => -1;	1134	$DEBUG_STATUS = new CFClient::UI::Label
		1135	padding => 0,
		1136	z => 100,
		1137	force_x => "max",
		1138	force_y => 0;
1009	$DEBUG_STATUS->show;	1139	$DEBUG_STATUS->show;
1010		1140
		1141	$BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);
		1142
1011	$STATUSBOX = new CFClient::UI::Statusbox;	1143	$STATUSBOX = new CFClient::UI::Statusbox;
1012	$STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]);	1144	$STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]);
1013		1145
1014	(new CFClient::UI::Frame	1146	(new CFClient::UI::Frame
1015	bg => [0, 0, 0, 0.4],	1147	bg => [0, 0, 0, 0.4],
1016	req_y => -1,	1148	force_x => 0,
		1149	force_y => "max",
1017	child => $STATUSBOX,	1150	child => $STATUSBOX,
1018	)->show;	1151	)->show;
1019		1152
1020	CFClient::UI::FancyFrame->new (	1153	CFClient::UI::FancyFrame->new (
		1154	x => 0,
		1155	y => $FONTSIZE + 8,
1021	border_bg => [1, 1, 1, 192/255],	1156	border_bg => [1, 1, 1, 192/255],
1022	bg => [1, 1, 1, 0],	1157	bg => [1, 1, 1, 0],
1023	child => ($MAPMAP = new CFClient::MapWidget::MapMap	1158	child => ($MAPMAP = new CFClient::MapWidget::MapMap
1024	tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",	1159	tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
1025	),	1160	),
…		…
1048	can_hover => 1,	1183	can_hover => 1,
1049	can_events => 1,	1184	can_events => 1,
1050	tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",	1185	tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1051	;	1186	;
1052		1187
1053	$BUTTONBAR = new CFClient::UI::HBox;	1188	$BUTTONBAR = new CFClient::UI::HBox x => 0, y => 0;
1054		1189
1055	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup,	1190	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup,
1056	tooltip => "Toggles a dialog where you can configure various aspects of the client, such as graphics mode, performance, and audio options.");	1191	tooltip => "Toggles a dialog where you can configure various aspects of the client, such as graphics mode, performance, and audio options.");
1057	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup,	1192	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup,
1058	tooltip => "Toggles a dialog where you can configure the server to play on, your username, password and other server-related options.");	1193	tooltip => "Toggles a dialog where you can configure the server to play on, your username, password and other server-related options.");
…		…
1062	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	1197	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
1063		1198
1064	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window,	1199	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window,
1065	tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");	1200	tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1066	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window,	1201	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window,
1067	tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :).");	1202	tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :)."
		1203	."You can also hit the Tab-key to show/hide the Inventory.");
1068		1204
1069	$BUTTONBAR->add (new CFClient::UI::Button	1205	$BUTTONBAR->add (new CFClient::UI::Button
1070	text => "Save Config",	1206	text => "Save Config",
1071	tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",	1207	tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1072	on_activate => sub {	1208	on_activate => sub {
1073	$::CFG->{layout} = CFClient::UI::get_layout;	1209	$::CFG->{layout} = CFClient::UI::get_layout;
1074	CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";	1210	CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1075	status "Configuration Saved";	1211	status "Configuration Saved";
1076	},	1212	},
1077	);	1213	);
1078		1214
1079	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window,	1215	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window,
1080	tooltip => "View Documentation");	1216	tooltip => "View Documentation");
		1217
		1218	$BUTTONBAR->add (new CFClient::UI::Flopper
		1219	text => "Bindings",
		1220	other => make_binding_window,
		1221	tooltip =>
		1222	"Lets you define, edit and delete bindings."
		1223	."There is a shortcut for making bindings: LCTRL+Insert opens the binding editor "
		1224	."with nothing set and the recording started. After doing the actions you "
		1225	."want to record press Insert and you will be asked to press a key-combo."
		1226	."After pressing the combo the binding will be saved automatically and the "
		1227	."binding editor closes");
		1228
		1229	$BUTTONBAR->add (new CFClient::UI::Flopper
		1230	text => "Spells",
		1231	other => make_spell_list,
		1232	tooltip => "The spell list");
1081		1233
1082	$BUTTONBAR->add (new CFClient::UI::Button	1234	$BUTTONBAR->add (new CFClient::UI::Button
1083	text => "Quit",	1235	text => "Quit",
1084	tooltip => "Terminates the program",	1236	tooltip => "Terminates the program",
1085	on_activate => sub {	1237	on_activate => sub {
…		…
1090	}	1242	}
1091	},	1243	},
1092	);	1244	);
1093		1245
1094	$BUTTONBAR->show;	1246	$BUTTONBAR->show;
		1247	$SERVER_SETUP->show;
1095		1248
1096	$STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);	1249	$STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1097
1098	# delay till geometry is constant
1099	$CFClient::UI::ROOT->on_post_alloc (startup => sub {
1100	$BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
1101	my $widget = $GAUGES->{win};
1102	$widget->move (0, $HEIGHT - $widget->{h});#d# to in toplevel
1103	});
1104	force_refresh ();
1105	}	1250	}
1106	}	1251	}
1107		1252
1108	sub video_shutdown {	1253	sub video_shutdown {
1109	undef $SDL_ACTIVE;	1254	undef $SDL_ACTIVE;
…		…
1177		1322
1178	my %demo;#d#	1323	my %demo;#d#
1179		1324
1180	sub force_refresh {	1325	sub force_refresh {
1181	$fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) \|\| 0.1) * 0.05;	1326	$fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) \|\| 0.1) * 0.05;
1182	debug sprintf "%3.2f", $fps;	1327	debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1183		1328
1184	$CFClient::UI::ROOT->draw;	1329	$CFClient::UI::ROOT->draw;
1185		1330
1186	$WANT_REFRESH = 0;	1331	$WANT_REFRESH = 0;
1187	$CAN_REFRESH = 0;	1332	$CAN_REFRESH = 0;
…		…
1319	#############################################################################	1464	#############################################################################
1320		1465
1321	$SIG{INT} = $SIG{TERM} = sub { exit };	1466	$SIG{INT} = $SIG{TERM} = sub { exit };
1322		1467
1323	{	1468	{
1324	local $SIG{__DIE__} = sub { CFClient::fatal $_[0] };	1469	local $SIG{__DIE__} = sub { CFClient::fatal $_[0] if defined $^S && !$^S };
1325		1470
1326	CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";	1471	CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1327	CFClient::UI::set_layout ($::CFG->{layout});	1472	CFClient::UI::set_layout ($::CFG->{layout});
1328		1473
1329	my %DEF_CFG = (	1474	my %DEF_CFG = (
1330	sdl_mode => 0,	1475	sdl_mode => 0,
1331	width => 640,	1476	width => 640,
…		…
1409		1554
1410	END { CFClient::SDL_Quit }	1555	END { CFClient::SDL_Quit }
1411		1556
1412	=head1 NAME	1557	=head1 NAME
1413		1558
1414	pclient - A Crossfire+ and Crossfire game client	1559	cfplus - A Crossfire+ and Crossfire game client
1415		1560
1416	=head1 SYNOPSIS	1561	=head1 SYNOPSIS
1417		1562
1418	Just run it - no commandline arguments are supported.	1563	Just run it - no commandline arguments are supported.
1419		1564
1420	=head1 USAGE	1565	=head1 USAGE
1421		1566
1422	Pclient utilises OpenGL for all UI elements and the game. It is supposed to be used	1567	cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used
1423	fullscreen and interactively.	1568	fullscreen and interactively.
1424		1569
1425	=head1 AUTHOR	1570	=head1 AUTHOR
1426		1571
1427	Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>	1572	Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents): Revision 1.18 by root, Sat May 27 20:46:54 2006 UTC vs. Revision 1.38 by elmex, Wed May 31 13:44:26 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.18 by root, Sat May 27 20:46:54 2006 UTC vs.
Revision 1.38 by elmex, Wed May 31 13:44:26 2006 UTC