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

Diff Legend

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