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

Diff Legend

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