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.85 by elmex, Sun Jul 2 19:32:56 2006 UTC vs.
Revision 1.141 by elmex, Sat Dec 16 17:33:26 2006 UTC

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

Diff Legend

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