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

Diff Legend

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