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.89 by elmex, Sun Jul 9 21:11:48 2006 UTC vs.
Revision 1.139 by root, Sat Dec 9 22:06:51 2006 UTC

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

Diff Legend

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