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

Diff Legend

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