[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.28 by root, Mon May 29 21:10:47 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;
105		109
106	sub status {	110	sub status {
107	$STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);	111	$STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
108	}	112	}
109		113
…		…
113	$DEBUG_STATUS->move ($WIDTH - $w, 0);	117	$DEBUG_STATUS->move ($WIDTH - $w, 0);
114	}	118	}
115		119
116	sub start_game {	120	sub start_game {
117	status "logging in...";	121	status "logging in...";
		122
		123	$LOGIN_BUTTON->set_text ("Logout");
		124	$SERVER_SETUP->hide;
118		125
119	my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;	126	my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
120		127
121	my ($host, $port) = split /:/, $CFG->{host};	128	my ($host, $port) = split /:/, $CFG->{host};
122		129
…		…
151	};	158	};
152		159
153	if ($CONN) {	160	if ($CONN) {
154	CFClient::lowdelay fileno $CONN->{fh};	161	CFClient::lowdelay fileno $CONN->{fh};
155		162
156	$LOGIN_BUTTON->set_text ("Logout");
157	status "login successful";	163	status "login successful";
158
159	$BUTTONBAR->{children}[1]->emit ("activate")
160	if $BUTTONBAR->{children}[1]->{state};
161
162	} else {	164	} else {
163	status "unable to connect";	165	status "unable to connect";
164	stop_game();	166	stop_game();
165	}	167	}
166	}	168	}
167		169
168	sub stop_game {	170	sub stop_game {
		171	$LOGIN_BUTTON->set_text ("Login");
		172	$SERVER_SETUP->show;
		173	$INV_WINDOW->hide;
		174	$LOGVIEW->hide;
		175
169	return unless $CONN;	176	return unless $CONN;
170		177
171	status "connection closed";	178	status "connection closed";
172	$LOGIN_BUTTON->set_text ("Login");	179
173	$CONN->destroy;	180	$CONN->destroy;
174	$CONN = 0; # false, does not autovivify	181	$CONN = 0; # false, does not autovivify
175
176	$BUTTONBAR->{children}[1]->emit ("activate")
177	unless $BUTTONBAR->{children}[1]->{state};
178	}	182	}
179		183
180	sub client_setup {	184	sub client_setup {
181	my $dialog = new CFClient::UI::FancyFrame	185	my $dialog = new CFClient::UI::FancyFrame
		186	req_x => 1,
		187	req_y => $HEIGHT * (1/8),
182	name => "client_setup",	188	name => "client_setup",
183	title => "Client Setup",	189	title => "Client Setup",
184	child => (my $vbox = new CFClient::UI::VBox);	190	child => (my $vbox = new CFClient::UI::VBox);
185	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	191	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
186		192
…		…
383		389
384	sub make_gauge_window {	390	sub make_gauge_window {
385	my $gh = int $HEIGHT * $CFG->{gauge_size};	391	my $gh = int $HEIGHT * $CFG->{gauge_size};
386		392
387	my $win = new CFClient::UI::Frame (	393	my $win = new CFClient::UI::Frame (
		394	req_x => 0,
388	req_y => -1,	395	req_y => -1,
389	user_w => $WIDTH,	396	def_w => $WIDTH,
390	user_h => $gh,	397	def_h => $gh,
391	);	398	);
392		399
393	$win->add (my $hbox = new CFClient::UI::HBox	400	$win->add (my $hbox = new CFClient::UI::HBox
394	children => [	401	children => [
395	(new CFClient::UI::HBox expand => 1),	402	(new CFClient::UI::HBox expand => 1),
…		…
431	&set_gauge_window_fontsize;	438	&set_gauge_window_fontsize;
432		439
433	$win	440	$win
434	}	441	}
435		442
		443
436	sub make_stats_window {	444	sub make_stats_window {
437	my $tgw = new CFClient::UI::FancyFrame title => "Stats", name => "stats_window";	445	my $tgw = new CFClient::UI::FancyFrame
		446	req_y => $HEIGHT * (2/8),
		447	req_x => -1,
		448	title => "Stats",
		449	name => "stats_window";
438		450
439	$tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);	451	$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,	452	$vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
441	can_hover => 1, can_events => 1,	453	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.");	454	tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
…		…
704	}	716	}
705	});	717	});
706	}	718	}
707		719
708	sub server_setup {	720	sub server_setup {
709	my $dialog = new CFClient::UI::FancyFrame	721	my $dialog = $SERVER_SETUP = new CFClient::UI::FancyFrame
		722	x => $WIDTH * (1/3),
		723	y => $HEIGHT * (1/8),
710	name => "server_setup",	724	name => "server_setup",
711	title => "Server Setup",	725	title => "Server Setup",
712	child => (my $vbox = new CFClient::UI::VBox);	726	child => (my $vbox = new CFClient::UI::VBox),
		727	on_visibility_change => sub {
		728	my ($self, $visible) = @_;
		729	$self->center if $visible;
		730	},
713		731	;
		732
714	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	733	$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");	734	$table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");
716		735
717	{	736	{
718	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);	737	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);
…		…
821	my $window = new CFClient::UI::FancyFrame	840	my $window = new CFClient::UI::FancyFrame
822	name => "message_window",	841	name => "message_window",
823	title => "Messages",	842	title => "Messages",
824	border_bg => [1, 1, 1, 1],	843	border_bg => [1, 1, 1, 1],
825	bg => [0, 0, 0, 0.75],	844	bg => [0, 0, 0, 0.75],
		845	req_x => -1,
		846	req_y => 0,
826	user_w => int $::WIDTH / 3,	847	def_w => int $::WIDTH / 3,
827	user_h => int $::HEIGHT / 5,	848	def_h => int $::HEIGHT / 5,
828	child => (my $vbox = new CFClient::UI::VBox);	849	child => (my $vbox = new CFClient::UI::VBox);
829		850
830	$vbox->add ($LOGVIEW);	851	$vbox->add ($LOGVIEW);
831		852
832	$vbox->add (my $input = new CFClient::UI::Entry	853	$vbox->add (my $input = new CFClient::UI::Entry
…		…
846	},	867	},
847	on_activate => sub {	868	on_activate => sub {
848	my ($input, $text) = @_;	869	my ($input, $text) = @_;
849	$input->set_text ('');	870	$input->set_text ('');
850		871
		872	if ($text =~ /^\/bind\s+(.*)$/) {
		873	CFClient::Recorder::open_binding_dialog ([$1]);
851	if ($text =~ /^\/(.*)/) {	874	} elsif ($text =~ /^\/(.*)/) {
852	$::CONN->user_send ($1);	875	$::CONN->user_send ($1);
853	} else {	876	} else {
854	my $say_cmd = $::CFG->{say_command} \|\| 'say';	877	my $say_cmd = $::CFG->{say_command} \|\| 'say';
855	$::CONN->user_send ("$say_cmd $text");	878	$::CONN->user_send ("$say_cmd $text");
856	}	879	}
…		…
872	$window	895	$window
873	}	896	}
874		897
875	sub open_quit_dialog {	898	sub open_quit_dialog {
876	unless ($QUIT_DIALOG) {	899	unless ($QUIT_DIALOG) {
877
878	$QUIT_DIALOG = new CFClient::UI::FancyFrame title => "Really Quit?";	900	$QUIT_DIALOG = new CFClient::UI::FancyFrame title => "Really Quit?";
879		901
880	$QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);	902	$QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
881		903
882	$vb->add (new CFClient::UI::Label	904	$vb->add (new CFClient::UI::Label
…		…
893	$hb->add (new CFClient::UI::Button	915	$hb->add (new CFClient::UI::Button
894	text => "Quit anyway",	916	text => "Quit anyway",
895	expand => 1,	917	expand => 1,
896	on_activate => sub { exit },	918	on_activate => sub { exit },
897	);	919	);
		920	}
898		921
		922	$QUIT_DIALOG->show;
899	$QUIT_DIALOG->show_centered;	923	$QUIT_DIALOG->center;
900	} else {
901	$QUIT_DIALOG->show_centered;
902	}
903	}	924	}
904		925
905	sub make_inventory_window {	926	sub make_inventory_window {
906	my $invwin = new CFClient::UI::FancyFrame	927	my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
907	user_w => $WIDTH * (7/8), user_h => $HEIGHT * (7/8), title => "Inventory", name => "inventory_window";	928	def_w => $WIDTH * 7/8,
908		929	def_h => $HEIGHT * 7/8,
909	$invwin->add (my $hb = new CFClient::UI::HBox expand => 1);	930	title => "Inventory",
910		931	name => "inventory_window",
911	$hb->add (my $vb1 = new CFClient::UI::VBox expand => 1);	932	on_visibility_change => sub {
912	$vb1->add (my $lbl = new CFClient::UI::Label align => 0);	933	my ($self, $visible) = @_;
913	$lbl->set_text ("Player");	934	$self->center if $visible;
914	$vb1->add ($INV = new CFClient::UI::Inventory expand => 1);
915
916	$hb->add (my $vb2 = new CFClient::UI::VBox expand => 1);
917
918	$vb2->add (my $hb2 = new CFClient::UI::HBox);
919	$hb2->add ($INVR_LBL = new CFClient::UI::Label align => 0, expand => 1);
920	$hb2->add (new CFClient::UI::Button
921	text => "Close",
922	tooltip => "Close the currently open container (if one is open)",
923	on_activate => sub {
924	$CONN->send ("apply $CONN->{open_container}")
925	if $CONN->{open_container} != 0;
926	},	935	},
927	);	936	;
928		937
929	$INVR_LBL->set_text ("Floor");	938	$invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);
		939
		940	$hb->add (my $vb1 = new CFClient::UI::VBox);
		941	$vb1->add (new CFClient::UI::Label align => 0, text => "Player");
		942	$vb1->add ($INV = new CFClient::UI::Inventory expand => 1);
		943
		944	$hb->add (my $vb2 = new CFClient::UI::VBox);
		945
		946	$vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
		947
930	$vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);	948	$vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
931		949
		950	# XXX: Call after $INVR = ... because set_opencont sets the items
		951	CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
		952
932	$invwin	953	$invwin
		954	}
		955
		956	sub make_binding_window {
		957	my $binding_list = new CFClient::UI::VBox;
		958
		959	my $refresh = sub {
		960	$binding_list->clear ();
		961
		962	for my $mod (keys %{$::CFG->{bindings}}) {
		963	for my $sym (keys %{$::CFG->{bindings}->{$mod}}) {
		964	my $cmds = $::CFG->{bindings}->{$mod}->{$sym};
		965	next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
		966
		967	my $lbl = join "; ", @$cmds;
		968	my $nam = CFClient::Recorder::keycombo_to_name ($mod, $sym);
		969	$binding_list->add (my $hb = new CFClient::UI::HBox);
		970	$hb->add (new CFClient::UI::Button
		971	text => "delete",
		972	on_activate => sub {
		973	$binding_list->remove ($hb);
		974	delete $::CFG->{bindings}->{$mod}->{$sym};
		975	});
		976	$hb->add (new CFClient::UI::Label text => "($nam)");
		977	$hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
		978	}
		979	}
		980	};
		981
		982	$BIND_WINDOW = new CFClient::UI::FancyFrame
		983	title => "Bindings",
		984	def_w => int $WIDTH * 7/8,
		985	def_h => int $HEIGHT * 7/8,
		986	on_visibility_change => sub {
		987	my ($self, $visible) = @_;
		988	if ($visible) {
		989	$self->center;
		990	$refresh->()
		991	}
		992	};
		993
		994	$BIND_WINDOW->add ($binding_list);
		995	$refresh->();
		996	$BIND_WINDOW
933	}	997	}
934		998
935	sub make_help_window {	999	sub make_help_window {
936	my $win = new CFClient::UI::FancyFrame	1000	my $win = new CFClient::UI::FancyFrame
937	user_w => $WIDTH * (7/8), user_h => $HEIGHT * (7/8), title => "Documentation";	1001	def_w => int $WIDTH * 7/8,
		1002	def_h => int $HEIGHT * 7/8,
		1003	title => "Documentation";
938		1004
939	$win->add (my $vbox = new CFClient::UI::VBox);	1005	$win->add (my $vbox = new CFClient::UI::VBox);
940		1006
941	$vbox->add (my $buttons = new CFClient::UI::HBox);	1007	$vbox->add (my $buttons = new CFClient::UI::HBox);
942	$vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8);	1008	$vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8);
…		…
1069	$BUTTONBAR->add (new CFClient::UI::Button	1135	$BUTTONBAR->add (new CFClient::UI::Button
1070	text => "Save Config",	1136	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.",	1137	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 {	1138	on_activate => sub {
1073	$::CFG->{layout} = CFClient::UI::get_layout;	1139	$::CFG->{layout} = CFClient::UI::get_layout;
1074	CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";	1140	CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1075	status "Configuration Saved";	1141	status "Configuration Saved";
1076	},	1142	},
1077	);	1143	);
1078		1144
1079	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window,	1145	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window,
1080	tooltip => "View Documentation");	1146	tooltip => "View Documentation");
		1147
		1148	$BUTTONBAR->add (new CFClient::UI::Flopper
		1149	text => "Bindings",
		1150	other => make_binding_window,
		1151	tooltip => "Lets you delete bindings you have made with the recorder"
		1152	);
		1153	$BUTTONBAR->add (new CFClient::UI::Flopper text => "[Rec]", other => CFClient::Recorder::make_window,
		1154	tooltip => "This feature lets you record a series of actions (eg. walking a path or ready a skill) and bind them to keys");
1081		1155
1082	$BUTTONBAR->add (new CFClient::UI::Button	1156	$BUTTONBAR->add (new CFClient::UI::Button
1083	text => "Quit",	1157	text => "Quit",
1084	tooltip => "Terminates the program",	1158	tooltip => "Terminates the program",
1085	on_activate => sub {	1159	on_activate => sub {
…		…
1093		1167
1094	$BUTTONBAR->show;	1168	$BUTTONBAR->show;
1095		1169
1096	$STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);	1170	$STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1097		1171
1098	# delay till geometry is constant	1172	$SERVER_SETUP->show;
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	}	1173	}
1106	}	1174	}
1107		1175
1108	sub video_shutdown {	1176	sub video_shutdown {
1109	undef $SDL_ACTIVE;	1177	undef $SDL_ACTIVE;
…		…
1321	$SIG{INT} = $SIG{TERM} = sub { exit };	1389	$SIG{INT} = $SIG{TERM} = sub { exit };
1322		1390
1323	{	1391	{
1324	local $SIG{__DIE__} = sub { CFClient::fatal $_[0] };	1392	local $SIG{__DIE__} = sub { CFClient::fatal $_[0] };
1325		1393
1326	CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";	1394	CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1327	CFClient::UI::set_layout ($::CFG->{layout});	1395	CFClient::UI::set_layout ($::CFG->{layout});
1328		1396
1329	my %DEF_CFG = (	1397	my %DEF_CFG = (
1330	sdl_mode => 0,	1398	sdl_mode => 0,
1331	width => 640,	1399	width => 640,
…		…
1409		1477
1410	END { CFClient::SDL_Quit }	1478	END { CFClient::SDL_Quit }
1411		1479
1412	=head1 NAME	1480	=head1 NAME
1413		1481
1414	pclient - A Crossfire+ and Crossfire game client	1482	cfplus - A Crossfire+ and Crossfire game client
1415		1483
1416	=head1 SYNOPSIS	1484	=head1 SYNOPSIS
1417		1485
1418	Just run it - no commandline arguments are supported.	1486	Just run it - no commandline arguments are supported.
1419		1487
1420	=head1 USAGE	1488	=head1 USAGE
1421		1489
1422	Pclient utilises OpenGL for all UI elements and the game. It is supposed to be used	1490	cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used
1423	fullscreen and interactively.	1491	fullscreen and interactively.
1424		1492
1425	=head1 AUTHOR	1493	=head1 AUTHOR
1426		1494
1427	Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>	1495	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.28 by root, Mon May 29 21:10:47 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.28 by root, Mon May 29 21:10:47 2006 UTC