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.84 by root, Sun Jul 2 18:52:05 2006 UTC vs.
Revision 1.143 by root, Fri Mar 16 02:33:50 2007 UTC

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

Diff Legend

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