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

Diff Legend

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