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

Diff Legend

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