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

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.21 by root, Sun May 28 01:16:04 2006 UTC vs.
Revision 1.62 by root, Tue Jun 6 08:35:22 2006 UTC

…		…
25	# need to do it again because that pile of garbage called PAR nukes it before main	25	# need to do it again because that pile of garbage called PAR nukes it before main
26	unshift @INC, $ENV{PAR_TEMP}	26	unshift @INC, $ENV{PAR_TEMP}
27	if %PAR::LibCache;	27	if %PAR::LibCache;
28		28
29	use Time::HiRes 'time';	29	use Time::HiRes 'time';
30	use Pod::POM;
31	use Event;	30	use Event;
32		31
33	use Crossfire;	32	use Crossfire;
34	use Crossfire::Protocol::Constants;	33	use Crossfire::Protocol::Constants;
35		34
…		…
39	use CFClient::OpenGL ();	38	use CFClient::OpenGL ();
40	use CFClient::Protocol;	39	use CFClient::Protocol;
41	use CFClient::UI;	40	use CFClient::UI;
42	use CFClient::MapWidget;	41	use CFClient::MapWidget;
43		42
		43	$SIG{QUIT} = sub { Carp::cluck "QUIT" };
		44
44	$Event::DIED = sub {	45	$Event::DIED = sub {
45	# TODO: display dialog box or so	46	# TODO: display dialog box or so
		47	Carp::confess $_[1];#d#TODO: remove when stable
46	CFClient::error $_[1];	48	CFClient::error $_[1];
47	};	49	};
48		50
49	#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d#	51	#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d#
50		52
…		…
81	our $LOGVIEW;	83	our $LOGVIEW;
82	our $CONSOLE;	84	our $CONSOLE;
83	our $METASERVER;	85	our $METASERVER;
84	our $LOGIN_BUTTON;	86	our $LOGIN_BUTTON;
85	our $QUIT_DIALOG;	87	our $QUIT_DIALOG;
		88	our $HOST_ENTRY;
86		89
		90	our $SETUP_DIALOG;
		91	our $SETUP_NOTEBOOK;
		92	our $SETUP_SERVER;
		93	our $SETUP_KEYBOARD;
		94	our $SETUP_SPELLS;
		95
		96	our $STATS_WINDOW;
		97	our $MESSAGE_WINDOW;
87	our $FLOORBOX;	98	our $FLOORBOX;
88	our $GAUGES;	99	our $GAUGES;
89	our $STATWIDS;	100	our $STATWIDS;
90		101
91	our $SDL_ACTIVE;	102	our $SDL_ACTIVE;
…		…
97		108
98	our $ALT_ENTER_MESSAGE;	109	our $ALT_ENTER_MESSAGE;
99	our $STATUSBOX;	110	our $STATUSBOX;
100	our $DEBUG_STATUS;	111	our $DEBUG_STATUS;
101		112
		113	our $INV_WINDOW;
102	our $INV;	114	our $INV;
103	our $INVR;	115	our $INVR;
104	our $INVR_LBL;	116	our $INV_RIGHT_HB;
		117
		118	our $BIND_EDITOR;
		119
		120	our $PICKUP_CFG;
105		121
106	sub status {	122	sub status {
107	$STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);	123	$STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
108	}	124	}
109		125
110	sub debug {	126	sub debug {
111	$DEBUG_STATUS->set_text ($_[0]);	127	$DEBUG_STATUS->set_text ($_[0]);
112	my ($w, $h) = $DEBUG_STATUS->size_request;	128	}
113	$DEBUG_STATUS->move ($WIDTH - $w, 0);	129
		130	sub destroy_query_dialog {
		131	(delete $_[0]{query_dialog})->destroy
		132	if $_[0]{query_dialog};
		133	}
		134
		135	# server query dialog
		136	sub server_query {
		137	my ($conn, $flags, $prompt) = @_;
		138
		139	$conn->{query_dialog} = my $dialog = new CFClient::UI::FancyFrame
		140	x => "center",
		141	y => "center",
		142	title => "Server Query",
		143	child => my $vbox = new CFClient::UI::VBox,
		144	;
		145
		146	my @dialog = my $label = new CFClient::UI::Label
		147	max_w => $::WIDTH * 0.4,
		148	ellipsise => 0,
		149	text => $prompt;
		150
		151	if ($flags & CS_QUERY_YESNO) {
		152	push @dialog, my $hbox = new CFClient::UI::HBox;
		153
		154	$hbox->add (new CFClient::UI::Button
		155	text => "No",
		156	on_activate => sub {
		157	$conn->send ("reply n");
		158	$dialog->destroy;
		159	}
		160	);
		161	$hbox->add (new CFClient::UI::Button
		162	text => "Yes",
		163	on_activate => sub {
		164	$conn->send ("reply y");
		165	destroy_query_dialog $conn;
		166	},
		167	);
		168
		169	$dialog->focus_in;
		170
		171	} elsif ($flags & CS_QUERY_SINGLECHAR) {
		172	$dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)";
		173
		174	if ($prompt =~ /Now choose a character\|Press any key for the next race/i) {
		175	$MESSAGE_WINDOW->show;
		176
		177	unshift @dialog, new CFClient::UI::Label
		178	max_w => $::WIDTH * 0.4,
		179	ellipsise => 0,
		180	markup => "\nOr use your keyboard:\n";
		181
		182	unshift @dialog, my $table = new CFClient::UI::Table;
		183
		184	$table->add (0, 0, new CFClient::UI::Button
		185	text => "Next Race",
		186	on_activate => sub {
		187	$conn->send ("reply n");
		188	destroy_query_dialog $conn;
		189	},
		190	);
		191	$table->add (2, 0, new CFClient::UI::Button
		192	text => "Accept",
		193	on_activate => sub {
		194	$conn->send ("reply d");
		195	destroy_query_dialog $conn;
		196	},
		197	);
		198
		199	unshift @dialog, new CFClient::UI::Label
		200	max_w => $::WIDTH * 0.4,
		201	ellipsise => 0,
		202	markup =>
		203	"<big><b>Character Creation: Race</b></big>\n\n"
		204	. "Look at the <b>Messages</b> window to see a description of this race "
		205	. "(<small>or hover with your mouse over the bottommost entry in the status area in the lower left area of the screen</small>) "
		206	. "and the center of the screen to see how this race looks like "
		207	. "(<small>this is below this dialog window, you may need to click on the display area to make it visible</small>).\n\n"
		208	. "You can look at another race, or accept this race (you will come back to this race eventually, "
		209	. "so you can take your time making this important choice."
		210	;
		211
		212	} elsif ($prompt =~ /roll new stats/) {
		213	if (my $stat = delete $conn->{stat_change_with}) {
		214	$conn->send ("reply $stat");
		215	destroy_query_dialog $conn;
		216	return;
		217	}
		218
		219	$STATS_WINDOW->show;
		220	$MESSAGE_WINDOW->hide;
		221
		222	unshift @dialog, new CFClient::UI::Label
		223	max_w => $::WIDTH * 0.4,
		224	ellipsise => 0,
		225	markup => "\nOr use your keyboard:\n";
		226
		227	unshift @dialog, my $table = new CFClient::UI::Table;
		228
		229	# left: re-roll
		230	$table->add (0, 0, new CFClient::UI::Button
		231	text => "Roll Again",
		232	on_activate => sub {
		233	$conn->send ("reply y");
		234	destroy_query_dialog $conn;
		235	},
		236	);
		237
		238	# center: swap stats
		239	my ($sw1, $sw2) = map +(new CFClient::UI::Combobox
		240	value => $_,
		241	options => [
		242	[Str => 1, "Strength ($conn->{stat}{+CS_STAT_STR})"],
		243	[Dex => 2, "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],
		244	[Con => 3, "Constitution ($conn->{stat}{+CS_STAT_CON})"],
		245	[Int => 4, "Intelligence ($conn->{stat}{+CS_STAT_INT})"],
		246	[Wis => 5, "Wisdom ($conn->{stat}{+CS_STAT_WIS})"],
		247	[Pow => 6, "Power ($conn->{stat}{+CS_STAT_POW})"],
		248	[Cha => 7, "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
		249	],
		250	), 1 .. 2;
		251
		252	$table->add (2, 0, new CFClient::UI::Button
		253	text => "Swap Stats",
		254	on_activate => sub {
		255	$conn->{stat_change_with} = $sw2->{value};
		256	$conn->send ("reply $sw1->{value}");
		257	destroy_query_dialog $conn;
		258	},
		259	);
		260	$table->add (2, 1, new CFClient::UI::HBox children => [$sw1, $sw2]);
		261
		262	# right: accept
		263	$table->add (4, 0, new CFClient::UI::Button
		264	text => "Accept",
		265	on_activate => sub {
		266	$conn->send ("reply n");
		267	$STATS_WINDOW->hide;
		268	destroy_query_dialog $conn;
		269	},
		270	);
		271
		272	unshift @dialog, new CFClient::UI::Label
		273	max_w => $::WIDTH * 0.4,
		274	ellipsise => 0,
		275	markup =>
		276	"<big><b>Character Creation: Stats</b></big>\n\n"
		277	. "Look at the <b>Stats</b> window to see your basic stats "
		278	. "(first column: 1 strength, 2 dexterity, 3 constitution, 4 intelligence, 5 wisdom, 6 power and 7 charisma).\n\n"
		279	. "You can create another set of stats, swap two stat values with each other or accept the stats as they are now and continue. "
		280	. "Race selection will influence those values later on."
		281	;
		282	}
		283
		284	push @dialog, my $entry = new CFClient::UI::Entry
		285	on_changed => sub {
		286	$conn->send ("reply $_[1]");
		287	destroy_query_dialog $conn;
		288	},
		289	;
		290
		291	$entry->focus_in;
		292
		293	} else {
		294	$dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";
		295
		296	push @dialog, my $entry = new CFClient::UI::Entry
		297	$flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (),
		298	on_activate => sub {
		299	$conn->send ("reply $_[1]");
		300	destroy_query_dialog $conn;
		301	},
		302	;
		303
		304	$entry->focus_in;
		305	}
		306
		307	$vbox->add (@dialog);
		308	$dialog->show;
114	}	309	}
115		310
116	sub start_game {	311	sub start_game {
117	status "logging in...";	312	status "logging in...";
		313
		314	$LOGIN_BUTTON->set_text ("Logout");
		315	$SETUP_DIALOG->hide;
118		316
119	my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;	317	my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
120		318
121	my ($host, $port) = split /:/, $CFG->{host};	319	my ($host, $port) = split /:/, $CFG->{host};
122		320
…		…
134	map_widget => $MAPWIDGET,	332	map_widget => $MAPWIDGET,
135	logview => $LOGVIEW,	333	logview => $LOGVIEW,
136	statusbox => $STATUSBOX,	334	statusbox => $STATUSBOX,
137	map => $MAP,	335	map => $MAP,
138	mapmap => $MAPMAP,	336	mapmap => $MAPMAP,
		337	query => \&server_query,
139		338
140	sound_play => sub {	339	sound_play => sub {
141	my ($x, $y, $soundnum, $type) = @_;	340	my ($x, $y, $soundnum, $type) = @_;
142		341
143	$SDL_MIXER	342	$SDL_MIXER
…		…
151	};	350	};
152		351
153	if ($CONN) {	352	if ($CONN) {
154	CFClient::lowdelay fileno $CONN->{fh};	353	CFClient::lowdelay fileno $CONN->{fh};
155		354
156	$LOGIN_BUTTON->set_text ("Logout");
157	status "login successful";	355	status "login successful";
158
159	$BUTTONBAR->{children}[1]->emit ("activate")
160	if $BUTTONBAR->{children}[1]->{state};
161
162	} else {	356	} else {
163	status "unable to connect";	357	status "unable to connect";
164	stop_game();	358	stop_game();
165	}	359	}
166	}	360	}
167		361
168	sub stop_game {	362	sub stop_game {
		363	$LOGIN_BUTTON->set_text ("Login");
		364	$SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
		365	$SETUP_DIALOG->show;
		366	$INV_WINDOW->hide;
		367
169	return unless $CONN;	368	return unless $CONN;
170		369
171	status "connection closed";	370	status "connection closed";
172	$LOGIN_BUTTON->set_text ("Login");	371
		372	destroy_query_dialog $CONN;
173	$CONN->destroy;	373	$CONN->destroy;
174	$CONN = 0; # false, does not autovivify	374	$CONN = 0; # false, does not autovivify
175
176	$BUTTONBAR->{children}[1]->emit ("activate")
177	unless $BUTTONBAR->{children}[1]->{state};
178	}	375	}
179		376
180	sub client_setup {	377	sub graphics_setup {
181	my $dialog = new CFClient::UI::FancyFrame
182	req_x => 1,
183	req_y => $HEIGHT * (1/8),
184	name => "client_setup",
185	title => "Client Setup",
186	child => (my $vbox = new CFClient::UI::VBox);	378	my $vbox = new CFClient::UI::VBox;
		379
187	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	380	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
188		381
189	$table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode");	382	$table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode");
190	$table->add (1, 0, my $hbox = new CFClient::UI::HBox);	383	$table->add (1, 0, my $hbox = new CFClient::UI::HBox);
191		384
192	$hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]);	385	$hbox->add (my $mode_slider = new CFClient::UI::Slider force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]);
193	$hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");	386	$hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
194		387
195	$mode_slider->connect (changed => sub {	388	$mode_slider->connect (changed => sub {
196	my ($self, $value) = @_;	389	my ($self, $value) = @_;
197		390
…		…
314	on_activate => sub {	507	on_activate => sub {
315	video_shutdown ();	508	video_shutdown ();
316	video_init ();	509	video_init ();
317	}	510	}
318	);	511	);
		512
		513	$vbox
		514	}
		515
		516	sub audio_setup {
		517	my $vbox = new CFClient::UI::VBox;
		518
		519	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
		520
		521	my $row = 0;
319		522
320	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");	523	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");
321	$table->add (1, $row++, new CFClient::UI::CheckBox	524	$table->add (1, $row++, new CFClient::UI::CheckBox
322	state => $CFG->{audio_enable},	525	state => $CFG->{audio_enable},
323	tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.",	526	tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.",
…		…
354	audio_shutdown ();	557	audio_shutdown ();
355	audio_init ();	558	audio_init ();
356	}	559	}
357	);	560	);
358		561
359	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command");	562	$vbox
360	$table->add (1, $row++, my $saycmd = new CFClient::UI::Entry
361	text => $CFG->{say_command},
362	tooltip => "This is the command that will be used if you write a line in the message window entry or press <b>\"</b> in the map window. "
363	. "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
364	. "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
365	on_changed => sub {
366	my ($self, $value) = @_;
367	$CFG->{say_command} = $value;
368	}
369	);
370
371	$dialog
372	}	563	}
373		564
374	sub set_stats_window_fontsize {	565	sub set_stats_window_fontsize {
375	for (values %{$STATWIDS}) {	566	for (values %{$STATWIDS}) {
376	$_->set_fontsize ($::CFG->{stat_fontsize});	567	$_->set_fontsize ($::CFG->{stat_fontsize});
…		…
385		576
386	sub make_gauge_window {	577	sub make_gauge_window {
387	my $gh = int $HEIGHT * $CFG->{gauge_size};	578	my $gh = int $HEIGHT * $CFG->{gauge_size};
388		579
389	my $win = new CFClient::UI::Frame (	580	my $win = new CFClient::UI::Frame (
390	req_x => 0,	581	force_x => 0,
391	req_y => -1,	582	force_y => "max",
392	def_w => $WIDTH,	583	force_w => $WIDTH,
393	def_h => $gh,	584	force_h => $gh,
394	);	585	);
395		586
396	$win->add (my $hbox = new CFClient::UI::HBox	587	$win->add (my $hbox = new CFClient::UI::HBox
397	children => [	588	children => [
398	(new CFClient::UI::HBox expand => 1),	589	(new CFClient::UI::HBox expand => 1),
…		…
434	&set_gauge_window_fontsize;	625	&set_gauge_window_fontsize;
435		626
436	$win	627	$win
437	}	628	}
438		629
		630
439	sub make_stats_window {	631	sub stats_window {
440	my $tgw = new CFClient::UI::FancyFrame	632	my $tgw = new CFClient::UI::FancyFrame
441	req_y => $HEIGHT * (2/8),	633	y => $HEIGHT * (2/8),
442	req_x => -1,	634	x => "max",
443	title => "Stats",	635	title => "Stats",
444	name => "stats_window";	636	name => "stats_window";
445		637
446	$tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);	638	$tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);
447	$vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,	639	$vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
448	can_hover => 1, can_events => 1,	640	can_hover => 1, can_events => 1,
449	tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");	641	tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
…		…
548	update_stats_window ({});	740	update_stats_window ({});
549		741
550	$tgw	742	$tgw
551	}	743	}
552		744
553	sub formsep {	745	sub formsep($) {
554	reverse join ",", grep length, split /(...)/, reverse $_[0] * 1	746	scalar reverse join ",", unpack "(A3)", reverse $_[0] 1
555	}	747	}
556		748
557	sub update_stats_window {	749	sub update_stats_window {
558	my ($stats) = @_;	750	my ($stats) = @_;
559		751
…		…
621		813
622	$STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})	814	$STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
623	for keys %tbl;	815	for keys %tbl;
624	}	816	}
625		817
626	sub metaserver_dialog {
627	my $dialog = new CFClient::UI::FancyFrame
628	title => "Server List",
629	child => (my $vbox = new CFClient::UI::VBox);
630
631	$vbox->add ($dialog->{table} = new CFClient::UI::Table);
632
633	$dialog
634	}
635
636	my $METASERVER_ATIME;	818	my $METASERVER_ATIME;
637		819
638	sub update_metaserver {	820	sub update_metaserver {
639	my ($HOST) = @_;
640
641	return if $METASERVER_ATIME > time;	821	return if $METASERVER_ATIME > time;
642	$METASERVER_ATIME = time + 60;	822	$METASERVER_ATIME = time + 60;
643		823
644	my $table = $METASERVER->{table};	824	my $table = $METASERVER->{table};
645	$table->clear;	825	$table->clear;
…		…
666		846
667	utf8::decode $buf if utf8::valid $buf;	847	utf8::decode $buf if utf8::valid $buf;
668		848
669	$table->clear;	849	$table->clear;
670		850
		851	my @tip = (
		852	"The current number of users logged in on the server.",
		853	"The hostname of the server.",
		854	"The time this server has been running without being restarted.",
		855	"The server software version - a '+' indicates a Crossfire+ server.",
		856	"Short information about this server provided by its admins.",
		857	);
671	my @col = qw(Use #Users Host Uptime Version Description);	858	my @col = qw(#Users Host Uptime Version Description);
672	$table->add ($_, 0, new CFClient::UI::Label align => 0, fg => [1, 1, 0], text => $col[$_])	859	$table->add ($_, 0, new CFClient::UI::Label
		860	can_hover => 1, can_events => 1,
		861	align => 0, fg => [1, 1, 0],
		862	text => $col[$_], tooltip => $tip[$_])
673	for 0 .. $#col;	863	for 0 .. $#col;
674		864
675	my @align = qw(1 0 1 1 -1);	865	my @align = qw(1 0 1 1 -1);
676		866
677	my $y = 0;	867	my $y = 0;
678	for my $m (sort { $b->[3] <=> $a->[3] } map [split /\\|/], split /\015?\012/, $buf) {	868	for my $m (sort { $b->[3] <=> $a->[3] } map [split /\\|/], split /\015?\012/, $buf) {
…		…
695		885
696	$m = [$users, $host, $uptime, $version, $desc];	886	$m = [$users, $host, $uptime, $version, $desc];
697		887
698	$y++;	888	$y++;
699		889
700	$table->add (0, $y, new CFClient::UI::VBox children => [	890	$table->add (scalar @$m, $y, new CFClient::UI::VBox children => [
701	(new CFClient::UI::Button text => "Use", on_activate => sub {	891	(new CFClient::UI::Button
		892	text => "Use",
		893	tooltip => "Put this server into the <b>Host:Port</b> field",
		894	on_activate => sub {
702	$HOST->set_text ($CFG->{host} = $host);	895	$HOST_ENTRY->set_text ($CFG->{host} = $host);
		896	$METASERVER->hide;
		897	},
703	}),	898	),
704	(new CFClient::UI::Empty expand => 1),	899	(new CFClient::UI::Empty expand => 1),
705	]);	900	]);
706		901
707	$table->add ($_ + 1, $y, new CFClient::UI::Label	902	$table->add ($_, $y, new CFClient::UI::Label
708	ellipsise => 0, align => $align[$_], text => $m->[$_], fontsize => 0.8)	903	ellipsise => 0,
		904	align => $align[$_],
		905	text => $m->[$_],
		906	tooltip => $tip[$_],
		907	can_hover => 1,
		908	can_events => 1,
		909	fontsize => 0.8)
709	for 0 .. $#$m;	910	for 0 .. $#$m;
710	}	911	}
711	}	912	}
712	});	913	});
713	}	914	}
714		915
715	sub server_setup {	916	sub metaserver_dialog {
716	my $dialog = new CFClient::UI::FancyFrame	917	my $dialog = new CFClient::UI::FancyFrame
717	x => $WIDTH * (1/3),	918	title => "Server List",
718	y => $HEIGHT * (1/8),	919	name => 'metaserver_dialog',
719	name => "server_setup",	920	x => 'center',
720	title => "Server Setup",	921	y => 'center',
		922	z => 3,
		923	force_h => $::HEIGHT * 0.4,
721	child => (my $vbox = new CFClient::UI::VBox),	924	child => (my $vbox = new CFClient::UI::VBox),
722	on_visibility_change => sub {	925	on_visibility_change => sub {
723	my ($self, $visible) = @_;	926	update_metaserver if $_[1];
724	$self->center if $visible;
725	},	927	},
726	;	928	;
727		929
		930	$dialog->{table} = new CFClient::UI::Table;
		931
		932	$vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $dialog->{table});
		933
		934	$dialog
		935	}
		936
		937	sub server_setup {
		938	my $vbox = new CFClient::UI::VBox;
		939
728	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	940	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
729	$table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");	941	$table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");
730		942
731	{	943	{
732	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);	944	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);
733		945
734	$vbox->add (	946	$vbox->add (
735	my $HOST = new CFClient::UI::Entry	947	$HOST_ENTRY = new CFClient::UI::Entry
736	expand => 1,	948	expand => 1,
737	text => $CFG->{host},	949	text => $CFG->{host},
738	tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",	950	tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
739	on_changed => sub {	951	on_changed => sub {
740	my ($self, $value) = @_;	952	my ($self, $value) = @_;
…		…
742	}	954	}
743	);	955	);
744		956
745	$METASERVER = metaserver_dialog;	957	$METASERVER = metaserver_dialog;
746		958
747	$vbox->add (new CFClient::UI::Flopper	959	$vbox->add (new CFClient::UI::Button
748	expand => 1,	960	expand => 1,
749	text => "Server List",	961	text => "Server List",
750	other => $METASERVER,	962	other => $METASERVER,
751	tooltip => "Show a list of available crossfire servers",	963	tooltip => "Show a list of available crossfire servers",
752	on_open => sub {	964	on_activate => sub { $METASERVER->toggle_visibility },
753	update_metaserver $HOST;	965	on_visibility_change => sub { $METASERVER->hide unless $_[1] },
754	}
755	);	966	);
756	}	967	}
757		968
758	$table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");	969	$table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
759	$table->add (1, 4, new CFClient::UI::Entry	970	$table->add (1, 4, new CFClient::UI::Entry
…		…
776	}	987	}
777	);	988	);
778		989
779	$table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");	990	$table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
780	$table->add (1, 7, new CFClient::UI::Slider	991	$table->add (1, 7, new CFClient::UI::Slider
781	req_w => 100,	992	force_w => 100,
782	range => [$CFG->{mapsize}, 10, 100, 0, 1],	993	range => [$CFG->{mapsize}, 10, 100, 0, 1],
783	tooltip => "This is the size of the portion of the map update the server sends you. "	994	tooltip => "This is the size of the portion of the map update the server sends you. "
784	. "If you set this to a high value you will be able to see further, "	995	. "If you set this to a high value you will be able to see further, "
785	. "but you also increase bandwidth requirements and latency. "	996	. "but you also increase bandwidth requirements and latency. "
786	. "This option is only used once at log-in.",	997	. "This option is only used once at log-in.",
…		…
826	$CONN ? stop_game	1037	$CONN ? stop_game
827	: start_game;	1038	: start_game;
828	},	1039	},
829	);	1040	);
830		1041
831	$dialog	1042	$table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command");
		1043	$table->add (1, 12, my $saycmd = new CFClient::UI::Entry
		1044	text => $CFG->{say_command},
		1045	tooltip => "This is the command that will be used if you write a line in the message window entry or press <b>\"</b> in the map window. "
		1046	. "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
		1047	. "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
		1048	on_changed => sub {
		1049	my ($self, $value) = @_;
		1050	$CFG->{say_command} = $value;
		1051	}
		1052	);
		1053
		1054	$vbox
832	}	1055	}
833		1056
834	sub message_window {	1057	sub message_window {
835	my $window = new CFClient::UI::FancyFrame	1058	my $window = new CFClient::UI::FancyFrame
836	name => "message_window",	1059	name => "message_window",
837	title => "Messages",	1060	title => "Messages",
838	border_bg => [1, 1, 1, 1],	1061	border_bg => [1, 1, 1, 1],
839	bg => [0, 0, 0, 0.75],	1062	bg => [0, 0, 0, 0.75],
840	req_x => -1,	1063	x => "max",
841	req_y => 0,	1064	y => 0,
842	def_w => int $::WIDTH / 3,	1065	force_w => $::WIDTH * 0.4,
843	def_h => int $::HEIGHT / 5,	1066	force_h => $::HEIGHT * 0.5,
844	child => (my $vbox = new CFClient::UI::VBox);	1067	child => (my $vbox = new CFClient::UI::VBox);
845		1068
846	$vbox->add ($LOGVIEW);	1069	$vbox->add ($LOGVIEW);
847		1070
848	$vbox->add (my $input = new CFClient::UI::Entry	1071	$vbox->add (my $input = new CFClient::UI::Entry
…		…
880	},	1103	},
881	);	1104	);
882		1105
883	$CONSOLE = {	1106	$CONSOLE = {
884	window => $window,	1107	window => $window,
885	input => $input	1108	input => $input,
886	};	1109	};
887		1110
888	$window	1111	$window
889	}	1112	}
890		1113
891	sub open_quit_dialog {	1114	sub open_quit_dialog {
892	unless ($QUIT_DIALOG) {	1115	unless ($QUIT_DIALOG) {
893	$QUIT_DIALOG = new CFClient::UI::FancyFrame title => "Really Quit?";	1116	$QUIT_DIALOG = new CFClient::UI::FancyFrame
		1117	x => "center",
		1118	y => "center",
		1119	z => 50,
		1120	title => "Really Quit?",
		1121	;
894		1122
895	$QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);	1123	$QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
896		1124
897	$vb->add (new CFClient::UI::Label	1125	$vb->add (new CFClient::UI::Label
898	text => "You should find a savebed and apply it first!",	1126	text => "You should find a savebed and apply it first!",
…		…
911	on_activate => sub { exit },	1139	on_activate => sub { exit },
912	);	1140	);
913	}	1141	}
914		1142
915	$QUIT_DIALOG->show;	1143	$QUIT_DIALOG->show;
916	$QUIT_DIALOG->center;
917	}	1144	}
918		1145
		1146	sub autopickup_setup {
		1147	my $table = new CFClient::UI::Table;
		1148
		1149	for (
		1150	["General", 0, 0,
		1151	["Enable autopickup" => PICKUP_NEWMODE],
		1152	["Inhibit autopickup" => PICKUP_INHIBIT],
		1153	["Stop before pickup" => PICKUP_STOP],
		1154	["Debug autopickup" => PICKUP_DEBUG],
		1155	],
		1156	["Weapons", 0, 6,
		1157	["All weapons" => PICKUP_ALLWEAPON],
		1158	["Missile weapons" => PICKUP_MISSILEWEAPON],
		1159	["Bows" => PICKUP_BOW],
		1160	["Arrows" => PICKUP_ARROW],
		1161	],
		1162	["Armour", 0, 12,
		1163	["Helmets" => PICKUP_HELMET],
		1164	["Shields" => PICKUP_SHIELD],
		1165	["Body Armour" => PICKUP_ARMOUR],
		1166	["Boots" => PICKUP_BOOTS],
		1167	["Gloves" => PICKUP_GLOVES],
		1168	["Cloaks" => PICKUP_CLOAK],
		1169	],
		1170
		1171	["Readables", 2, 2,
		1172	["Spellbooks" => PICKUP_SPELLBOOK],
		1173	["Skillscrolls" => PICKUP_SKILLSCROLL],
		1174	["Normal Books/Scrolls" => PICKUP_READABLES],
		1175	],
		1176	["Misc", 2, 7,
		1177	["Food" => PICKUP_FOOD],
		1178	["Drinks" => PICKUP_DRINK],
		1179	["Valuables (Money, Gems)" => PICKUP_VALUABLES],
		1180	["Keys" => PICKUP_KEY],
		1181	["Magical Items" => PICKUP_MAGICAL],
		1182	["Potions" => PICKUP_POTION],
		1183	["Magic Devices" => PICKUP_MAGIC_DEVICE],
		1184	["Ignore cursed" => PICKUP_NOT_CURSED],
		1185	["Jewelery" => PICKUP_JEWELS],
		1186	],
		1187	)
		1188	{
		1189	my ($title, $x, $y, @bits) = @$_;
		1190	$table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
		1191
		1192	for (@bits) {
		1193	++$y;
		1194
		1195	my $mask = $_->[1];
		1196	$table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);
		1197	$table->add ($x+1, $y, new CFClient::UI::CheckBox
		1198	state => $CFG->{pickup} & $mask,
		1199	on_changed => sub {
		1200	my ($box, $value) = @_;
		1201	if ($value) {
		1202	$::CFG->{pickup} \|= $mask;
		1203	} else {
		1204	$::CFG->{pickup} = $::CFG->{pickup} & ~$mask;
		1205	}
		1206	$::CONN->send (sprintf "command pickup %u", $::CFG->{pickup})
		1207	if defined $::CONN;
		1208	});
		1209	}
		1210	}
		1211
		1212	$table
		1213	}
		1214
919	sub make_inventory_window {	1215	sub inventory_window {
920	my $invwin = new CFClient::UI::FancyFrame	1216	my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
		1217	x => "center",
		1218	y => "center",
921	def_w => $WIDTH * 7/8,	1219	force_w => $WIDTH * 9/10,
922	def_h => $HEIGHT * 7/8,	1220	force_h => $HEIGHT * 9/10,
923	title => "Inventory",	1221	title => "Inventory",
924	name => "inventory_window",
925	on_visibility_change => sub {
926	my ($self, $visible) = @_;
927	$self->center if $visible;
928	},
929	;	1222	;
930		1223
931	$invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);	1224	$invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);
932		1225
933	$hb->add (my $vb1 = new CFClient::UI::VBox);	1226	$hb->add (my $vb1 = new CFClient::UI::VBox);
934	$vb1->add (new CFClient::UI::Label align => 0, text => "Player");	1227	$vb1->add (new CFClient::UI::Label align => 0, text => "Player");
935	$vb1->add ($INV = new CFClient::UI::Inventory expand => 1);	1228	$vb1->add ($INV = new CFClient::UI::Inventory expand => 1);
936		1229
937	$hb->add (my $vb2 = new CFClient::UI::VBox);	1230	$hb->add (my $vb2 = new CFClient::UI::VBox);
938		1231
		1232	$vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
		1233
		1234	$vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
		1235
		1236	# XXX: Call after $INVR = ... because set_opencont sets the items
		1237	CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
		1238
		1239	$invwin
		1240	}
		1241
		1242	sub spell_setup {
		1243	new CFClient::UI::SpellList
		1244	}
		1245
		1246	sub keyboard_setup {
		1247	my $binding_list = new CFClient::UI::VBox;
		1248
		1249	my $refresh;
		1250	$refresh = sub {
		1251	$binding_list->clear ();
		1252
		1253	for my $mod (keys %{$::CFG->{bindings}}) {
		1254	for my $sym (keys %{$::CFG->{bindings}->{$mod}}) {
		1255	my $cmds = $::CFG->{bindings}->{$mod}->{$sym};
		1256	next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
		1257
		1258	my $lbl = join "; ", @$cmds;
		1259	my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym);
		1260	$binding_list->add (my $hb = new CFClient::UI::HBox);
		1261	$hb->add (new CFClient::UI::Button
		1262	text => "delete",
		1263	tooltip => "Deletes the binding",
		1264	on_activate => sub {
		1265	$binding_list->remove ($hb);
		1266	delete $::CFG->{bindings}->{$mod}->{$sym};
		1267	});
		1268
		1269	$hb->add (new CFClient::UI::Button
		1270	text => "edit",
		1271	tooltip => "Edits the binding",
		1272	on_activate => sub {
		1273	$::BIND_EDITOR->set_binding (
		1274	$mod, $sym, $::CFG->{bindings}->{$mod}->{$sym},
		1275	sub {
		1276	my ($nmod, $nsym, $ncmds) = @_;
		1277	delete $::CFG->{bindings}->{$mod}->{$sym};
		1278	$::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds;
		1279	$refresh->();
		1280	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
		1281	$SETUP_DIALOG->show;
		1282	},
		1283	sub {
		1284	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
		1285	$SETUP_DIALOG->show;
		1286	});
		1287	$::BIND_EDITOR->show;
		1288	$SETUP_DIALOG->hide;
		1289	});
		1290
		1291	$hb->add (new CFClient::UI::Label text => "(Key: $nam)");
		1292	$hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
		1293	}
		1294	}
		1295	};
		1296
		1297	my $vb = new CFClient::UI::VBox;
		1298	$vb->add ($binding_list);
939	$vb2->add (my $hb2 = new CFClient::UI::HBox);	1299	$vb->add (my $hb = new CFClient::UI::HBox);
940	$hb2->add ($INVR_LBL = new CFClient::UI::Label align => 0, expand => 1, text => "Floor");	1300
941	$hb2->add (new CFClient::UI::Button	1301	$hb->add (new CFClient::UI::Button
942	text => "Close",	1302	text => "record new",
943	tooltip => "Close the currently open container (if one is open)",	1303	expand => 1,
		1304	tooltip => "This button opens the binding editor with an empty binding.",
944	on_activate => sub {	1305	on_activate => sub {
945	$CONN->send ("apply $CONN->{open_container}")	1306	$::BIND_EDITOR->set_binding (undef, undef, [],
946	if $CONN->{open_container} != 0;	1307	sub {
		1308	my ($mod, $sym, $cmds) = @_;
		1309	$::CFG->{bindings}->{$mod}->{$sym} = $cmds;
		1310	$refresh->();
		1311	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
		1312	$SETUP_DIALOG->show;
		1313	},
		1314	sub {
		1315	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
		1316	$SETUP_DIALOG->show;
		1317	},
		1318	);
		1319	$SETUP_DIALOG->hide;
		1320	$::BIND_EDITOR->show;
947	},	1321	},
948	);	1322	);
949		1323
950	$vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);	1324	$hb->add (new CFClient::UI::Button
		1325	text => "close",
		1326	tooltip => "Closes the binding window",
		1327	expand => 1,
		1328	on_activate => sub {
		1329	$SETUP_DIALOG->hide;
		1330	}
		1331	);
951		1332
952	$invwin	1333	$refresh->();
		1334
		1335	$vb
953	}	1336	}
954		1337
955	sub make_help_window {	1338	sub make_help_window {
956	my $win = new CFClient::UI::FancyFrame	1339	my $win = new CFClient::UI::FancyFrame
		1340	x => 'center',
		1341	y => 'center',
		1342	z => 2,
		1343	name => 'doc_browser',
957	def_w => int $WIDTH * 7/8,	1344	force_w => int $WIDTH * 7/8,
958	def_h => int $HEIGHT * 7/8,	1345	force_h => int $HEIGHT * 7/8,
959	title => "Documentation";	1346	title => "Documentation";
960		1347
961	$win->add (my $vbox = new CFClient::UI::VBox);	1348	$win->add (my $vbox = new CFClient::UI::VBox);
962		1349
963	$vbox->add (my $buttons = new CFClient::UI::HBox);	1350	$vbox->add (my $buttons = new CFClient::UI::HBox);
964	$vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8);	1351	$vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8);
…		…
972	my ($pod, $label) = @$_;	1359	my ($pod, $label) = @$_;
973		1360
974	$buttons->add (new CFClient::UI::Button	1361	$buttons->add (new CFClient::UI::Button
975	text => $label,	1362	text => $label,
976	on_activate => sub {	1363	on_activate => sub {
977	my $parser = new Pod::POM;	1364	my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
978	my $pom = $parser->parse_file (CFClient::find_rcfile "pod/$pod.pod");	1365	doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };
979		1366
980	$viewer->clear;	1367	$viewer->clear;
981		1368
982	$viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])	1369	$viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
983	for @{ CFClient::pod_to_pango_list $pom };	1370	for @$pom;
984		1371
985	$viewer->set_offset (0);	1372	$viewer->set_offset (0);
986	},	1373	},
987	);	1374	);
988	}	1375	}
…		…
1025	if ($DEBUG_STATUS) {	1412	if ($DEBUG_STATUS) {
1026	CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;	1413	CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1027	} else {	1414	} else {
1028	# create the widgets	1415	# create the widgets
1029		1416
1030	$DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, req_x => -1;	1417	$DEBUG_STATUS = new CFClient::UI::Label
		1418	padding => 0,
		1419	z => 100,
		1420	force_x => "max",
		1421	force_y => 0;
1031	$DEBUG_STATUS->show;	1422	$DEBUG_STATUS->show;
1032		1423
		1424	$BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);
		1425
1033	$STATUSBOX = new CFClient::UI::Statusbox;	1426	$STATUSBOX = new CFClient::UI::Statusbox;
1034	$STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]);	1427	$STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1035		1428
1036	(new CFClient::UI::Frame	1429	(new CFClient::UI::Frame
1037	bg => [0, 0, 0, 0.4],	1430	bg => [0, 0, 0, 0.4],
1038	req_y => -1,	1431	force_x => 0,
		1432	force_y => "max",
1039	child => $STATUSBOX,	1433	child => $STATUSBOX,
1040	)->show;	1434	)->show;
1041		1435
1042	CFClient::UI::FancyFrame->new (	1436	CFClient::UI::FancyFrame->new (
		1437	title => "Map",
		1438	name => "mapmap",
		1439	x => 0,
		1440	y => $FONTSIZE + 8,
1043	border_bg => [1, 1, 1, 192/255],	1441	border_bg => [1, 1, 1, 192/255],
1044	bg => [1, 1, 1, 0],	1442	bg => [1, 1, 1, 0],
1045	child => ($MAPMAP = new CFClient::MapWidget::MapMap	1443	child => ($MAPMAP = new CFClient::MapWidget::MapMap
1046	tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",	1444	tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
1047	),	1445	),
…		…
1065		1463
1066	$LOGVIEW = new CFClient::UI::TextView	1464	$LOGVIEW = new CFClient::UI::TextView
1067	expand => 1,	1465	expand => 1,
1068	font => $FONT_FIXED,	1466	font => $FONT_FIXED,
1069	fontsize => $::CFG->{log_fontsize},	1467	fontsize => $::CFG->{log_fontsize},
		1468	indent => -4,
1070	can_hover => 1,	1469	can_hover => 1,
1071	can_events => 1,	1470	can_events => 1,
1072	tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",	1471	tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1073	;	1472	;
1074		1473
1075	$BUTTONBAR = new CFClient::UI::HBox;	1474	$SETUP_DIALOG = new CFClient::UI::FancyFrame
		1475	title => "Setup",
		1476	name => "setup_dialog",
		1477	x => 'center',
		1478	y => 'center',
		1479	z => 2,
		1480	force_w => $::WIDTH * 0.6,
		1481	force_h => $::HEIGHT * 0.6,
		1482	;
1076		1483
		1484	$SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,
		1485	filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
		1486
		1487	$SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
		1488	"Configure the server to play on, your username, password and other server-related options.");
		1489	$SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
		1490	"Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
		1491	$SETUP_NOTEBOOK->add (Graphics => graphics_setup,
		1492	"Configure the video mode, performance, fonts and other graphical aspects of the game.");
		1493	$SETUP_NOTEBOOK->add (Audio => audio_setup,
		1494	"Configure the use of audio, sound effects and background music.");
		1495	$SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
		1496	"Lets you define, edit and delete bindings."
		1497	. "There is a shortcut for making bindings: <b>Left Control + Insert</b> opens the binding editor "
		1498	. "with nothing set and the recording started. After doing the actions you "
		1499	. "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
		1500	. "After pressing the combo the binding will be saved automatically and the "
		1501	. "binding editor closes");
		1502	$SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup,
		1503	"Displays all spells you have and lets you edit keyboard shortcuts for them.");
		1504
		1505	$BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
		1506
1077	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup,	1507	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1078	tooltip => "Toggles a dialog where you can configure various aspects of the client, such as graphics mode, performance, and audio options.");	1508	tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1079	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup,	1509
1080	tooltip => "Toggles a dialog where you can configure the server to play on, your username, password and other server-related options.");
1081	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window,	1510	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,
1082	tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");	1511	tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1083		1512
1084	make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D	1513	make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D
1085		1514
1086	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window,	1515	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => $STATS_WINDOW = stats_window,
1087	tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");	1516	tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1088	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window,	1517	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => inventory_window,
1089	tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :).");	1518	tooltip => "Toggles the inventory window, where you can manage your loot (or treasures :). "
		1519	. "You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1090		1520
1091	$BUTTONBAR->add (new CFClient::UI::Button	1521	$BUTTONBAR->add (new CFClient::UI::Button
1092	text => "Save Config",	1522	text => "Save Config",
1093	tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",	1523	tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1094	on_activate => sub {	1524	on_activate => sub {
1095	$::CFG->{layout} = CFClient::UI::get_layout;	1525	$::CFG->{layout} = CFClient::UI::get_layout;
1096	CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";	1526	CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1097	status "Configuration Saved";	1527	status "Configuration Saved";
1098	},	1528	},
1099	);	1529	);
1100		1530
1101	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window,	1531	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window,
…		…
1112	}	1542	}
1113	},	1543	},
1114	);	1544	);
1115		1545
1116	$BUTTONBAR->show;	1546	$BUTTONBAR->show;
1117		1547	$SETUP_DIALOG->show;
1118	$STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1119
1120	# delay till geometry is constant
1121	$CFClient::UI::ROOT->on_post_alloc (startup => sub {
1122	$BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
1123	my $widget = $GAUGES->{win};
1124	$widget->move (0, $HEIGHT - $widget->{h});#d# to in toplevel
1125	});
1126	force_refresh ();
1127	}	1548	}
		1549
		1550	$STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1128	}	1551	}
1129		1552
1130	sub video_shutdown {	1553	sub video_shutdown {
1131	undef $SDL_ACTIVE;	1554	undef $SDL_ACTIVE;
1132	}	1555	}
…		…
1199		1622
1200	my %demo;#d#	1623	my %demo;#d#
1201		1624
1202	sub force_refresh {	1625	sub force_refresh {
1203	$fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) \|\| 0.1) * 0.05;	1626	$fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) \|\| 0.1) * 0.05;
1204	debug sprintf "%3.2f", $fps;	1627	debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1205		1628
1206	$CFClient::UI::ROOT->draw;	1629	$CFClient::UI::ROOT->draw;
1207		1630
1208	$WANT_REFRESH = 0;	1631	$WANT_REFRESH = 0;
1209	$CAN_REFRESH = 0;	1632	$CAN_REFRESH = 0;
…		…
1264	};	1687	};
1265		1688
1266	CFClient::SDL_GL_SwapBuffers;	1689	CFClient::SDL_GL_SwapBuffers;
1267	}	1690	}
1268		1691
1269	my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub {	1692	my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1270	$NOW = time;	1693	$NOW = time;
1271		1694
1272	($SDL_CB{$_->{type}} \|\| sub { warn "unhandled event $_->{type}" })->($_)	1695	($SDL_CB{$_->{type}} \|\| sub { warn "unhandled event $_->{type}" })->($_)
1273	for CFClient::SDL_PollEvent;	1696	for CFClient::SDL_PollEvent;
1274		1697
…		…
1341	#############################################################################	1764	#############################################################################
1342		1765
1343	$SIG{INT} = $SIG{TERM} = sub { exit };	1766	$SIG{INT} = $SIG{TERM} = sub { exit };
1344		1767
1345	{	1768	{
1346	local $SIG{__DIE__} = sub { CFClient::fatal $_[0] };	1769	local $SIG{__DIE__} = sub {
		1770	return unless defined $^S && !$^S;
		1771	Carp::confess $_[1];#d#TODO: remove when stable
		1772	CFClient::fatal $_[0];
		1773	};
1347		1774
1348	CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";	1775	CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1349	CFClient::UI::set_layout ($::CFG->{layout});	1776	CFClient::UI::set_layout ($::CFG->{layout});
1350		1777
1351	my %DEF_CFG = (	1778	my %DEF_CFG = (
1352	sdl_mode => 0,	1779	sdl_mode => 0,
1353	width => 640,	1780	width => 640,
…		…
1357	map_scale => 1,	1784	map_scale => 1,
1358	fow_enable => 1,	1785	fow_enable => 1,
1359	fow_intensity => 0.45,	1786	fow_intensity => 0.45,
1360	fow_smooth => 0,	1787	fow_smooth => 0,
1361	gui_fontsize => 1,	1788	gui_fontsize => 1,
1362	log_fontsize => 1,	1789	log_fontsize => 0.7,
1363	gauge_fontsize=> 1,	1790	gauge_fontsize=> 1,
1364	gauge_size => 0.35,	1791	gauge_size => 0.35,
1365	stat_fontsize => 1,	1792	stat_fontsize => 0.7,
1366	mapsize => 100,	1793	mapsize => 100,
1367	host => "crossfire.schmorp.de",	1794	host => "crossfire.schmorp.de",
1368	say_command => 'say',	1795	say_command => 'say',
1369	audio_enable => 1,	1796	audio_enable => 1,
1370	bgm_enable => 1,	1797	bgm_enable => 1,
…		…
1431		1858
1432	END { CFClient::SDL_Quit }	1859	END { CFClient::SDL_Quit }
1433		1860
1434	=head1 NAME	1861	=head1 NAME
1435		1862
1436	pclient - A Crossfire+ and Crossfire game client	1863	cfplus - A Crossfire+ and Crossfire game client
1437		1864
1438	=head1 SYNOPSIS	1865	=head1 SYNOPSIS
1439		1866
1440	Just run it - no commandline arguments are supported.	1867	Just run it - no commandline arguments are supported.
1441		1868
1442	=head1 USAGE	1869	=head1 USAGE
1443		1870
1444	Pclient utilises OpenGL for all UI elements and the game. It is supposed to be used	1871	cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used
1445	fullscreen and interactively.	1872	fullscreen and interactively.
1446		1873
		1874	=head1 DEBUGGING
		1875
		1876
		1877	CFPLUS_DEBUG - environment variable
		1878
		1879	1 draw borders around widgets
		1880	2 add low-level widget info to tooltips
		1881	4 show fps
		1882	8 suppress tooltips
		1883
1447	=head1 AUTHOR	1884	=head1 AUTHOR
1448		1885
1449	Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>	1886	Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
1450		1887
1451		1888

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents): Revision 1.21 by root, Sun May 28 01:16:04 2006 UTC vs. Revision 1.62 by root, Tue Jun 6 08:35:22 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.21 by root, Sun May 28 01:16:04 2006 UTC vs.
Revision 1.62 by root, Tue Jun 6 08:35:22 2006 UTC