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.99 by root, Sun Jul 23 08:58:44 2006 UTC vs.
Revision 1.153 by root, Tue Apr 24 01:13:54 2007 UTC

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

Diff Legend

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