[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.36 by elmex, Tue May 30 14:59:26 2006 UTC

…		…
101	our $DEBUG_STATUS;	101	our $DEBUG_STATUS;
102		102
103	our $INV_WINDOW;	103	our $INV_WINDOW;
104	our $INV;	104	our $INV;
105	our $INVR;	105	our $INVR;
106	our $INVR_LBL;	106	our $INV_RIGHT_HB;
		107
		108	our $BIND_WINDOW;
		109	our $BIND_EDITOR;
107		110
108	sub status {	111	sub status {
109	$STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);	112	$STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
110	}	113	}
111		114
112	sub debug {	115	sub debug {
113	$DEBUG_STATUS->set_text ($_[0]);	116	$DEBUG_STATUS->set_text ($_[0]);
114	my ($w, $h) = $DEBUG_STATUS->size_request;
115	$DEBUG_STATUS->move ($WIDTH - $w, 0);
116	}	117	}
117		118
118	sub start_game {	119	sub start_game {
119	status "logging in...";	120	status "logging in...";
120		121
…		…
179	$CONN = 0; # false, does not autovivify	180	$CONN = 0; # false, does not autovivify
180	}	181	}
181		182
182	sub client_setup {	183	sub client_setup {
183	my $dialog = new CFClient::UI::FancyFrame	184	my $dialog = new CFClient::UI::FancyFrame
184	req_x => 1,	185	x => 1,
185	req_y => $HEIGHT * (1/8),	186	y => $HEIGHT * (1/8),
186	name => "client_setup",	187	name => "client_setup",
187	title => "Client Setup",	188	title => "Client Setup",
188	child => (my $vbox = new CFClient::UI::VBox);	189	child => (my $vbox = new CFClient::UI::VBox);
		190
189	$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]);
190		192
191	$table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode");	193	$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);	194	$table->add (1, 0, my $hbox = new CFClient::UI::HBox);
193		195
194	$hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]);	196	$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");	197	$hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
196		198
197	$mode_slider->connect (changed => sub {	199	$mode_slider->connect (changed => sub {
198	my ($self, $value) = @_;	200	my ($self, $value) = @_;
199		201
…		…
387		389
388	sub make_gauge_window {	390	sub make_gauge_window {
389	my $gh = int $HEIGHT * $CFG->{gauge_size};	391	my $gh = int $HEIGHT * $CFG->{gauge_size};
390		392
391	my $win = new CFClient::UI::Frame (	393	my $win = new CFClient::UI::Frame (
392	req_x => 0,	394	force_x => 0,
393	req_y => -1,	395	force_y => "max",
394	def_w => $WIDTH,	396	force_w => $WIDTH,
395	def_h => $gh,	397	force_h => $gh,
396	);	398	);
397		399
398	$win->add (my $hbox = new CFClient::UI::HBox	400	$win->add (my $hbox = new CFClient::UI::HBox
399	children => [	401	children => [
400	(new CFClient::UI::HBox expand => 1),	402	(new CFClient::UI::HBox expand => 1),
…		…
436	&set_gauge_window_fontsize;	438	&set_gauge_window_fontsize;
437		439
438	$win	440	$win
439	}	441	}
440		442
		443
441	sub make_stats_window {	444	sub make_stats_window {
442	my $tgw = new CFClient::UI::FancyFrame	445	my $tgw = new CFClient::UI::FancyFrame
443	req_y => $HEIGHT * (2/8),	446	y => $HEIGHT * (2/8),
444	req_x => -1,	447	x => "max",
445	title => "Stats",	448	title => "Stats",
446	name => "stats_window";	449	name => "stats_window";
447		450
448	$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);
449	$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,
450	can_hover => 1, can_events => 1,	453	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.");	454	tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
…		…
714	});	717	});
715	}	718	}
716		719
717	sub server_setup {	720	sub server_setup {
718	my $dialog = $SERVER_SETUP = new CFClient::UI::FancyFrame	721	my $dialog = $SERVER_SETUP = new CFClient::UI::FancyFrame
719	x => $WIDTH * (1/3),	722	x => "center",
720	y => $HEIGHT * (1/8),	723	y => "center",
721	name => "server_setup",	724	name => "server_setup",
722	title => "Server Setup",	725	title => "Server Setup",
723	child => (my $vbox = new CFClient::UI::VBox),	726	child => (my $vbox = new CFClient::UI::VBox),
724	on_visibility_change => sub {
725	my ($self, $visible) = @_;
726	$self->center if $visible;
727	},
728	;	727	;
729		728
730	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	729	$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");	730	$table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");
732		731
…		…
778	}	777	}
779	);	778	);
780		779
781	$table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");	780	$table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
782	$table->add (1, 7, new CFClient::UI::Slider	781	$table->add (1, 7, new CFClient::UI::Slider
783	req_w => 100,	782	force_w => 100,
784	range => [$CFG->{mapsize}, 10, 100, 0, 1],	783	range => [$CFG->{mapsize}, 10, 100, 0, 1],
785	tooltip => "This is the size of the portion of the map update the server sends you. "	784	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, "	785	. "If you set this to a high value you will be able to see further, "
787	. "but you also increase bandwidth requirements and latency. "	786	. "but you also increase bandwidth requirements and latency. "
788	. "This option is only used once at log-in.",	787	. "This option is only used once at log-in.",
…		…
837	my $window = new CFClient::UI::FancyFrame	836	my $window = new CFClient::UI::FancyFrame
838	name => "message_window",	837	name => "message_window",
839	title => "Messages",	838	title => "Messages",
840	border_bg => [1, 1, 1, 1],	839	border_bg => [1, 1, 1, 1],
841	bg => [0, 0, 0, 0.75],	840	bg => [0, 0, 0, 0.75],
842	req_x => -1,	841	x => "max",
843	req_y => 0,	842	y => 0,
844	def_w => int $::WIDTH / 3,	843	force_w => $::WIDTH / 3,
845	def_h => int $::HEIGHT / 5,	844	force_h => $::HEIGHT / 5,
846	child => (my $vbox = new CFClient::UI::VBox);	845	child => (my $vbox = new CFClient::UI::VBox);
847		846
848	$vbox->add ($LOGVIEW);	847	$vbox->add ($LOGVIEW);
849		848
850	$vbox->add (my $input = new CFClient::UI::Entry	849	$vbox->add (my $input = new CFClient::UI::Entry
…		…
864	},	863	},
865	on_activate => sub {	864	on_activate => sub {
866	my ($input, $text) = @_;	865	my ($input, $text) = @_;
867	$input->set_text ('');	866	$input->set_text ('');
868		867
		868	if ($text =~ /^\/bind\s+(.*)$/) {
		869	CFClient::Binder::open_binding_dialog (sub {
		870	my ($mod, $sym) = @_;
		871	$::CFG->{bindings}->{$mod}->{$sym} = [$1];
		872	});
869	if ($text =~ /^\/(.*)/) {	873	} elsif ($text =~ /^\/(.*)/) {
870	$::CONN->user_send ($1);	874	$::CONN->user_send ($1);
871	} else {	875	} else {
872	my $say_cmd = $::CFG->{say_command} \|\| 'say';	876	my $say_cmd = $::CFG->{say_command} \|\| 'say';
873	$::CONN->user_send ("$say_cmd $text");	877	$::CONN->user_send ("$say_cmd $text");
874	}	878	}
…		…
882	},	886	},
883	);	887	);
884		888
885	$CONSOLE = {	889	$CONSOLE = {
886	window => $window,	890	window => $window,
887	input => $input	891	input => $input,
888	};	892	};
889		893
890	$window	894	$window
891	}	895	}
892		896
893	sub open_quit_dialog {	897	sub open_quit_dialog {
894	unless ($QUIT_DIALOG) {	898	unless ($QUIT_DIALOG) {
895	$QUIT_DIALOG = new CFClient::UI::FancyFrame title => "Really Quit?";	899	$QUIT_DIALOG = new CFClient::UI::FancyFrame
		900	x => "center",
		901	y => "center",
		902	title => "Really Quit?",
		903	;
896		904
897	$QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);	905	$QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
898		906
899	$vb->add (new CFClient::UI::Label	907	$vb->add (new CFClient::UI::Label
900	text => "You should find a savebed and apply it first!",	908	text => "You should find a savebed and apply it first!",
…		…
913	on_activate => sub { exit },	921	on_activate => sub { exit },
914	);	922	);
915	}	923	}
916		924
917	$QUIT_DIALOG->show;	925	$QUIT_DIALOG->show;
918	$QUIT_DIALOG->center;
919	}	926	}
920		927
921	sub make_inventory_window {	928	sub make_inventory_window {
922	my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame	929	my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
		930	x => "center",
		931	y => "center",
923	def_w => $WIDTH * 7/8,	932	force_w => $WIDTH * 9/10,
924	def_h => $HEIGHT * 7/8,	933	force_h => $HEIGHT * 9/10,
925	title => "Inventory",	934	title => "Inventory",
926	name => "inventory_window",	935	name => "inventory_window",
927	on_visibility_change => sub {
928	my ($self, $visible) = @_;
929	$self->center if $visible;
930	},
931	;	936	;
932		937
933	$invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);	938	$invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);
934		939
935	$hb->add (my $vb1 = new CFClient::UI::VBox);	940	$hb->add (my $vb1 = new CFClient::UI::VBox);
936	$vb1->add (new CFClient::UI::Label align => 0, text => "Player");	941	$vb1->add (new CFClient::UI::Label align => 0, text => "Player");
937	$vb1->add ($INV = new CFClient::UI::Inventory expand => 1);	942	$vb1->add ($INV = new CFClient::UI::Inventory expand => 1);
938		943
939	$hb->add (my $vb2 = new CFClient::UI::VBox);	944	$hb->add (my $vb2 = new CFClient::UI::VBox);
940		945
		946	$vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
		947
		948	$vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
		949
		950	# XXX: Call after $INVR = ... because set_opencont sets the items
		951	CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
		952
		953	$invwin
		954	}
		955
		956	sub make_binding_window {
		957	my $binding_list = new CFClient::UI::VBox;
		958
		959	my $refresh;
		960	$refresh = sub {
		961	$binding_list->clear ();
		962
		963	for my $mod (keys %{$::CFG->{bindings}}) {
		964	for my $sym (keys %{$::CFG->{bindings}->{$mod}}) {
		965	my $cmds = $::CFG->{bindings}->{$mod}->{$sym};
		966	next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
		967
		968	my $lbl = join "; ", @$cmds;
		969	my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym);
		970	$binding_list->add (my $hb = new CFClient::UI::HBox);
		971	$hb->add (new CFClient::UI::Button
		972	text => "delete",
		973	tooltip => "Deletes the binding",
		974	on_activate => sub {
		975	$binding_list->remove ($hb);
		976	delete $::CFG->{bindings}->{$mod}->{$sym};
		977	});
		978
		979	$hb->add (new CFClient::UI::Button
		980	text => "edit",
		981	tooltip => "Edits the binding",
		982	on_activate => sub {
		983	$::BIND_EDITOR->set_binding (
		984	$mod, $sym, $::CFG->{bindings}->{$mod}->{$sym},
		985	sub {
		986	my ($nmod, $nsym, $ncmds) = @_;
		987	delete $::CFG->{bindings}->{$mod}->{$sym};
		988	$::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds;
		989	$refresh->();
		990	$::BIND_WINDOW->show;
		991	},
		992	sub {
		993	$::BIND_WINDOW->show;
		994	});
		995	$::BIND_EDITOR->show;
		996	$::BIND_WINDOW->hide;
		997	});
		998
		999	$hb->add (new CFClient::UI::Label text => "(Key: $nam)");
		1000	$hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
		1001	}
		1002	}
		1003	};
		1004
		1005	$BIND_WINDOW = new CFClient::UI::FancyFrame
		1006	title => "Bindings",
		1007	x => "center",
		1008	y => "center",
		1009	def_w => int $WIDTH * 9/10,
		1010	def_h => int $HEIGHT * 9/10,
		1011	on_visibility_change => sub {
		1012	my ($self, $visible) = @_;
		1013	$refresh->() if $visible;
		1014	};
		1015
		1016	$BIND_WINDOW->add (my $vb = new CFClient::UI::VBox);
		1017	$vb->add ($binding_list);
941	$vb2->add (my $hb2 = new CFClient::UI::HBox);	1018	$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	1019	$hb->add (new CFClient::UI::Button
944	text => "Close",	1020	text => "record new",
945	tooltip => "Close the currently open container (if one is open)",	1021	expand => 1,
		1022	tooltip => "This button opens the binding editor with an empty binding.",
946	on_activate => sub {	1023	on_activate => sub {
947	$CONN->send ("apply $CONN->{open_container}")	1024	$::BIND_EDITOR->set_binding (undef, undef, [],
948	if $CONN->{open_container} != 0;	1025	sub {
		1026	my ($mod, $sym, $cmds) = @_;
		1027	$::CFG->{bindings}->{$mod}->{$sym} = $cmds;
		1028	$refresh->();
		1029	$::BIND_WINDOW->show;
		1030	},
		1031	sub {
		1032	$::BIND_WINDOW->show;
		1033	});
		1034	$::BIND_WINDOW->hide;
		1035	$::BIND_EDITOR->show;
949	},	1036	},
950	);	1037	);
		1038	$hb->add (new CFClient::UI::Button
		1039	text => "close",
		1040	tooltip => "Closes the binding window",
		1041	expand => 1,
		1042	on_activate => sub {
		1043	$::BIND_WINDOW->hide;
		1044	}
		1045	);
951		1046
952	$vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);	1047	$refresh->();
953		1048	$BIND_WINDOW
954	$invwin
955	}	1049	}
956		1050
957	sub make_help_window {	1051	sub make_help_window {
958	my $win = new CFClient::UI::FancyFrame	1052	my $win = new CFClient::UI::FancyFrame
959	def_w => int $WIDTH * 7/8,	1053	def_w => int $WIDTH * 7/8,
…		…
1027	if ($DEBUG_STATUS) {	1121	if ($DEBUG_STATUS) {
1028	CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;	1122	CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1029	} else {	1123	} else {
1030	# create the widgets	1124	# create the widgets
1031		1125
1032	$DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, req_x => -1;	1126	$DEBUG_STATUS = new CFClient::UI::Label
		1127	padding => 0,
		1128	z => 100,
		1129	force_x => "max",
		1130	force_y => 0;
1033	$DEBUG_STATUS->show;	1131	$DEBUG_STATUS->show;
1034		1132
		1133	$BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);
		1134
1035	$STATUSBOX = new CFClient::UI::Statusbox;	1135	$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]);	1136	$STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]);
1037		1137
1038	(new CFClient::UI::Frame	1138	(new CFClient::UI::Frame
1039	bg => [0, 0, 0, 0.4],	1139	bg => [0, 0, 0, 0.4],
1040	req_y => -1,	1140	force_x => 0,
		1141	force_y => "max",
1041	child => $STATUSBOX,	1142	child => $STATUSBOX,
1042	)->show;	1143	)->show;
1043		1144
1044	CFClient::UI::FancyFrame->new (	1145	CFClient::UI::FancyFrame->new (
		1146	x => 0,
		1147	y => $FONTSIZE + 8,
1045	border_bg => [1, 1, 1, 192/255],	1148	border_bg => [1, 1, 1, 192/255],
1046	bg => [1, 1, 1, 0],	1149	bg => [1, 1, 1, 0],
1047	child => ($MAPMAP = new CFClient::MapWidget::MapMap	1150	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.",	1151	tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
1049	),	1152	),
…		…
1072	can_hover => 1,	1175	can_hover => 1,
1073	can_events => 1,	1176	can_events => 1,
1074	tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",	1177	tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1075	;	1178	;
1076		1179
1077	$BUTTONBAR = new CFClient::UI::HBox;	1180	$BUTTONBAR = new CFClient::UI::HBox x => 0, y => 0;
1078		1181
1079	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup,	1182	$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.");	1183	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,	1184	$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.");	1185	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	1189	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		1190
1088	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window,	1191	$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.");	1192	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,	1193	$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 :).");	1194	tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :)."
		1195	."You can also hit the Tab-key to show/hide the Inventory.");
1092		1196
1093	$BUTTONBAR->add (new CFClient::UI::Button	1197	$BUTTONBAR->add (new CFClient::UI::Button
1094	text => "Save Config",	1198	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.",	1199	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 {	1200	on_activate => sub {
1097	$::CFG->{layout} = CFClient::UI::get_layout;	1201	$::CFG->{layout} = CFClient::UI::get_layout;
1098	CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";	1202	CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1099	status "Configuration Saved";	1203	status "Configuration Saved";
1100	},	1204	},
1101	);	1205	);
1102		1206
1103	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window,	1207	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window,
1104	tooltip => "View Documentation");	1208	tooltip => "View Documentation");
		1209
		1210	$BUTTONBAR->add (new CFClient::UI::Flopper
		1211	text => "Bindings",
		1212	other => make_binding_window,
		1213	tooltip =>
		1214	"Lets you define, edit and delete bindings."
		1215	."There is a shortcut for making bindings: LCTRL+Insert opens the binding editor "
		1216	."with nothing set and the recording started. After doing the actions you "
		1217	."want to record press Insert and you will be asked to press a key-combo."
		1218	."After pressing the combo the binding will be saved automatically and the "
		1219	."binding editor closes"
		1220	);
1105		1221
1106	$BUTTONBAR->add (new CFClient::UI::Button	1222	$BUTTONBAR->add (new CFClient::UI::Button
1107	text => "Quit",	1223	text => "Quit",
1108	tooltip => "Terminates the program",	1224	tooltip => "Terminates the program",
1109	on_activate => sub {	1225	on_activate => sub {
…		…
1114	}	1230	}
1115	},	1231	},
1116	);	1232	);
1117		1233
1118	$BUTTONBAR->show;	1234	$BUTTONBAR->show;
		1235	$SERVER_SETUP->show;
1119		1236
1120	$STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);	1237	$STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1121
1122	$SERVER_SETUP->show;
1123	}	1238	}
1124	}	1239	}
1125		1240
1126	sub video_shutdown {	1241	sub video_shutdown {
1127	undef $SDL_ACTIVE;	1242	undef $SDL_ACTIVE;
…		…
1195		1310
1196	my %demo;#d#	1311	my %demo;#d#
1197		1312
1198	sub force_refresh {	1313	sub force_refresh {
1199	$fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) \|\| 0.1) * 0.05;	1314	$fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) \|\| 0.1) * 0.05;
1200	debug sprintf "%3.2f", $fps;	1315	debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1201		1316
1202	$CFClient::UI::ROOT->draw;	1317	$CFClient::UI::ROOT->draw;
1203		1318
1204	$WANT_REFRESH = 0;	1319	$WANT_REFRESH = 0;
1205	$CAN_REFRESH = 0;	1320	$CAN_REFRESH = 0;
…		…
1337	#############################################################################	1452	#############################################################################
1338		1453
1339	$SIG{INT} = $SIG{TERM} = sub { exit };	1454	$SIG{INT} = $SIG{TERM} = sub { exit };
1340		1455
1341	{	1456	{
1342	local $SIG{__DIE__} = sub { CFClient::fatal $_[0] };	1457	local $SIG{__DIE__} = sub { CFClient::fatal $_[0] if defined $^S && !$^S };
1343		1458
1344	CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";	1459	CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1345	CFClient::UI::set_layout ($::CFG->{layout});	1460	CFClient::UI::set_layout ($::CFG->{layout});
1346		1461
1347	my %DEF_CFG = (	1462	my %DEF_CFG = (
1348	sdl_mode => 0,	1463	sdl_mode => 0,
1349	width => 640,	1464	width => 640,
…		…
1427		1542
1428	END { CFClient::SDL_Quit }	1543	END { CFClient::SDL_Quit }
1429		1544
1430	=head1 NAME	1545	=head1 NAME
1431		1546
1432	pclient - A Crossfire+ and Crossfire game client	1547	cfplus - A Crossfire+ and Crossfire game client
1433		1548
1434	=head1 SYNOPSIS	1549	=head1 SYNOPSIS
1435		1550
1436	Just run it - no commandline arguments are supported.	1551	Just run it - no commandline arguments are supported.
1437		1552
1438	=head1 USAGE	1553	=head1 USAGE
1439		1554
1440	Pclient utilises OpenGL for all UI elements and the game. It is supposed to be used	1555	cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used
1441	fullscreen and interactively.	1556	fullscreen and interactively.
1442		1557
1443	=head1 AUTHOR	1558	=head1 AUTHOR
1444		1559
1445	Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>	1560	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.23 by root, Sun May 28 02:31:04 2006 UTC vs. Revision 1.36 by elmex, Tue May 30 14:59:26 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.36 by elmex, Tue May 30 14:59:26 2006 UTC