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

Diff Legend

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