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.75 by root, Sun Jun 18 17:23:36 2006 UTC vs.
Revision 1.134 by elmex, Mon Dec 4 15:17:14 2006 UTC

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

Diff Legend

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