ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/Deliantra-Client/bin/cfplus

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.56 by root, Mon Jun 5 05:23:21 2006 UTC vs.
Revision 1.134 by elmex, Mon Dec 4 15:17:14 2006 UTC

1	#!/opt/bin/perl	1	#!/opt/bin/perl
		2
		3	my $startup_done = sub { };
		4
		5	# do splash-screen thingy on win32
		6	BEGIN {
		7	if (%PAR::LibCache && $^O eq "MSWin32") {
		8	while (my ($filename, $zip) = each %PAR::LibCache) {
		9	$zip->extractMember ("SPLASH.bmp", "$ENV{PAR_TEMP}/SPLASH.bmp");
		10	}
		11
		12	require Win32::GUI::SplashScreen;
		13
		14	Win32::GUI::SplashScreen::Show (
		15	-file => "$ENV{PAR_TEMP}/SPLASH.bmp",
		16	);
		17
		18	$startup_done = sub {
		19	Win32::GUI::SplashScreen::Done (1);
		20	};
		21	}
		22	}
2		23
3	use strict;	24	use strict;
4	use utf8;	25	use utf8;
		26
		27	use Carp 'verbose';
5		28
6	# do things only needed for single-binary version (par)	29	# do things only needed for single-binary version (par)
7	BEGIN {	30	BEGIN {
8	if (%PAR::LibCache) {	31	if (%PAR::LibCache) {
9	@INC = grep ref, @INC; # weed out all paths except pars loader refs	32	@INC = grep ref, @INC; # weed out all paths except pars loader refs
10		33
11	while (my ($filename, $zip) = each %PAR::LibCache) {	34	while (my ($filename, $zip) = each %PAR::LibCache) {
12	for ($zip->memberNames) {	35	for ($zip->memberNames) {
13	next unless /^\/root\/(.*)/;	36	next unless /^root\/(.*)/;
14	$zip->extractMember ($_, "$ENV{PAR_TEMP}/$1")	37	$zip->extractMember ($_, "$ENV{PAR_TEMP}/$1")
15	unless -e "$ENV{PAR_TEMP}/$1";	38	unless -e "$ENV{PAR_TEMP}/$1";
16	}	39	}
17	}	40	}
18		41
…		…
32	use Crossfire;	55	use Crossfire;
33	use Crossfire::Protocol::Constants;	56	use Crossfire::Protocol::Constants;
34		57
35	use Compress::LZF;	58	use Compress::LZF;
36		59
37	use CFClient;	60	use CFPlus;
38	use CFClient::OpenGL ();	61	use CFPlus::OpenGL ();
39	use CFClient::Protocol;	62	use CFPlus::Protocol;
40	use CFClient::UI;	63	use CFPlus::UI;
		64	use CFPlus::Pod;
		65	use CFPlus::BindingEditor;
41	use CFClient::MapWidget;	66	use CFPlus::MapWidget;
42		67
		68	$SIG{QUIT} = sub { Carp::cluck "QUIT" };
		69	$SIG{PIPE} = 'IGNORE';
		70
		71	$Event::Eval = 0;
43	$Event::DIED = sub {	72	$Event::DIED = sub {
44	# TODO: display dialog box or so	73	CFPlus::fatal Carp::longmess $_[1]
45	Carp::confess $_[1];#d#TODO: remove when stable
46	CFClient::error $_[1];
47	};	74	};
48
49	#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d#
50
51	our $VERSION = '0.1';
52		75
53	my $MAX_FPS = 60;	76	my $MAX_FPS = 60;
54	my $MIN_FPS = 5; # unused as of yet	77	my $MIN_FPS = 5; # unused as of yet
55		78
56	our $META_SERVER = "crossfire.real-time.com:13326";	79	our $META_SERVER = "http://metaserver.schmorp.de/current.json";
57		80
58	our $LAST_REFRESH;	81	our $LAST_REFRESH;
59	our $NOW;	82	our $NOW;
60		83
61	our $CFG;	84	our $CFG;
62	our $CONN;	85	our $CONN;
		86	our $PROFILE; # current profile
63	our $FAST; # fast, low-quality mode, possibly useful for software-rendering	87	our $FAST; # fast, low-quality mode, possibly useful for software-rendering
64		88
65	our $WANT_REFRESH;	89	our $WANT_REFRESH;
66	our $CAN_REFRESH;	90	our $CAN_REFRESH;
67		91
…		…
82	our $CONSOLE;	106	our $CONSOLE;
83	our $METASERVER;	107	our $METASERVER;
84	our $LOGIN_BUTTON;	108	our $LOGIN_BUTTON;
85	our $QUIT_DIALOG;	109	our $QUIT_DIALOG;
86	our $HOST_ENTRY;	110	our $HOST_ENTRY;
		111	our $FULLSCREEN_ENABLE;
		112	our $PICKUP_ENABLE;
		113	our $SERVER_INFO;
87		114
88	our $SETUP_DIALOG;	115	our $SETUP_DIALOG;
89	our $SETUP_NOTEBOOK;	116	our $SETUP_NOTEBOOK;
90	our $SETUP_SERVER;	117	our $SETUP_SERVER;
91	our $SETUP_KEYBOARD;	118	our $SETUP_KEYBOARD;
92	our $SETUP_SPELLS;
93		119
		120	our $PL_NOTEBOOK;
		121	our $PL_WINDOW;
		122
		123	our $INVENTORY_PAGE;
		124	our $STATS_PAGE;
		125	our $SKILL_PAGE;
		126	our $SPELL_PAGE;
		127	our $SPELL_LIST;
		128
		129	our $HELP_WINDOW;
		130	our $MESSAGE_WINDOW;
94	our $FLOORBOX;	131	our $FLOORBOX;
95	our $GAUGES;	132	our $GAUGES;
96	our $STATWIDS;	133	our $STATWIDS;
97		134
98	our $SDL_ACTIVE;	135	our $SDL_ACTIVE;
…		…
104		141
105	our $ALT_ENTER_MESSAGE;	142	our $ALT_ENTER_MESSAGE;
106	our $STATUSBOX;	143	our $STATUSBOX;
107	our $DEBUG_STATUS;	144	our $DEBUG_STATUS;
108		145
109	our $INV_WINDOW;
110	our $INV;	146	our $INV;
111	our $INVR;	147	our $INVR;
112	our $INV_RIGHT_HB;	148	our $INV_RIGHT_HB;
113		149
114	our $BIND_EDITOR;	150	our $BIND_EDITOR;
		151	our $BIND_UPD_CB;
115		152
116	our $PICKUP_CFG;	153	our $PICKUP_CFG;
117		154
		155	our $IN_BUILD_MODE;
		156	our $BUILD_BUTTON;
		157
118	sub status {	158	sub status {
119	$STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);	159	$STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
120	}	160	}
121		161
122	sub debug {	162	sub debug {
123	$DEBUG_STATUS->set_text ($_[0]);	163	$DEBUG_STATUS->set_text ($_[0]);
124	}	164	}
125		165
		166	sub message {
		167	my ($para) = @_;
		168
		169	my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
		170
		171	$para->{markup} = "<span foreground='#ffffff'>$time</span> $para->{markup}";
		172
		173	$LOGVIEW->add_paragraph ($para);
		174	$LOGVIEW->scroll_to_bottom;
		175	}
		176
		177	sub destroy_query_dialog {
		178	(delete $_[0]{query_dialog})->destroy
		179	if $_[0]{query_dialog};
		180	}
		181
		182	# server query dialog
		183	sub server_query {
		184	my ($conn, $flags, $prompt) = @_;
		185
		186	$conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel
		187	x => "center",
		188	y => "center",
		189	title => "Server Query",
		190	child => my $vbox = new CFPlus::UI::VBox,
		191	;
		192
		193	my @dialog = my $label = new CFPlus::UI::Label
		194	max_w => $::WIDTH * 0.4,
		195	ellipsise => 0,
		196	text => $prompt;
		197
		198	if ($flags & CS_QUERY_YESNO) {
		199	push @dialog, my $hbox = new CFPlus::UI::HBox;
		200
		201	$hbox->add (new CFPlus::UI::Button
		202	text => "No",
		203	on_activate => sub {
		204	$conn->send ("reply n");
		205	$dialog->destroy;
		206	0
		207	}
		208	);
		209	$hbox->add (new CFPlus::UI::Button
		210	text => "Yes",
		211	on_activate => sub {
		212	$conn->send ("reply y");
		213	destroy_query_dialog $conn;
		214	0
		215	},
		216	);
		217
		218	$dialog->grab_focus;
		219
		220	} elsif ($flags & CS_QUERY_SINGLECHAR) {
		221	$dialog->{tooltip} = "#charcreation_focus";
		222
		223	if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
		224	$MESSAGE_WINDOW->show;
		225
		226	unshift @dialog, new CFPlus::UI::Label
		227	max_w => $::WIDTH * 0.4,
		228	ellipsise => 0,
		229	markup => "\nOr use your keyboard and the text entry below:\n";
		230
		231	unshift @dialog, my $table = new CFPlus::UI::Table;
		232
		233	$table->add (0, 0, new CFPlus::UI::Button
		234	text => "Next Race",
		235	on_activate => sub {
		236	$conn->send ("reply n");
		237	destroy_query_dialog $conn;
		238	0
		239	},
		240	);
		241	$table->add (2, 0, new CFPlus::UI::Button
		242	text => "Accept",
		243	on_activate => sub {
		244	$conn->send ("reply d");
		245	destroy_query_dialog $conn;
		246	0
		247	},
		248	);
		249
		250	unshift @dialog, new CFPlus::UI::Label
		251	max_w => $::WIDTH * 0.4,
		252	ellipsise => 0,
		253	markup => (CFPlus::Pod::section_label ui => "chargen_race"),
		254	;
		255
		256	} elsif ($prompt =~ /roll new stats/) {
		257	if (my $stat = delete $conn->{stat_change_with}) {
		258	$conn->send ("reply $stat");
		259	destroy_query_dialog $conn;
		260	return;
		261	}
		262
		263	$STATS_PAGE->show;
		264	$MESSAGE_WINDOW->hide;
		265
		266	unshift @dialog, new CFPlus::UI::Label
		267	max_w => $::WIDTH * 0.4,
		268	ellipsise => 0,
		269	markup => "\nOr use your keyboard and the text entry below:\n";
		270
		271	unshift @dialog, my $table = new CFPlus::UI::Table;
		272
		273	# left: re-roll
		274	$table->add (0, 0, new CFPlus::UI::Button
		275	text => "Roll Again",
		276	on_activate => sub {
		277	$conn->send ("reply y");
		278	destroy_query_dialog $conn;
		279	0
		280	},
		281	);
		282
		283	# center: swap stats
		284	my ($sw1, $sw2) = map +(new CFPlus::UI::Selector
		285	expand => 1,
		286	value => $_,
		287	options => [
		288	[1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"],
		289	[2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],
		290	[3 => "Con", "Constitution ($conn->{stat}{+CS_STAT_CON})"],
		291	[4 => "Int", "Intelligence ($conn->{stat}{+CS_STAT_INT})"],
		292	[5 => "Wis", "Wisdom ($conn->{stat}{+CS_STAT_WIS})"],
		293	[6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
		294	[7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
		295	],
		296	), 1 .. 2;
		297
		298	$table->add (2, 0, new CFPlus::UI::Button
		299	text => "Swap Stats",
		300	on_activate => sub {
		301	$conn->{stat_change_with} = $sw2->{value};
		302	$conn->send ("reply $sw1->{value}");
		303	destroy_query_dialog $conn;
		304	0
		305	},
		306	);
		307	$table->add (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]);
		308
		309	# right: accept
		310	$table->add (4, 0, new CFPlus::UI::Button
		311	text => "Accept",
		312	on_activate => sub {
		313	$conn->send ("reply n");
		314	$STATS_PAGE->hide;
		315	destroy_query_dialog $conn;
		316	0
		317	},
		318	);
		319
		320	unshift @dialog, my $hbox = new CFPlus::UI::HBox;
		321	for (
		322	[Str => CS_STAT_STR],
		323	[Dex => CS_STAT_DEX],
		324	[Con => CS_STAT_CON],
		325	[Int => CS_STAT_INT],
		326	[Wis => CS_STAT_WIS],
		327	[Pow => CS_STAT_POW],
		328	[Cha => CS_STAT_CHA],
		329	) {
		330	my ($name, $id) = @$_;
		331	$hbox->add (new CFPlus::UI::Label
		332	markup => "$conn->{stat}{$id} <span foreground='yellow'>$name</span>",
		333	align => 0,
		334	expand => 1,
		335	can_events => 1,
		336	can_hover => 1,
		337	tooltip => "#stat_$name",
		338	);
		339	}
		340
		341	unshift @dialog, new CFPlus::UI::Label
		342	max_w => $::WIDTH * 0.4,
		343	ellipsise => 0,
		344	markup => (CFPlus::Pod::section_label ui => "chargen_stats"),
		345	;
		346	}
		347
		348	push @dialog, my $entry = new CFPlus::UI::Entry
		349	on_changed => sub {
		350	$conn->send ("reply $_[1]");
		351	destroy_query_dialog $conn;
		352	0
		353	},
		354	;
		355
		356	$entry->grab_focus;
		357
		358	} else {
		359	$dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";
		360
		361	push @dialog, my $entry = new CFPlus::UI::Entry
		362	$flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (),
		363	on_activate => sub {
		364	$conn->send ("reply $_[1]");
		365	destroy_query_dialog $conn;
		366	0
		367	},
		368	;
		369
		370	$entry->grab_focus;
		371	}
		372
		373	$vbox->add (@dialog);
		374	$dialog->show;
		375	}
		376
126	sub start_game {	377	sub start_game {
127	status "logging in...";	378	status "logging in...";
128		379
129	$LOGIN_BUTTON->set_text ("Logout");	380	$LOGIN_BUTTON->set_text ("Logout");
130	$SETUP_DIALOG->hide;	381	$SETUP_DIALOG->hide;
131		382
		383	$PROFILE = $CFG->{profile}{default};
		384
132	my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;	385	my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
133		386
134	my ($host, $port) = split /:/, $CFG->{host};	387	my ($host, $port) = split /:/, $PROFILE->{host};
135		388
136	$MAP = new CFClient::Map $mapsize, $mapsize;	389	$MAP = new CFPlus::Map;
137		390
138	$CONN = eval {	391	$CONN = eval {
139	new CFClient::Protocol	392	new CFPlus::Protocol
140	host => $host,	393	host => $host,
141	port => $port || 13327,	394	port => $port || 13327,
142	user => $CFG->{user},	395	user => $PROFILE->{user},
143	pass => $CFG->{password},	396	pass => $PROFILE->{password},
144	mapw => $mapsize,	397	mapw => $mapsize,
145	maph => $mapsize,	398	maph => $mapsize,
		399
		400	client => "cfplus $CFPlus::VERSION $] $^O",
146		401
147	map_widget => $MAPWIDGET,	402	map_widget => $MAPWIDGET,
148	logview => $LOGVIEW,	403	logview => $LOGVIEW,
149	statusbox => $STATUSBOX,	404	statusbox => $STATUSBOX,
150	map => $MAP,	405	map => $MAP,
151	mapmap => $MAPMAP,	406	mapmap => $MAPMAP,
		407	query => \&server_query,
152		408
153	sound_play => sub {	409	sound_play => sub {
154	my ($x, $y, $soundnum, $type) = @_;	410	my ($x, $y, $soundnum, $type) = @_;
155		411
156	$SDL_MIXER	412	$SDL_MIXER
…		…
162	$chunk->play;	418	$chunk->play;
163	},	419	},
164	};	420	};
165		421
166	if ($CONN) {	422	if ($CONN) {
167	CFClient::lowdelay fileno $CONN->{fh};	423	CFPlus::lowdelay fileno $CONN->{fh};
168		424
169	status "login successful";	425	status "login successful";
170	} else {	426	} else {
171	status "unable to connect";	427	status "unable to connect";
172	stop_game();	428	stop_game();
…		…
175		431
176	sub stop_game {	432	sub stop_game {
177	$LOGIN_BUTTON->set_text ("Login");	433	$LOGIN_BUTTON->set_text ("Login");
178	$SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);	434	$SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
179	$SETUP_DIALOG->show;	435	$SETUP_DIALOG->show;
180	$INV_WINDOW->hide;	436	$PL_WINDOW->hide;
		437	$SPELL_LIST->clear_spells;
181		438
182	return unless $CONN;	439	return unless $CONN;
183		440
184	status "connection closed";	441	status "connection closed";
185		442
		443	destroy_query_dialog $CONN;
186	$CONN->destroy;	444	$CONN->destroy;
187	$CONN = 0; # false, does not autovivify	445	$CONN = 0; # false, does not autovivify
		446
		447	undef $MAP;
188	}	448	}
189		449
190	sub graphics_setup {	450	sub graphics_setup {
191	my $vbox = new CFClient::UI::VBox;	451	my $vbox = new CFPlus::UI::VBox;
192		452
193	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	453	$vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
194		454
195	$table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode");	455	$table->add (0, 0, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode");
196	$table->add (1, 0, my $hbox = new CFClient::UI::HBox);	456	$table->add (1, 0, my $hbox = new CFPlus::UI::HBox);
197		457
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]);	458	$hbox->add (my $mode_slider = new CFPlus::UI::Slider force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]);
199	$hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");	459	$hbox->add (my $mode_label = new CFPlus::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
200		460
201	$mode_slider->connect (changed => sub {	461	$mode_slider->connect (changed => sub {
202	my ($self, $value) = @_;	462	my ($self, $value) = @_;
203		463
204	$CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;	464	$CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
…		…
206	});	466	});
207	$mode_slider->emit (changed => $mode_slider->{range}[0]);	467	$mode_slider->emit (changed => $mode_slider->{range}[0]);
208		468
209	my $row = 1;	469	my $row = 1;
210		470
211	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen");	471	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen");
212	$table->add (1, $row++, new CFClient::UI::CheckBox	472	$table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
213	state => $CFG->{fullscreen},	473	state => $CFG->{fullscreen},
214	tooltip => "Bring the client into fullscreen mode.",	474	tooltip => "Bring the client into fullscreen mode.",
215	on_changed => sub {	475	on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
216	my ($self, $value) = @_;
217	$CFG->{fullscreen} = $value;
218	}
219	);	476	);
220		477
221	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly");	478	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
222	$table->add (1, $row++, new CFClient::UI::CheckBox	479	$table->add (1, $row++, new CFPlus::UI::CheckBox
223	state => $CFG->{fast},	480	state => $CFG->{fast},
224	tooltip => "Lower the visual quality considerably to speed up rendering.",	481	tooltip => "Lower the visual quality considerably to speed up rendering.",
225	on_changed => sub {	482	on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
226	my ($self, $value) = @_;
227	$CFG->{fast} = $value;
228	}
229	);	483	);
230		484
231	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale");	485	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale");
232	$table->add (1, $row++, new CFClient::UI::Slider	486	$table->add (1, $row++, new CFPlus::UI::Slider
233	range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],	487	range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
234	tooltip => "Enlarge or shrink the displayed map. Changes are instant.",	488	tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
235	on_changed => sub {	489	on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
236	my ($self, $value) = @_;
237	$CFG->{map_scale} = 2 ** $value;
238	}
239	);	490	);
240		491
241	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War");	492	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War");
242	$table->add (1, $row++, new CFClient::UI::CheckBox	493	$table->add (1, $row++, new CFPlus::UI::CheckBox
243	state => $CFG->{fow_enable},	494	state => $CFG->{fow_enable},
244	tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",	495	tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
245	on_changed => sub {	496	on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
246	my ($self, $value) = @_;
247	$CFG->{fow_enable} = $value;
248	}
249	);	497	);
250		498
251	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity");	499	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity");
252	$table->add (1, $row++, new CFClient::UI::Slider	500	$table->add (1, $row++, new CFPlus::UI::Slider
253	range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],	501	range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
254	tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",	502	tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
255	on_changed => sub {	503	on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
256	my ($self, $value) = @_;
257	$CFG->{fow_intensity} = $value;
258	}
259	);	504	);
260		505
261	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth");	506	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Smooth");
262	$table->add (1, $row++, new CFClient::UI::CheckBox	507	$table->add (1, $row++, new CFPlus::UI::CheckBox
263	state => $CFG->{fow_smooth},	508	state => $CFG->{fow_smooth},
264	tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",	509	tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
265	on_changed => sub {	510	on_changed => sub {
266	my ($self, $value) = @_;	511	my ($self, $value) = @_;
267	$CFG->{fow_smooth} = $value;	512	$CFG->{fow_smooth} = $value;
268	status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::OpenGL::GL_VERSION < 1.2;	513	status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2;
		514	0
269	}	515	}
270	);	516	);
271		517
272	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");	518	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
273	$table->add (1, $row++, new CFClient::UI::Slider	519	$table->add (1, $row++, new CFPlus::UI::Slider
274	range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],	520	range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
275	tooltip => "The base font size used by most GUI elements that do not have their own setting.",	521	tooltip => "The base font size used by most GUI elements that do not have their own setting.",
276	on_changed => sub { $CFG->{gui_fontsize} = $_[1] },	522	on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
277	);	523	);
278		524
279	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Message Fontsize");	525	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
280	$table->add (1, $row++, new CFClient::UI::Slider	526	$table->add (1, $row++, new CFPlus::UI::Slider
281	range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],	527	range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
282	tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",	528	tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",
283	on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]) },	529	on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
284	);	530	);
285		531
286	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
287
288	$table->add (1, $row++, new CFClient::UI::Slider
289	range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1],
290	tooltip => "The font size used by the <b>statistics window</b> only. Changes are instant.",
291	on_changed => sub {
292	$CFG->{stat_fontsize} = $_[1];
293	&set_stats_window_fontsize;
294	}
295	);
296
297	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");	532	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
298	$table->add (1, $row++, new CFClient::UI::Slider	533	$table->add (1, $row++, new CFPlus::UI::Slider
299	range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],	534	range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
300	tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",	535	tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
301	on_changed => sub {	536	on_changed => sub {
302	$CFG->{gauge_fontsize} = $_[1];	537	$CFG->{gauge_fontsize} = $_[1];
303	&set_gauge_window_fontsize;	538	&set_gauge_window_fontsize;
		539	0
304	}	540	}
305	);	541	);
306		542
307	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size");	543	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size");
308	$table->add (1, $row++, new CFClient::UI::Slider	544	$table->add (1, $row++, new CFPlus::UI::Slider
309	range => [$CFG->{gauge_size}, 0.2, 0.8],	545	range => [$CFG->{gauge_size}, 0.2, 0.8],
310	tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",	546	tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
311	on_changed => sub {	547	on_changed => sub {
312	$CFG->{gauge_size} = $_[1];	548	$CFG->{gauge_size} = $_[1];
313	$GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});	549	$GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
		550	0
314	}	551	}
315	);	552	);
316		553
317	$table->add (1, $row++, new CFClient::UI::Button	554	$table->add (1, $row++, new CFPlus::UI::Button
318	expand => 1, align => 0, text => "Apply",	555	expand => 1, align => 0, text => "Apply",
319	tooltip => "Apply the video settings",	556	tooltip => "Apply the video settings",
320	on_activate => sub {	557	on_activate => sub {
321	video_shutdown ();	558	video_shutdown ();
322	video_init ();	559	video_init ();
		560	0
323	}	561	}
324	);	562	);
325		563
326	$vbox	564	$vbox
327	}	565	}
328		566
329	sub audio_setup {	567	sub audio_setup {
330	my $vbox = new CFClient::UI::VBox;	568	my $vbox = new CFPlus::UI::VBox;
331		569
332	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	570	$vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
333		571
334	my $row = 0;	572	my $row = 0;
335		573
336	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");	574	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable");
337	$table->add (1, $row++, new CFClient::UI::CheckBox	575	$table->add (1, $row++, new CFPlus::UI::CheckBox
338	state => $CFG->{audio_enable},	576	state => $CFG->{audio_enable},
339	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.",	577	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.",
340	on_changed => sub {	578	on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
341	$CFG->{audio_enable} = $_[1];
342	}
343	);	579	);
344	# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume");	580	# $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume");
345	# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {	581	# $table->add (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
346	# $CFG->{effects_volume} = $_[1];	582	# $CFG->{effects_volume} = $_[1];
347	# });	583	# });
348	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music");	584	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music");
349	$table->add (1, $row++, my $hbox = new CFClient::UI::HBox);	585	$table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
350	$hbox->add (new CFClient::UI::CheckBox	586	$hbox->add (new CFPlus::UI::CheckBox
351	expand => 1, state => $CFG->{bgm_enable},	587	expand => 1, state => $CFG->{bgm_enable},
352	tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",	588	tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
353	on_changed => sub {	589	on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
354	$CFG->{bgm_enable} = $_[1];
355	}
356	);	590	);
357	$hbox->add (new CFClient::UI::Slider	591	$hbox->add (new CFPlus::UI::Slider
358	expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],	592	expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
359	tooltip => "The volume of the background music. Changes are instant.",	593	tooltip => "The volume of the background music. Changes are instant.",
360	on_changed => sub {	594	on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFPlus::MixMusic::volume $_[1] * 128; 0 }
361	$CFG->{bgm_volume} = $_[1];
362	CFClient::MixMusic::volume $_[1] * 128;
363	}
364	);	595	);
365		596
366	$table->add (1, $row++, new CFClient::UI::Button	597	$table->add (1, $row++, new CFPlus::UI::Button
367	expand => 1, align => 0, text => "Apply",	598	expand => 1, align => 0, text => "Apply",
368	tooltip => "Apply the audio settings",	599	tooltip => "Apply the audio settings",
369	on_activate => sub {	600	on_activate => sub {
370	audio_shutdown ();	601	audio_shutdown ();
371	audio_init ();	602	audio_init ();
		603	0
372	}	604	}
373	);	605	);
374		606
375	$vbox	607	$vbox
376	}
377
378	sub set_stats_window_fontsize {
379	for (values %{$STATWIDS}) {
380	$_->set_fontsize ($::CFG->{stat_fontsize});
381	}
382	}	608	}
383		609
384	sub set_gauge_window_fontsize {	610	sub set_gauge_window_fontsize {
385	for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) {	611	for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) {
386	$_->set_fontsize ($::CFG->{gauge_fontsize});	612	$_->set_fontsize ($::CFG->{gauge_fontsize});
…		…
388	}	614	}
389		615
390	sub make_gauge_window {	616	sub make_gauge_window {
391	my $gh = int $HEIGHT * $CFG->{gauge_size};	617	my $gh = int $HEIGHT * $CFG->{gauge_size};
392		618
393	my $win = new CFClient::UI::Frame (	619	my $win = new CFPlus::UI::Frame (
394	force_x => 0,	620	force_x => 0,
395	force_y => "max",	621	force_y => "max",
396	force_w => $WIDTH,	622	force_w => $WIDTH,
397	force_h => $gh,	623	force_h => $gh,
398	);	624	);
399		625
400	$win->add (my $hbox = new CFClient::UI::HBox	626	$win->add (my $hbox = new CFPlus::UI::HBox
401	children => [	627	children => [
402	(new CFClient::UI::HBox expand => 1),	628	(new CFPlus::UI::HBox expand => 1),
403	(new CFClient::UI::VBox children => [	629	(new CFPlus::UI::VBox children => [
404	(new CFClient::UI::Empty expand => 1),	630	(new CFPlus::UI::Empty expand => 1),
405	(new CFClient::UI::Frame bg => [0, 0, 0, 0.4], child => ($FLOORBOX = new CFClient::UI::Table)),	631	(new CFPlus::UI::Frame bg => [0, 0, 0, 0.4], child => ($FLOORBOX = new CFPlus::UI::Table)),
406	]),	632	]),
407	(my $vbox = new CFClient::UI::VBox),	633	(my $vbox = new CFPlus::UI::VBox),
408	],	634	],
409	);	635	);
410		636
411	$vbox->add (new CFClient::UI::HBox	637	$vbox->add (new CFPlus::UI::HBox
412	expand => 1,	638	expand => 1,
413	children => [	639	children => [
414	(new CFClient::UI::Empty expand => 1),	640	(new CFPlus::UI::Empty expand => 1),
415	(my $hb = new CFClient::UI::HBox),	641	(my $hb = new CFPlus::UI::HBox),
416	],	642	],
417	);	643	);
418		644
419	$hb->add (my $hg = new CFClient::UI::Gauge type => 'hp',	645	$hb->add (my $hg = new CFPlus::UI::Gauge type => 'hp', tooltip => "#stat_health");
420	tooltip => "<b>Health points</b>. Measures of how much damage you can take before dying. Hit points are determined from your level and are influenced by the value of your Con. Hp value may range between 1 to beyond 500 and higher values indicate a greater ability to withstand punishment.");
421	$hb->add (my $mg = new CFClient::UI::Gauge type => 'mana',	646	$hb->add (my $mg = new CFPlus::UI::Gauge type => 'mana', tooltip => "#stat_mana");
422	tooltip => "<b>Spell points</b>. Measures of how much \"fuel\" you have for casting spells and incantations. Mana is calculated from your level and your Pow. Mana values can range between 1 to beyond 500 (glowing crystals can increase the current spell points beyond your normal maximum). Higher values indicate greater amounts of mana.");
423	$hb->add (my $gg = new CFClient::UI::Gauge type => 'grace',	647	$hb->add (my $gg = new CFPlus::UI::Gauge type => 'grace', tooltip => "#stat_grace");
424	tooltip => "<b>Grace points</b> - how favored you are by your god. In game terms, how much divine magic you can cast. Your level, Wis and Pow effect what the value of grace is. Prayong on an altar of your god can increase this value beyond your normal maximum. Grace can take on large positive and negative values. Positive values indicate favor by the gods.");
425	$hb->add (my $fg = new CFClient::UI::Gauge type => 'food',	648	$hb->add (my $fg = new CFPlus::UI::Gauge type => 'food', tooltip => "#stat_food");
426	tooltip => "<b>Food</b>. Ranges between 0 (starving) and 999 (satiated). At a value of 0 the character begins to die. Some magic can speed up or slow down the character digestion. Healing wounds will speed up digestion too.");
427		649
428	$vbox->add (my $exp = new CFClient::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1,	650	$vbox->add (my $exp = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_exp");
429	tooltip => "<b>Experience points and overall level</b> - experience is increased as a reward for appropriate action (such as killing monsters) and may decrease as a result of a magical attack or dying. Level is directly derived from the experience value. As the level of the character increases, the character becomes able to succeed at more difficult tasks. A character's level starts at a value of 0 and may range up beyond 100.");
430	$vbox->add (my $rng = new CFClient::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1,	651	$vbox->add (my $rng = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, tooltip => "#stat_ranged");
431	tooltip => "<b>Ranged attack</b> - how you attack when you press shift-cursor (spell, skill, weapon etc.)");
432		652
433	$GAUGES = {	653	$GAUGES = {
434	exp => $exp, win => $win, range => $rng,	654	exp => $exp, win => $win, range => $rng,
435	food => $fg, mana => $mg, hp => $hg, grace => $gg	655	food => $fg, mana => $mg, hp => $hg, grace => $gg
436	};	656	};
…		…
438	&set_gauge_window_fontsize;	658	&set_gauge_window_fontsize;
439		659
440	$win	660	$win
441	}	661	}
442		662
		663	sub debug_setup {
		664	my $table = new CFPlus::UI::Table;
443		665
		666	$table->add (0, 0, new CFPlus::UI::Label text => "Widget Borders");
		667	$table->add (1, 0, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });
		668	$table->add (0, 1, new CFPlus::UI::Label text => "Tooltip Widget Info");
		669	$table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
		670	$table->add (0, 2, new CFPlus::UI::Label text => "Show FPS");
		671	$table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
		672	$table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
		673	$table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
		674	$table->add (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { die "violator" } );
		675
		676	my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
		677
		678	for my $x (0..2) {
		679	for my $y (0 .. 2) {
		680	$table->add ($x + 3, $y,
		681	new CFPlus::UI::Entry
		682	text => $default_smooth[$x * 3 + $y],
		683	on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
		684	);
		685	}
		686	}
		687
		688
		689	$table
		690	}
		691
444	sub make_stats_window {	692	sub stats_window {
445	my $tgw = new CFClient::UI::FancyFrame	693	my $r = new CFPlus::UI::ScrolledWindow (
446	y => $HEIGHT * (2/8),	694	expand => 1,
447	x => "max",	695	scroll_y => 1
448	title => "Stats",	696	);
449	name => "stats_window";	697	$r->add (my $vb = new CFPlus::UI::VBox);
450		698
451	$tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);	699	$vb->add (new CFPlus::UI::FancyFrame
		700	label => "Player",
		701	child => (my $pi = new CFPlus::UI::VBox),
		702	);
		703
452	$vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,	704	$pi->add ($STATWIDS->{title} = new CFPlus::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
453	can_hover => 1, can_events => 1,	705	can_hover => 1, can_events => 1,
454	tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");	706	tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
455	$vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,	707	$pi->add ($STATWIDS->{map} = new CFPlus::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
456	can_hover => 1, can_events => 1,	708	can_hover => 1, can_events => 1,
457	tooltip => "The map you are currently on (if supported by the server).");	709	tooltip => "The map you are currently on (if supported by the server).");
458		710
459	$vb->add (my $hb0 = new CFClient::UI::HBox);	711	$pi->add (my $hb0 = new CFPlus::UI::HBox);
460	$hb0->add ($STATWIDS->{weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1,	712	$hb0->add ($STATWIDS->{weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1,
461	can_hover => 1, can_events => 1,	713	can_hover => 1, can_events => 1,
462	tooltip => "The weight of the player including all inventory items.");	714	tooltip => "The weight of the player including all inventory items.");
463	$hb0->add ($STATWIDS->{m_weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1,	715	$hb0->add ($STATWIDS->{m_weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1,
464	can_hover => 1, can_events => 1,	716	can_hover => 1, can_events => 1,
465	tooltip => "The weight limit: you cannot carry more than this.");	717	tooltip => "The weight limit: you cannot carry more than this.");
466		718
467		719	$vb->add (new CFPlus::UI::FancyFrame
		720	label => "Primary/Secondary Statistics",
468	$vb->add (my $hb = new CFClient::UI::HBox expand => 1);	721	child => (my $hb = new CFPlus::UI::HBox expand => 1),
		722	);
469	$hb->add (my $tbl = new CFClient::UI::Table expand => 1);	723	$hb->add (my $tbl = new CFPlus::UI::Table expand => 1);
470		724
471	my $color2 = [1, 1, 0];	725	my $color2 = [1, 1, 0];
472		726
473	for (	727	for (
474	[0, 0, st_str => "Str", 30, "<b>Physical Strength</b>, determines damage dealt with weapons, how much you can carry, and how often you can attack"],	728	[0, 0, st_str => "Str", 30],
475	[0, 1, st_dex => "Dex", 30, "<b>Dexterity</b>, your physical agility. Determines chance of being hit and affects armor class and speed"],	729	[0, 1, st_dex => "Dex", 30],
476	[0, 2, st_con => "Con", 30, "<b>Constitution</b>, physical health and toughness. Determines how many healthpoints you can have"],	730	[0, 2, st_con => "Con", 30],
477	[0, 3, st_int => "Int", 30, "<b>Intelligence</b>, your ability to learn and use skills and incantations (both prayers and magic) and determines how much spell points you can have"],	731	[0, 3, st_int => "Int", 30],
478	[0, 4, st_wis => "Wis", 30, "<b>Wisdom</b>, the ability to learn and use divine magic (prayers). Determines how many grace points you can have"],	732	[0, 4, st_wis => "Wis", 30],
479	[0, 5, st_pow => "Pow", 30, "<b>Power</b>, your magical potential. Influences the strength of spell effects, and also how much your spell and grace points increase when leveling up"],	733	[0, 5, st_pow => "Pow", 30],
480	[0, 6, st_cha => "Cha", 30, "<b>Charisma</b>, how well you are received by NPCs. Affects buying and selling prices in shops."],	734	[0, 6, st_cha => "Cha", 30],
481		735
482	[2, 0, st_wc => "Wc", -120, "<b>Weapon Class</b>, effectiveness of melee/missile attacks. Lower is more potent. Current weapon, level and Str are some things which effect the value of Wc. The value of Wc may range between 25 and -72."],	736	[2, 0, st_wc => "Wc", -120],
483	[2, 1, st_ac => "Ac", -120, "<b>Armour Class</b>, how protected you are from being hit by any attack. Lower values are better. Ac is based on your race and is modified by the Dex and current armour worn. For characters that cannot wear armour, Ac improves as their level increases."],	737	[2, 1, st_ac => "Ac", -120],
484	[2, 2, st_dam => "Dam", 120, "<b>Damage</b>, how much damage your melee/missile attack inflicts. Higher values indicate a greater amount of damage will be inflicted with each attack."],	738	[2, 2, st_dam => "Dam", 120],
485	[2, 3, st_arm => "Arm", 120, "<b>Armour</b>, how much damage (from physical attacks) will be subtracted from successful hits made upon you. This value ranges between 0 to 99%. Current armour worn primarily determines Arm value."],	739	[2, 3, st_arm => "Arm", 120],
486	[2, 4, st_spd => "Spd", 10.54, "<b>Speed</b>, how fast you can move. The value of speed may range between nearly 0 (\"very slow\") to higher than 5 (\"lightning fast\"). Base speed is determined from the Dex and modified downward proportionally by the amount of weight carried which exceeds the Max Carry limit. The armour worn also sets the upper limit on speed."],	740	[2, 4, st_spd => "Spd", 10.54],
487	[2, 5, st_wspd => "WSp", 10.54, "<b>Weapon Speed</b>, how many attacks you may make per unit of time (0.120s). Higher values indicate faster attack speed. Current weapon and Dex effect the value of weapon speed."],	741	[2, 5, st_wspd => "WSp", 10.54],
488	) {	742	) {
489	my ($col, $row, $id, $label, $template, $tooltip) = @$_;	743	my ($col, $row, $id, $label, $template) = @$_;
490		744
491	$tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label	745	$tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
492	font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, align => +1, template => $template, tooltip => $tooltip);	746	font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
		747	align => +1, template => $template, tooltip => "#stat_$label");
493	$tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFClient::UI::Label	748	$tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label
494	font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, align => -1, text => $label, tooltip => $tooltip);	749	font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
		750	align => -1, text => $label, tooltip => "#stat_$label");
495	}	751	}
496		752
		753	$vb->add (new CFPlus::UI::FancyFrame
		754	label => "Resistancies",
497	$hb->add (my $tbl2 = new CFClient::UI::Table expand => 1);	755	child => (my $tbl2 = new CFPlus::UI::Table expand => 1),
		756	);
498		757
499	my $row = 0;	758	my $row = 0;
500	my $col = 0;	759	my $col = 0;
501		760
502	my %resist_names = (	761	my %resist_names = (
		762	slow => ["Slow",
503	slow => "<b>Slow</b> (slows you down when you are hit by the spell. Monsters will have an opportunity to come near you faster and hit you more often.)",	763	"<b>Slow</b> (slows you down when you are hit by the spell. Monsters will have an opportunity to come near you faster and hit you more often.)"],
		764	holyw => ["Holy Word",
504	holyw => "<b>Holy Word</b> (resistance you against getting the fear when someone whose god doesn't like you spells the holy word on you.)",	765	"<b>Holy Word</b> (resistance you against getting the fear when someone whose god doesn't like you spells the holy word on you.)"],
		766	conf => ["Confusion",
505	conf => "<b>Confusion</b> (If you are hit by confusion you will move into random directions, and likely into monsters.)",	767	"<b>Confusion</b> (If you are hit by confusion you will move into random directions, and likely into monsters.)"],
		768	fire => ["Fire",
506	fire => "<b>Fire</b> (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)",	769	"<b>Fire</b> (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)"],
		770	depl => ["Depletion",
507	depl => "<b>Depletion</b> (some monsters and other effects can cause stats depletion)",	771	"<b>Depletion</b> (some monsters and other effects can cause stats depletion)"],
		772	magic => ["Magic",
508	magic => "<b>Magic</b> (resistance to magic spells like magic missile or similar)",	773	"<b>Magic</b> (resistance to magic spells like magic missile or similar)"],
		774	drain => ["Draining",
509	drain => "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)",	775	"<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)"],
		776	acid => ["Acid",
510	acid => "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)",	777	"<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)"],
		778	pois => ["Poison",
511	pois => "<b>Poison</b> (resistance to getting poisoned)",	779	"<b>Poison</b> (resistance to getting poisoned)"],
		780	para => ["Paralysation",
512	para => "<b>Paralysation</b> (this resistance affects the chance you get paralysed)",	781	"<b>Paralysation</b> (this resistance affects the chance you get paralysed)"],
		782	deat => ["Death",
513	deat => "<b>Death</b> (resistance against death spells)",	783	"<b>Death</b> (resistance against death spells)"],
514	phys => "<b>Physical</b> (this is the resistance against physical attacks, like when a monster hit you in melee combat)",	784	phys => ["Physical",
		785	"<b>Physical</b> (this is the resistance against physical attacks, like when a monster hit you in melee combat. The value displayed here is also displayed in the 'Arm' field on the left.)"],
		786	blind => ["Blind",
515	blind => "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)",	787	"<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)"],
		788	fear => ["Fear",
516	fear => "<b>Fear</b> (this attack will drive you away from monsters who cast this and hit you successfully, being resistant to this helps a lot when fighting those monsters)",	789	"<b>Fear</b> (this attack will drive you away from monsters who cast this and hit you successfully, being resistant to this helps a lot when fighting those monsters)"],
		790	tund => ["Turn undead",
517	tund => "<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead...",	791	"<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead..."],
		792	elec => ["Electricity",
518	elec => "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)",	793	"<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)"],
		794	cold => ["Cold",
519	cold => "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)",	795	"<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"],
		796	ghit => ["Ghost hit",
520	ghit => "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)",	797	"<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"],
521	);	798	);
522	for (qw/slow holyw conf fire depl magic	799	for (qw/slow holyw conf fire depl magic
523	drain acid pois para deat phys	800	drain acid pois para deat phys
524	blind fear tund elec cold ghit/)	801	blind fear tund elec cold ghit/)
525	{	802	{
526	$tbl2->add ($col, $row,	803	$tbl2->add ($col, $row,
527	$STATWIDS->{"res_$_"} =	804	$STATWIDS->{"res_$_"} =
528	new CFClient::UI::Label	805	new CFPlus::UI::Label
529	font => $FONT_FIXED,	806	font => $FONT_FIXED,
530	template => "-100%",	807	template => "-100%",
531	align => +1,	808	align => +1,
532	valign => 0,	809	valign => 0,
533	can_events => 1,	810	can_events => 1,
534	can_hover => 1,	811	can_hover => 1,
535	tooltip => $resist_names{$_},	812	tooltip => $resist_names{$_}->[1],
536	);	813	);
537	$tbl2->add ($col + 1, $row, new CFClient::UI::Image	814	$tbl2->add ($col + 1, $row, new CFPlus::UI::Image
538	font => $FONT_FIXED,	815	font => $FONT_FIXED,
539	can_hover => 1,	816	can_hover => 1,
540	can_events => 1,	817	can_events => 1,
541	image => "ui/resist/resist_$_.png",	818	path => "ui/resist/resist_$_.png",
542	tooltip => $resist_names{$_},	819	tooltip => $resist_names{$_}->[1],
		820	);
		821	$tbl2->add ($col + 2, $row, new CFPlus::UI::Label
		822	text => $resist_names{$_}->[0],
		823	font => $FONT_FIXED,
		824	can_hover => 1,
		825	can_events => 1,
		826	tooltip => $resist_names{$_}->[1],
543	);	827	);
544		828
545	$row++;	829	$row++;
546	if ($row % 6 == 0) {	830	if ($row % 6 == 0) {
547	$col += 2;	831	$col += 3;
548	$row = 0;	832	$row = 0;
549	}	833	}
550	}	834	}
551		835
552	&set_stats_window_fontsize;
553	update_stats_window ({});	836	#update_stats_window ({});
554		837
		838	$r
		839	}
		840
		841	sub skill_window {
		842	my $sw = new CFPlus::UI::ScrolledWindow (expand => 1);
		843	$sw->add ($STATWIDS->{skill_tbl} = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1, 0, 0, 1]);
555	$tgw	844	$sw
556	}	845	}
557		846
558	sub formsep($) {	847	sub formsep($) {
559	scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1	848	scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
560	}	849	}
561		850
562	sub update_stats_window {
563	my ($stats) = @_;
564
565	# I love text protocols...
566
567	my $hp = $stats->{+CS_STAT_HP} * 1;
568	my $hp_m = $stats->{+CS_STAT_MAXHP} * 1;
569	my $sp = $stats->{+CS_STAT_SP} * 1;
570	my $sp_m = $stats->{+CS_STAT_MAXSP} * 1;
571	my $fo = $stats->{+CS_STAT_FOOD} * 1;
572	my $fo_m = 999;
573	my $gr = $stats->{+CS_STAT_GRACE} * 1;
574	my $gr_m = $stats->{+CS_STAT_MAXGRACE} * 1;
575
576	$GAUGES->{hp} ->set_value ($hp, $hp_m);
577	$GAUGES->{mana} ->set_value ($sp, $sp_m);
578	$GAUGES->{food} ->set_value ($fo, $fo_m);
579	$GAUGES->{grace} ->set_value ($gr, $gr_m);
580	$GAUGES->{exp} ->set_text ("Exp: " . (formsep $stats->{+CS_STAT_EXP64})
581	. " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
582	my $rng = $stats->{+CS_STAT_RANGE};
583	$rng =~ s/^Range: //; # thank you so much dear server
584	$GAUGES->{range} ->set_text ("Rng: " . $rng);
585	my $title = $stats->{+CS_STAT_TITLE};
586	$title =~ s/^Player: //;
587	$STATWIDS->{title} ->set_text ("Title: " . $title);
588
589	$STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
590	$STATWIDS->{st_dex} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DEX});
591	$STATWIDS->{st_con} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CON});
592	$STATWIDS->{st_int} ->set_text (sprintf "%d" , $stats->{+CS_STAT_INT});
593	$STATWIDS->{st_wis} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WIS});
594	$STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
595	$STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
596	$STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
597	$STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
598	$STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
599	$STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_ARMOUR});
600	$STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
601	$STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
602
603	$STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000);
604
605	# TODO: replace by CS_STAT_RES_xxx constants
606	my %tbl = (
607	phys => 100,
608	magic => 101,
609	fire => 102,
610	elec => 103,
611	cold => 104,
612	conf => 105,
613	acid => 106,
614	drain => 107,
615	ghit => 108,
616	pois => 109,
617	slow => 110,
618	para => 111,
619	tund => 112,
620	fear => 113,
621	depl => 113,
622	deat => 115,
623	holyw => 116,
624	blind => 117,
625	);
626
627	$STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
628	for keys %tbl;
629	}
630
631	my $METASERVER_ATIME;	851	my $METASERVER_ATIME;
632		852
633	sub update_metaserver {	853	sub update_metaserver {
		854	my ($metaserver_dialog) = @_;
		855
		856	$METASERVER = $metaserver_dialog
		857	if defined $metaserver_dialog;
		858
634	return if $METASERVER_ATIME > time;	859	return if $METASERVER_ATIME > time;
635	$METASERVER_ATIME = time + 60;	860	$METASERVER_ATIME = time + 60;
636		861
637	my $table = $METASERVER->{table};	862	my $table = $METASERVER->{table};
638	$table->clear;	863	$table->clear;
639	$table->add (0, 0, my $label = new CFClient::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");	864	$table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
640		865
641	my $buf;	866	my $ok = 0;
642		867
643	my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0;	868	CFPlus::background {
		869	my $ua = CFPlus::lwp_useragent;
644		870
645	unless ($fh) {	871	CFPlus::background_msg CFPlus::from_json +(CFPlus::lwp_check $ua->get ($META_SERVER))->decoded_content;
646	$label->set_text ("unable to contact metaserver: $!");	872	} sub {
647	return;	873	my ($msg) = @_;
648	}	874	if ($msg) {
649
650	Event->io (fd => $fh, poll => 'r', cb => sub {
651	my $res = sysread $fh, $buf, 8192, length $buf;
652
653	if (!defined $res) {
654	$_[0]->w->cancel;
655	$label->set_text ("error while retrieving server list: $!");
656	} elsif ($res == 0) {
657	$_[0]->w->cancel;
658	status "server list retrieved";
659
660	utf8::decode $buf if utf8::valid $buf;
661
662	$table->clear;	875	$table->clear;
663		876
		877	my @tip = (
		878	"The current number of users logged in on the server.",
		879	"The hostname of the server.",
		880	"The time this server has been running without being restarted.",
		881	"The server software version - a '+' indicates a Crossfire+ server.",
		882	"Short information about this server provided by its admins.",
		883	);
664	my @col = qw(Use #Users Host Uptime Version Description);	884	my @col = qw(#Users Host Uptime Version Description);
665	$table->add ($_, 0, new CFClient::UI::Label align => 0, fg => [1, 1, 0], text => $col[$_])	885	$table->add ($_, 0, new CFPlus::UI::Label
		886	can_hover => 1, can_events => 1,
		887	align => 0, fg => [1, 1, 0],
		888	text => $col[$_], tooltip => $tip[$_])
666	for 0 .. $#col;	889	for 0 .. $#col;
667		890
668	my @align = qw(1 0 1 1 -1);	891	my @align = qw(1 0 1 1 -1);
669		892
670	my $y = 0;	893	my $y = 0;
671	for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) {	894	for my $m (
		895	sort {
		896	$b->{version} <=> $a->{version}
		897	or $b->{users} <=> $a->{users}
		898	}
		899	@{ $msg->{servers} }
		900	) {
672	my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = @$m;	901	my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) =
		902	@$m{qw(ip age hostname users version description ibytes obytes uptime)};
673		903
674	for ($desc) {	904	for ($desc) {
675	s/<br>/\n/gi;	905	s/<br>/\n/gi;
676	s/<li>/\n· /gi;	906	s/<li>/\n· /gi;
677	s/<.*?>//sgi;	907	s/<.*?>//sgi;
678	s/&/&amp;/g;	908	s/&amp;/&/g;
679	s/</&lt;/g;	909	s/&lt;/</g;
680	s/>/&gt;/g;	910	s/&gt;/>/g;
681	}	911	}
682		912
683	$uptime = sprintf "%dd %02d:%02d:%02d",	913	$uptime = sprintf "%dd %02d:%02d:%02d",
684	(int $m->[8] / 86400),	914	(int $uptime / 86400),
685	(int $m->[8] / 3600) % 24,	915	(int $uptime / 3600) % 24,
686	(int $m->[8] / 60) % 60,	916	(int $uptime / 60) % 60,
687	$m->[8] % 60;	917	$uptime % 60;
688		918
689	$m = [$users, $host, $uptime, $version, $desc];	919	$m = [$users, $host, $uptime, $version, $desc];
690		920
691	$y++;	921	$y++;
692		922
693	$table->add (0, $y, new CFClient::UI::VBox children => [	923	$table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [
694	(new CFClient::UI::Button text => "Use", on_activate => sub {	924	(new CFPlus::UI::Button
		925	text => "Use",
		926	tooltip => "Put this server into the <b>Host:Port</b> field",
		927	on_activate => sub {
695	$HOST_ENTRY->set_text ($CFG->{host} = $host);	928	$HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
696	$METASERVER->toggle_visibility;	929	$METASERVER->hide;
		930	0
		931	},
697	}),	932	),
698	(new CFClient::UI::Empty expand => 1),	933	(new CFPlus::UI::Empty expand => 1),
699	]);	934	]);
700		935
701	$table->add ($_ + 1, $y, new CFClient::UI::Label	936	$table->add ($_, $y, new CFPlus::UI::Label
702	ellipsise => 0, align => $align[$_], text => $m->[$_], fontsize => 0.8)	937	max_w => $::WIDTH * 0.4,
		938	ellipsise => 0,
		939	align => $align[$_],
		940	text => $m->[$_],
		941	tooltip => $tip[$_],
		942	fg => ($m->[3] =~ /\+$/ ? [1, 1, 1] : [.7, .7, .7]),
		943	can_hover => 1,
		944	can_events => 1,
		945	fontsize => 0.8)
703	for 0 .. $#$m;	946	for 0 .. $#$m;
704	}	947	}
		948	} else {
		949	$ok or $label->set_text ("error while contacting metaserver");
705	}	950	}
706	});	951	};
		952
707	}	953	}
708		954
709	sub metaserver_dialog {	955	sub metaserver_dialog {
710	my $dialog = new CFClient::UI::FancyFrame	956	my $vbox = new CFPlus::UI::VBox;
		957	my $table = new CFPlus::UI::Table;
		958	$vbox->add (new CFPlus::UI::ScrolledWindow expand => 1, child => $table);
		959
		960	my $dialog = new CFPlus::UI::Toplevel
711	title => "Server List",	961	title => "Server List",
712	name => 'metaserver_dialog',	962	name => 'metaserver_dialog',
713	x => 'center',	963	x => 'center',
714	y => 'center',	964	y => 'center',
715	child => (my $vbox = new CFClient::UI::VBox),	965	z => 3,
		966	force_w => $::WIDTH * 0.9,
		967	force_h => $::HEIGHT * 0.7,
		968	child => $vbox,
		969	has_close_button => 1,
		970	table => $table,
716	on_visibility_change => sub {	971	on_visibility_change => sub {
717	update_metaserver if $_[1];	972	update_metaserver ($_[0]) if $_[1];
		973	0
718	},	974	},
719	;	975	;
720		976
721	$vbox->add ($dialog->{table} = new CFClient::UI::Table);
722
723	$dialog	977	$dialog
724	}	978	}
725		979
726	sub server_setup {	980	sub server_setup {
727	my $vbox = new CFClient::UI::VBox;	981	my $vbox = new CFPlus::UI::VBox;
728		982
		983	$vbox->add (new CFPlus::UI::FancyFrame
		984	label => "Connection Settings",
729	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	985	child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
		986	);
730	$table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");	987	$table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");
731		988
732	{	989	{
733	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);	990	$table->add (1, 2, my $vbox = new CFPlus::UI::VBox);
734		991
735	$vbox->add (	992	$vbox->add (
736	$HOST_ENTRY = new CFClient::UI::Entry	993	$HOST_ENTRY = new CFPlus::UI::Entry
737	expand => 1,	994	expand => 1,
738	text => $CFG->{host},	995	text => $CFG->{profile}{default}{host},
739	tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",	996	tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
740	on_changed => sub {	997	on_changed => sub {
741	my ($self, $value) = @_;	998	my ($self, $value) = @_;
742	$CFG->{host} = $value;	999	$CFG->{profile}{default}{host} = $value;
		1000	0
743	}	1001	}
744	);	1002	);
745		1003
746	$METASERVER = metaserver_dialog;
747
748	$vbox->add (new CFClient::UI::Button	1004	$vbox->add (new CFPlus::UI::Button
749	expand => 1,	1005	expand => 1,
750	text => "Server List",	1006	text => "Server List",
751	other => $METASERVER,	1007	other => $METASERVER,
752	tooltip => "Show a list of available crossfire servers",	1008	tooltip => "Show a list of available crossfire servers",
753	on_activate => sub { $METASERVER->toggle_visibility },	1009	on_activate => sub { $METASERVER->toggle_visibility; 0 },
		1010	on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
754	);	1011	);
755	}	1012	}
756		1013
757	$table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");	1014	$table->add (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username");
758	$table->add (1, 4, new CFClient::UI::Entry	1015	$table->add (1, 4, new CFPlus::UI::Entry
759	text => $CFG->{user},	1016	text => $CFG->{profile}{default}{user},
760	tooltip => "The name of your character on the server",	1017	tooltip => "The name of your character on the server",
761	on_changed => sub {	1018	on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
762	my ($self, $value) = @_;
763	$CFG->{user} = $value;
764	}
765	);	1019	);
766		1020
767	$table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password");	1021	$table->add (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password");
768	$table->add (1, 5, new CFClient::UI::Entry	1022	$table->add (1, 5, new CFPlus::UI::Entry
769	text => $CFG->{password},	1023	text => $CFG->{profile}{default}{password},
770	hidden => 1,	1024	hidden => 1,
771	tooltip => "The password for your character",	1025	tooltip => "The password for your character",
772	on_changed => sub {	1026	on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
773	my ($self, $value) = @_;
774	$CFG->{password} = $value;
775	}
776	);	1027	);
777		1028
778	$table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");	1029	$table->add (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size");
779	$table->add (1, 7, new CFClient::UI::Slider	1030	$table->add (1, 7, new CFPlus::UI::Slider
780	force_w => 100,	1031	force_w => 100,
781	range => [$CFG->{mapsize}, 10, 100, 0, 1],	1032	range => [$CFG->{mapsize}, 10, 100, 0, 1],
782	tooltip => "This is the size of the portion of the map update the server sends you. "	1033	tooltip => "This is the size of the portion of the map update the server sends you. "
783	. "If you set this to a high value you will be able to see further, "	1034	. "If you set this to a high value you will be able to see further, "
784	. "but you also increase bandwidth requirements and latency. "	1035	. "but you also increase bandwidth requirements and latency. "
785	. "This option is only used once at log-in.",	1036	. "This option is only used once at log-in.",
786	on_changed => sub {	1037	on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },
787	my ($self, $value) = @_;
788
789	$CFG->{mapsize} = $self->{range}[0] = $value = int $value;
790	},
791	);	1038	);
792		1039
793	$table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Face Prefetch");	1040	$table->add (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Face Prefetch");
794	$table->add (1, 8, new CFClient::UI::CheckBox	1041	$table->add (1, 8, new CFPlus::UI::CheckBox
795	state => $CFG->{face_prefetch},	1042	state => $CFG->{face_prefetch},
796	tooltip => "<b>Background Image Prefetch</b>\n\n"	1043	tooltip => "<b>Background Image Prefetch</b>\n\n"
797	. "If enabled, the client automatically pre-fetches images from the server. "	1044	. "If enabled, the client automatically pre-fetches images from the server. "
798	. "This might increase or create lag, but increases the chances "	1045	. "This might increase or create lag, but increases the chances "
799	. "of faces being ready for display when you encounter them. "	1046	. "of faces being ready for display when you encounter them. "
800	. "It also uses up server bandwidth on every connect, "	1047	. "It also uses up server bandwidth on every connect, "
801	. "so only set it if you really need to prefetch images. "	1048	. "so only set it if you really need to prefetch images. "
802	. "This option can be set and unset any time.",	1049	. "This option can be set and unset any time.",
803	on_changed => sub { $CFG->{face_prefetch} = $_[1] },	1050	on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
804	);	1051	);
805		1052
806	$table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count");	1053	$table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
807	$table->add (1, 9, new CFClient::UI::Entry	1054	$table->add (1, 9, new CFPlus::UI::Entry
808	text => $CFG->{output_count},	1055	text => $CFG->{output_count},
809	tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",	1056	tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
810	on_changed => sub { $CFG->{output_count} = $_[1] },	1057	on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
811	);	1058	);
812		1059
813	$table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync");	1060	$table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
814	$table->add (1, 10, new CFClient::UI::Entry	1061	$table->add (1, 10, new CFPlus::UI::Entry
815	text => $CFG->{output_sync},	1062	text => $CFG->{output_sync},
816	tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",	1063	tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
817	on_changed => sub { $CFG->{output_sync} = $_[1] },	1064	on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
818	);	1065	);
819		1066
820	$table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button	1067	$table->add (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
821	expand => 1,	1068	expand => 1,
822	align => 0,	1069	align => 0,
823	text => "Login",	1070	text => "Login",
824	on_activate => sub {	1071	on_activate => sub {
825	$CONN ? stop_game	1072	$CONN ? stop_game
826	: start_game;	1073	: start_game;
		1074	0
827	},	1075	},
828	);	1076	);
829		1077
830	$table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command");	1078	$table->add (0, 12, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
831	$table->add (1, 12, my $saycmd = new CFClient::UI::Entry	1079	$table->add (1, 12, my $saycmd = new CFPlus::UI::Entry
832	text => $CFG->{say_command},	1080	text => $CFG->{say_command},
833	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. "	1081	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. "
834	. "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "	1082	. "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
835	. "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",	1083	. "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
836	on_changed => sub {	1084	on_changed => sub {
837	my ($self, $value) = @_;	1085	my ($self, $value) = @_;
838	$CFG->{say_command} = $value;	1086	$CFG->{say_command} = $value;
		1087	0
839	}	1088	}
840	);	1089	);
841		1090
		1091	$table->add (0, 13, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
		1092	$table->add (1, 13, my $saycmd = new CFPlus::UI::CheckBox
		1093	state => $CFG->{show_tips},
		1094	tooltip => "Show the <b>Tip of the day</b> window at startup?",
		1095	on_changed => sub {
		1096	my ($self, $value) = @_;
		1097	$CFG->{show_tips} = $value;
		1098	0
		1099	}
		1100	);
		1101
		1102	$vbox->add (new CFPlus::UI::FancyFrame
		1103	label => "Server Info",
		1104	child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
		1105	);
		1106
842	$vbox	1107	$vbox
843	}	1108	}
844		1109
845	sub message_window {	1110	sub message_window {
846	my $window = new CFClient::UI::FancyFrame	1111	my $window = new CFPlus::UI::Toplevel
847	name => "message_window",	1112	name => "message_window",
848	title => "Messages",	1113	title => "Messages",
849	border_bg => [1, 1, 1, 1],	1114	border_bg => [1, 1, 1, 1],
850	bg => [0, 0, 0, 0.75],
851	x => "max",	1115	x => "max",
852	y => 0,	1116	y => 0,
853	force_w => $::WIDTH / 3,	1117	force_w => $::WIDTH * 0.4,
854	force_h => $::HEIGHT / 5,	1118	force_h => $::HEIGHT * 0.5,
855	child => (my $vbox = new CFClient::UI::VBox);	1119	child => (my $vbox = new CFPlus::UI::VBox),
		1120	has_close_button => 1;
856		1121
857	$vbox->add ($LOGVIEW);	1122	$vbox->add ($LOGVIEW);
858		1123
859	$vbox->add (my $input = new CFClient::UI::Entry	1124	$vbox->add (my $input = new CFPlus::UI::Entry
860	tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "	1125	tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
861	. "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "	1126	. "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "
862	. "If you prepend a slash (/), you will submit a command instead (similar to IRC). "	1127	. "If you prepend a slash (/), you will submit a command instead (similar to IRC). "
863	. "A better way to submit commands (and the occasional chat command) is often the map command completer.",	1128	. "A better way to submit commands (and the occasional chat command) is often the map command completer.",
864	on_focus_in => sub {	1129	on_focus_in => sub {
…		…
868		1133
869	if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {	1134	if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
870	$input->{refocus_map} = 1;	1135	$input->{refocus_map} = 1;
871	}	1136	}
872	delete $input->{auto_activated};	1137	delete $input->{auto_activated};
		1138
		1139	0
873	},	1140	},
874	on_activate => sub {	1141	on_activate => sub {
875	my ($input, $text) = @_;	1142	my ($input, $text) = @_;
876	$input->set_text ('');	1143	$input->set_text ('');
877		1144
…		…
883	}	1150	}
884	if ($input->{refocus_map}) {	1151	if ($input->{refocus_map}) {
885	delete $input->{refocus_map};	1152	delete $input->{refocus_map};
886	$MAPWIDGET->focus_in	1153	$MAPWIDGET->focus_in
887	}	1154	}
		1155
		1156	0
888	},	1157	},
889	on_escape => sub {	1158	on_escape => sub {
890	$MAPWIDGET->focus_in	1159	$MAPWIDGET->grab_focus;
		1160
		1161	0
891	},	1162	},
892	);	1163	);
893		1164
894	$CONSOLE = {	1165	$CONSOLE = {
895	window => $window,	1166	window => $window,
…		…
897	};	1168	};
898		1169
899	$window	1170	$window
900	}	1171	}
901		1172
902	sub open_quit_dialog {
903	unless ($QUIT_DIALOG) {
904	$QUIT_DIALOG = new CFClient::UI::FancyFrame
905	x => "center",
906	y => "center",
907	z => 50,
908	title => "Really Quit?",
909	;
910
911	$QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
912
913	$vb->add (new CFClient::UI::Label
914	text => "You should find a savebed and apply it first!",
915	max_w => $WIDTH * 0.25,
916	ellipsize => 0,
917	);
918	$vb->add (my $hb = new CFClient::UI::HBox expand => 1);
919	$hb->add (new CFClient::UI::Button
920	text => "Ok",
921	expand => 1,
922	on_activate => sub { $QUIT_DIALOG->hide },
923	);
924	$hb->add (new CFClient::UI::Button
925	text => "Quit anyway",
926	expand => 1,
927	on_activate => sub { exit },
928	);
929	}
930
931	$QUIT_DIALOG->show;
932	}
933
934	sub autopickup_setup {	1173	sub autopickup_setup {
935	my $table = new CFClient::UI::Table;	1174	my $table = new CFPlus::UI::Table;
936		1175
937	for (	1176	for (
938	["General", 0, 0,	1177	["General", 0, 0,
939	["Enable autopickup" => CFClient::Pickup::PU_NEWMODE],	1178	["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
940	["Inhibit autopickup" => CFClient::Pickup::PU_INHIBIT],	1179	["Inhibit autopickup" => PICKUP_INHIBIT],
941	["Stop before pickup" => CFClient::Pickup::PU_STOP],	1180	["Stop before pickup" => PICKUP_STOP],
942	["Debug autopickup" => CFClient::Pickup::PU_DEBUG],	1181	["Debug autopickup" => PICKUP_DEBUG],
943	],	1182	],
944	["Weapons", 0, 6,	1183	["Weapons", 0, 6,
945	["All weapons" => CFClient::Pickup::PU_ALLWEAPON],	1184	["All weapons" => PICKUP_ALLWEAPON],
946	["Missile weapons" => CFClient::Pickup::PU_MISSILEWEAPON],	1185	["Missile weapons" => PICKUP_MISSILEWEAPON],
947	["Bows" => CFClient::Pickup::PU_BOW],	1186	["Bows" => PICKUP_BOW],
948	["Arrows" => CFClient::Pickup::PU_ARROW],	1187	["Arrows" => PICKUP_ARROW],
949	],	1188	],
950	["Armour", 0, 12,	1189	["Armour", 0, 12,
951	["Helmets" => CFClient::Pickup::PU_HELMET],	1190	["Helmets" => PICKUP_HELMET],
952	["Shields" => CFClient::Pickup::PU_SHIELD],	1191	["Shields" => PICKUP_SHIELD],
953	["Body Armour" => CFClient::Pickup::PU_ARMOUR],	1192	["Body Armour" => PICKUP_ARMOUR],
954	["Boots" => CFClient::Pickup::PU_BOOTS],	1193	["Boots" => PICKUP_BOOTS],
955	["Gloves" => CFClient::Pickup::PU_GLOVES],	1194	["Gloves" => PICKUP_GLOVES],
956	["Cloaks" => CFClient::Pickup::PU_CLOAK],	1195	["Cloaks" => PICKUP_CLOAK],
957	],	1196	],
958		1197
959	["Readables", 2, 2,	1198	["Readables", 2, 0,
960	["Spellbooks" => CFClient::Pickup::PU_SPELLBOOK],	1199	["Spellbooks" => PICKUP_SPELLBOOK],
961	["Skillscrolls" => CFClient::Pickup::PU_SKILLSCROLL],	1200	["Skillscrolls" => PICKUP_SKILLSCROLL],
962	["Normal Books/Scrolls" => CFClient::Pickup::PU_READABLES],	1201	["Normal Books/Scrolls" => PICKUP_READABLES],
963	],	1202	],
964	["Misc", 2, 7,	1203	["Misc", 2, 5,
965	["Food" => CFClient::Pickup::PU_FOOD],	1204	["Food" => PICKUP_FOOD],
966	["Drinks" => CFClient::Pickup::PU_DRINK],	1205	["Drinks" => PICKUP_DRINK],
967	["Valuables (Money, Gems)" => CFClient::Pickup::PU_VALUABLES],	1206	["Valuables (Money, Gems)" => PICKUP_VALUABLES],
968	["Keys" => CFClient::Pickup::PU_KEY],	1207	["Keys" => PICKUP_KEY],
969	["Magical Items" => CFClient::Pickup::PU_MAGICAL],	1208	["Magical Items" => PICKUP_MAGICAL],
970	["Potions" => CFClient::Pickup::PU_POTION],	1209	["Potions" => PICKUP_POTION],
971	["Magic Devices" => CFClient::Pickup::PU_MAGIC_DEVICE],	1210	["Magic Devices" => PICKUP_MAGIC_DEVICE],
972	["Ignore cursed" => CFClient::Pickup::PU_NOT_CURSED],	1211	["Ignore cursed" => PICKUP_NOT_CURSED],
973	["Jewelery" => CFClient::Pickup::PU_JEWELS],	1212	["Jewelery" => PICKUP_JEWELS],
		1213	["Flesh" => PICKUP_FLESH],
974	],	1214	],
		1215	["Weight/Value ratio", 2, 17]
975	)	1216	)
976	{	1217	{
977	my ($title, $x, $y, @bits) = @$_;	1218	my ($title, $x, $y, @bits) = @$_;
978	$table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]);	1219	$table->add ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
979		1220
980	for (@bits) {	1221	for (@bits) {
981	++$y;	1222	++$y;
982		1223
983	my $mask = $_->[1];	1224	my $mask = $_->[1];
984	$table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);	1225	$table->add ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1);
985	$table->add ($x+1, $y, new CFClient::UI::CheckBox	1226	$table->add ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
986	state => $CFG->{pickup} & $mask,	1227	state => $::CFG->{pickup} & $mask,
987	on_changed => sub {	1228	on_changed => sub {
988	my ($box, $value) = @_;	1229	my ($box, $value) = @_;
		1230
989	if ($value) {	1231	if ($value) {
990	$::CFG->{pickup} |= $mask;	1232	$::CFG->{pickup} |= $mask;
991	} else {	1233	} else {
992	$::CFG->{pickup} = $::CFG->{pickup} & ~$mask;	1234	$::CFG->{pickup} &= ~$mask;
993	}	1235	}
		1236
994	$::CONN->send (sprintf "command pickup %u", $::CFG->{pickup})	1237	$::CONN->send_command ("pickup $::CFG->{pickup}")
995	if defined $::CONN;	1238	if defined $::CONN;
		1239
		1240	0
996	});	1241	});
		1242
		1243	${$_->[2]} = $checkbox if $_->[2];
997	}	1244	}
998	}	1245	}
999		1246
		1247	$table->add (2, 18, new CFPlus::UI::ValSlider
		1248	range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
		1249	template => ">= 99",
		1250	to_value => sub { ">= " . 5 * $_[0] },
		1251	on_changed => sub {
		1252	my ($slider, $value) = @_;
		1253
		1254	$::CFG->{pickup} &= ~0xF;
		1255	$::CFG->{pickup} |= int $value
		1256	if $value;
		1257	1;
		1258	});
		1259
		1260	$table->add (3, 18, new CFPlus::UI::Button
		1261	text => "set",
		1262	on_activate => sub {
		1263	$::CONN->send_command ("pickup $::CFG->{pickup}")
		1264	if defined $::CONN;
		1265	0
		1266	});
		1267
1000	$table	1268	$table
1001	}	1269	}
1002		1270
		1271	my %SORT_ORDER = (
		1272	type => undef,
		1273	mtime => sub {
		1274	my $NOW = time;
		1275	sort {
		1276	my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
		1277	my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
		1278
		1279	($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
		1280	or $btime <=> $atime
		1281	or $a->{type} <=> $b->{type}
		1282	} @_
		1283	},
		1284	weight => sub { sort {
		1285	$a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
		1286	or $a->{type} <=> $b->{type}
		1287	} @_ },
		1288	);
		1289
1003	sub make_inventory_window {	1290	sub inventory_widget {
1004	my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame	1291	my $hb = new CFPlus::UI::HBox homogeneous => 1;
		1292
		1293	$hb->add (my $vb1 = new CFPlus::UI::VBox);
		1294	$vb1->add (new CFPlus::UI::Label align => 0, text => "Player");
		1295
		1296	$vb1->add (my $hb1 = new CFPlus::UI::HBox);
		1297
		1298	use sort 'stable';
		1299
		1300	$hb1->add (new CFPlus::UI::Selector
		1301	value => $::CFG->{inv_sort},
		1302	options => [
		1303	[type => "Type/Name"],
		1304	[mtime => "Recent/Normal/Locked"],
		1305	[weight => "Weight/Type"],
		1306	],
		1307	on_changed => sub {
		1308	$::CFG->{inv_sort} = $_[1];
		1309	$INV->set_sort_order ($SORT_ORDER{$_[1]});
		1310	},
		1311	);
		1312	$hb1->add (new CFPlus::UI::Label text => "Weight: ", align => 1, expand => 1);
		1313	#TODO# update to weigh/maxweight
		1314	$hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1);
		1315
		1316	$vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
		1317	$sw1->add ($INV = new CFPlus::UI::Inventory);
		1318	$INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
		1319
		1320	$hb->add (my $vb2 = new CFPlus::UI::VBox);
		1321
		1322	$vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox);
		1323
		1324	$vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
		1325	$sw2->add ($INVR = new CFPlus::UI::Inventory);
		1326
		1327	# XXX: Call after $INVR = ... because set_opencont sets the items
		1328	CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
		1329
		1330	$hb
		1331	}
		1332
		1333	sub toggle_player_page {
		1334	my ($widget) = @_;
		1335
		1336	if ($PL_WINDOW->{visible} && $PL_NOTEBOOK->get_current_page == $widget) {
		1337	$PL_WINDOW->hide;
		1338	} else {
		1339	$PL_NOTEBOOK->set_current_page ($widget);
		1340	$PL_WINDOW->show;
		1341	}
		1342	}
		1343
		1344	sub player_window {
		1345	my $plwin = $PL_WINDOW = new CFPlus::UI::Toplevel
1005	x => "center",	1346	x => "center",
1006	y => "center",	1347	y => "center",
1007	force_w => $WIDTH * 9/10,	1348	force_w => $WIDTH * 9/10,
1008	force_h => $HEIGHT * 9/10,	1349	force_h => $HEIGHT * 9/10,
1009	title => "Inventory",	1350	title => "Player",
		1351	name => "playerbook",
		1352	has_close_button => 1
1010	;	1353	;
1011		1354
1012	$invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);	1355	my $ntb =
		1356	$PL_NOTEBOOK =
		1357	new CFPlus::UI::Notebook expand => 1, debug => 1;
1013		1358
1014	$hb->add (my $vb1 = new CFClient::UI::VBox);	1359	$ntb->add (
1015	$vb1->add (new CFClient::UI::Label align => 0, text => "Player");	1360	"Statistics (F2)" => $STATS_PAGE = stats_window,
1016	$vb1->add ($INV = new CFClient::UI::Inventory expand => 1);	1361	"Shows statistics, where all your Stats and Resistances are shown."
		1362	);
		1363	$ntb->add (
		1364	"Skills (F3)" => $SKILL_PAGE = skill_window,
		1365	"Shows all your Skills."
		1366	);
1017		1367
1018	$hb->add (my $vb2 = new CFClient::UI::VBox);	1368	my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
		1369	$spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
		1370	$ntb->add (
		1371	"Spellbook (F4)" => $spellsw,
		1372	"Displays all spells you have and lets you edit keyboard shortcuts for them."
		1373	);
		1374	$ntb->add (
		1375	"Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
		1376	"Toggles the inventory window, where you can manage your loot (or treasures :). "
		1377	. "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
		1378	);
1019		1379
1020	$vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);	1380	$ntb->set_current_page ($INVENTORY_PAGE);
1021		1381
1022	$vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);	1382	$plwin->add ($ntb);
1023		1383	$plwin
1024	# XXX: Call after $INVR = ... because set_opencont sets the items
1025	CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1026
1027	$invwin
1028	}	1384	}
1029		1385
1030	sub spell_setup {	1386	sub update_bindings {
1031	new CFClient::UI::SpellList	1387	$BIND_UPD_CB->() if $BIND_UPD_CB;
1032	}	1388	}
1033		1389
1034	sub keyboard_setup {	1390	sub keyboard_setup {
1035	my $binding_list = new CFClient::UI::VBox;	1391	my $binding_list = new CFPlus::UI::VBox;
1036		1392
1037	my $refresh;	1393	my $refresh;
1038	$refresh = sub {	1394	$refresh = $BIND_UPD_CB = sub {
1039	$binding_list->clear ();	1395	$binding_list->clear ();
1040		1396
		1397	return unless $PROFILE;
		1398
1041	for my $mod (keys %{$::CFG->{bindings}}) {	1399	for my $mod (keys %{$PROFILE->{bindings}}) {
1042	for my $sym (keys %{$::CFG->{bindings}->{$mod}}) {	1400	for my $sym (keys %{$PROFILE->{bindings}{$mod}}) {
1043	my $cmds = $::CFG->{bindings}->{$mod}->{$sym};	1401	my $cmds = $PROFILE->{bindings}{$mod}{$sym};
1044	next unless ref $cmds eq 'ARRAY' and @$cmds > 0;	1402	next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1045		1403
1046	my $lbl = join "; ", @$cmds;	1404	my $lbl = join "; ", @$cmds;
1047	my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym);	1405	my $nam = CFPlus::BindingEditor::keycombo_to_name ($mod, $sym);
1048	$binding_list->add (my $hb = new CFClient::UI::HBox);	1406	$binding_list->add (my $hb = new CFPlus::UI::HBox);
1049	$hb->add (new CFClient::UI::Button	1407	$hb->add (new CFPlus::UI::Button
1050	text => "delete",	1408	text => "delete",
1051	tooltip => "Deletes the binding",	1409	tooltip => "Deletes the binding",
1052	on_activate => sub {	1410	on_activate => sub {
1053	$binding_list->remove ($hb);	1411	$binding_list->remove ($hb);
1054	delete $::CFG->{bindings}->{$mod}->{$sym};	1412	delete $PROFILE->{bindings}{$mod}{$sym};
		1413	0
1055	});	1414	});
1056		1415
1057	$hb->add (new CFClient::UI::Button	1416	$hb->add (new CFPlus::UI::Button
1058	text => "edit",	1417	text => "edit",
1059	tooltip => "Edits the binding",	1418	tooltip => "Edits the binding",
1060	on_activate => sub {	1419	on_activate => sub {
1061	$::BIND_EDITOR->set_binding (	1420	$::BIND_EDITOR->set_binding (
1062	$mod, $sym, $::CFG->{bindings}->{$mod}->{$sym},	1421	$mod, $sym, $PROFILE->{bindings}{$mod}{$sym},
1063	sub {	1422	sub {
1064	my ($nmod, $nsym, $ncmds) = @_;	1423	my ($nmod, $nsym, $ncmds) = @_;
1065	delete $::CFG->{bindings}->{$mod}->{$sym};	1424	$::BIND_EDITOR->cfg_unbind ($mod, $sym);
1066	$::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds;	1425	$::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1067	$refresh->();	1426	$refresh->();
1068	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);	1427	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1069	$SETUP_DIALOG->show;	1428	$SETUP_DIALOG->show;
1070	},	1429	},
1071	sub {	1430	sub {
1072	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);	1431	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1073	$SETUP_DIALOG->show;	1432	$SETUP_DIALOG->show;
1074	});	1433	});
1075	$::BIND_EDITOR->show;	1434	$::BIND_EDITOR->show;
1076	$SETUP_DIALOG->hide;	1435	$SETUP_DIALOG->hide;
		1436	0
1077	});	1437	});
1078		1438
1079	$hb->add (new CFClient::UI::Label text => "(Key: $nam)");	1439	$hb->add (new CFPlus::UI::Label text => "(Key: $nam)");
1080	$hb->add (new CFClient::UI::Label text => $lbl, expand => 1);	1440	$hb->add (new CFPlus::UI::Label text => $lbl, expand => 1);
1081	}	1441	}
1082	}	1442	}
1083	};	1443	};
1084		1444
1085	my $vb = new CFClient::UI::VBox;	1445	my $vb = new CFPlus::UI::VBox;
1086	$vb->add ($binding_list);	1446	$vb->add (new CFPlus::UI::FancyFrame
		1447	label => "Options",
		1448	child => (my $hb = new CFPlus::UI::HBox),
		1449	);
		1450	$hb->add (new CFPlus::UI::Label text => "only shift-up stops fire");
		1451	$hb->add (new CFPlus::UI::CheckBox
		1452	expand => 1,
		1453	state => $CFG->{shift_fire_stop},
		1454	tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
		1455	on_changed => sub {
		1456	my ($cbox, $value) = @_;
		1457	$CFG->{shift_fire_stop} = $value;
		1458	0
		1459	});
		1460
		1461	$vb->add (new CFPlus::UI::FancyFrame
		1462	label => "Bindings",
		1463	child => $binding_list);
1087	$vb->add (my $hb = new CFClient::UI::HBox);	1464	$vb->add (my $hb = new CFPlus::UI::HBox);
1088		1465
1089	$hb->add (new CFClient::UI::Button	1466	$hb->add (new CFPlus::UI::Button
1090	text => "record new",	1467	text => "record new",
1091	expand => 1,	1468	expand => 1,
1092	tooltip => "This button opens the binding editor with an empty binding.",	1469	tooltip => "This button opens the binding editor with an empty binding.",
1093	on_activate => sub {	1470	on_activate => sub {
1094	$::BIND_EDITOR->set_binding (undef, undef, [],	1471	$::BIND_EDITOR->set_binding (undef, undef, [],
1095	sub {	1472	sub {
1096	my ($mod, $sym, $cmds) = @_;	1473	my ($mod, $sym, $cmds) = @_;
1097	$::CFG->{bindings}->{$mod}->{$sym} = $cmds;	1474	$::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1098	$refresh->();	1475	$refresh->();
1099	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);	1476	$SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1100	$SETUP_DIALOG->show;	1477	$SETUP_DIALOG->show;
1101	},	1478	},
1102	sub {	1479	sub {
…		…
1104	$SETUP_DIALOG->show;	1481	$SETUP_DIALOG->show;
1105	},	1482	},
1106	);	1483	);
1107	$SETUP_DIALOG->hide;	1484	$SETUP_DIALOG->hide;
1108	$::BIND_EDITOR->show;	1485	$::BIND_EDITOR->show;
		1486	0
1109	},	1487	},
1110	);	1488	);
1111		1489
1112	$hb->add (new CFClient::UI::Button	1490	$hb->add (new CFPlus::UI::Button
1113	text => "close",	1491	text => "close",
1114	tooltip => "Closes the binding window",	1492	tooltip => "Closes the binding window",
1115	expand => 1,	1493	expand => 1,
1116	on_activate => sub {	1494	on_activate => sub {
1117	$SETUP_DIALOG->hide;	1495	$SETUP_DIALOG->hide;
		1496	0
1118	}	1497	}
1119	);	1498	);
1120		1499
1121	$refresh->();	1500	$refresh->();
1122		1501
1123	$vb	1502	$vb
1124	}	1503	}
1125		1504
1126	sub make_help_window {	1505	sub help_window {
1127	my $win = new CFClient::UI::FancyFrame	1506	my $win = new CFPlus::UI::Toplevel
1128	x => 'center',	1507	x => 'center',
1129	y => 'center',	1508	y => 'center',
1130	z => 2,	1509	z => 4,
1131	name => 'doc_browser',	1510	name => 'doc_browser',
1132	force_w => int $WIDTH * 7/8,	1511	force_w => int $WIDTH * 7/8,
1133	force_h => int $HEIGHT * 7/8,	1512	force_h => int $HEIGHT * 7/8,
1134	title => "Documentation";	1513	title => "Help Browser",
		1514	has_close_button => 1;
1135		1515
1136	$win->add (my $vbox = new CFClient::UI::VBox);	1516	$win->add (my $vbox = new CFPlus::UI::VBox);
1137		1517
1138	$vbox->add (my $buttons = new CFClient::UI::HBox);	1518	$vbox->add (new CFPlus::UI::FancyFrame
1139	$vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8);	1519	label => "Navigation",
		1520	child => (my $buttons = new CFPlus::UI::HBox),
		1521	);
		1522	$vbox->add (my $viewer = new CFPlus::UI::TextScroller
		1523	expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1140		1524
1141	for (	1525	my @history;
1142	[intro => "Introduction"],	1526	my @future;
1143	[manual => "Manual"],	1527	my $curnode;
1144	[command_help => "Commands"],	1528
1145	[skill_help => "Skills"],	1529	my $load_node; $load_node = sub {
1146	) {
1147	my ($pod, $label) = @$_;	1530	my ($node, $para) = @_;
1148		1531
		1532	$buttons->clear;
		1533
1149	$buttons->add (new CFClient::UI::Button	1534	$buttons->add (new CFPlus::UI::Button
1150	text => $label,	1535	text => "⇤",
		1536	tooltip => "back to the starting page",
1151	on_activate => sub {	1537	on_activate => sub {
1152	my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod";	1538	unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1153		1539	unshift @future, @history;
1154	$viewer->clear;	1540	@history = ();
1155		1541	$load_node->(@{shift @future});
1156	$viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
1157	for @{ CFClient::pod_to_pango_list $pom };
1158
1159	$viewer->set_offset (0);
1160	},	1542	},
1161	);	1543	);
		1544
		1545	if (@history) {
		1546	$buttons->add (new CFPlus::UI::Button
		1547	text => "⋘",
		1548	tooltip => "back to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $history[-1][0]) . "</i>",
		1549	on_activate => sub {
		1550	unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
		1551	$load_node->(@{pop @history});
		1552	},
		1553	);
		1554	}
		1555
		1556	if (@future) {
		1557	$buttons->add (new CFPlus::UI::Button
		1558	text => "⋙",
		1559	tooltip => "forward to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $future[0][0]) . "</i>",
		1560	on_activate => sub {
		1561	push @history, [$curnode, $viewer->current_paragraph];
		1562	$load_node->(@{shift @future});
		1563	},
		1564	);
		1565	}
		1566
		1567	$buttons->add (new CFPlus::UI::Label text => " ");
		1568
		1569	my @path = CFPlus::Pod::full_path_of $node;
		1570	pop @path; # drop current node
		1571
		1572	for my $node (@path) {
		1573	$buttons->add (new CFPlus::UI::Button
		1574	text => $node->{kw}[0],
		1575	tooltip => "go to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $node) . "</i>",
		1576	on_activate => sub {
		1577	push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
		1578	$load_node->($node);
		1579	},
		1580	);
		1581	$buttons->add (new CFPlus::UI::Label text => "/");
		1582	}
		1583
		1584	$buttons->add (new CFPlus::UI::Label text => $node->{kw}[0], padding_x => 4, padding_y => 4);
		1585
		1586	$curnode = $node;
		1587
		1588	$viewer->clear;
		1589	$viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $curnode);
		1590	$viewer->scroll_to ($para);
		1591	};
		1592
		1593	$load_node->(CFPlus::Pod::find pod => "mainpage");
		1594
		1595	$CFPlus::Pod::goto_document = sub {
		1596	my (@path) = @_;
		1597
		1598	push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
		1599
		1600	$load_node->((CFPlus::Pod::find @path)[0]);
		1601	$win->show;
		1602	};
		1603
		1604	$win
		1605	}
		1606
		1607	sub open_string_query {
		1608	my ($title, $cb, $txt, $tooltip) = @_;
		1609	my $dialog = new CFPlus::UI::Toplevel
		1610	x => "center",
		1611	y => "center",
		1612	z => 50,
		1613	force_w => $WIDTH * 4/5,
		1614	title => $title;
		1615
		1616	$dialog->add (
		1617	my $e = new CFPlus::UI::Entry
		1618	on_activate => sub { $cb->(@_); $dialog->hide; 0 },
		1619	on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
		1620	tooltip => $tooltip
		1621	);
		1622
		1623	$e->grab_focus;
		1624	$e->set_text ($txt) if $txt;
		1625	$dialog->show;
		1626	}
		1627
		1628	sub open_quit_dialog {
		1629	unless ($QUIT_DIALOG) {
		1630	$QUIT_DIALOG = new CFPlus::UI::Toplevel
		1631	x => "center",
		1632	y => "center",
		1633	z => 50,
		1634	title => "Really Quit?",
		1635	on_key_down => sub {
		1636	my ($dialog, $ev) = @_;
		1637	$ev->{sym} == 27 and $dialog->hide;
		1638	}
		1639	;
		1640
		1641	$QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
		1642
		1643	$vb->add (new CFPlus::UI::Label
		1644	text => "You should find a savebed and apply it first!",
		1645	max_w => $WIDTH * 0.25,
		1646	ellipsize => 0,
		1647	);
		1648	$vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
		1649	$hb->add (new CFPlus::UI::Button
		1650	text => "Ok",
		1651	expand => 1,
		1652	on_activate => sub { $QUIT_DIALOG->hide; 0 },
		1653	);
		1654	$hb->add (new CFPlus::UI::Button
		1655	text => "Quit anyway",
		1656	expand => 1,
		1657	on_activate => sub { exit },
		1658	);
1162	}	1659	}
1163		1660
1164	$viewer->add_paragraph ([1, 1, 0, 1], "<big>Use one of the buttons above to display a document.</big>");	1661	$QUIT_DIALOG->show;
		1662	$QUIT_DIALOG->grab_focus;
		1663	}
1165		1664
1166	$win	1665	sub show_tip_of_the_day {
		1666	# find all tips
		1667	my @tod = CFPlus::Pod::find tip_of_the_day => "*";
		1668
		1669	my $todindex = $CFPlus::DB_STATE->get ("tip_of_the_day");
		1670	$todindex = 0 if $todindex >= @tod;
		1671	$CFPlus::DB_STATE->put (tip_of_the_day => $todindex + 1);
		1672
		1673	# create dialog
		1674	my $dialog;
		1675
		1676	my $close = sub {
		1677	$dialog->destroy;
		1678	};
		1679
		1680	$dialog = new CFPlus::UI::Toplevel
		1681	x => "center",
		1682	y => "center",
		1683	z => 3,
		1684	name => 'tip_of_the_day',
		1685	force_w => int $WIDTH * 4/9,
		1686	force_h => int $WIDTH * 2/9,
		1687	title => "Tip of the day #" . (1 + $todindex),
		1688	child => my $vbox = new CFPlus::UI::VBox,
		1689	has_close_button => 1,
		1690	on_delete => $close,
		1691	;
		1692
		1693	$vbox->add (my $viewer = new CFPlus::UI::TextScroller
		1694	expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
		1695	$viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
		1696
		1697	$vbox->add (my $table = new CFPlus::UI::Table);
		1698
		1699	$table->add (0, 0, new CFPlus::UI::Button
		1700	text => "Close",
		1701	tooltip => "Close the tip of the day window. To never see it again, disable the tip of the day in the <b>Server Setup</b>.",
		1702	on_activate => $close,
		1703	);
		1704
		1705	$table->add (2, 0, new CFPlus::UI::Button
		1706	text => "Next",
		1707	tooltip => "Show the next <b>Tip of the day</b>.",
		1708	on_activate => sub {
		1709	$close->();
		1710	&show_tip_of_the_day;
		1711	},
		1712	);
		1713
		1714	$dialog->show;
1167	}	1715	}
1168		1716
1169	sub sdl_init {	1717	sub sdl_init {
1170	CFClient::SDL_Init	1718	CFPlus::SDL_Init
1171	and die "SDL::Init failed!\n";	1719	and die "SDL::Init failed!\n";
1172	}	1720	}
1173		1721
1174	sub video_init {	1722	sub video_init {
1175	sdl_init;	1723	sdl_init;
…		…
1180		1728
1181	($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };	1729	($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1182	$FULLSCREEN = $CFG->{fullscreen};	1730	$FULLSCREEN = $CFG->{fullscreen};
1183	$FAST = $CFG->{fast};	1731	$FAST = $CFG->{fast};
1184		1732
1185	CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN	1733	CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN
1186	or die "SDL_SetVideoMode failed: " . (CFClient::SDL_GetError) . "\n";	1734	or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1187		1735
1188	$SDL_ACTIVE = 1;	1736	$SDL_ACTIVE = 1;
1189	$LAST_REFRESH = time - 0.01;	1737	$LAST_REFRESH = time - 0.01;
1190		1738
1191	CFClient::OpenGL::init;	1739	CFPlus::OpenGL::init;
1192		1740
1193	$FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};	1741	$FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
1194		1742
1195	$CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#	1743	$CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
1196		1744
1197	#############################################################################	1745	#############################################################################
1198		1746
1199	if ($DEBUG_STATUS) {	1747	if ($DEBUG_STATUS) {
1200	CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;	1748	CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1201	} else {	1749	} else {
1202	# create the widgets	1750	# create the widgets
1203		1751
1204	$DEBUG_STATUS = new CFClient::UI::Label	1752	$DEBUG_STATUS = new CFPlus::UI::Label
1205	padding => 0,	1753	padding => 0,
1206	z => 100,	1754	z => 100,
1207	force_x => "max",	1755	force_x => "max",
1208	force_y => 0;	1756	force_y => 0;
1209	$DEBUG_STATUS->show;	1757	$DEBUG_STATUS->show;
1210		1758
1211	$BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0);	1759	$BIND_EDITOR = new CFPlus::BindingEditor (x => "max", y => 0);
1212		1760
1213	$STATUSBOX = new CFClient::UI::Statusbox;	1761	$STATUSBOX = new CFPlus::UI::Statusbox;
1214	$STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);	1762	$STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1215		1763
1216	(new CFClient::UI::Frame	1764	(new CFPlus::UI::Frame
1217	bg => [0, 0, 0, 0.4],	1765	bg => [0, 0, 0, 0.4],
1218	force_x => 0,	1766	force_x => 0,
1219	force_y => "max",	1767	force_y => "max",
1220	child => $STATUSBOX,	1768	child => $STATUSBOX,
1221	)->show;	1769	)->show;
1222		1770
1223	CFClient::UI::FancyFrame->new (	1771	CFPlus::UI::Toplevel->new (
1224	title => "Map",	1772	title => "Map",
1225	name => "mapmap",	1773	name => "mapmap",
1226	x => 0,	1774	x => 0,
1227	y => $FONTSIZE + 8,	1775	y => $FONTSIZE + 8,
1228	border_bg => [1, 1, 1, 192/255],	1776	border_bg => [1, 1, 1, 192/255],
1229	bg => [1, 1, 1, 0],	1777	bg => [1, 1, 1, 0],
1230	child => ($MAPMAP = new CFClient::MapWidget::MapMap	1778	child => ($MAPMAP = new CFPlus::MapWidget::MapMap
1231	tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",	1779	tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
1232	),	1780	),
1233	)->show;	1781	)->show;
1234		1782
1235	$MAPWIDGET = new CFClient::MapWidget;	1783	$MAPWIDGET = new CFPlus::MapWidget;
1236	$MAPWIDGET->connect (activate_console => sub {	1784	$MAPWIDGET->connect (activate_console => sub {
1237	my ($mapwidget, $preset) = @_;	1785	my ($mapwidget, $preset) = @_;
1238		1786
1239	if ($CONSOLE) {	1787	if ($CONSOLE) {
1240	$CONSOLE->{input}->{auto_activated} = 1;	1788	$CONSOLE->{input}->{auto_activated} = 1;
1241	$CONSOLE->{input}->focus_in;	1789	$CONSOLE->{input}->grab_focus;
1242		1790
1243	if ($preset && $CONSOLE->{input}->get_text eq '') {	1791	if ($preset && $CONSOLE->{input}->get_text eq '') {
1244	$CONSOLE->{input}->set_text ($preset);	1792	$CONSOLE->{input}->set_text ($preset);
1245	}	1793	}
1246	}	1794	}
1247	});	1795	});
1248	$MAPWIDGET->show;	1796	$MAPWIDGET->show;
1249	$MAPWIDGET->focus_in;	1797	$MAPWIDGET->grab_focus;
1250		1798
1251	$LOGVIEW = new CFClient::UI::TextView	1799	$LOGVIEW = new CFPlus::UI::TextScroller
1252	expand => 1,	1800	expand => 1,
1253	font => $FONT_FIXED,	1801	font => $FONT_FIXED,
1254	fontsize => $::CFG->{log_fontsize},	1802	fontsize => $::CFG->{log_fontsize},
		1803	indent => -4,
1255	can_hover => 1,	1804	can_hover => 1,
1256	can_events => 1,	1805	can_events => 1,
1257	tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",	1806	tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1258	;	1807	;
1259		1808
1260	$SETUP_DIALOG = new CFClient::UI::FancyFrame	1809	$SETUP_DIALOG = new CFPlus::UI::Toplevel
1261	title => "Setup",	1810	title => "Setup",
1262	name => "setup_dialog",	1811	name => "setup_dialog",
1263	x => 'center',	1812	x => 'center',
1264	y => 'center',	1813	y => 'center',
1265	z => 2,	1814	z => 2,
1266	force_w => $::WIDTH * 0.6,	1815	force_w => $::WIDTH * 0.6,
1267	force_h => $::HEIGHT * 0.6,	1816	force_h => $::HEIGHT * 0.6,
		1817	has_close_button => 1,
1268	;	1818	;
1269		1819
		1820	$METASERVER = metaserver_dialog;
		1821
1270	$SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,	1822	$SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1271	filter => new CFClient::UI::ScrolledWindow xxx => 1, expand => 1, scroll_y => 1);	1823	filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1272		1824
1273	$SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,	1825	$SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1274	"Configure the server to play on, your username, password and other server-related options.");	1826	"Configure the server to play on, your username, password and other server-related options.");
1275	$SETUP_NOTEBOOK->add (Pickup => autopickup_setup,	1827	$SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1276	"Configure autopicking stetings, i.e. which items you will pick up automatically when walking over them.");	1828	"Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1277	$SETUP_NOTEBOOK->add (Graphics => graphics_setup,	1829	$SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1278	"Configure the video mode, performance, fonts and other graphical aspects of the game.");	1830	"Configure the video mode, performance, fonts and other graphical aspects of the game.");
1279	$SETUP_NOTEBOOK->add (Audio => audio_setup,	1831	$SETUP_NOTEBOOK->add (Audio => audio_setup,
1280	"Configure the use of audio, sound effects and background music.");	1832	"Configure the use of audio, sound effects and background music.");
1281	$SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,	1833	$SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1282	"Lets you define, edit and delete bindings."	1834	"Lets you define, edit and delete key bindings."
1283	. "There is a shortcut for making bindings: <b>Left Control + Insert</b> opens the binding editor "	1835	. "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "
1284	. "with nothing set and the recording started. After doing the actions you "	1836	. "with nothing set and the recording started. After doing the actions you "
1285	. "want to record press <b>Insert</b> and you will be asked to press a key-combo. "	1837	. "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1286	. "After pressing the combo the binding will be saved automatically and the "	1838	. "After pressing the combo the binding will be saved automatically and the "
1287	. "binding editor closes");	1839	. "binding editor closes");
1288	$SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup,	1840	$SETUP_NOTEBOOK->add (Debug => debug_setup,
1289	"Displays all spells you have and lets you edit keyboard shortcuts for them.");	1841	"Some debuggin' options. Do not ask.");
1290		1842
1291	$BUTTONBAR = new CFClient::UI::HBox x => 0, y => 0;	1843	$BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1292		1844
1293	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,	1845	$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1294	tooltip => "Toggles a dialog where you can configure all aspects of this client.");	1846	tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1295		1847
1296	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window,	1848	$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,
1297	tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");	1849	tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1298		1850
1299	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	1851	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
1300		1852
1301	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window,
1302	tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1303	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window,	1853	$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
1304	tooltip => "Toggles the inventory window, where you can manage your loot (or treasures :). "	1854	tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
1305	. "You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1306		1855
1307	$BUTTONBAR->add (new CFClient::UI::Button	1856	$BUTTONBAR->add (new CFPlus::UI::Button
1308	text => "Save Config",	1857	text => "Save Config",
1309	tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",	1858	tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1310	on_activate => sub {	1859	on_activate => sub {
1311	$::CFG->{layout} = CFClient::UI::get_layout;	1860	$::CFG->{layout} = CFPlus::UI::get_layout;
1312	CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";	1861	CFPlus::write_cfg "$Crossfire::VARDIR/cfplusrc";
1313	status "Configuration Saved";	1862	status "Configuration Saved";
		1863	0
1314	},	1864	},
1315	);	1865	);
1316		1866
1317	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window,	1867	$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1318	tooltip => "View Documentation");	1868	tooltip => "View Documentation");
1319		1869
		1870
1320	$BUTTONBAR->add (new CFClient::UI::Button	1871	$BUTTONBAR->add (new CFPlus::UI::Button
1321	text => "Quit",	1872	text => "Quit",
1322	tooltip => "Terminates the program",	1873	tooltip => "Terminates the program",
1323	on_activate => sub {	1874	on_activate => sub {
1324	if ($CONN) {	1875	if ($CONN) {
1325	open_quit_dialog;	1876	open_quit_dialog;
1326	} else {	1877	} else {
1327	exit;	1878	exit;
1328	}	1879	}
		1880	0
1329	},	1881	},
1330	);	1882	);
1331		1883
1332	$BUTTONBAR->show;	1884	$BUTTONBAR->show;
1333	$SETUP_DIALOG->show;	1885	$SETUP_DIALOG->show;
1334	}	1886	}
1335		1887
1336	$STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);	1888	$STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1337	}	1889	}
1338		1890
		1891	sub setup_build_button {
		1892	my ($enabled) = @_;
		1893	if ($enabled) {
		1894	$BUILD_BUTTON ||= new CFPlus::UI::Button
		1895	text => "Build",
		1896	tooltip => "Opens the ingame builder",
		1897	on_activate => sub {
		1898	if ($CONN) {
		1899	$CONN->send_ext_req (builder_player_items => sub {
		1900	open_ingame_editor ($_[0]) if exists $_[0]->{items};
		1901	});
		1902	}
		1903	0
		1904	};
		1905	$BUTTONBAR->add ($BUILD_BUTTON);
		1906	} else {
		1907	$BUILD_BUTTON->hide if $BUILD_BUTTON;
		1908	}
		1909	}
		1910
		1911	sub open_ingame_editor {
		1912	my ($msg) = @_;
		1913
		1914	my $win = new CFPlus::UI::Toplevel
		1915	x => 0,
		1916	y => 'center',
		1917	z => 4,
		1918	name => 'builder_window',
		1919	force_w => int $WIDTH * 1/4,
		1920	force_h => int $HEIGHT * 3/4,
		1921	title => "In game builder",
		1922	has_close_button => 1;
		1923
		1924	my $r = new CFPlus::UI::ScrolledWindow (
		1925	expand => 1,
		1926	scroll_y => 1
		1927	);
		1928	$r->add (my $vb = new CFPlus::UI::VBox);
		1929	$win->add ($r);
		1930
		1931
		1932	$vb->add (my $chk = new CFPlus::UI::Button text => "Disable build mode", on_activate => sub { $::IN_BUILD_MODE = undef });
		1933	$vb->add (my $chk = new CFPlus::UI::Button text => "ERASE", on_activate => sub { $::IN_BUILD_MODE = { do_erase => 1 } });
		1934
		1935	for my $itemarchname (keys %{$msg->{items}}) {
		1936	$vb->add (
		1937	new CFPlus::UI::Button text => "$itemarchname",
		1938	on_activate => sub {
		1939	$::IN_BUILD_MODE = $itemarchname;
		1940	}
		1941	);
		1942	}
		1943
		1944	$win->show;
		1945	}
		1946
1339	sub video_shutdown {	1947	sub video_shutdown {
		1948	CFPlus::OpenGL::shutdown;
		1949
1340	undef $SDL_ACTIVE;	1950	undef $SDL_ACTIVE;
1341	}	1951	}
1342		1952
1343	my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#	1953	my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
1344	my $bgmusic;#TODO#hack#d#	1954	my $bgmusic;#TODO#hack#d#
…		…
1351		1961
1352	sub audio_music_finished {	1962	sub audio_music_finished {
1353	return unless $CFG->{bgm_enable};	1963	return unless $CFG->{bgm_enable};
1354		1964
1355	# TODO: hack, do play loop and mood music	1965	# TODO: hack, do play loop and mood music
1356	$bgmusic = new_from_file CFClient::MixMusic CFClient::find_rcfile "music/$bgmusic[0]";	1966	$bgmusic = new_from_file CFPlus::MixMusic CFPlus::find_rcfile "music/$bgmusic[0]";
1357	$bgmusic->play (0);	1967	$bgmusic->play (0);
1358		1968
1359	push @bgmusic, shift @bgmusic;	1969	push @bgmusic, shift @bgmusic;
1360	}	1970	}
1361		1971
1362	sub audio_init {	1972	sub audio_init {
1363	if ($CFG->{audio_enable}) {	1973	if ($CFG->{audio_enable}) {
1364	if (open my $fh, "<", CFClient::find_rcfile "sounds/config") {	1974	if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
1365	$SDL_MIXER = !CFClient::Mix_OpenAudio;	1975	$SDL_MIXER = !CFPlus::Mix_OpenAudio;
1366		1976
1367	unless ($SDL_MIXER) {	1977	unless ($SDL_MIXER) {
1368	status "Unable to open sound device: there will be no sound";	1978	status "Unable to open sound device: there will be no sound";
1369	return;	1979	return;
1370	}	1980	}
1371		1981
1372	CFClient::Mix_AllocateChannels 8;	1982	CFPlus::Mix_AllocateChannels 8;
1373	CFClient::MixMusic::volume $CFG->{bgm_volume} * 128;	1983	CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1374		1984
1375	audio_music_finished;	1985	audio_music_finished;
1376		1986
		1987	local $_;
1377	while (<$fh>) {	1988	while (<$fh>) {
1378	next if /^\s*#/;	1989	next if /^\s*#/;
1379	next if /^\s*$/;	1990	next if /^\s*$/;
1380		1991
1381	my ($file, $volume, $event) = split /\s+/, $_, 3;	1992	my ($file, $volume, $event) = split /\s+/, $_, 3;
1382		1993
1383	push @SOUNDS, "$volume,$file";	1994	push @SOUNDS, "$volume,$file";
1384		1995
1385	$AUDIO_CHUNKS{"$volume,$file"} ||= do {	1996	$AUDIO_CHUNKS{"$volume,$file"} ||= do {
1386	my $chunk = new_from_file CFClient::MixChunk CFClient::find_rcfile "sounds/$file";	1997	my $chunk = new_from_file CFPlus::MixChunk CFPlus::find_rcfile "sounds/$file";
1387	$chunk->volume ($volume * 128 / 100);	1998	$chunk->volume ($volume * 128 / 100);
1388	$chunk	1999	$chunk
1389	};	2000	};
1390	}	2001	}
1391	} else {	2002	} else {
…		…
1393	}	2004	}
1394	}	2005	}
1395	}	2006	}
1396		2007
1397	sub audio_shutdown {	2008	sub audio_shutdown {
1398	CFClient::Mix_CloseAudio if $SDL_MIXER;	2009	CFPlus::Mix_CloseAudio if $SDL_MIXER;
1399	undef $SDL_MIXER;	2010	undef $SDL_MIXER;
1400	@SOUNDS = ();	2011	@SOUNDS = ();
1401	%AUDIO_CHUNKS = ();	2012	%AUDIO_CHUNKS = ();
1402	}	2013	}
1403		2014
…		…
1410		2021
1411	sub force_refresh {	2022	sub force_refresh {
1412	$fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;	2023	$fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
1413	debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;	2024	debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1414		2025
1415	$CFClient::UI::ROOT->draw;	2026	$CFPlus::UI::ROOT->draw;
1416		2027
1417	$WANT_REFRESH = 0;	2028	$WANT_REFRESH = 0;
1418	$CAN_REFRESH = 0;	2029	$CAN_REFRESH = 0;
1419	$LAST_REFRESH = $NOW;	2030	$LAST_REFRESH = $NOW;
1420		2031
1421	0 && do {
1422	# some weird model-drawing code, just a joke right now
1423	use CFClient::OpenGL;
1424
1425	$demo{t}{eye_auv} ||= new_from_file CFClient::Texture "eye2.png" or die;
1426	$demo{t}{body_auv} ||= new_from_file CFClient::Texture "body_auv3.png" or die;
1427	$demo{r} ||= do {
1428	my $mod = Compress::LZF::sthaw do { local $/; open my $fh, "<:raw:perlio", "dread.lz3"; <$fh> };
1429	$mod->{v} = pack "f*", @{$mod->{v}};
1430	$_ = [scalar @$_, pack "S!*", @$_]
1431	for values %{$mod->{g}};
1432	$mod
1433	};
1434
1435	my $r = $demo{r} or die;
1436
1437	glDepthMask 1;
1438	glClear GL_DEPTH_BUFFER_BIT;
1439	glEnable GL_TEXTURE_2D;
1440	glEnable GL_DEPTH_TEST;
1441	glEnable GL_CULL_FACE;
1442	glShadeModel $::FAST ? GL_FLAT : GL_SMOOTH;
1443
1444	glMatrixMode GL_PROJECTION;
1445	glLoadIdentity;
1446	glFrustum -1 * ($::WIDTH / $::HEIGHT), 1 * ($::WIDTH / $::HEIGHT), 1, -1, 1, 10000;
1447	#glOrtho 0, $::WIDTH, 0, $::HEIGHT, -10000, 10000;
1448	glMatrixMode GL_MODELVIEW;
1449	glLoadIdentity;
1450
1451	glPushMatrix;
1452	glTranslate 0, 0, -800;
1453	glScale 1, -1, 1;
1454	glRotate $NOW * 1000 % 36000 / 5, 0, 1, 0;
1455	glRotate $NOW * 1000 % 36000 / 6, 1, 0, 0;
1456	glRotate $NOW * 1000 % 36000 / 7, 0, 0, 1;
1457	glScale 50, 50, 50;
1458
1459	glInterleavedArrays GL_T2F_N3F_V3F, 0, $r->{v};
1460	while (my ($k, $v) = each %{$r->{g}}) {
1461	glBindTexture GL_TEXTURE_2D, ($demo{t}{$k}{name} or die);
1462	glDrawElements GL_TRIANGLES, $v->[0], GL_UNSIGNED_SHORT, $v->[1];
1463	}
1464
1465	glPopMatrix;
1466
1467	glShadeModel GL_FLAT;
1468	glDisable GL_DEPTH_TEST;
1469	glDisable GL_TEXTURE_2D;
1470	glDepthMask 0;
1471
1472	$WANT_REFRESH++;
1473	};
1474
1475	CFClient::SDL_GL_SwapBuffers;	2032	CFPlus::SDL_GL_SwapBuffers;
1476	}	2033	}
1477		2034
1478	my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {	2035	my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1479	$NOW = time;	2036	$NOW = time;
1480		2037
1481	($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)	2038	($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1482	for CFClient::SDL_PollEvent;	2039	for CFPlus::SDL_PollEvent;
1483		2040
1484	if (%animate_object) {	2041	if (%animate_object) {
1485	$_->animate ($LAST_REFRESH - $NOW) for values %animate_object;	2042	$_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
1486	$WANT_REFRESH++;	2043	$WANT_REFRESH++;
1487	}	2044	}
…		…
1511	$CONN->face_prefetch	2068	$CONN->face_prefetch
1512	if $CONN;	2069	if $CONN;
1513	});	2070	});
1514		2071
1515	%SDL_CB = (	2072	%SDL_CB = (
1516	CFClient::SDL_QUIT => sub {	2073	CFPlus::SDL_QUIT => sub {
1517	Event::unloop -1;	2074	Event::unloop -1;
1518	},	2075	},
1519	CFClient::SDL_VIDEORESIZE => sub {	2076	CFPlus::SDL_VIDEORESIZE => sub {
1520	},	2077	},
1521	CFClient::SDL_VIDEOEXPOSE => sub {	2078	CFPlus::SDL_VIDEOEXPOSE => sub {
1522	CFClient::UI::full_refresh;	2079	CFPlus::UI::full_refresh;
1523	},	2080	},
1524	CFClient::SDL_ACTIVEEVENT => sub {	2081	CFPlus::SDL_ACTIVEEVENT => sub {
1525	# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#	2082	# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
1526	},	2083	},
1527	CFClient::SDL_KEYDOWN => sub {	2084	CFPlus::SDL_KEYDOWN => sub {
1528	if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {	2085	if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
1529	# alt-enter	2086	# alt-enter
		2087	$FULLSCREEN_ENABLE->toggle;
1530	video_shutdown;	2088	video_shutdown;
1531	$CFG->{fullscreen} = !$CFG->{fullscreen};
1532	video_init;	2089	video_init;
1533	} else {	2090	} else {
1534	CFClient::UI::feed_sdl_key_down_event ($_[0]);	2091	CFPlus::UI::feed_sdl_key_down_event ($_[0]);
1535	}	2092	}
1536	},	2093	},
1537	CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event,	2094	CFPlus::SDL_KEYUP => \&CFPlus::UI::feed_sdl_key_up_event,
1538	CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event,	2095	CFPlus::SDL_MOUSEMOTION => \&CFPlus::UI::feed_sdl_motion_event,
1539	CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event,	2096	CFPlus::SDL_MOUSEBUTTONDOWN => \&CFPlus::UI::feed_sdl_button_down_event,
1540	CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event,	2097	CFPlus::SDL_MOUSEBUTTONUP => \&CFPlus::UI::feed_sdl_button_up_event,
1541	CFClient::SDL_USEREVENT => sub {	2098	CFPlus::SDL_USEREVENT => sub {
1542	if ($_[0]{code} == 1) {	2099	if ($_[0]{code} == 1) {
1543	audio_channel_finished $_[0]{data1};	2100	audio_channel_finished $_[0]{data1};
1544	} elsif ($_[0]{code} == 0) {	2101	} elsif ($_[0]{code} == 0) {
1545	audio_music_finished;	2102	audio_music_finished;
1546	}	2103	}
…		…
1550	#############################################################################	2107	#############################################################################
1551		2108
1552	$SIG{INT} = $SIG{TERM} = sub { exit };	2109	$SIG{INT} = $SIG{TERM} = sub { exit };
1553		2110
1554	{	2111	{
1555	local $SIG{__DIE__} = sub {
1556	return unless defined $^S && !$^S;
1557	Carp::confess $_[1];#d#TODO: remove when stable
1558	CFClient::fatal $_[0];
1559	};
1560
1561	CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";	2112	CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
1562	CFClient::UI::set_layout ($::CFG->{layout});	2113	CFPlus::UI::set_layout ($::CFG->{layout});
1563		2114
1564	my %DEF_CFG = (	2115	my %DEF_CFG = (
1565	sdl_mode => 0,	2116	sdl_mode => 0,
1566	width => 640,	2117	width => 640,
1567	height => 480,	2118	height => 480,
1568	fullscreen => 0,	2119	fullscreen => 0,
1569	fast => 0,	2120	fast => 0,
1570	map_scale => 1,	2121	map_scale => 1,
1571	fow_enable => 1,	2122	fow_enable => 1,
1572	fow_intensity => 0.45,	2123	fow_intensity => 0.45,
1573	fow_smooth => 0,	2124	fow_smooth => 0,
1574	gui_fontsize => 1,	2125	gui_fontsize => 1,
1575	log_fontsize => 1,	2126	log_fontsize => 0.7,
1576	gauge_fontsize=> 1,	2127	gauge_fontsize => 1,
1577	gauge_size => 0.35,	2128	gauge_size => 0.35,
1578	stat_fontsize => 1,	2129	stat_fontsize => 0.7,
1579	mapsize => 100,	2130	mapsize => 100,
1580	host => "crossfire.schmorp.de",
1581	say_command => 'say',	2131	say_command => 'chat',
1582	audio_enable => 1,	2132	audio_enable => 1,
1583	bgm_enable => 1,	2133	bgm_enable => 1,
1584	bgm_volume => 0.25,	2134	bgm_volume => 0.25,
1585	face_prefetch => 0,	2135	face_prefetch => 0,
1586	output_sync => 1,	2136	output_sync => 1,
1587	output_count => 1,	2137	output_count => 1,
		2138	pickup => 0,
		2139	inv_sort => "mtime",
		2140	default => "profile", # default profile
		2141	show_tips => 1,
		2142	);
1588	);	2143
1589
1590	while (my ($k, $v) = each %DEF_CFG) {	2144	while (my ($k, $v) = each %DEF_CFG) {
1591	$CFG->{$k} = $v unless exists $CFG->{$k};	2145	$CFG->{$k} = $v unless exists $CFG->{$k};
1592	}	2146	}
1593		2147
		2148	$CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
		2149
1594	sdl_init;	2150	sdl_init;
1595		2151
1596	@SDL_MODES = reverse	2152	@SDL_MODES = reverse
1597	grep $_->[0] >= 640 && $_->[1] >= 480,	2153	grep $_->[0] >= 640 && $_->[1] >= 480,
1598	CFClient::SDL_ListModes;	2154	CFPlus::SDL_ListModes;
1599		2155
1600	@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";	2156	@SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
1601		2157
1602	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;	2158	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1603		2159
1604	{	2160	{
1605	my @fonts = map CFClient::find_rcfile "fonts/$_", qw(	2161	my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
1606	DejaVuSans.ttf	2162	DejaVuSans.ttf
1607	DejaVuSansMono.ttf	2163	DejaVuSansMono.ttf
1608	DejaVuSans-Bold.ttf	2164	DejaVuSans-Bold.ttf
1609	DejaVuSansMono-Bold.ttf	2165	DejaVuSansMono-Bold.ttf
1610	DejaVuSans-Oblique.ttf	2166	DejaVuSans-Oblique.ttf
1611	DejaVuSansMono-Oblique.ttf	2167	DejaVuSansMono-Oblique.ttf
1612	DejaVuSans-BoldOblique.ttf	2168	DejaVuSans-BoldOblique.ttf
1613	DejaVuSansMono-BoldOblique.ttf	2169	DejaVuSansMono-BoldOblique.ttf
1614	);	2170	);
1615		2171
1616	CFClient::add_font $_ for @fonts;	2172	CFPlus::add_font $_ for @fonts;
1617		2173
1618	CFClient::pango_init;	2174	CFPlus::pango_init;
1619		2175
1620	$FONT_PROP = new_from_file CFClient::Font $fonts[0];	2176	$FONT_PROP = new_from_file CFPlus::Font $fonts[0];
1621	$FONT_FIXED = new_from_file CFClient::Font $fonts[1];	2177	$FONT_FIXED = new_from_file CFPlus::Font $fonts[1];
1622		2178
1623	$FONT_PROP->make_default;	2179	$FONT_PROP->make_default;
1624	}	2180	}
1625		2181
1626	# compare mono (ft) vs. rgba (cairo)	2182	# compare mono (ft) vs. rgba (cairo)
1627	# ft - 1.8s, cairo 3s, even in alpha-only mode	2183	# ft - 1.8s, cairo 3s, even in alpha-only mode
1628	# for my $rgba (0..1) {	2184	# for my $rgba (0..1) {
1629	# my $t1 = Time::HiRes::time;	2185	# my $t1 = Time::HiRes::time;
1630	# for (1..1000) {	2186	# for (1..1000) {
1631	# my $layout = CFClient::Layout->new ($rgba);	2187	# my $layout = CFPlus::Layout->new ($rgba);
1632	# $layout->set_text ("hallo" x 100);	2188	# $layout->set_text ("hallo" x 100);
1633	# $layout->render;	2189	# $layout->render;
1634	# }	2190	# }
1635	# my $t2 = Time::HiRes::time;	2191	# my $t2 = Time::HiRes::time;
1636	# warn $t2-$t1;	2192	# warn $t2-$t1;
1637	# }	2193	# }
1638		2194
		2195	$startup_done->();
		2196
1639	video_init;	2197	video_init;
1640	audio_init;	2198	audio_init;
1641	}	2199	}
1642		2200
		2201	show_tip_of_the_day if $CFG->{show_tips};
		2202
1643	Event::loop;	2203	Event::loop;
		2204	#CFPlus::SDL_Quit;
		2205	#CFPlus::_exit 0;
1644		2206
1645	END { CFClient::SDL_Quit }	2207	END { CFPlus::SDL_Quit }
1646		2208
1647	=head1 NAME	2209	=head1 NAME
1648		2210
1649	cfplus - A Crossfire+ and Crossfire game client	2211	cfplus - A Crossfire+ and Crossfire game client
1650		2212

Diff Legend

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