[ViewVC] Diff of: cvs/deliantra/Deliantra-Client/bin/pclient

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.106 by root, Fri Apr 14 22:26:28 2006 UTC vs.
Revision 1.137 by elmex, Tue Apr 18 21:31:48 2006 UTC

…		…
8		8
9	use SDL;	9	use SDL;
10	use SDL::App;	10	use SDL::App;
11	use SDL::Event;	11	use SDL::Event;
12	use SDL::Surface;	12	use SDL::Surface;
		13
		14	use SDL::Mixer;
		15	use SDL::Sound;
		16	use SDL::Music;
		17
13	use SDL::OpenGL;	18	use SDL::OpenGL;
14		19
15	use Crossfire;	20	use Crossfire;
16	use Crossfire::Protocol;	21	use Crossfire::Protocol;
17		22
		23	use Compress::LZF;
		24
18	use CFClient;	25	use CFClient;
19	use CFClient::UI;	26	use CFClient::UI;
20		27
21	our $VERSION = '0.1';	28	our $VERSION = '0.1';
22		29
23	my $MAX_FPS = 60;	30	my $MAX_FPS = 60;
24	my $MIN_FPS = 5; # unused as of yet	31	my $MIN_FPS = 5; # unused as of yet
25		32
		33	our $META_SERVER = "crossfire.real-time.com:13326";
		34
		35	our $FACEMAP;
		36	our $TILECACHE;
26	our $FACECACHE;	37	our $MAPCACHE;
27		38
28	our $LAST_REFRESH;	39	our $LAST_REFRESH;
29	our $NOW;	40	our $NOW;
30		41
31	our $CFG;	42	our $CFG;
…		…
38	our $FULLSCREEN;	49	our $FULLSCREEN;
39	our $FONTSIZE;	50	our $FONTSIZE;
40		51
41	our $MAP;	52	our $MAP;
42	our $MAPWIDGET;	53	our $MAPWIDGET;
		54	our $BUTTONBAR;
		55	our $LOGVIEW;
		56	our $CONSOLE;
		57	our $METASERVER;
		58
		59	our $GAUGES;
43		60
44	our $SDL_ACTIVE;	61	our $SDL_ACTIVE;
45	our $SDL_EV;	62	our $SDL_EV;
46	our %SDL_CB;	63	our %SDL_CB;
47		64
		65	our $SDL_MIXER;
		66	our @SOUNDS; # event => file mapping
		67	our %AUDIO_CHUNKS; # audio files
		68
48	our $ALT_ENTER_MESSAGE;	69	our $ALT_ENTER_MESSAGE;
49	our $STATUS_LINE;	70	our $STATUS_LINE;
50	our $DEBUG_STATUS;	71	our $DEBUG_STATUS;
51	our $BUTTONBAR;
52	our $LOGVIEW;
53	our $CONSOLE;
54		72
55	sub status {	73	sub status {
56	$STATUS_LINE->set_text ($_[0]);	74	$STATUS_LINE->set_text ($_[0]);
57	my ($w, $h) = $STATUS_LINE->size_request;
58	$STATUS_LINE->size_allocate (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $h, $w, $h);	75	$STATUS_LINE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $STATUS_LINE->{h});
59	}	76	}
60		77
61	sub debug {	78	sub debug {
62	$DEBUG_STATUS->set_text ($_[0]);	79	$DEBUG_STATUS->set_text ($_[0]);
63	my ($w, $h) = $DEBUG_STATUS->size_request;	80	$DEBUG_STATUS->move ($WIDTH - $DEBUG_STATUS->{w}, 0, $DEBUG_STATUS->{w}, $DEBUG_STATUS->{h});
64	$DEBUG_STATUS->size_allocate ($WIDTH - $w, 0, $w, $h);
65	}	81	}
66		82
67	sub start_game {	83	sub start_game {
68	status "logging in...";	84	status "logging in...";
69		85
70	my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;	86	my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
71		87
		88	$MAPCACHE = CFClient::db_table "mapcache_$CFG->{host}";
		89
72	$MAP = new CFClient::Map $mapsize, $mapsize;	90	$MAP = new CFClient::Map $mapsize, $mapsize;
		91
		92	my ($host, $port) = split /:/, $CFG->{host};
73		93
74	$CONN = new conn	94	$CONN = new conn
75	host => $CFG->{host},	95	host => $host,
76	port => $CFG->{port},	96	port => $port \|\| 13327,
77	user => $CFG->{user},	97	user => $CFG->{user},
78	pass => $CFG->{password},	98	pass => $CFG->{password},
79	mapw => $mapsize,	99	mapw => $mapsize,
80	maph => $mapsize,	100	maph => $mapsize,
81	;	101	;
…		…
87		107
88	sub stop_game {	108	sub stop_game {
89	undef $CONN;	109	undef $CONN;
90	}	110	}
91		111
92	sub config_dialog {	112	sub client_setup {
93	my $dialog = new CFClient::UI::FancyFrame	113	my $dialog = new CFClient::UI::FancyFrame
94	child => (my $vbox = new CFClient::UI::VBox);	114	child => (my $vbox = new CFClient::UI::VBox);
95	$vbox->add (new CFClient::UI::Label align => 0, text => "Client Setup");	115	$vbox->add (new CFClient::UI::Label align => 0, text => "Client Setup");
96	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	116	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
97		117
…		…
135		155
136	$table->add (0, 5, new CFClient::UI::Label align => 1, text => "FoW Smooth");	156	$table->add (0, 5, new CFClient::UI::Label align => 1, text => "FoW Smooth");
137	$table->add (1, 5, new CFClient::UI::CheckBox state => $CFG->{fow_smooth}, connect_changed => sub {	157	$table->add (1, 5, new CFClient::UI::CheckBox state => $CFG->{fow_smooth}, connect_changed => sub {
138	my ($self, $value) = @_;	158	my ($self, $value) = @_;
139	$CFG->{fow_smooth} = $value;	159	$CFG->{fow_smooth} = $value;
		160	status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::GL_VERSION < 1.2;
140	});	161	});
141		162
142	$table->add (0, 5, new CFClient::UI::Label align => 1, text => "Log Fontsize");	163	$table->add (0, 6, new CFClient::UI::Label align => 1, text => "Log Fontsize");
143	$table->add (1, 5, new CFClient::UI::Slider range => [$CFG->{log_fontsize}, 8, 30, 1], connect_changed => sub {	164	$table->add (1, 6, new CFClient::UI::Slider range => [$CFG->{log_fontsize}, 8, 30, 1], connect_changed => sub {
144	my ($self, $value) = @_;	165	my ($self, $value) = @_;
145	$LOGVIEW->set_fontsize ($CFG->{log_fontsize} = int $value);	166	$LOGVIEW->set_fontsize ($CFG->{log_fontsize} = int $value);
146	});	167	});
147		168
148	$table->add (1, 6, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {	169	$table->add (1, 7, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {
149	destroy_screen ();	170	video_shutdown ();
150	init_screen ();	171	video_init ();
151	});	172	});
		173
		174	$table->add (0, 8, new CFClient::UI::Label align => 1, text => "Sound");
		175	$table->add (1, 8, new CFClient::UI::CheckBox state => $CFG->{sound}, connect_changed => sub {
		176	my ($self, $value) = @_;
		177	$CFG->{sound} = $value;
		178	});
		179	$table->add (0, 9, new CFClient::UI::Label align => 1, text => "Bg. Music");
		180	$table->add (1, 9, new CFClient::UI::CheckBox state => $CFG->{bg_music_enable}, connect_changed => sub {
		181	my ($self, $value) = @_;
		182	$CFG->{bg_music_enable} = $value;
		183	});
		184	$table->add (1, 10, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {
		185	audio_shutdown ();
		186	audio_init ();
		187	});
		188
		189	$dialog
		190	}
		191
		192	sub metaserver_dialog {
		193	my $dialog = new CFClient::UI::FancyFrame
		194	child => (my $vbox = new CFClient::UI::VBox);
		195
		196	$vbox->add ($dialog->{table} = new CFClient::UI::Table);
		197
		198	$dialog
		199	}
		200
		201	sub update_metaserver {
		202	my ($HOST) = @_;
		203
		204	status "fetching metaserver list...";
		205
		206	my $buf;
		207
		208	my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0;
		209
		210	Event->io (fd => $fh, poll => 'r', cb => sub {
		211	my $res = sysread $fh, $buf, 8192, length $buf;
		212
		213	if (!defined $res) {
		214	$_[0]->w->cancel;
		215	status "metaserver: $!";
		216	} elsif ($res == 0) {
		217	$_[0]->w->cancel;
		218	status "server list retrieved";
		219
		220	my $table = $METASERVER->{table};
		221
		222	$table->clear;
		223
		224	my @col = qw(Use #Users Host Uptime Version Description);
		225	$table->add ($_, 0, new CFClient::UI::Label align => 0, fg => [1, 1, 0], text => $col[$_])
		226	for 0 .. $#col;
		227
		228	my @align = qw(1 0 1 1 -1);
		229
		230	my $y = 0;
		231	for my $m (sort { $b->[3] <=> $a->[3] } map [split /\\|/], split /\015?\012/, $buf) {
		232	my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = @$m;
		233
		234	for ($desc) {
		235	s/<br>/\n/gi;
		236	s/<li>/\n· /gi;
		237	s/<.*?>//sgi;
		238	s/&/&/g;
		239	s/</</g;
		240	s/>/>/g;
		241	}
		242
		243	$uptime = sprintf "%dd %02d:%02d:%02d",
		244	(int $m->[8] / 86400),
		245	(int $m->[8] / 3600) % 24,
		246	(int $m->[8] / 60) % 60,
		247	$m->[8] % 60;
		248
		249	$m = [$users, $host, $uptime, $version, $desc];
		250
		251	$y++;
		252
		253	$table->add (0, $y, new CFClient::UI::VBox children => [
		254	(new CFClient::UI::Button text => " ", connect_activate => sub {
		255	$HOST->set_text ($CFG->{host} = $host);
		256	}),
		257	(new CFClient::UI::Empty expand => 1),
		258	]);
		259
		260	$table->add ($_ + 1, $y, new CFClient::UI::Label align => $align[$_], text => $m->[$_], fontsize => $FONTSIZE * 0.8)
		261	for 0 .. $#$m;
		262	}
		263	}
		264	});
		265	}
		266
		267	sub server_setup {
		268	my $dialog = new CFClient::UI::FancyFrame
		269	child => (my $vbox = new CFClient::UI::VBox);
152		270
153	$vbox->add (new CFClient::UI::Label align => 0, text => "Server Setup");	271	$vbox->add (new CFClient::UI::Label align => 0, text => "Server Setup");
154	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	272	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
155	$table->add (0, 2, new CFClient::UI::Label align => 1, text => "Host");	273	$table->add (0, 2, new CFClient::UI::Label align => 1, text => "Host:Port");
		274
		275	{
		276	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);
		277
156	$table->add (1, 2, my $host = new CFClient::UI::Entry text => $CFG->{host}, connect_changed => sub {	278	$vbox->add (my $HOST = new CFClient::UI::Entry text => $CFG->{host}, connect_changed => sub {
157	my ($self, $value) = @_;	279	my ($self, $value) = @_;
158	$CFG->{host} = $value;	280	$CFG->{host} = $value;
159	});	281	});
160		282
161	$table->add (0, 3, new CFClient::UI::Label align => 1, text => "Port");	283	$METASERVER = metaserver_dialog;
162	$table->add (1, 3, my $port = new CFClient::UI::Entry text => $CFG->{port}, connect_changed => sub {	284
163	my ($self, $value) = @_;	285	$vbox->add (new CFClient::UI::Flopper text => "Metaserver", other => $METASERVER, connect_open => sub {
164	$CFG->{port} = $value;	286	update_metaserver $HOST;
165	});	287	});
		288	}
166		289
167	$table->add (0, 4, new CFClient::UI::Label align => 1, text => "Username");	290	$table->add (0, 4, new CFClient::UI::Label align => 1, text => "Username");
168	$table->add (1, 4, my $user = new CFClient::UI::Entry text => $CFG->{user}, connect_changed => sub {	291	$table->add (1, 4, new CFClient::UI::Entry text => $CFG->{user}, connect_changed => sub {
169	my ($self, $value) = @_;	292	my ($self, $value) = @_;
170	$CFG->{user} = $value;	293	$CFG->{user} = $value;
171	});	294	});
172		295
173	$table->add (0, 5, new CFClient::UI::Label align => 1, text => "Password");	296	$table->add (0, 5, new CFClient::UI::Label align => 1, text => "Password");
174	$table->add (1, 5, my $pass = new CFClient::UI::Entry text => $CFG->{password}, hidden => 1, connect_changed => sub {	297	$table->add (1, 5, new CFClient::UI::Entry text => $CFG->{password}, hidden => 1, connect_changed => sub {
175	my ($self, $value) = @_;	298	my ($self, $value) = @_;
176	$CFG->{password} = $value;	299	$CFG->{password} = $value;
177	});	300	});
178		301
179	$table->add (0, 6, new CFClient::UI::Label align => 1, text => "Def. say cmd");	302	$table->add (0, 6, new CFClient::UI::Label align => 1, text => "Def. say cmd");
…		…
195		318
196	$table->add (1, 8, new CFClient::UI::Button expand => 1, align => 0, text => "Login", connect_activate => sub {	319	$table->add (1, 8, new CFClient::UI::Button expand => 1, align => 0, text => "Login", connect_activate => sub {
197	start_game;	320	start_game;
198	});	321	});
199		322
200	$vbox->add (my $hbox = new CFClient::UI::HBox);
201
202	$hbox->add (new CFClient::UI::Button expand => 1, align => 0, text => "Save", connect_activate => sub {
203	CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
204	status "Configuration Saved";
205	});
206
207	$dialog	323	$dialog
208	}	324	}
209		325
210	sub console_window {	326	sub message_window {
211	my $window = new CFClient::UI::FancyFrame	327	my $window = new CFClient::UI::FancyFrame
212	border_bg => [1, 1, 1, 0.5],	328	border_bg => [1, 1, 1, 0.5],
213	bg => [0.3, 0.3, 0.3, 0.8],	329	bg => [0.3, 0.3, 0.3, 0.8],
214	user_w => $::WIDTH/4,	330	user_w => int $::WIDTH / 3,
215	user_h => $::HEIGHT,	331	user_h => int $::HEIGHT / 5,
216	child => (my $vbox = new CFClient::UI::VBox);	332	child => (my $vbox = new CFClient::UI::VBox);
217		333
218	$vbox->add ($LOGVIEW = new CFClient::UI::TextView	334	$vbox->add ($LOGVIEW = new CFClient::UI::TextView
219	expand => 1,	335	expand => 1,
220	fontsize => $::CFG->{log_fontsize},	336	fontsize => $::CFG->{log_fontsize},
221	);	337	);
222		338
223	$vbox->add (my $input = new CFClient::UI::LineEntry);	339	$vbox->add (my $input = new CFClient::UI::Entry
		340	connect_focus_in => sub {
		341	my ($input, $prev_focus) = @_;
		342
		343	delete $input->{refocus_map};
		344
		345	if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
		346	$input->{refocus_map} = 1;
		347	}
		348	delete $input->{auto_activated};
		349	},
224	$input->connect (activate => sub {	350	connect_activate => sub {
225	my ($input, $text) = @_;	351	my ($input, $text) = @_;
226	$input->set_text ('');	352	$input->set_text ('');
227		353
228	if ($text =~ /^\/(.*)/) {	354	if ($text =~ /^\/(.*)/) {
229	$::CONN->user_send ("command $1");	355	$::CONN->user_send ($1);
230	} else {	356	} else {
231	my $say_cmd = $::CFG->{say_command} \|\| 'say';	357	my $say_cmd = $::CFG->{say_command} \|\| 'say';
232	$::CONN->user_send ("command $say_cmd $text");	358	$::CONN->user_send ("$say_cmd $text");
233	}	359	}
		360	if ($input->{refocus_map}) {
		361	delete $input->{refocus_map};
		362	$MAPWIDGET->focus_in
234	1	363	}
235	});	364	},
236	$input->connect (escape => sub {	365	connect_escape => sub {
237	$MAPWIDGET->focus_in	366	$MAPWIDGET->focus_in
238	});	367	},
239	$input->focus_in;	368	);
240		369
241	$CONSOLE = {	370	$CONSOLE = {
242	window => $window,	371	window => $window,
243	input => $input	372	input => $input
244	};	373	};
245		374
246	$window	375	$window
247	}	376	}
248		377
249	sub sdl_init {	378	sub sdl_init {
		379	#SDL::Init SDL_INIT_AUDIO \| SDL_INIT_VIDEO \| SDL_INIT_NOPARACHUTE
250	SDL::Init SDL_INIT_AUDIO \| SDL_INIT_VIDEO	380	SDL::Init SDL_INIT_AUDIO \| SDL_INIT_VIDEO
251	and die "SDL::Init failed!\n";	381	and die "SDL::Init failed!\n";
252	}	382	}
253		383
254	sub init_screen {	384	sub video_init {
255	sdl_init;	385	sdl_init;
256		386
257	($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };	387	($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
258	$FULLSCREEN = $CFG->{fullscreen};	388	$FULLSCREEN = $CFG->{fullscreen};
259	$FAST = $CFG->{fast};	389	$FAST = $CFG->{fast};
260		390
261	SDL::GLSetAttribute SDL_GL_RED_SIZE, 5;	391	SDL::GLSetAttribute SDL_GL_RED_SIZE, 5;
262	SDL::GLSetAttribute SDL_GL_GREEN_SIZE, 5;	392	SDL::GLSetAttribute SDL_GL_GREEN_SIZE, 5;
263	SDL::GLSetAttribute SDL_GL_BLUE_SIZE, 5;	393	SDL::GLSetAttribute SDL_GL_BLUE_SIZE, 5;
264	SDL::GLSetAttribute SDL_GL_ALPHA_SIZE, 0;	394	SDL::GLSetAttribute SDL_GL_ALPHA_SIZE, 1;
265		395
266	SDL::GLSetAttribute SDL_GL_ACCUM_RED_SIZE, 0;	396	SDL::GLSetAttribute SDL_GL_ACCUM_RED_SIZE, 0;
267	SDL::GLSetAttribute SDL_GL_ACCUM_GREEN_SIZE, 0;	397	SDL::GLSetAttribute SDL_GL_ACCUM_GREEN_SIZE, 0;
268	SDL::GLSetAttribute SDL_GL_ACCUM_BLUE_SIZE, 0;	398	SDL::GLSetAttribute SDL_GL_ACCUM_BLUE_SIZE, 0;
269	SDL::GLSetAttribute SDL_GL_ACCUM_ALPHA_SIZE, 0;	399	SDL::GLSetAttribute SDL_GL_ACCUM_ALPHA_SIZE, 0;
…		…
291	$FONTSIZE = int $HEIGHT / 40;	421	$FONTSIZE = int $HEIGHT / 40;
292		422
293	#############################################################################	423	#############################################################################
294		424
295	$DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100;	425	$DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100;
296	$CFClient::UI::TOPLEVEL->add ($DEBUG_STATUS);	426	$CFClient::UI::ROOT->add ($DEBUG_STATUS);
297		427
298	$STATUS_LINE = new CFClient::UI::Label	428	$STATUS_LINE = new CFClient::UI::Label
299	padding => 0,	429	padding => 0,
300	y => $HEIGHT * 44 / 45 - $FONTSIZE;	430	y => $HEIGHT * 44 / 45 - $FONTSIZE;
301	$CFClient::UI::TOPLEVEL->add ($STATUS_LINE);	431	$CFClient::UI::ROOT->add ($STATUS_LINE);
302		432
303	$ALT_ENTER_MESSAGE = new CFClient::UI::Label	433	$ALT_ENTER_MESSAGE = new CFClient::UI::Label
304	padding => 0,	434	padding => 0,
305	y => $HEIGHT * 44 / 45,	435	y => $HEIGHT * 44 / 45,
306	height => $HEIGHT / 45,	436	fontsize => $HEIGHT / 45,
307	text => "Use <b>Alt-Enter</b> to toggle fullscreen mode";	437	markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode";
308	$CFClient::UI::TOPLEVEL->add ($ALT_ENTER_MESSAGE);	438	$CFClient::UI::ROOT->add ($ALT_ENTER_MESSAGE);
309		439
310	$CFClient::UI::TOPLEVEL->add ($MAPWIDGET = new CFClient::UI::MapWidget);	440	$CFClient::UI::ROOT->add ($MAPWIDGET = new CFClient::UI::MapWidget);
311	$MAPWIDGET->focus_in;	441	$MAPWIDGET->focus_in;
312	$MAPWIDGET->connect (activate_console => sub {	442	$MAPWIDGET->connect (activate_console => sub {
313	my ($mapwidget, $preset) = @_;	443	my ($mapwidget, $preset) = @_;
314		444
315	if ($CONSOLE) {	445	if ($CONSOLE) {
		446	$CONSOLE->{input}->{auto_activated} = 1;
316	$CONSOLE->{input}->focus_in;	447	$CONSOLE->{input}->focus_in;
317		448
318	if ($preset && $CONSOLE->{input}->get_text eq '') {	449	if ($preset && $CONSOLE->{input}->get_text eq '') {
319	$CONSOLE->{input}->set_text ($preset);	450	$CONSOLE->{input}->set_text ($preset);
320	}	451	}
321	}	452	}
322	});	453	});
323		454
324	$CFClient::UI::TOPLEVEL->add ($BUTTONBAR = new CFClient::UI::HBox);	455	$CFClient::UI::ROOT->add ($BUTTONBAR = new CFClient::UI::HBox);
325		456
326	$BUTTONBAR->add (my $setup = new CFClient::UI::Flopper x => 0, y => 0, text => "Setup", other => config_dialog, state => 1);	457	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup);
327	$BUTTONBAR->add (my $setup = new CFClient::UI::Flopper x => 0, y => 0, text => "Console", other => console_window);	458	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup);
328	}	459	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window);
329		460
330	sub destroy_screen {	461	$BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub {
		462	CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
		463	status "Configuration Saved";
		464	});
		465
		466	$BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
		467
		468	my $tgw = new CFClient::UI::FancyFrame (x => $WIDTH - 300, y => 0);
		469	$tgw->add (my $hbox = new CFClient::UI::HBox ());
		470
		471	$hbox->add (my $hg = new CFClient::UI::VGauge (gauge => 'hp'));
		472	$hbox->add (my $mg = new CFClient::UI::VGauge (gauge => 'mana'));
		473	$hbox->add (my $gg = new CFClient::UI::VGauge (gauge => 'grace'));
		474	$hbox->add (my $fg = new CFClient::UI::VGauge (gauge => 'food'));
		475
		476	$GAUGES = { food => $fg, mana => $mg, hp => $hg, grace => $gg };
		477	$CFClient::UI::ROOT->add ($tgw);
		478	}
		479
		480	sub video_shutdown {
331	$CFClient::UI::TOPLEVEL->{children} = [];	481	$CFClient::UI::ROOT->{children} = [];
332	undef $SDL_ACTIVE;	482	undef $SDL_ACTIVE;
333	undef $SDL_EV;	483	undef $SDL_EV;
334	SDL::Quit;	484	}
		485
		486	my $bgmusic;#TODO#hack#d#
		487
		488	sub audio_init {
		489	if ($CFG->{sound} \|\| 1) {
		490	if (open my $fh, "<:utf8", CFClient::find_rcfile "sounds/config") {
		491	$SDL_MIXER = new SDL::Mixer;
		492	$SDL_MIXER->allocate_channels (8);
		493
		494	if ($CFG->{bg_music_enable}) {
		495	$bgmusic = new SDL::Music CFClient::find_rcfile "music/game3.ogg";
		496	$SDL_MIXER->play_music ($bgmusic, -1);
		497	}
		498
		499	while (<$fh>) {
		500	next if /^\s*#/;
		501	next if /^\s*$/;
		502
		503	my ($file, $volume, $event) = split /\s+/, $_, 3;
		504
		505	push @SOUNDS, "$volume,$file";
		506
		507	$AUDIO_CHUNKS{"$volume,$file"} \|\|= do {
		508	my $chunk = new SDL::Sound CFClient::find_rcfile "sounds/$file";
		509	$chunk->volume ($volume * 128 / 100);
		510	$chunk
		511	};
		512	}
		513	} else {
		514	status "unable to open sound config: $!";
		515	}
		516	}
		517	}
		518
		519	sub audio_shutdown {
		520	undef $SDL_MIXER;
		521	@SOUNDS = ();
		522	%AUDIO_CHUNKS = ();
335	}	523	}
336		524
337	my %animate_object;	525	my %animate_object;
338	my $animate_timer;	526	my $animate_timer;
339		527
…		…
347	debug sprintf "%3.2f", $fps;	535	debug sprintf "%3.2f", $fps;
348		536
349	$want_refresh = 0;	537	$want_refresh = 0;
350	$can_refresh = 0;	538	$can_refresh = 0;
351		539
352	$CFClient::UI::TOPLEVEL->draw;	540	$CFClient::UI::ROOT->draw;
353		541
354	SDL::GLSwapBuffers;	542	SDL::GLSwapBuffers;
355		543
356	$LAST_REFRESH = $NOW;	544	$LAST_REFRESH = $NOW;
357	}	545	}
…		…
388	delete $animate_object{$widget};	576	delete $animate_object{$widget};
389	}	577	}
390		578
391	@conn::ISA = Crossfire::Protocol::;	579	@conn::ISA = Crossfire::Protocol::;
392		580
		581	sub conn::stats_update {
		582	my ($self, $stats) = @_;
		583
		584	# i love text protocols!!!
		585	# FIXME: the stats are somehow weird
		586	my $hp = $stats->{1};
		587	my $hp_m = $stats->{2};
		588	my $sp = $stats->{3};
		589	my $sp_m = $stats->{4};
		590	my $fo = $stats->{18};
		591	my $fo_m = 1000;
		592	my $gr = $stats->{23};
		593	my $gr_m = $stats->{24};
		594
		595	#d# warn "DATA $hp $hp_m $sp $sp_m $fo $fo_m $gr $gr_m\n";
		596	$GAUGES->{hp}->set_value ($hp, $hp_m);
		597	$GAUGES->{mana}->set_value ($sp, $sp_m);
		598	$GAUGES->{food}->set_value ($fo, $fo_m);
		599	$GAUGES->{grace}->set_value ($gr, $gr_m);
		600	}
		601
393	sub conn::user_send {	602	sub conn::user_send {
394	my ($self, $command) = @_;	603	my ($self, $command) = @_;
395		604
396	$self->send ($command);	605	$self->send_command ($command);
397	status $command;	606	status $command;
		607	}
		608
		609	sub conn::map_scroll {
		610	my ($self, $dx, $dy) = @_;
		611
		612	$MAP->scroll ($dx, $dy);
398	}	613	}
399		614
400	sub conn::feed_map1a {	615	sub conn::feed_map1a {
401	my ($self, $data) = @_;	616	my ($self, $data) = @_;
402		617
403	# $self->Crossfire::Protocol::feed_map1a ($data);	618	# $self->Crossfire::Protocol::feed_map1a ($data);
404		619
405	$MAP->scroll (delete $self->{delayed_scroll_x}, delete $self->{delayed_scroll_y});
406	$MAP->map1a_update ($data);	620	$MAP->map1a_update ($data);
407	$MAPWIDGET->update;	621	$MAPWIDGET->update;
408	}	622	}
409		623
410	#sub conn::map_update {	624	sub conn::flush_map {
411	# my ($self, $dirty) = @_;	625	my ($self) = @_;
412	#	626
413	# $MAPWIDGET->update;	627	my $map_info = delete $self->{map_info}
414	#}	628	or return;
		629
		630	my ($hash, $x, $y, $w, $h) = @$map_info;
		631
		632	my $data = $MAP->get_rect ($x, $y, $w, $h);
		633	$MAPCACHE->put ($hash => Compress::LZF::compress $data);
		634
		635	warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
		636
		637	}
415		638
416	sub conn::map_clear {	639	sub conn::map_clear {
417	my ($self) = @_;	640	my ($self) = @_;
418		641
		642	$self->flush_map;
		643	delete $self->{neigh};
		644
419	$MAP->clear;	645	$MAP->clear;
		646	}
420		647
421	# refresh;	648
		649	sub conn::load_map($$$) {
		650	my ($self, $hash, $x, $y) = @_;
		651
		652	if (defined (my $data = $MAPCACHE->get ($hash))) {
		653	$data = Compress::LZF::decompress $data;
		654	warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
		655	for my $id ($MAP->set_rect ($x, $y, $data)) {
		656	my $data = $TILECACHE->get ($id)
		657	or next;
		658
		659	$self->set_texture ($id => $data);
		660	}
		661	}
		662	}
		663
		664	sub conn::flood_fill {
		665	my ($self, $path, $hash, $flags, $x0, $y0, $x1, $y1) = @_;
		666
		667	# the server does not allow map paths > 6
		668	return if 6 <= length $path;
		669
		670	for my $tile (1..4) {
		671	next if $self->{neigh}{$hash}[$tile];
		672	next unless $flags & (1 << ($tile - 1));
		673
		674	my $neigh = $self->{neigh}{$hash} \|\|= [];
		675
		676	$self->send_mapinfo ("spatial $path$tile", sub {
		677	my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
		678
		679	#warn "map<$path>_$tile=<$mode,$x,$y,$w,$h,$hash>\n";#d#
		680	return if $mode ne "spatial";
		681
		682	$x += $MAP->ox;
		683	$y += $MAP->oy;
		684
		685	$self->load_map ($hash, $x, $y)
		686	unless $self->{neigh}{$hash}[5]++;#d#
		687
		688	$neigh->[$tile] = [$x, $y, $w, $h];
		689
		690	$self->flood_fill ("$path$tile", $hash, $flags, $x0, $y0, $x1, $y1)
		691	if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
		692	});
		693	}
		694	}
		695
		696	sub conn::map_change {
		697	my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
		698
		699	$self->flush_map;
		700
		701	my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
		702
		703	my $mapmapw = 250;
		704	my $mapmaph = 250;
		705
		706	$self->flood_fill ("", $hash, $flags,
		707	$ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5,
		708	$ox + $mapmapw * 0.5, $oy + $mapmapw * 0.5);
		709
		710	$x += $ox;
		711	$y += $oy;
		712
		713	$self->{map_info} = [$hash, $x, $y, $w, $h];
		714
		715	$self->load_map ($hash, $x, $y);
422	}	716	}
423		717
424	sub conn::face_find {	718	sub conn::face_find {
425	my ($self, $face) = @_;	719	my ($self, $facenum, $face) = @_;
426		720
427	$FACECACHE->{"$face->{chksum},$face->{name}"}	721	my $hash = "$face->{chksum},$face->{name}";
		722
		723	my $id = $FACEMAP->get ($hash);
		724
		725	unless ($id) {
		726	# create new id for face
		727	# i love transactions
		728	for (1..100) {
		729	my $txn = $CFClient::DB_ENV->txn_begin;
		730	my $status = $FACEMAP->db_get (id => $id, BerkeleyDB::DB_RMW);
		731	if ($status == 0 \|\| $status == BerkeleyDB::DB_NOTFOUND) {
		732	$id++;
		733	if ($FACEMAP->put (id => $id) == 0
		734	&& $FACEMAP->put ($hash => $id) == 0) {
		735	$txn->txn_commit;
		736
		737	goto gotid;
		738	}
		739	}
		740	$txn->abort;
		741	}
		742
		743	CFClient::fatal "maximum number of transaction retries reached - database problems?";
		744	}
		745
		746	gotid:
		747	$face->{id} = $id;
		748	$MAP->set_face ($facenum => $id);
		749	$TILECACHE->get ($id)
428	}	750	}
429		751
430	sub conn::face_update {	752	sub conn::face_update {
431	my ($self, $facenum, $face) = @_;	753	my ($self, $facenum, $face) = @_;
432		754
433	$FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image};	755	$TILECACHE->put ($face->{id} => $face->{image}); #TODO: try to avoid duplicate writes
434		756
435	my $tex = $face->{texture} = new_from_image CFClient::Texture delete $face->{image};	757	$self->set_texture ($face->{id} => delete $face->{image});
		758	}
436		759
		760	sub conn::set_texture {
		761	my ($self, $id, $data) = @_;
		762
		763	$self->{texture}[$id] \|\|= do {
		764	my $tex =
		765	new_from_image CFClient::Texture
		766	$data, minify => 1;
		767
437	$MAP->set_texture ($facenum, @$tex{qw(name w h s t)});	768	$MAP->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
438	$MAPWIDGET->update;	769	$MAPWIDGET->update;
		770
		771	$tex
		772	};
		773	}
		774
		775	sub conn::sound_play {
		776	my ($self, $x, $y, $soundnum, $type) = @_;
		777
		778	my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]}
		779	or return;
		780
		781	$SDL_MIXER->play_channel (-1, $chunk);
		782	warn "sound $x,$y,$soundnum,$type\n";#d#
439	}	783	}
440		784
441	sub conn::query {	785	sub conn::query {
442	my ($self, $flags, $prompt) = @_;	786	my ($self, $flags, $prompt) = @_;
443		787
…		…
449	my ($self, $color, $text) = @_;	793	my ($self, $color, $text) = @_;
450		794
451	my @color = (	795	my @color = (
452	[1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],	796	[1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
453	[1.00, 1.00, 1.00],	797	[1.00, 1.00, 1.00],
454	[0.00, 0.00, 0.55],	798	[0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
455	[1.00, 0.00, 0.00],	799	[1.00, 0.00, 0.00],
456	[1.00, 0.54, 0.00],	800	[1.00, 0.54, 0.00],
457	[0.11, 0.56, 1.00],	801	[0.11, 0.56, 1.00],
458	[0.93, 0.46, 0.00],	802	[0.93, 0.46, 0.00],
459	[0.18, 0.54, 0.34],	803	[0.18, 0.54, 0.34],
…		…
477	refresh;	821	refresh;
478	},	822	},
479	SDL_KEYDOWN() => sub {	823	SDL_KEYDOWN() => sub {
480	if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {	824	if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {
481	# alt-enter	825	# alt-enter
482	destroy_screen;	826	video_shutdown;
483	$CFG->{fullscreen} = !$CFG->{fullscreen};	827	$CFG->{fullscreen} = !$CFG->{fullscreen};
484	init_screen;	828	video_init;
485	} else {	829	} else {
486	CFClient::UI::feed_sdl_key_down_event ($SDL_EV);	830	CFClient::UI::feed_sdl_key_down_event ($SDL_EV);
487	}	831	}
488	},	832	},
489	SDL_KEYUP() => sub {	833	SDL_KEYUP() => sub {
…		…
503	},	847	},
504	);	848	);
505		849
506	#############################################################################	850	#############################################################################
507		851
		852	$SIG{INT} = $SIG{TERM} = sub { exit };
		853
		854	$TILECACHE = CFClient::db_table "tilecache";
		855	$FACEMAP = CFClient::db_table "facemap";
		856
508	CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";	857	CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
509		858
510	my %DEF_CFG = (	859	my %DEF_CFG = (
511	sdl_mode => 0,	860	sdl_mode => 0,
512	width => 640,	861	width => 640,
…		…
517	fow_intensity => 0.45,	866	fow_intensity => 0.45,
518	fow_smooth => 0,	867	fow_smooth => 0,
519	log_fontsize => 14,	868	log_fontsize => 14,
520	mapsize => 100,	869	mapsize => 100,
521	host => "crossfire.schmorp.de",	870	host => "crossfire.schmorp.de",
522	port => 13327,
523	say_command => 'say',	871	say_command => 'say',
524	);	872	);
525		873
526	while (my ($k, $v) = each %DEF_CFG) {	874	while (my ($k, $v) = each %DEF_CFG) {
527	$CFG->{$k} = $v unless exists $CFG->{$k};	875	$CFG->{$k} = $v unless exists $CFG->{$k};
…		…
536		884
537	@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";	885	@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
538		886
539	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;	887	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
540		888
541	init_screen;
542
543	{	889	{
544	my @fonts = map CFClient::find_rcfile $_, qw(uifont.ttf uifontb.ttf uifonti.ttf uifontbi.ttf);	890	my @fonts = map CFClient::find_rcfile $_, qw(uifont.ttf uifontb.ttf uifonti.ttf uifontbi.ttf);
545		891
546	CFClient::add_font $_ for @fonts;	892	CFClient::add_font $_ for @fonts;
547	CFClient::set_font $fonts[0];	893	CFClient::set_font $fonts[0];
548	}	894	}
549		895
550	$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } \|\| {};	896	video_init;
		897	audio_init;
551		898
552	Event::loop;	899	Event::loop;
553		900
554	Crossfire::save_ref $FACECACHE, "$Crossfire::VARDIR/pclient.faces";	901	END { SDL::Quit }
555		902
		903

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents): Revision 1.106 by root, Fri Apr 14 22:26:28 2006 UTC vs. Revision 1.137 by elmex, Tue Apr 18 21:31:48 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.106 by root, Fri Apr 14 22:26:28 2006 UTC vs.
Revision 1.137 by elmex, Tue Apr 18 21:31:48 2006 UTC