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.102 by root, Mon Jul 24 04:24:43 2006 UTC vs.
Revision 1.106 by root, Sun Aug 13 02:43:22 2006 UTC

…		…
32	use Crossfire;	32	use Crossfire;
33	use Crossfire::Protocol::Constants;	33	use Crossfire::Protocol::Constants;
34		34
35	use Compress::LZF;	35	use Compress::LZF;
36		36
37	use CFClient;	37	use CFPlus;
38	use CFClient::OpenGL ();	38	use CFPlus::OpenGL ();
39	use CFClient::Protocol;	39	use CFPlus::Protocol;
40	use CFClient::UI;	40	use CFPlus::UI;
41	use CFClient::Pod;	41	use CFPlus::Pod;
42	use CFClient::BindingEditor;	42	use CFPlus::BindingEditor;
43	use CFClient::MapWidget;	43	use CFPlus::MapWidget;
44		44
45	$SIG{QUIT} = sub { Carp::cluck "QUIT" };	45	$SIG{QUIT} = sub { Carp::cluck "QUIT" };
46	$SIG{PIPE} = 'IGNORE';	46	$SIG{PIPE} = 'IGNORE';
47		47
		48	$Event::Eval = 0;
48	$Event::DIED = sub {	49	$Event::DIED = sub {
49	# TODO: display dialog box or so	50	# TODO: display dialog box or so
50	Carp::confess $_[1];#d#TODO: remove when stable	51	Carp::cluck $_[1];#d#TODO: remove when stable
51	CFClient::error $_[1];	52	CFPlus::error $_[1];
52	};	53	};
53		54
54	#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d#	55	$SIG{__DIE__} = sub {
		56	return if CFPlus::in_destruct;
		57	Carp::cluck $_[0];
		58	CFPlus::error $_[0];
		59	return;#d#
		60	#return unless defined $^S && !$^S;
		61	$Event::DIED->(undef, $_[0]);
		62	};
55		63
56	our $VERSION = '0.1';	64	our $VERSION = '0.1';
57		65
58	my $MAX_FPS = 60;	66	my $MAX_FPS = 60;
59	my $MIN_FPS = 5; # unused as of yet	67	my $MIN_FPS = 5; # unused as of yet
…		…
131	our $BIND_UPD_CB;	139	our $BIND_UPD_CB;
132		140
133	our $PICKUP_CFG;	141	our $PICKUP_CFG;
134		142
135	sub status {	143	sub status {
136	$STATUSBOX->add (CFClient::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);	144	$STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
137	}	145	}
138		146
139	sub debug {	147	sub debug {
140	$DEBUG_STATUS->set_text ($_[0]);	148	$DEBUG_STATUS->set_text ($_[0]);
141	}	149	}
…		…
147		155
148	# server query dialog	156	# server query dialog
149	sub server_query {	157	sub server_query {
150	my ($conn, $flags, $prompt) = @_;	158	my ($conn, $flags, $prompt) = @_;
151		159
152	$conn->{query_dialog} = my $dialog = new CFClient::UI::FancyFrame	160	$conn->{query_dialog} = my $dialog = new CFPlus::UI::FancyFrame
153	x => "center",	161	x => "center",
154	y => "center",	162	y => "center",
155	title => "Server Query",	163	title => "Server Query",
156	child => my $vbox = new CFClient::UI::VBox,	164	child => my $vbox = new CFPlus::UI::VBox,
157	;	165	;
158		166
159	my @dialog = my $label = new CFClient::UI::Label	167	my @dialog = my $label = new CFPlus::UI::Label
160	max_w => $::WIDTH * 0.4,	168	max_w => $::WIDTH * 0.4,
161	ellipsise => 0,	169	ellipsise => 0,
162	text => $prompt;	170	text => $prompt;
163		171
164	if ($flags & CS_QUERY_YESNO) {	172	if ($flags & CS_QUERY_YESNO) {
165	push @dialog, my $hbox = new CFClient::UI::HBox;	173	push @dialog, my $hbox = new CFPlus::UI::HBox;
166		174
167	$hbox->add (new CFClient::UI::Button	175	$hbox->add (new CFPlus::UI::Button
168	text => "No",	176	text => "No",
169	on_activate => sub {	177	on_activate => sub {
170	$conn->send ("reply n");	178	$conn->send ("reply n");
171	$dialog->destroy;	179	$dialog->destroy;
172	0	180	0
173	}	181	}
174	);	182	);
175	$hbox->add (new CFClient::UI::Button	183	$hbox->add (new CFPlus::UI::Button
176	text => "Yes",	184	text => "Yes",
177	on_activate => sub {	185	on_activate => sub {
178	$conn->send ("reply y");	186	$conn->send ("reply y");
179	destroy_query_dialog $conn;	187	destroy_query_dialog $conn;
180	0	188	0
…		…
187	$dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)";	195	$dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)";
188		196
189	if ($prompt =~ /Now choose a character|Press any key for the next race/i) {	197	if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
190	$MESSAGE_WINDOW->show;	198	$MESSAGE_WINDOW->show;
191		199
192	unshift @dialog, new CFClient::UI::Label	200	unshift @dialog, new CFPlus::UI::Label
193	max_w => $::WIDTH * 0.4,	201	max_w => $::WIDTH * 0.4,
194	ellipsise => 0,	202	ellipsise => 0,
195	markup => "\nOr use your keyboard and the text entry below:\n";	203	markup => "\nOr use your keyboard and the text entry below:\n";
196		204
197	unshift @dialog, my $table = new CFClient::UI::Table;	205	unshift @dialog, my $table = new CFPlus::UI::Table;
198		206
199	$table->add (0, 0, new CFClient::UI::Button	207	$table->add (0, 0, new CFPlus::UI::Button
200	text => "Next Race",	208	text => "Next Race",
201	on_activate => sub {	209	on_activate => sub {
202	$conn->send ("reply n");	210	$conn->send ("reply n");
203	destroy_query_dialog $conn;	211	destroy_query_dialog $conn;
204	0	212	0
205	},	213	},
206	);	214	);
207	$table->add (2, 0, new CFClient::UI::Button	215	$table->add (2, 0, new CFPlus::UI::Button
208	text => "Accept",	216	text => "Accept",
209	on_activate => sub {	217	on_activate => sub {
210	$conn->send ("reply d");	218	$conn->send ("reply d");
211	destroy_query_dialog $conn;	219	destroy_query_dialog $conn;
212	0	220	0
213	},	221	},
214	);	222	);
215		223
216	unshift @dialog, new CFClient::UI::Label	224	unshift @dialog, new CFPlus::UI::Label
217	max_w => $::WIDTH * 0.4,	225	max_w => $::WIDTH * 0.4,
218	ellipsise => 0,	226	ellipsise => 0,
219	markup =>	227	markup =>
220	"<big><b>Character Creation: Race</b></big>\n\n"	228	"<big><b>Character Creation: Race</b></big>\n\n"
221	. "Look at the <b>Messages</b> window to see a description of this race "	229	. "Look at the <b>Messages</b> window to see a description of this race "
…		…
234	}	242	}
235		243
236	$STATS_PAGE->show;	244	$STATS_PAGE->show;
237	$MESSAGE_WINDOW->hide;	245	$MESSAGE_WINDOW->hide;
238		246
239	unshift @dialog, new CFClient::UI::Label	247	unshift @dialog, new CFPlus::UI::Label
240	max_w => $::WIDTH * 0.4,	248	max_w => $::WIDTH * 0.4,
241	ellipsise => 0,	249	ellipsise => 0,
242	markup => "\nOr use your keyboard and the text entry below:\n";	250	markup => "\nOr use your keyboard and the text entry below:\n";
243		251
244	unshift @dialog, my $table = new CFClient::UI::Table;	252	unshift @dialog, my $table = new CFPlus::UI::Table;
245		253
246	# left: re-roll	254	# left: re-roll
247	$table->add (0, 0, new CFClient::UI::Button	255	$table->add (0, 0, new CFPlus::UI::Button
248	text => "Roll Again",	256	text => "Roll Again",
249	on_activate => sub {	257	on_activate => sub {
250	$conn->send ("reply y");	258	$conn->send ("reply y");
251	destroy_query_dialog $conn;	259	destroy_query_dialog $conn;
252	0	260	0
253	},	261	},
254	);	262	);
255		263
256	# center: swap stats	264	# center: swap stats
257	my ($sw1, $sw2) = map +(new CFClient::UI::Selector	265	my ($sw1, $sw2) = map +(new CFPlus::UI::Selector
258	expand => 1,	266	expand => 1,
259	value => $_,	267	value => $_,
260	options => [	268	options => [
261	[1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"],	269	[1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"],
262	[2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],	270	[2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],
…		…
266	[6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],	274	[6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
267	[7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],	275	[7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
268	],	276	],
269	), 1 .. 2;	277	), 1 .. 2;
270		278
271	$table->add (2, 0, new CFClient::UI::Button	279	$table->add (2, 0, new CFPlus::UI::Button
272	text => "Swap Stats",	280	text => "Swap Stats",
273	on_activate => sub {	281	on_activate => sub {
274	$conn->{stat_change_with} = $sw2->{value};	282	$conn->{stat_change_with} = $sw2->{value};
275	$conn->send ("reply $sw1->{value}");	283	$conn->send ("reply $sw1->{value}");
276	destroy_query_dialog $conn;	284	destroy_query_dialog $conn;
277	0	285	0
278	},	286	},
279	);	287	);
280	$table->add (2, 1, new CFClient::UI::HBox children => [$sw1, $sw2]);	288	$table->add (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]);
281		289
282	# right: accept	290	# right: accept
283	$table->add (4, 0, new CFClient::UI::Button	291	$table->add (4, 0, new CFPlus::UI::Button
284	text => "Accept",	292	text => "Accept",
285	on_activate => sub {	293	on_activate => sub {
286	$conn->send ("reply n");	294	$conn->send ("reply n");
287	$STATS_PAGE->hide;	295	$STATS_PAGE->hide;
288	destroy_query_dialog $conn;	296	destroy_query_dialog $conn;
289	0	297	0
290	},	298	},
291	);	299	);
292		300
293	unshift @dialog, my $hbox = new CFClient::UI::HBox;	301	unshift @dialog, my $hbox = new CFPlus::UI::HBox;
294	for (	302	for (
295	[Str => CS_STAT_STR],	303	[Str => CS_STAT_STR],
296	[Dex => CS_STAT_DEX],	304	[Dex => CS_STAT_DEX],
297	[Con => CS_STAT_CON],	305	[Con => CS_STAT_CON],
298	[Int => CS_STAT_INT],	306	[Int => CS_STAT_INT],
299	[Wis => CS_STAT_WIS],	307	[Wis => CS_STAT_WIS],
300	[Pow => CS_STAT_POW],	308	[Pow => CS_STAT_POW],
301	[Cha => CS_STAT_CHA],	309	[Cha => CS_STAT_CHA],
302	) {	310	) {
303	my ($name, $id) = @$_;	311	my ($name, $id) = @$_;
304	$hbox->add (new CFClient::UI::Label	312	$hbox->add (new CFPlus::UI::Label
305	markup => "$conn->{stat}{$id} <span foreground='yellow'>$name</span>",	313	markup => "$conn->{stat}{$id} <span foreground='yellow'>$name</span>",
306	align => 0,	314	align => 0,
307	expand => 1,	315	expand => 1,
308	can_events => 1,	316	can_events => 1,
309	can_hover => 1,	317	can_hover => 1,
310	tooltip => $CFClient::STAT_TOOLTIP{$name},	318	tooltip => $CFPlus::STAT_TOOLTIP{$name},
311	);	319	);
312	}	320	}
313		321
314	unshift @dialog, new CFClient::UI::Label	322	unshift @dialog, new CFPlus::UI::Label
315	max_w => $::WIDTH * 0.4,	323	max_w => $::WIDTH * 0.4,
316	ellipsise => 0,	324	ellipsise => 0,
317	markup =>	325	markup =>
318	"<big><b>Character Creation: Stats</b></big>\n\n"	326	"<big><b>Character Creation: Stats</b></big>\n\n"
319	. "<b>Stats</b> are a very important aspect of your character. You can use the tooltips to learn what each Stat governs.\n\n"	327	. "<b>Stats</b> are a very important aspect of your character. You can use the tooltips to learn what each Stat governs.\n\n"
…		…
321	. "They will be modified later by both the race and the class you choose.\n\n"	329	. "They will be modified later by both the race and the class you choose.\n\n"
322	. "You can create another set of stats, swap two stat values with each other or accept the stats as shown below and continue.\n"	330	. "You can create another set of stats, swap two stat values with each other or accept the stats as shown below and continue.\n"
323	;	331	;
324	}	332	}
325		333
326	push @dialog, my $entry = new CFClient::UI::Entry	334	push @dialog, my $entry = new CFPlus::UI::Entry
327	on_changed => sub {	335	on_changed => sub {
328	$conn->send ("reply $_[1]");	336	$conn->send ("reply $_[1]");
329	destroy_query_dialog $conn;	337	destroy_query_dialog $conn;
330	0	338	0
331	},	339	},
…		…
334	$entry->grab_focus;	342	$entry->grab_focus;
335		343
336	} else {	344	} else {
337	$dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";	345	$dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";
338		346
339	push @dialog, my $entry = new CFClient::UI::Entry	347	push @dialog, my $entry = new CFPlus::UI::Entry
340	$flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (),	348	$flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (),
341	on_activate => sub {	349	on_activate => sub {
342	$conn->send ("reply $_[1]");	350	$conn->send ("reply $_[1]");
343	destroy_query_dialog $conn;	351	destroy_query_dialog $conn;
344	0	352	0
…		…
360		368
361	my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;	369	my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
362		370
363	my ($host, $port) = split /:/, $CFG->{profile}{default}{host};	371	my ($host, $port) = split /:/, $CFG->{profile}{default}{host};
364		372
365	$MAP = new CFClient::Map $mapsize, $mapsize;	373	$MAP = new CFPlus::Map $mapsize, $mapsize;
366		374
367	$CONN = eval {	375	$CONN = eval {
368	new CFClient::Protocol	376	new CFPlus::Protocol
369	host => $host,	377	host => $host,
370	port => $port || 13327,	378	port => $port || 13327,
371	user => $CFG->{profile}{default}{user},	379	user => $CFG->{profile}{default}{user},
372	pass => $CFG->{profile}{default}{password},	380	pass => $CFG->{profile}{default}{password},
373	mapw => $mapsize,	381	mapw => $mapsize,
…		…
392	$chunk->play;	400	$chunk->play;
393	},	401	},
394	};	402	};
395		403
396	if ($CONN) {	404	if ($CONN) {
397	CFClient::lowdelay fileno $CONN->{fh};	405	CFPlus::lowdelay fileno $CONN->{fh};
398		406
399	status "login successful";	407	status "login successful";
400	} else {	408	} else {
401	status "unable to connect";	409	status "unable to connect";
402	stop_game();	410	stop_game();
…		…
420		428
421	undef $MAP;	429	undef $MAP;
422	}	430	}
423		431
424	sub graphics_setup {	432	sub graphics_setup {
425	my $vbox = new CFClient::UI::VBox;	433	my $vbox = new CFPlus::UI::VBox;
426		434
427	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	435	$vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
428		436
429	$table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode");	437	$table->add (0, 0, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode");
430	$table->add (1, 0, my $hbox = new CFClient::UI::HBox);	438	$table->add (1, 0, my $hbox = new CFPlus::UI::HBox);
431		439
432	$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]);	440	$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]);
433	$hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");	441	$hbox->add (my $mode_label = new CFPlus::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
434		442
435	$mode_slider->connect (changed => sub {	443	$mode_slider->connect (changed => sub {
436	my ($self, $value) = @_;	444	my ($self, $value) = @_;
437		445
438	$CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;	446	$CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
…		…
440	});	448	});
441	$mode_slider->emit (changed => $mode_slider->{range}[0]);	449	$mode_slider->emit (changed => $mode_slider->{range}[0]);
442		450
443	my $row = 1;	451	my $row = 1;
444		452
445	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen");	453	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen");
446	$table->add (1, $row++, $FULLSCREEN_ENABLE = new CFClient::UI::CheckBox	454	$table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
447	state => $CFG->{fullscreen},	455	state => $CFG->{fullscreen},
448	tooltip => "Bring the client into fullscreen mode.",	456	tooltip => "Bring the client into fullscreen mode.",
449	on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }	457	on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
450	);	458	);
451		459
452	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly");	460	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
453	$table->add (1, $row++, new CFClient::UI::CheckBox	461	$table->add (1, $row++, new CFPlus::UI::CheckBox
454	state => $CFG->{fast},	462	state => $CFG->{fast},
455	tooltip => "Lower the visual quality considerably to speed up rendering.",	463	tooltip => "Lower the visual quality considerably to speed up rendering.",
456	on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }	464	on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
457	);	465	);
458		466
459	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale");	467	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale");
460	$table->add (1, $row++, new CFClient::UI::Slider	468	$table->add (1, $row++, new CFPlus::UI::Slider
461	range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],	469	range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
462	tooltip => "Enlarge or shrink the displayed map. Changes are instant.",	470	tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
463	on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }	471	on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
464	);	472	);
465		473
466	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War");	474	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War");
467	$table->add (1, $row++, new CFClient::UI::CheckBox	475	$table->add (1, $row++, new CFPlus::UI::CheckBox
468	state => $CFG->{fow_enable},	476	state => $CFG->{fow_enable},
469	tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",	477	tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
470	on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }	478	on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
471	);	479	);
472		480
473	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity");	481	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity");
474	$table->add (1, $row++, new CFClient::UI::Slider	482	$table->add (1, $row++, new CFPlus::UI::Slider
475	range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],	483	range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
476	tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",	484	tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
477	on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }	485	on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
478	);	486	);
479		487
480	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth");	488	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Smooth");
481	$table->add (1, $row++, new CFClient::UI::CheckBox	489	$table->add (1, $row++, new CFPlus::UI::CheckBox
482	state => $CFG->{fow_smooth},	490	state => $CFG->{fow_smooth},
483	tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",	491	tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
484	on_changed => sub {	492	on_changed => sub {
485	my ($self, $value) = @_;	493	my ($self, $value) = @_;
486	$CFG->{fow_smooth} = $value;	494	$CFG->{fow_smooth} = $value;
487	status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::OpenGL::GL_VERSION < 1.2;	495	status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2;
488	0	496	0
489	}	497	}
490	);	498	);
491		499
492	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");	500	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
493	$table->add (1, $row++, new CFClient::UI::Slider	501	$table->add (1, $row++, new CFPlus::UI::Slider
494	range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],	502	range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
495	tooltip => "The base font size used by most GUI elements that do not have their own setting.",	503	tooltip => "The base font size used by most GUI elements that do not have their own setting.",
496	on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },	504	on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
497	);	505	);
498		506
499	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Message Fontsize");	507	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
500	$table->add (1, $row++, new CFClient::UI::Slider	508	$table->add (1, $row++, new CFPlus::UI::Slider
501	range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],	509	range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
502	tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",	510	tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",
503	on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },	511	on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
504	);	512	);
505		513
506	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");	514	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
507	$table->add (1, $row++, new CFClient::UI::Slider	515	$table->add (1, $row++, new CFPlus::UI::Slider
508	range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],	516	range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
509	tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",	517	tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
510	on_changed => sub {	518	on_changed => sub {
511	$CFG->{gauge_fontsize} = $_[1];	519	$CFG->{gauge_fontsize} = $_[1];
512	&set_gauge_window_fontsize;	520	&set_gauge_window_fontsize;
513	0	521	0
514	}	522	}
515	);	523	);
516		524
517	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size");	525	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size");
518	$table->add (1, $row++, new CFClient::UI::Slider	526	$table->add (1, $row++, new CFPlus::UI::Slider
519	range => [$CFG->{gauge_size}, 0.2, 0.8],	527	range => [$CFG->{gauge_size}, 0.2, 0.8],
520	tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",	528	tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
521	on_changed => sub {	529	on_changed => sub {
522	$CFG->{gauge_size} = $_[1];	530	$CFG->{gauge_size} = $_[1];
523	$GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});	531	$GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
524	0	532	0
525	}	533	}
526	);	534	);
527		535
528	$table->add (1, $row++, new CFClient::UI::Button	536	$table->add (1, $row++, new CFPlus::UI::Button
529	expand => 1, align => 0, text => "Apply",	537	expand => 1, align => 0, text => "Apply",
530	tooltip => "Apply the video settings",	538	tooltip => "Apply the video settings",
531	on_activate => sub {	539	on_activate => sub {
532	video_shutdown ();	540	video_shutdown ();
533	video_init ();	541	video_init ();
…		…
537		545
538	$vbox	546	$vbox
539	}	547	}
540		548
541	sub audio_setup {	549	sub audio_setup {
542	my $vbox = new CFClient::UI::VBox;	550	my $vbox = new CFPlus::UI::VBox;
543		551
544	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	552	$vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
545		553
546	my $row = 0;	554	my $row = 0;
547		555
548	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");	556	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable");
549	$table->add (1, $row++, new CFClient::UI::CheckBox	557	$table->add (1, $row++, new CFPlus::UI::CheckBox
550	state => $CFG->{audio_enable},	558	state => $CFG->{audio_enable},
551	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.",	559	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.",
552	on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }	560	on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
553	);	561	);
554	# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume");	562	# $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume");
555	# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {	563	# $table->add (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
556	# $CFG->{effects_volume} = $_[1];	564	# $CFG->{effects_volume} = $_[1];
557	# });	565	# });
558	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music");	566	$table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music");
559	$table->add (1, $row++, my $hbox = new CFClient::UI::HBox);	567	$table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
560	$hbox->add (new CFClient::UI::CheckBox	568	$hbox->add (new CFPlus::UI::CheckBox
561	expand => 1, state => $CFG->{bgm_enable},	569	expand => 1, state => $CFG->{bgm_enable},
562	tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",	570	tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
563	on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }	571	on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
564	);	572	);
565	$hbox->add (new CFClient::UI::Slider	573	$hbox->add (new CFPlus::UI::Slider
566	expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],	574	expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
567	tooltip => "The volume of the background music. Changes are instant.",	575	tooltip => "The volume of the background music. Changes are instant.",
568	on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFClient::MixMusic::volume $_[1] * 128; 0 }	576	on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFPlus::MixMusic::volume $_[1] * 128; 0 }
569	);	577	);
570		578
571	$table->add (1, $row++, new CFClient::UI::Button	579	$table->add (1, $row++, new CFPlus::UI::Button
572	expand => 1, align => 0, text => "Apply",	580	expand => 1, align => 0, text => "Apply",
573	tooltip => "Apply the audio settings",	581	tooltip => "Apply the audio settings",
574	on_activate => sub {	582	on_activate => sub {
575	audio_shutdown ();	583	audio_shutdown ();
576	audio_init ();	584	audio_init ();
…		…
588	}	596	}
589		597
590	sub make_gauge_window {	598	sub make_gauge_window {
591	my $gh = int $HEIGHT * $CFG->{gauge_size};	599	my $gh = int $HEIGHT * $CFG->{gauge_size};
592		600
593	my $win = new CFClient::UI::Frame (	601	my $win = new CFPlus::UI::Frame (
594	force_x => 0,	602	force_x => 0,
595	force_y => "max",	603	force_y => "max",
596	force_w => $WIDTH,	604	force_w => $WIDTH,
597	force_h => $gh,	605	force_h => $gh,
598	);	606	);
599		607
600	$win->add (my $hbox = new CFClient::UI::HBox	608	$win->add (my $hbox = new CFPlus::UI::HBox
601	children => [	609	children => [
602	(new CFClient::UI::HBox expand => 1),	610	(new CFPlus::UI::HBox expand => 1),
603	(new CFClient::UI::VBox children => [	611	(new CFPlus::UI::VBox children => [
604	(new CFClient::UI::Empty expand => 1),	612	(new CFPlus::UI::Empty expand => 1),
605	(new CFClient::UI::Frame bg => [0, 0, 0, 0.4], child => ($FLOORBOX = new CFClient::UI::Table)),	613	(new CFPlus::UI::Frame bg => [0, 0, 0, 0.4], child => ($FLOORBOX = new CFPlus::UI::Table)),
606	]),	614	]),
607	(my $vbox = new CFClient::UI::VBox),	615	(my $vbox = new CFPlus::UI::VBox),
608	],	616	],
609	);	617	);
610		618
611	$vbox->add (new CFClient::UI::HBox	619	$vbox->add (new CFPlus::UI::HBox
612	expand => 1,	620	expand => 1,
613	children => [	621	children => [
614	(new CFClient::UI::Empty expand => 1),	622	(new CFPlus::UI::Empty expand => 1),
615	(my $hb = new CFClient::UI::HBox),	623	(my $hb = new CFPlus::UI::HBox),
616	],	624	],
617	);	625	);
618		626
619	$hb->add (my $hg = new CFClient::UI::Gauge type => 'hp',	627	$hb->add (my $hg = new CFPlus::UI::Gauge type => 'hp',
620	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.");	628	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.");
621	$hb->add (my $mg = new CFClient::UI::Gauge type => 'mana',	629	$hb->add (my $mg = new CFPlus::UI::Gauge type => 'mana',
622	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.");	630	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.");
623	$hb->add (my $gg = new CFClient::UI::Gauge type => 'grace',	631	$hb->add (my $gg = new CFPlus::UI::Gauge type => 'grace',
624	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.");	632	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.");
625	$hb->add (my $fg = new CFClient::UI::Gauge type => 'food',	633	$hb->add (my $fg = new CFPlus::UI::Gauge type => 'food',
626	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.");	634	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.");
627		635
628	$vbox->add (my $exp = new CFClient::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1,	636	$vbox->add (my $exp = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1,
629	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.");	637	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.");
630	$vbox->add (my $rng = new CFClient::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1,	638	$vbox->add (my $rng = new CFPlus::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1,
631	tooltip => "<b>Ranged attack</b> - how you attack when you press shift-cursor (spell, skill, weapon etc.)");	639	tooltip => "<b>Ranged attack</b> - how you attack when you press shift-cursor (spell, skill, weapon etc.)");
632		640
633	$GAUGES = {	641	$GAUGES = {
634	exp => $exp, win => $win, range => $rng,	642	exp => $exp, win => $win, range => $rng,
635	food => $fg, mana => $mg, hp => $hg, grace => $gg	643	food => $fg, mana => $mg, hp => $hg, grace => $gg
…		…
639		647
640	$win	648	$win
641	}	649	}
642		650
643	sub debug_setup {	651	sub debug_setup {
644	my $table = new CFClient::UI::Table;	652	my $table = new CFPlus::UI::Table;
645		653
646	$table->add (0, 0, new CFClient::UI::Label text => "Widget Borders");	654	$table->add (0, 0, new CFPlus::UI::Label text => "Widget Borders");
647	$table->add (1, 0, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });	655	$table->add (1, 0, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });
648	$table->add (0, 1, new CFClient::UI::Label text => "Tooltip Widget Info");	656	$table->add (0, 1, new CFPlus::UI::Label text => "Tooltip Widget Info");
649	$table->add (1, 1, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });	657	$table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
650	$table->add (0, 2, new CFClient::UI::Label text => "Show FPS");	658	$table->add (0, 2, new CFPlus::UI::Label text => "Show FPS");
651	$table->add (1, 2, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });	659	$table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
652	$table->add (0, 3, new CFClient::UI::Label text => "Suppress Tooltips");	660	$table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
653	$table->add (1, 3, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });	661	$table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
654		662
655	my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);	663	my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
656		664
657	for my $x (0..2) {	665	for my $x (0..2) {
658	for my $y (0 .. 2) {	666	for my $y (0 .. 2) {
659	$table->add ($x + 3, $y,	667	$table->add ($x + 3, $y,
660	new CFClient::UI::Entry	668	new CFPlus::UI::Entry
661	text => $default_smooth[$x * 3 + $y],	669	text => $default_smooth[$x * 3 + $y],
662	on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },	670	on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
663	);	671	);
664	}	672	}
665	}	673	}
…		…
667		675
668	$table	676	$table
669	}	677	}
670		678
671	sub stats_window {	679	sub stats_window {
672	my $r = new CFClient::UI::ScrolledWindow (	680	my $r = new CFPlus::UI::ScrolledWindow (
673	expand => 1,	681	expand => 1,
674	scroll_y => 1	682	scroll_y => 1
675	);	683	);
676	$r->add (my $vb = new CFClient::UI::VBox);	684	$r->add (my $vb = new CFPlus::UI::VBox);
677		685
678	$vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,	686	$vb->add ($STATWIDS->{title} = new CFPlus::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
679	can_hover => 1, can_events => 1,	687	can_hover => 1, can_events => 1,
680	tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");	688	tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
681	$vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,	689	$vb->add ($STATWIDS->{map} = new CFPlus::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
682	can_hover => 1, can_events => 1,	690	can_hover => 1, can_events => 1,
683	tooltip => "The map you are currently on (if supported by the server).");	691	tooltip => "The map you are currently on (if supported by the server).");
684		692
685	$vb->add (my $hb0 = new CFClient::UI::HBox);	693	$vb->add (my $hb0 = new CFPlus::UI::HBox);
686	$hb0->add ($STATWIDS->{weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1,	694	$hb0->add ($STATWIDS->{weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1,
687	can_hover => 1, can_events => 1,	695	can_hover => 1, can_events => 1,
688	tooltip => "The weight of the player including all inventory items.");	696	tooltip => "The weight of the player including all inventory items.");
689	$hb0->add ($STATWIDS->{m_weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1,	697	$hb0->add ($STATWIDS->{m_weight} = new CFPlus::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1,
690	can_hover => 1, can_events => 1,	698	can_hover => 1, can_events => 1,
691	tooltip => "The weight limit: you cannot carry more than this.");	699	tooltip => "The weight limit: you cannot carry more than this.");
692		700
693	$vb->add (my $hb = new CFClient::UI::HBox expand => 1);	701	$vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
694	$hb->add (my $tbl = new CFClient::UI::Table expand => 1);	702	$hb->add (my $tbl = new CFPlus::UI::Table expand => 1);
695		703
696	my $color2 = [1, 1, 0];	704	my $color2 = [1, 1, 0];
697		705
698	for (	706	for (
699	[0, 0, st_str => "Str", 30],	707	[0, 0, st_str => "Str", 30],
…		…
711	[2, 4, st_spd => "Spd", 10.54],	719	[2, 4, st_spd => "Spd", 10.54],
712	[2, 5, st_wspd => "WSp", 10.54],	720	[2, 5, st_wspd => "WSp", 10.54],
713	) {	721	) {
714	my ($col, $row, $id, $label, $template) = @$_;	722	my ($col, $row, $id, $label, $template) = @$_;
715		723
716	$tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label	724	$tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
717	font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,	725	font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
718	align => +1, template => $template, tooltip => $CFClient::STAT_TOOLTIP{$label});	726	align => +1, template => $template, tooltip => $CFPlus::STAT_TOOLTIP{$label});
719	$tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFClient::UI::Label	727	$tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label
720	font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,	728	font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
721	align => -1, text => $label, tooltip => $CFClient::STAT_TOOLTIP{$label});	729	align => -1, text => $label, tooltip => $CFPlus::STAT_TOOLTIP{$label});
722	}	730	}
723		731
724	$vb->add (my $tbl2 = new CFClient::UI::Table expand => 1);	732	$vb->add (my $tbl2 = new CFPlus::UI::Table expand => 1);
725		733
726	my $row = 0;	734	my $row = 0;
727	my $col = 0;	735	my $col = 0;
728		736
729	my %resist_names = (	737	my %resist_names = (
…		…
768	drain acid pois para deat phys	776	drain acid pois para deat phys
769	blind fear tund elec cold ghit/)	777	blind fear tund elec cold ghit/)
770	{	778	{
771	$tbl2->add ($col, $row,	779	$tbl2->add ($col, $row,
772	$STATWIDS->{"res_$_"} =	780	$STATWIDS->{"res_$_"} =
773	new CFClient::UI::Label	781	new CFPlus::UI::Label
774	font => $FONT_FIXED,	782	font => $FONT_FIXED,
775	template => "-100%",	783	template => "-100%",
776	align => +1,	784	align => +1,
777	valign => 0,	785	valign => 0,
778	can_events => 1,	786	can_events => 1,
779	can_hover => 1,	787	can_hover => 1,
780	tooltip => $resist_names{$_}->[1],	788	tooltip => $resist_names{$_}->[1],
781	);	789	);
782	$tbl2->add ($col + 1, $row, new CFClient::UI::Image	790	$tbl2->add ($col + 1, $row, new CFPlus::UI::Image
783	font => $FONT_FIXED,	791	font => $FONT_FIXED,
784	can_hover => 1,	792	can_hover => 1,
785	can_events => 1,	793	can_events => 1,
786	path => "ui/resist/resist_$_.png",	794	path => "ui/resist/resist_$_.png",
787	tooltip => $resist_names{$_}->[1],	795	tooltip => $resist_names{$_}->[1],
788	);	796	);
789	$tbl2->add ($col + 2, $row, new CFClient::UI::Label	797	$tbl2->add ($col + 2, $row, new CFPlus::UI::Label
790	text => $resist_names{$_}->[0],	798	text => $resist_names{$_}->[0],
791	font => $FONT_FIXED,	799	font => $FONT_FIXED,
792	can_hover => 1,	800	can_hover => 1,
793	can_events => 1,	801	can_events => 1,
794	tooltip => $resist_names{$_}->[1],	802	tooltip => $resist_names{$_}->[1],
…		…
805		813
806	$r	814	$r
807	}	815	}
808		816
809	sub skill_window {	817	sub skill_window {
810	my $sw = new CFClient::UI::ScrolledWindow (expand => 1);	818	my $sw = new CFPlus::UI::ScrolledWindow (expand => 1);
811	$sw->add ($STATWIDS->{skill_tbl} = new CFClient::UI::Table expand => 1, col_expand => [0, 0, 1, 0, 0, 1]);	819	$sw->add ($STATWIDS->{skill_tbl} = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1, 0, 0, 1]);
812	$sw	820	$sw
813	}	821	}
814		822
815	sub formsep($) {	823	sub formsep($) {
816	scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1	824	scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
…		…
827	return if $METASERVER_ATIME > time;	835	return if $METASERVER_ATIME > time;
828	$METASERVER_ATIME = time + 60;	836	$METASERVER_ATIME = time + 60;
829		837
830	my $table = $METASERVER->{table};	838	my $table = $METASERVER->{table};
831	$table->clear;	839	$table->clear;
832	$table->add (0, 0, my $label = new CFClient::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");	840	$table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
833		841
834	my $buf;	842	my $buf;
835		843
836	my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0;	844	my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0;
837		845
…		…
860	"The time this server has been running without being restarted.",	868	"The time this server has been running without being restarted.",
861	"The server software version - a '+' indicates a Crossfire+ server.",	869	"The server software version - a '+' indicates a Crossfire+ server.",
862	"Short information about this server provided by its admins.",	870	"Short information about this server provided by its admins.",
863	);	871	);
864	my @col = qw(#Users Host Uptime Version Description);	872	my @col = qw(#Users Host Uptime Version Description);
865	$table->add ($_, 0, new CFClient::UI::Label	873	$table->add ($_, 0, new CFPlus::UI::Label
866	can_hover => 1, can_events => 1,	874	can_hover => 1, can_events => 1,
867	align => 0, fg => [1, 1, 0],	875	align => 0, fg => [1, 1, 0],
868	text => $col[$_], tooltip => $tip[$_])	876	text => $col[$_], tooltip => $tip[$_])
869	for 0 .. $#col;	877	for 0 .. $#col;
870		878
…		…
891		899
892	$m = [$users, $host, $uptime, $version, $desc];	900	$m = [$users, $host, $uptime, $version, $desc];
893		901
894	$y++;	902	$y++;
895		903
896	$table->add (scalar @$m, $y, new CFClient::UI::VBox children => [	904	$table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [
897	(new CFClient::UI::Button	905	(new CFPlus::UI::Button
898	text => "Use",	906	text => "Use",
899	tooltip => "Put this server into the <b>Host:Port</b> field",	907	tooltip => "Put this server into the <b>Host:Port</b> field",
900	on_activate => sub {	908	on_activate => sub {
901	$HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);	909	$HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
902	$METASERVER->hide;	910	$METASERVER->hide;
903	0	911	0
904	},	912	},
905	),	913	),
906	(new CFClient::UI::Empty expand => 1),	914	(new CFPlus::UI::Empty expand => 1),
907	]);	915	]);
908		916
909	$table->add ($_, $y, new CFClient::UI::Label	917	$table->add ($_, $y, new CFPlus::UI::Label
910	ellipsise => 0,	918	ellipsise => 0,
911	align => $align[$_],	919	align => $align[$_],
912	text => $m->[$_],	920	text => $m->[$_],
913	tooltip => $tip[$_],	921	tooltip => $tip[$_],
914	can_hover => 1,	922	can_hover => 1,
…		…
919	}	927	}
920	});	928	});
921	}	929	}
922		930
923	sub metaserver_dialog {	931	sub metaserver_dialog {
924	my $vbox = new CFClient::UI::VBox;	932	my $vbox = new CFPlus::UI::VBox;
925	my $table = new CFClient::UI::Table;	933	my $table = new CFPlus::UI::Table;
926	$vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $table);	934	$vbox->add (new CFPlus::UI::ScrolledWindow expand => 1, child => $table);
927		935
928	my $dialog = new CFClient::UI::FancyFrame	936	my $dialog = new CFPlus::UI::FancyFrame
929	title => "Server List",	937	title => "Server List",
930	name => 'metaserver_dialog',	938	name => 'metaserver_dialog',
931	x => 'center',	939	x => 'center',
932	y => 'center',	940	y => 'center',
933	z => 3,	941	z => 3,
…		…
943		951
944	$dialog	952	$dialog
945	}	953	}
946		954
947	sub server_setup {	955	sub server_setup {
948	my $vbox = new CFClient::UI::VBox;	956	my $vbox = new CFPlus::UI::VBox;
949		957
950	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	958	$vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
951	$table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");	959	$table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");
952		960
953	{	961	{
954	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);	962	$table->add (1, 2, my $vbox = new CFPlus::UI::VBox);
955		963
956	$vbox->add (	964	$vbox->add (
957	$HOST_ENTRY = new CFClient::UI::Entry	965	$HOST_ENTRY = new CFPlus::UI::Entry
958	expand => 1,	966	expand => 1,
959	text => $CFG->{profile}{default}{host},	967	text => $CFG->{profile}{default}{host},
960	tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",	968	tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
961	on_changed => sub {	969	on_changed => sub {
962	my ($self, $value) = @_;	970	my ($self, $value) = @_;
963	$CFG->{profile}{default}{host} = $value;	971	$CFG->{profile}{default}{host} = $value;
964	0	972	0
965	}	973	}
966	);	974	);
967		975
968	$vbox->add (new CFClient::UI::Button	976	$vbox->add (new CFPlus::UI::Button
969	expand => 1,	977	expand => 1,
970	text => "Server List",	978	text => "Server List",
971	other => $METASERVER,	979	other => $METASERVER,
972	tooltip => "Show a list of available crossfire servers",	980	tooltip => "Show a list of available crossfire servers",
973	on_activate => sub { $METASERVER->toggle_visibility; 0 },	981	on_activate => sub { $METASERVER->toggle_visibility; 0 },
974	on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },	982	on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
975	);	983	);
976	}	984	}
977		985
978	$table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");	986	$table->add (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username");
979	$table->add (1, 4, new CFClient::UI::Entry	987	$table->add (1, 4, new CFPlus::UI::Entry
980	text => $CFG->{profile}{default}{user},	988	text => $CFG->{profile}{default}{user},
981	tooltip => "The name of your character on the server",	989	tooltip => "The name of your character on the server",
982	on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }	990	on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
983	);	991	);
984		992
985	$table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password");	993	$table->add (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password");
986	$table->add (1, 5, new CFClient::UI::Entry	994	$table->add (1, 5, new CFPlus::UI::Entry
987	text => $CFG->{profile}{default}{password},	995	text => $CFG->{profile}{default}{password},
988	hidden => 1,	996	hidden => 1,
989	tooltip => "The password for your character",	997	tooltip => "The password for your character",
990	on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }	998	on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
991	);	999	);
992		1000
993	$table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");	1001	$table->add (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size");
994	$table->add (1, 7, new CFClient::UI::Slider	1002	$table->add (1, 7, new CFPlus::UI::Slider
995	force_w => 100,	1003	force_w => 100,
996	range => [$CFG->{mapsize}, 10, 100, 0, 1],	1004	range => [$CFG->{mapsize}, 10, 100, 0, 1],
997	tooltip => "This is the size of the portion of the map update the server sends you. "	1005	tooltip => "This is the size of the portion of the map update the server sends you. "
998	. "If you set this to a high value you will be able to see further, "	1006	. "If you set this to a high value you will be able to see further, "
999	. "but you also increase bandwidth requirements and latency. "	1007	. "but you also increase bandwidth requirements and latency. "
1000	. "This option is only used once at log-in.",	1008	. "This option is only used once at log-in.",
1001	on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },	1009	on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },
1002	);	1010	);
1003		1011
1004	$table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Face Prefetch");	1012	$table->add (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Face Prefetch");
1005	$table->add (1, 8, new CFClient::UI::CheckBox	1013	$table->add (1, 8, new CFPlus::UI::CheckBox
1006	state => $CFG->{face_prefetch},	1014	state => $CFG->{face_prefetch},
1007	tooltip => "<b>Background Image Prefetch</b>\n\n"	1015	tooltip => "<b>Background Image Prefetch</b>\n\n"
1008	. "If enabled, the client automatically pre-fetches images from the server. "	1016	. "If enabled, the client automatically pre-fetches images from the server. "
1009	. "This might increase or create lag, but increases the chances "	1017	. "This might increase or create lag, but increases the chances "
1010	. "of faces being ready for display when you encounter them. "	1018	. "of faces being ready for display when you encounter them. "
…		…
1012	. "so only set it if you really need to prefetch images. "	1020	. "so only set it if you really need to prefetch images. "
1013	. "This option can be set and unset any time.",	1021	. "This option can be set and unset any time.",
1014	on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },	1022	on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1015	);	1023	);
1016		1024
1017	$table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count");	1025	$table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1018	$table->add (1, 9, new CFClient::UI::Entry	1026	$table->add (1, 9, new CFPlus::UI::Entry
1019	text => $CFG->{output_count},	1027	text => $CFG->{output_count},
1020	tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",	1028	tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1021	on_changed => sub { $CFG->{output_count} = $_[1]; 0 },	1029	on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
1022	);	1030	);
1023		1031
1024	$table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync");	1032	$table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
1025	$table->add (1, 10, new CFClient::UI::Entry	1033	$table->add (1, 10, new CFPlus::UI::Entry
1026	text => $CFG->{output_sync},	1034	text => $CFG->{output_sync},
1027	tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",	1035	tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1028	on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },	1036	on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
1029	);	1037	);
1030		1038
1031	$table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button	1039	$table->add (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
1032	expand => 1,	1040	expand => 1,
1033	align => 0,	1041	align => 0,
1034	text => "Login",	1042	text => "Login",
1035	on_activate => sub {	1043	on_activate => sub {
1036	$CONN ? stop_game	1044	$CONN ? stop_game
1037	: start_game;	1045	: start_game;
1038	0	1046	0
1039	},	1047	},
1040	);	1048	);
1041		1049
1042	$table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command");	1050	$table->add (0, 12, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
1043	$table->add (1, 12, my $saycmd = new CFClient::UI::Entry	1051	$table->add (1, 12, my $saycmd = new CFPlus::UI::Entry
1044	text => $CFG->{say_command},	1052	text => $CFG->{say_command},
1045	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. "	1053	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. "
1046	. "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "	1054	. "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1047	. "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",	1055	. "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1048	on_changed => sub {	1056	on_changed => sub {
…		…
1050	$CFG->{say_command} = $value;	1058	$CFG->{say_command} = $value;
1051	0	1059	0
1052	}	1060	}
1053	);	1061	);
1054		1062
1055	$vbox->add (new CFClient::UI::Label	1063	$vbox->add (new CFPlus::UI::Label
1056	text => "Server Info",	1064	text => "Server Info",
1057	fontsize => 1.2,	1065	fontsize => 1.2,
1058	padding_y => 8,	1066	padding_y => 8,
1059	fg => [1, 1, 0, 1],	1067	fg => [1, 1, 0, 1],
1060	);	1068	);
1061		1069
1062	$vbox->add ($SERVER_INFO = new CFClient::UI::Label ellipsise => 0);	1070	$vbox->add ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0);
1063		1071
1064	$vbox	1072	$vbox
1065	}	1073	}
1066		1074
1067	sub message_window {	1075	sub message_window {
1068	my $window = new CFClient::UI::FancyFrame	1076	my $window = new CFPlus::UI::FancyFrame
1069	name => "message_window",	1077	name => "message_window",
1070	title => "Messages",	1078	title => "Messages",
1071	border_bg => [1, 1, 1, 1],	1079	border_bg => [1, 1, 1, 1],
1072	x => "max",	1080	x => "max",
1073	y => 0,	1081	y => 0,
1074	force_w => $::WIDTH * 0.4,	1082	force_w => $::WIDTH * 0.4,
1075	force_h => $::HEIGHT * 0.5,	1083	force_h => $::HEIGHT * 0.5,
1076	child => (my $vbox = new CFClient::UI::VBox),	1084	child => (my $vbox = new CFPlus::UI::VBox),
1077	has_close_button => 1;	1085	has_close_button => 1;
1078		1086
1079	$vbox->add ($LOGVIEW);	1087	$vbox->add ($LOGVIEW);
1080		1088
1081	$vbox->add (my $input = new CFClient::UI::Entry	1089	$vbox->add (my $input = new CFPlus::UI::Entry
1082	tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "	1090	tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
1083	. "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "	1091	. "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "
1084	. "If you prepend a slash (/), you will submit a command instead (similar to IRC). "	1092	. "If you prepend a slash (/), you will submit a command instead (similar to IRC). "
1085	. "A better way to submit commands (and the occasional chat command) is often the map command completer.",	1093	. "A better way to submit commands (and the occasional chat command) is often the map command completer.",
1086	on_focus_in => sub {	1094	on_focus_in => sub {
…		…
1125	};	1133	};
1126		1134
1127	$window	1135	$window
1128	}	1136	}
1129		1137
		1138	sub open_string_query {
		1139	my $cb = $_[1];
		1140	my $dialog = new CFPlus::UI::FancyFrame
		1141	x => "center",
		1142	y => "center",
		1143	z => 50,
		1144	force_w => $WIDTH * 4/5,
		1145	title => $_[0];
		1146
		1147	$dialog->add (
		1148	my $e = new CFPlus::UI::Entry
		1149	on_activate => sub { $cb->(@_); $dialog->hide; 0 },
		1150	on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
		1151	);
		1152
		1153	$e->grab_focus;
		1154	$dialog->show;
		1155	}
		1156
1130	sub open_quit_dialog {	1157	sub open_quit_dialog {
1131	unless ($QUIT_DIALOG) {	1158	unless ($QUIT_DIALOG) {
1132	$QUIT_DIALOG = new CFClient::UI::FancyFrame	1159	$QUIT_DIALOG = new CFPlus::UI::FancyFrame
1133	x => "center",	1160	x => "center",
1134	y => "center",	1161	y => "center",
1135	z => 50,	1162	z => 50,
1136	title => "Really Quit?",	1163	title => "Really Quit?",
1137	on_key_down => sub {	1164	on_key_down => sub {
1138	my ($dialog, $ev) = @_;	1165	my ($dialog, $ev) = @_;
1139	$ev->{sym} == 27 and $dialog->hide;	1166	$ev->{sym} == 27 and $dialog->hide;
1140	}	1167	}
1141	;	1168	;
1142		1169
1143	$QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);	1170	$QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
1144		1171
1145	$vb->add (new CFClient::UI::Label	1172	$vb->add (new CFPlus::UI::Label
1146	text => "You should find a savebed and apply it first!",	1173	text => "You should find a savebed and apply it first!",
1147	max_w => $WIDTH * 0.25,	1174	max_w => $WIDTH * 0.25,
1148	ellipsize => 0,	1175	ellipsize => 0,
1149	);	1176	);
1150	$vb->add (my $hb = new CFClient::UI::HBox expand => 1);	1177	$vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1151	$hb->add (new CFClient::UI::Button	1178	$hb->add (new CFPlus::UI::Button
1152	text => "Ok",	1179	text => "Ok",
1153	expand => 1,	1180	expand => 1,
1154	on_activate => sub { $QUIT_DIALOG->hide; 0 },	1181	on_activate => sub { $QUIT_DIALOG->hide; 0 },
1155	);	1182	);
1156	$hb->add (new CFClient::UI::Button	1183	$hb->add (new CFPlus::UI::Button
1157	text => "Quit anyway",	1184	text => "Quit anyway",
1158	expand => 1,	1185	expand => 1,
1159	on_activate => sub { exit },	1186	on_activate => sub { exit },
1160	);	1187	);
1161	}	1188	}
…		…
1163	$QUIT_DIALOG->show;	1190	$QUIT_DIALOG->show;
1164	$QUIT_DIALOG->grab_focus;	1191	$QUIT_DIALOG->grab_focus;
1165	}	1192	}
1166		1193
1167	sub autopickup_setup {	1194	sub autopickup_setup {
1168	my $table = new CFClient::UI::Table;	1195	my $table = new CFPlus::UI::Table;
1169		1196
1170	for (	1197	for (
1171	["General", 0, 0,	1198	["General", 0, 0,
1172	["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],	1199	["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1173	["Inhibit autopickup" => PICKUP_INHIBIT],	1200	["Inhibit autopickup" => PICKUP_INHIBIT],
…		…
1207	],	1234	],
1208	["Weight/Value ratio", 2, 17]	1235	["Weight/Value ratio", 2, 17]
1209	)	1236	)
1210	{	1237	{
1211	my ($title, $x, $y, @bits) = @$_;	1238	my ($title, $x, $y, @bits) = @$_;
1212	$table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]);	1239	$table->add ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1213		1240
1214	for (@bits) {	1241	for (@bits) {
1215	++$y;	1242	++$y;
1216		1243
1217	my $mask = $_->[1];	1244	my $mask = $_->[1];
1218	$table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);	1245	$table->add ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1);
1219	$table->add ($x+1, $y, my $checkbox = new CFClient::UI::CheckBox	1246	$table->add ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1220	state => $::CFG->{pickup} & $mask,	1247	state => $::CFG->{pickup} & $mask,
1221	on_changed => sub {	1248	on_changed => sub {
1222	my ($box, $value) = @_;	1249	my ($box, $value) = @_;
1223		1250
1224	if ($value) {	1251	if ($value) {
…		…
1235		1262
1236	${$_->[2]} = $checkbox if $_->[2];	1263	${$_->[2]} = $checkbox if $_->[2];
1237	}	1264	}
1238	}	1265	}
1239		1266
1240	$table->add (2, 18, new CFClient::UI::ValSlider	1267	$table->add (2, 18, new CFPlus::UI::ValSlider
1241	range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],	1268	range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1242	template => ">= 99",	1269	template => ">= 99",
1243	to_value => sub { ">= " . 5 * $_[0] },	1270	to_value => sub { ">= " . 5 * $_[0] },
1244	on_changed => sub {	1271	on_changed => sub {
1245	my ($slider, $value) = @_;	1272	my ($slider, $value) = @_;
…		…
1248	$::CFG->{pickup} |= int $value	1275	$::CFG->{pickup} |= int $value
1249	if $value;	1276	if $value;
1250	1;	1277	1;
1251	});	1278	});
1252		1279
1253	$table->add (3, 18, new CFClient::UI::Button	1280	$table->add (3, 18, new CFPlus::UI::Button
1254	text => "set",	1281	text => "set",
1255	on_activate => sub {	1282	on_activate => sub {
1256	$::CONN->send_command ("pickup $::CFG->{pickup}")	1283	$::CONN->send_command ("pickup $::CFG->{pickup}")
1257	if defined $::CONN;	1284	if defined $::CONN;
1258	0	1285	0
…		…
1273	or $a->{type} <=> $b->{type}	1300	or $a->{type} <=> $b->{type}
1274	} @_ },	1301	} @_ },
1275	);	1302	);
1276		1303
1277	sub inventory_widget {	1304	sub inventory_widget {
1278	my $hb = new CFClient::UI::HBox homogeneous => 1;	1305	my $hb = new CFPlus::UI::HBox homogeneous => 1;
1279		1306
1280	$hb->add (my $vb1 = new CFClient::UI::VBox);	1307	$hb->add (my $vb1 = new CFPlus::UI::VBox);
1281	$vb1->add (new CFClient::UI::Label align => 0, text => "Player");	1308	$vb1->add (new CFPlus::UI::Label align => 0, text => "Player");
1282		1309
1283	$vb1->add (my $hb1 = new CFClient::UI::HBox);	1310	$vb1->add (my $hb1 = new CFPlus::UI::HBox);
1284		1311
1285	use sort 'stable';	1312	use sort 'stable';
1286		1313
1287	$hb1->add (new CFClient::UI::Selector	1314	$hb1->add (new CFPlus::UI::Selector
1288	value => $::CFG->{inv_sort},	1315	value => $::CFG->{inv_sort},
1289	options => [	1316	options => [
1290	[type => "Type/Name"],	1317	[type => "Type/Name"],
1291	[mtime => "Recent/Normal/Locked"],	1318	[mtime => "Recent/Normal/Locked"],
1292	[weight => "Weight/Type"],	1319	[weight => "Weight/Type"],
…		…
1294	on_changed => sub {	1321	on_changed => sub {
1295	$::CFG->{inv_sort} = $_[1];	1322	$::CFG->{inv_sort} = $_[1];
1296	$INV->set_sort_order ($SORT_ORDER{$_[1]});	1323	$INV->set_sort_order ($SORT_ORDER{$_[1]});
1297	},	1324	},
1298	);	1325	);
1299	$hb1->add (new CFClient::UI::Label text => "Weight: ", align => 1, expand => 1);	1326	$hb1->add (new CFPlus::UI::Label text => "Weight: ", align => 1, expand => 1);
1300	#TODO# update to weigh/maxweight	1327	#TODO# update to weigh/maxweight
1301	$hb1->add ($STATWIDS->{i_weight} = new CFClient::UI::Label align => -1);	1328	$hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1);
1302		1329
1303	$vb1->add (my $sw1 = new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);	1330	$vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1304	$sw1->add ($INV = new CFClient::UI::Inventory);	1331	$sw1->add ($INV = new CFPlus::UI::Inventory);
1305		1332
1306	$hb->add (my $vb2 = new CFClient::UI::VBox);	1333	$hb->add (my $vb2 = new CFPlus::UI::VBox);
1307		1334
1308	$vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);	1335	$vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox);
1309		1336
1310	$vb2->add (my $sw2 = new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);	1337	$vb2->add (my $sw2 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1311	$sw2->add ($INVR = new CFClient::UI::Inventory);	1338	$sw2->add ($INVR = new CFPlus::UI::Inventory);
1312		1339
1313	# XXX: Call after $INVR = ... because set_opencont sets the items	1340	# XXX: Call after $INVR = ... because set_opencont sets the items
1314	CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");	1341	CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
1315		1342
1316	$hb	1343	$hb
1317	}	1344	}
1318		1345
1319	sub toggle_player_page {	1346	sub toggle_player_page {
…		…
1326	$PL_WINDOW->show;	1353	$PL_WINDOW->show;
1327	}	1354	}
1328	}	1355	}
1329		1356
1330	sub player_window {	1357	sub player_window {
1331	my $plwin = $PL_WINDOW = new CFClient::UI::FancyFrame	1358	my $plwin = $PL_WINDOW = new CFPlus::UI::FancyFrame
1332	x => "center",	1359	x => "center",
1333	y => "center",	1360	y => "center",
1334	force_w => $WIDTH * 9/10,	1361	force_w => $WIDTH * 9/10,
1335	force_h => $HEIGHT * 9/10,	1362	force_h => $HEIGHT * 9/10,
1336	title => "Player",	1363	title => "Player",
…		…
1338	has_close_button => 1	1365	has_close_button => 1
1339	;	1366	;
1340		1367
1341	my $ntb =	1368	my $ntb =
1342	$PL_NOTEBOOK =	1369	$PL_NOTEBOOK =
1343	new CFClient::UI::Notebook expand => 1, debug => 1;	1370	new CFPlus::UI::Notebook expand => 1, debug => 1;
1344		1371
1345	$ntb->add (	1372	$ntb->add (
1346	"Statistics (F2)" => $STATS_PAGE = stats_window,	1373	"Statistics (F2)" => $STATS_PAGE = stats_window,
1347	"Shows statistics, where all your Stats and Resistances are shown."	1374	"Shows statistics, where all your Stats and Resistances are shown."
1348	);	1375	);
1349	$ntb->add (	1376	$ntb->add (
1350	"Skills (F3)" => $SKILL_PAGE = skill_window,	1377	"Skills (F3)" => $SKILL_PAGE = skill_window,
1351	"Shows all your Skills."	1378	"Shows all your Skills."
1352	);	1379	);
1353		1380
1354	my $spellsw = new CFClient::UI::ScrolledWindow (expand => 1, scroll_y => 1);	1381	my $spellsw = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1355	$spellsw->add ($SPELL_PAGE = new CFClient::UI::SpellList);	1382	$spellsw->add ($SPELL_PAGE = new CFPlus::UI::SpellList);
1356	$ntb->add (	1383	$ntb->add (
1357	"Spellbook (F4)" => $spellsw,	1384	"Spellbook (F4)" => $spellsw,
1358	"Displays all spells you have and lets you edit keyboard shortcuts for them."	1385	"Displays all spells you have and lets you edit keyboard shortcuts for them."
1359	);	1386	);
1360	$ntb->add (	1387	$ntb->add (
…		…
1372	sub update_bindings {	1399	sub update_bindings {
1373	$BIND_UPD_CB->() if $BIND_UPD_CB;	1400	$BIND_UPD_CB->() if $BIND_UPD_CB;
1374	}	1401	}
1375		1402
1376	sub keyboard_setup {	1403	sub keyboard_setup {
1377	my $binding_list = new CFClient::UI::VBox;	1404	my $binding_list = new CFPlus::UI::VBox;
1378		1405
1379	my $refresh;	1406	my $refresh;
1380	$refresh = $BIND_UPD_CB = sub {	1407	$refresh = $BIND_UPD_CB = sub {
1381	$binding_list->clear ();	1408	$binding_list->clear ();
1382		1409
…		…
1384	for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {	1411	for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
1385	my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};	1412	my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1386	next unless ref $cmds eq 'ARRAY' and @$cmds > 0;	1413	next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1387		1414
1388	my $lbl = join "; ", @$cmds;	1415	my $lbl = join "; ", @$cmds;
1389	my $nam = CFClient::BindingEditor::keycombo_to_name ($mod, $sym);	1416	my $nam = CFPlus::BindingEditor::keycombo_to_name ($mod, $sym);
1390	$binding_list->add (my $hb = new CFClient::UI::HBox);	1417	$binding_list->add (my $hb = new CFPlus::UI::HBox);
1391	$hb->add (new CFClient::UI::Button	1418	$hb->add (new CFPlus::UI::Button
1392	text => "delete",	1419	text => "delete",
1393	tooltip => "Deletes the binding",	1420	tooltip => "Deletes the binding",
1394	on_activate => sub {	1421	on_activate => sub {
1395	$binding_list->remove ($hb);	1422	$binding_list->remove ($hb);
1396	delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};	1423	delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1397	0	1424	0
1398	});	1425	});
1399		1426
1400	$hb->add (new CFClient::UI::Button	1427	$hb->add (new CFPlus::UI::Button
1401	text => "edit",	1428	text => "edit",
1402	tooltip => "Edits the binding",	1429	tooltip => "Edits the binding",
1403	on_activate => sub {	1430	on_activate => sub {
1404	$::BIND_EDITOR->set_binding (	1431	$::BIND_EDITOR->set_binding (
1405	$mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},	1432	$mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},
…		…
1418	$::BIND_EDITOR->show;	1445	$::BIND_EDITOR->show;
1419	$SETUP_DIALOG->hide;	1446	$SETUP_DIALOG->hide;
1420	0	1447	0
1421	});	1448	});
1422		1449
1423	$hb->add (new CFClient::UI::Label text => "(Key: $nam)");	1450	$hb->add (new CFPlus::UI::Label text => "(Key: $nam)");
1424	$hb->add (new CFClient::UI::Label text => $lbl, expand => 1);	1451	$hb->add (new CFPlus::UI::Label text => $lbl, expand => 1);
1425	}	1452	}
1426	}	1453	}
1427	};	1454	};
1428		1455
1429	my $vb = new CFClient::UI::VBox;	1456	my $vb = new CFPlus::UI::VBox;
1430	$vb->add (my $hb = new CFClient::UI::HBox);	1457	$vb->add (my $hb = new CFPlus::UI::HBox);
1431	$hb->add (new CFClient::UI::Label text => "only shift-up stops fire");	1458	$hb->add (new CFPlus::UI::Label text => "only shift-up stops fire");
1432	$hb->add (new CFClient::UI::CheckBox	1459	$hb->add (new CFPlus::UI::CheckBox
1433	expand => 1,	1460	expand => 1,
1434	state => $CFG->{shift_fire_stop},	1461	state => $CFG->{shift_fire_stop},
1435	tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",	1462	tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
1436	on_changed => sub {	1463	on_changed => sub {
1437	my ($cbox, $value) = @_;	1464	my ($cbox, $value) = @_;
1438	$CFG->{shift_fire_stop} = $value;	1465	$CFG->{shift_fire_stop} = $value;
1439	0	1466	0
1440	});	1467	});
1441		1468
1442	$vb->add ($binding_list);	1469	$vb->add ($binding_list);
1443	$vb->add (my $hb = new CFClient::UI::HBox);	1470	$vb->add (my $hb = new CFPlus::UI::HBox);
1444		1471
1445	$hb->add (new CFClient::UI::Button	1472	$hb->add (new CFPlus::UI::Button
1446	text => "record new",	1473	text => "record new",
1447	expand => 1,	1474	expand => 1,
1448	tooltip => "This button opens the binding editor with an empty binding.",	1475	tooltip => "This button opens the binding editor with an empty binding.",
1449	on_activate => sub {	1476	on_activate => sub {
1450	$::BIND_EDITOR->set_binding (undef, undef, [],	1477	$::BIND_EDITOR->set_binding (undef, undef, [],
…		…
1464	$::BIND_EDITOR->show;	1491	$::BIND_EDITOR->show;
1465	0	1492	0
1466	},	1493	},
1467	);	1494	);
1468		1495
1469	$hb->add (new CFClient::UI::Button	1496	$hb->add (new CFPlus::UI::Button
1470	text => "close",	1497	text => "close",
1471	tooltip => "Closes the binding window",	1498	tooltip => "Closes the binding window",
1472	expand => 1,	1499	expand => 1,
1473	on_activate => sub {	1500	on_activate => sub {
1474	$SETUP_DIALOG->hide;	1501	$SETUP_DIALOG->hide;
…		…
1479	$refresh->();	1506	$refresh->();
1480		1507
1481	$vb	1508	$vb
1482	}	1509	}
1483		1510
1484	# just weirdness, pls. ignore
1485	sub load_html_page {
1486	my ($viewer, $base) = @_;
1487
1488	$viewer->clear;
1489
1490	require LWP::Simple;
1491	require HTML::Parser;
1492	require URI;
1493
1494	my $page = LWP::Simple::get ($base)
1495	or return;
1496
1497	my @s = { };
1498	my %passthrough = map ($_ => undef), qw(b i u s tt big small sub sup);
1499
1500	my $parser = HTML::Parser->new (
1501	text_h => [sub {
1502	my ($text) = @_;
1503	$text =~ s/\s+/ /g;
1504	$s[-1]{text} .= CFClient::asxml $text;
1505	}, "dtext"],
1506	start_h => [sub {
1507	my ($tag, $attr) = @_;
1508	if ($passthrough{$tag}) {
1509	$s[-1]{text} .= "<$tag>";
1510	} elsif ($tag eq "h1") {
1511	push @s, { text => "<span foreground='#ffff00' size='x-large'>" };
1512	} elsif ($tag eq "h2") {
1513	push @s, { text => "<span foreground='#ccccff' size='large'>" };
1514	} elsif ($tag eq "h3") {
1515	push @s, { text => "<span size='large'>" };
1516	} elsif ($tag eq "a") {
1517	push @s, { text => "", url => $attr->{href} };
1518	} elsif ($tag eq "p") {
1519	push @s, { };
1520	} elsif ($tag eq "img") {
1521	eval {
1522	push @{$s[-1]{obj}}, new CFClient::UI::Image
1523	tex => (new_from_image CFClient::Texture LWP::Simple::get (URI->new ($attr->{src}, $base)->abs ($base)));
1524	$s[-1]{text} .= "\x{fffc}";
1525	};
1526	}
1527	}, "tagname, attr"],
1528	end_h => [sub {
1529	my ($tag) = @_;
1530	if ($passthrough{$tag}) {
1531	$s[-1]{text} .= "</$tag>";
1532	} elsif ($tag =~ /^h\d$/) {
1533	$s[-1]{text} .= "</span>";
1534	push @s, { };
1535	} elsif ($tag eq "a") {
1536	my $S = pop @s;
1537	$s[-1]{text} .= "\x{fffc}";
1538	push @{$s[-1]{obj}}, new CFClient::UI::Label
1539	fg => [0.8, 0.8, 1],
1540	markup => "<u>$S->{text}</u>",
1541	fontsize => 0.8,
1542	can_events => 1,
1543	can_focus => 1,
1544	on_button_up => sub {
1545	load_html_page ($viewer, URI->new ($S->{url}, $base)->abs ($base));
1546	},
1547	;
1548	}
1549	}, "tagname"],
1550	);
1551
1552	$parser->parse ($page);
1553	$parser->eof;
1554
1555	$viewer->add_paragraph ([1, 1, 1, 1], [$_->{text}, @{ $_->{obj} || [] }], $_->{indent})
1556	for @s;
1557
1558	$viewer->set_offset (0);
1559	}
1560
1561	sub help_window {	1511	sub help_window {
1562	my $win = new CFClient::UI::FancyFrame	1512	my $win = new CFPlus::UI::FancyFrame
1563	x => 'center',	1513	x => 'center',
1564	y => 'center',	1514	y => 'center',
1565	z => 2,	1515	z => 2,
1566	name => 'doc_browser',	1516	name => 'doc_browser',
1567	force_w => int $WIDTH * 7/8,	1517	force_w => int $WIDTH * 7/8,
1568	force_h => int $HEIGHT * 7/8,	1518	force_h => int $HEIGHT * 7/8,
1569	title => "Help Browser",	1519	title => "Help Browser",
1570	has_close_button => 1;	1520	has_close_button => 1;
1571		1521
1572	$win->add (my $vbox = new CFClient::UI::VBox);	1522	$win->add (my $vbox = new CFPlus::UI::VBox);
1573		1523
1574	$vbox->add (my $buttons = new CFClient::UI::HBox);	1524	$vbox->add (my $buttons = new CFPlus::UI::HBox);
1575	$vbox->add (my $viewer = new CFClient::UI::TextScroller	1525	$vbox->add (my $viewer = new CFPlus::UI::TextScroller
1576	expand => 1, fontsize => 0.8, padding_x => 4);	1526	expand => 1, fontsize => 0.8, padding_x => 4);
1577		1527
1578	$buttons->add (new CFClient::UI::Label text => "Choose a document to display: ");	1528	$buttons->add (new CFPlus::UI::Label text => "Choose a document to display: ");
1579	$buttons->add (my $combo = new CFClient::UI::Selector	1529	$buttons->add (my $combo = new CFPlus::UI::Selector
1580	value => undef,	1530	value => undef,
1581	options => [	1531	options => [
1582	[intro => "Introduction"],	1532	[intro => "Introduction"],
1583	[manual => "Main Manual"],	1533	[manual => "Main Manual"],
1584	[skill_help => "Skill Reference"],	1534	[skill_help => "Skill Reference"],
1585	[command_help => "Command Reference"],	1535	[command_help => "Command Reference"],
1586	[dmcommand_help => "DM Commands"],	1536	[dmcommand_help => "DM Commands"],
1587	[COPYING => "License Terms"],	1537	[COPYING => "License Terms"],
1588	[test => "test (do not select)"], #d#TODO
1589	],	1538	],
1590	on_changed => sub {	1539	on_changed => sub {
1591	my ($self, $pod) = @_;	1540	my ($self, $pod) = @_;
1592		1541
1593	if ($pod eq "test") {#d#TODO
1594	eval {
1595	load_html_page $viewer, "http://crossfire.real-time.com/guides/walkthrough/newbie-tower.html";
1596	};
1597	warn "$@" if $@;
1598	return;
1599	}
1600
1601	my $pom = CFClient::Pod::load CFClient::find_rcfile "pod/$pod.pod",
1602	doc_viewer => 1, sub { CFClient::Pod::as_paragraphs $_[0] };
1603
1604	#use Data::Dumper; warn Dumper $pom;#d#
1605
1606	$viewer->clear;	1542	$viewer->clear;
1607		1543	$viewer->add_paragraph (CFPlus::Pod::section pod => $pod);
1608	# $viewer->add_paragraph ([1, 1, 1, 1], ["<big>Test</big>\n\n \x{fffc} \x{fffc}\n",
1609	# (new CFClient::UI::Image path => "x.png", can_hover => 1, can_events => 1),
1610	# (new CFClient::UI::Label text => "üüüü", can_hover => 1, can_events => 1, tooltip => "??"),
1611	# ]);#d#
1612
1613	$viewer->add_paragraph ([1, 1, 1, 1], [$_->{text}, @{ $_->{obj} || [] }], $_->{indent})
1614	for @$pom;
1615
1616	$viewer->set_offset (0);	1544	$viewer->set_offset (0);
1617		1545
1618	0	1546	0
1619	},	1547	},
1620	on_visibility_change => sub {	1548	on_visibility_change => sub {
…		…
1628		1556
1629	$win	1557	$win
1630	}	1558	}
1631		1559
1632	sub sdl_init {	1560	sub sdl_init {
1633	CFClient::SDL_Init	1561	CFPlus::SDL_Init
1634	and die "SDL::Init failed!\n";	1562	and die "SDL::Init failed!\n";
1635	}	1563	}
1636		1564
1637	sub video_init {	1565	sub video_init {
1638	sdl_init;	1566	sdl_init;
…		…
1643		1571
1644	($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };	1572	($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1645	$FULLSCREEN = $CFG->{fullscreen};	1573	$FULLSCREEN = $CFG->{fullscreen};
1646	$FAST = $CFG->{fast};	1574	$FAST = $CFG->{fast};
1647		1575
1648	CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN	1576	CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN
1649	or die "SDL_SetVideoMode failed: " . (CFClient::SDL_GetError) . "\n";	1577	or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1650		1578
1651	$SDL_ACTIVE = 1;	1579	$SDL_ACTIVE = 1;
1652	$LAST_REFRESH = time - 0.01;	1580	$LAST_REFRESH = time - 0.01;
1653		1581
1654	CFClient::OpenGL::init;	1582	CFPlus::OpenGL::init;
1655		1583
1656	$FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};	1584	$FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
1657		1585
1658	$CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#	1586	$CFPlus::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
1659		1587
1660	#############################################################################	1588	#############################################################################
1661		1589
1662	if ($DEBUG_STATUS) {	1590	if ($DEBUG_STATUS) {
1663	CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;	1591	CFPlus::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
1664	} else {	1592	} else {
1665	# create the widgets	1593	# create the widgets
1666		1594
1667	$DEBUG_STATUS = new CFClient::UI::Label	1595	$DEBUG_STATUS = new CFPlus::UI::Label
1668	padding => 0,	1596	padding => 0,
1669	z => 100,	1597	z => 100,
1670	force_x => "max",	1598	force_x => "max",
1671	force_y => 0;	1599	force_y => 0;
1672	$DEBUG_STATUS->show;	1600	$DEBUG_STATUS->show;
1673		1601
1674	$BIND_EDITOR = new CFClient::BindingEditor (x => "max", y => 0);	1602	$BIND_EDITOR = new CFPlus::BindingEditor (x => "max", y => 0);
1675		1603
1676	$STATUSBOX = new CFClient::UI::Statusbox;	1604	$STATUSBOX = new CFPlus::UI::Statusbox;
1677	$STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);	1605	$STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1678		1606
1679	(new CFClient::UI::Frame	1607	(new CFPlus::UI::Frame
1680	bg => [0, 0, 0, 0.4],	1608	bg => [0, 0, 0, 0.4],
1681	force_x => 0,	1609	force_x => 0,
1682	force_y => "max",	1610	force_y => "max",
1683	child => $STATUSBOX,	1611	child => $STATUSBOX,
1684	)->show;	1612	)->show;
1685		1613
1686	CFClient::UI::FancyFrame->new (	1614	CFPlus::UI::FancyFrame->new (
1687	title => "Map",	1615	title => "Map",
1688	name => "mapmap",	1616	name => "mapmap",
1689	x => 0,	1617	x => 0,
1690	y => $FONTSIZE + 8,	1618	y => $FONTSIZE + 8,
1691	border_bg => [1, 1, 1, 192/255],	1619	border_bg => [1, 1, 1, 192/255],
1692	bg => [1, 1, 1, 0],	1620	bg => [1, 1, 1, 0],
1693	child => ($MAPMAP = new CFClient::MapWidget::MapMap	1621	child => ($MAPMAP = new CFPlus::MapWidget::MapMap
1694	tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",	1622	tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
1695	),	1623	),
1696	)->show;	1624	)->show;
1697		1625
1698	$MAPWIDGET = new CFClient::MapWidget;	1626	$MAPWIDGET = new CFPlus::MapWidget;
1699	$MAPWIDGET->connect (activate_console => sub {	1627	$MAPWIDGET->connect (activate_console => sub {
1700	my ($mapwidget, $preset) = @_;	1628	my ($mapwidget, $preset) = @_;
1701		1629
1702	if ($CONSOLE) {	1630	if ($CONSOLE) {
1703	$CONSOLE->{input}->{auto_activated} = 1;	1631	$CONSOLE->{input}->{auto_activated} = 1;
…		…
1709	}	1637	}
1710	});	1638	});
1711	$MAPWIDGET->show;	1639	$MAPWIDGET->show;
1712	$MAPWIDGET->grab_focus;	1640	$MAPWIDGET->grab_focus;
1713		1641
1714	$LOGVIEW = new CFClient::UI::TextScroller	1642	$LOGVIEW = new CFPlus::UI::TextScroller
1715	expand => 1,	1643	expand => 1,
1716	font => $FONT_FIXED,	1644	font => $FONT_FIXED,
1717	fontsize => $::CFG->{log_fontsize},	1645	fontsize => $::CFG->{log_fontsize},
1718	indent => -4,	1646	indent => -4,
1719	can_hover => 1,	1647	can_hover => 1,
1720	can_events => 1,	1648	can_events => 1,
1721	tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",	1649	tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1722	;	1650	;
1723		1651
1724	$SETUP_DIALOG = new CFClient::UI::FancyFrame	1652	$SETUP_DIALOG = new CFPlus::UI::FancyFrame
1725	title => "Setup",	1653	title => "Setup",
1726	name => "setup_dialog",	1654	name => "setup_dialog",
1727	x => 'center',	1655	x => 'center',
1728	y => 'center',	1656	y => 'center',
1729	z => 2,	1657	z => 2,
…		…
1732	has_close_button => 1,	1660	has_close_button => 1,
1733	;	1661	;
1734		1662
1735	$METASERVER = metaserver_dialog;	1663	$METASERVER = metaserver_dialog;
1736		1664
1737	$SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,	1665	$SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1738	filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);	1666	filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1739		1667
1740	$SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,	1668	$SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1741	"Configure the server to play on, your username, password and other server-related options.");	1669	"Configure the server to play on, your username, password and other server-related options.");
1742	$SETUP_NOTEBOOK->add (Pickup => autopickup_setup,	1670	$SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1743	"Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");	1671	"Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
…		…
1753	. "After pressing the combo the binding will be saved automatically and the "	1681	. "After pressing the combo the binding will be saved automatically and the "
1754	. "binding editor closes");	1682	. "binding editor closes");
1755	$SETUP_NOTEBOOK->add (Debug => debug_setup,	1683	$SETUP_NOTEBOOK->add (Debug => debug_setup,
1756	"Some debuggin' options. Do not ask.");	1684	"Some debuggin' options. Do not ask.");
1757		1685
1758	$BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top	1686	$BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1759		1687
1760	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,	1688	$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1761	tooltip => "Toggles a dialog where you can configure all aspects of this client.");	1689	tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1762		1690
1763	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,	1691	$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,
1764	tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");	1692	tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1765		1693
1766	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	1694	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
1767		1695
1768	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Playerbook", other => player_window,	1696	$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
1769	tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");	1697	tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
1770		1698
1771	$BUTTONBAR->add (new CFClient::UI::Button	1699	$BUTTONBAR->add (new CFPlus::UI::Button
1772	text => "Save Config",	1700	text => "Save Config",
1773	tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",	1701	tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1774	on_activate => sub {	1702	on_activate => sub {
1775	$::CFG->{layout} = CFClient::UI::get_layout;	1703	$::CFG->{layout} = CFPlus::UI::get_layout;
1776	CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";	1704	CFPlus::write_cfg "$Crossfire::VARDIR/cfplusrc";
1777	status "Configuration Saved";	1705	status "Configuration Saved";
1778	0	1706	0
1779	},	1707	},
1780	);	1708	);
1781		1709
1782	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,	1710	$BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1783	tooltip => "View Documentation");	1711	tooltip => "View Documentation");
1784		1712
1785	$BUTTONBAR->add (new CFClient::UI::Button	1713	$BUTTONBAR->add (new CFPlus::UI::Button
1786	text => "Quit",	1714	text => "Quit",
1787	tooltip => "Terminates the program",	1715	tooltip => "Terminates the program",
1788	on_activate => sub {	1716	on_activate => sub {
1789	if ($CONN) {	1717	if ($CONN) {
1790	open_quit_dialog;	1718	open_quit_dialog;
…		…
1801		1729
1802	$STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);	1730	$STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1803	}	1731	}
1804		1732
1805	sub video_shutdown {	1733	sub video_shutdown {
1806	CFClient::OpenGL::shutdown;	1734	CFPlus::OpenGL::shutdown;
1807		1735
1808	undef $SDL_ACTIVE;	1736	undef $SDL_ACTIVE;
1809	}	1737	}
1810		1738
1811	my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#	1739	my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
…		…
1819		1747
1820	sub audio_music_finished {	1748	sub audio_music_finished {
1821	return unless $CFG->{bgm_enable};	1749	return unless $CFG->{bgm_enable};
1822		1750
1823	# TODO: hack, do play loop and mood music	1751	# TODO: hack, do play loop and mood music
1824	$bgmusic = new_from_file CFClient::MixMusic CFClient::find_rcfile "music/$bgmusic[0]";	1752	$bgmusic = new_from_file CFPlus::MixMusic CFPlus::find_rcfile "music/$bgmusic[0]";
1825	$bgmusic->play (0);	1753	$bgmusic->play (0);
1826		1754
1827	push @bgmusic, shift @bgmusic;	1755	push @bgmusic, shift @bgmusic;
1828	}	1756	}
1829		1757
1830	sub audio_init {	1758	sub audio_init {
1831	if ($CFG->{audio_enable}) {	1759	if ($CFG->{audio_enable}) {
1832	if (open my $fh, "<", CFClient::find_rcfile "sounds/config") {	1760	if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
1833	$SDL_MIXER = !CFClient::Mix_OpenAudio;	1761	$SDL_MIXER = !CFPlus::Mix_OpenAudio;
1834		1762
1835	unless ($SDL_MIXER) {	1763	unless ($SDL_MIXER) {
1836	status "Unable to open sound device: there will be no sound";	1764	status "Unable to open sound device: there will be no sound";
1837	return;	1765	return;
1838	}	1766	}
1839		1767
1840	CFClient::Mix_AllocateChannels 8;	1768	CFPlus::Mix_AllocateChannels 8;
1841	CFClient::MixMusic::volume $CFG->{bgm_volume} * 128;	1769	CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1842		1770
1843	audio_music_finished;	1771	audio_music_finished;
1844		1772
1845	while (<$fh>) {	1773	while (<$fh>) {
1846	next if /^\s*#/;	1774	next if /^\s*#/;
…		…
1849	my ($file, $volume, $event) = split /\s+/, $_, 3;	1777	my ($file, $volume, $event) = split /\s+/, $_, 3;
1850		1778
1851	push @SOUNDS, "$volume,$file";	1779	push @SOUNDS, "$volume,$file";
1852		1780
1853	$AUDIO_CHUNKS{"$volume,$file"} ||= do {	1781	$AUDIO_CHUNKS{"$volume,$file"} ||= do {
1854	my $chunk = new_from_file CFClient::MixChunk CFClient::find_rcfile "sounds/$file";	1782	my $chunk = new_from_file CFPlus::MixChunk CFPlus::find_rcfile "sounds/$file";
1855	$chunk->volume ($volume * 128 / 100);	1783	$chunk->volume ($volume * 128 / 100);
1856	$chunk	1784	$chunk
1857	};	1785	};
1858	}	1786	}
1859	} else {	1787	} else {
…		…
1861	}	1789	}
1862	}	1790	}
1863	}	1791	}
1864		1792
1865	sub audio_shutdown {	1793	sub audio_shutdown {
1866	CFClient::Mix_CloseAudio if $SDL_MIXER;	1794	CFPlus::Mix_CloseAudio if $SDL_MIXER;
1867	undef $SDL_MIXER;	1795	undef $SDL_MIXER;
1868	@SOUNDS = ();	1796	@SOUNDS = ();
1869	%AUDIO_CHUNKS = ();	1797	%AUDIO_CHUNKS = ();
1870	}	1798	}
1871		1799
…		…
1878		1806
1879	sub force_refresh {	1807	sub force_refresh {
1880	$fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;	1808	$fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
1881	debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;	1809	debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1882		1810
1883	$CFClient::UI::ROOT->draw;	1811	$CFPlus::UI::ROOT->draw;
1884		1812
1885	$WANT_REFRESH = 0;	1813	$WANT_REFRESH = 0;
1886	$CAN_REFRESH = 0;	1814	$CAN_REFRESH = 0;
1887	$LAST_REFRESH = $NOW;	1815	$LAST_REFRESH = $NOW;
1888		1816
1889	CFClient::SDL_GL_SwapBuffers;	1817	CFPlus::SDL_GL_SwapBuffers;
1890	}	1818	}
1891		1819
1892	my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {	1820	my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1893	$NOW = time;	1821	$NOW = time;
1894		1822
1895	($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)	1823	($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1896	for CFClient::SDL_PollEvent;	1824	for CFPlus::SDL_PollEvent;
1897		1825
1898	if (%animate_object) {	1826	if (%animate_object) {
1899	$_->animate ($LAST_REFRESH - $NOW) for values %animate_object;	1827	$_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
1900	$WANT_REFRESH++;	1828	$WANT_REFRESH++;
1901	}	1829	}
…		…
1925	$CONN->face_prefetch	1853	$CONN->face_prefetch
1926	if $CONN;	1854	if $CONN;
1927	});	1855	});
1928		1856
1929	%SDL_CB = (	1857	%SDL_CB = (
1930	CFClient::SDL_QUIT => sub {	1858	CFPlus::SDL_QUIT => sub {
1931	Event::unloop -1;	1859	Event::unloop -1;
1932	},	1860	},
1933	CFClient::SDL_VIDEORESIZE => sub {	1861	CFPlus::SDL_VIDEORESIZE => sub {
1934	},	1862	},
1935	CFClient::SDL_VIDEOEXPOSE => sub {	1863	CFPlus::SDL_VIDEOEXPOSE => sub {
1936	CFClient::UI::full_refresh;	1864	CFPlus::UI::full_refresh;
1937	},	1865	},
1938	CFClient::SDL_ACTIVEEVENT => sub {	1866	CFPlus::SDL_ACTIVEEVENT => sub {
1939	# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#	1867	# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
1940	},	1868	},
1941	CFClient::SDL_KEYDOWN => sub {	1869	CFPlus::SDL_KEYDOWN => sub {
1942	if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {	1870	if ($_[0]{mod} & CFPlus::KMOD_ALT && $_[0]{sym} == 13) {
1943	# alt-enter	1871	# alt-enter
1944	$FULLSCREEN_ENABLE->toggle;	1872	$FULLSCREEN_ENABLE->toggle;
1945	video_shutdown;	1873	video_shutdown;
1946	video_init;	1874	video_init;
1947	} else {	1875	} else {
1948	CFClient::UI::feed_sdl_key_down_event ($_[0]);	1876	CFPlus::UI::feed_sdl_key_down_event ($_[0]);
1949	}	1877	}
1950	},	1878	},
1951	CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event,	1879	CFPlus::SDL_KEYUP => \&CFPlus::UI::feed_sdl_key_up_event,
1952	CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event,	1880	CFPlus::SDL_MOUSEMOTION => \&CFPlus::UI::feed_sdl_motion_event,
1953	CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event,	1881	CFPlus::SDL_MOUSEBUTTONDOWN => \&CFPlus::UI::feed_sdl_button_down_event,
1954	CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event,	1882	CFPlus::SDL_MOUSEBUTTONUP => \&CFPlus::UI::feed_sdl_button_up_event,
1955	CFClient::SDL_USEREVENT => sub {	1883	CFPlus::SDL_USEREVENT => sub {
1956	if ($_[0]{code} == 1) {	1884	if ($_[0]{code} == 1) {
1957	audio_channel_finished $_[0]{data1};	1885	audio_channel_finished $_[0]{data1};
1958	} elsif ($_[0]{code} == 0) {	1886	} elsif ($_[0]{code} == 0) {
1959	audio_music_finished;	1887	audio_music_finished;
1960	}	1888	}
…		…
1964	#############################################################################	1892	#############################################################################
1965		1893
1966	$SIG{INT} = $SIG{TERM} = sub { exit };	1894	$SIG{INT} = $SIG{TERM} = sub { exit };
1967		1895
1968	{	1896	{
1969	local $SIG{__DIE__} = sub {
1970	return unless defined $^S && !$^S;
1971	Carp::confess $_[0];#d#TODO: remove when stable
1972	CFClient::fatal $_[0];
1973	};
1974
1975	CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";	1897	CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
1976	CFClient::UI::set_layout ($::CFG->{layout});	1898	CFPlus::UI::set_layout ($::CFG->{layout});
1977		1899
1978	my %DEF_CFG = (	1900	my %DEF_CFG = (
1979	sdl_mode => 0,	1901	sdl_mode => 0,
1980	width => 640,	1902	width => 640,
1981	height => 480,	1903	height => 480,
…		…
2011		1933
2012	sdl_init;	1934	sdl_init;
2013		1935
2014	@SDL_MODES = reverse	1936	@SDL_MODES = reverse
2015	grep $_->[0] >= 640 && $_->[1] >= 480,	1937	grep $_->[0] >= 640 && $_->[1] >= 480,
2016	CFClient::SDL_ListModes;	1938	CFPlus::SDL_ListModes;
2017		1939
2018	@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";	1940	@SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2019		1941
2020	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;	1942	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2021		1943
2022	{	1944	{
2023	my @fonts = map CFClient::find_rcfile "fonts/$_", qw(	1945	my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
2024	DejaVuSans.ttf	1946	DejaVuSans.ttf
2025	DejaVuSansMono.ttf	1947	DejaVuSansMono.ttf
2026	DejaVuSans-Bold.ttf	1948	DejaVuSans-Bold.ttf
2027	DejaVuSansMono-Bold.ttf	1949	DejaVuSansMono-Bold.ttf
2028	DejaVuSans-Oblique.ttf	1950	DejaVuSans-Oblique.ttf
2029	DejaVuSansMono-Oblique.ttf	1951	DejaVuSansMono-Oblique.ttf
2030	DejaVuSans-BoldOblique.ttf	1952	DejaVuSans-BoldOblique.ttf
2031	DejaVuSansMono-BoldOblique.ttf	1953	DejaVuSansMono-BoldOblique.ttf
2032	);	1954	);
2033		1955
2034	CFClient::add_font $_ for @fonts;	1956	CFPlus::add_font $_ for @fonts;
2035		1957
2036	CFClient::pango_init;	1958	CFPlus::pango_init;
2037		1959
2038	$FONT_PROP = new_from_file CFClient::Font $fonts[0];	1960	$FONT_PROP = new_from_file CFPlus::Font $fonts[0];
2039	$FONT_FIXED = new_from_file CFClient::Font $fonts[1];	1961	$FONT_FIXED = new_from_file CFPlus::Font $fonts[1];
2040		1962
2041	$FONT_PROP->make_default;	1963	$FONT_PROP->make_default;
2042	}	1964	}
2043		1965
2044	# compare mono (ft) vs. rgba (cairo)	1966	# compare mono (ft) vs. rgba (cairo)
2045	# ft - 1.8s, cairo 3s, even in alpha-only mode	1967	# ft - 1.8s, cairo 3s, even in alpha-only mode
2046	# for my $rgba (0..1) {	1968	# for my $rgba (0..1) {
2047	# my $t1 = Time::HiRes::time;	1969	# my $t1 = Time::HiRes::time;
2048	# for (1..1000) {	1970	# for (1..1000) {
2049	# my $layout = CFClient::Layout->new ($rgba);	1971	# my $layout = CFPlus::Layout->new ($rgba);
2050	# $layout->set_text ("hallo" x 100);	1972	# $layout->set_text ("hallo" x 100);
2051	# $layout->render;	1973	# $layout->render;
2052	# }	1974	# }
2053	# my $t2 = Time::HiRes::time;	1975	# my $t2 = Time::HiRes::time;
2054	# warn $t2-$t1;	1976	# warn $t2-$t1;
…		…
2057	video_init;	1979	video_init;
2058	audio_init;	1980	audio_init;
2059	}	1981	}
2060		1982
2061	Event::loop;	1983	Event::loop;
2062	#CFClient::SDL_Quit;	1984	#CFPlus::SDL_Quit;
2063	#CFClient::_exit 0;	1985	#CFPlus::_exit 0;
2064		1986
2065	END { CFClient::SDL_Quit }	1987	END { CFPlus::SDL_Quit }
2066		1988
2067	=head1 NAME	1989	=head1 NAME
2068		1990
2069	cfplus - A Crossfire+ and Crossfire game client	1991	cfplus - A Crossfire+ and Crossfire game client
2070		1992

Diff Legend

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