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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.85 by root, Wed Apr 12 17:11:02 2006 UTC vs.
Revision 1.113 by root, Sat Apr 15 19:35:22 2006 UTC

…		…
1	#!/opt/bin/perl	1	#!/opt/bin/perl
2		2
3	use strict;	3	use strict;
4	use utf8;	4	use utf8;
5		5
6	use Glib;	6	use Time::HiRes 'time';
7	use Gtk2 -init;	7	use Event;
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	use SDL::OpenGL;	13	use SDL::OpenGL;
14	use SDL::OpenGL::Constants;
15		14
16	use Crossfire;	15	use Crossfire;
17	use Crossfire::Protocol;	16	use Crossfire::Protocol;
18		17
19	use CFClient;	18	use CFClient;
20	use CFClient::UI;	19	use CFClient::UI;
21		20
22	our $VERSION = '0.1';	21	our $VERSION = '0.1';
23		22
24	my $MAX_FPS = 60;	23	my $MAX_FPS = 60;
25	my $MIN_FPS = 5; # unused	24	my $MIN_FPS = 5; # unused as of yet
26	my $TICKS_PER_FRAME = int 1000 / $MAX_FPS - 1; # min ticks per frame	25
		26	our $META_SERVER = "crossfire.real-time.com:13326";
27		27
28	our $FACECACHE;	28	our $FACECACHE;
		29
		30	our $LAST_REFRESH;
		31	our $NOW;
29		32
30	our $CFG;	33	our $CFG;
31	our $CONN;	34	our $CONN;
32	our $FAST; # fast, low-quality mode, possibly useful for software-rendering	35	our $FAST; # fast, low-quality mode, possibly useful for software-rendering
33		36
34	our @SDL_MODES;	37	our @SDL_MODES;
35	our $WIDTH;	38	our $WIDTH;
36	our $HEIGHT;	39	our $HEIGHT;
37	our $FULLSCREEN;	40	our $FULLSCREEN;
		41	our $FONTSIZE;
38		42
39	our $NOW;	43	our $MAP;
40
41	our $MAPWIDGET;	44	our $MAPWIDGET;
42	our $FONTSIZE;	45	our $BUTTONBAR;
		46	our $LOGVIEW;
		47	our $CONSOLE;
		48	our $METASERVER;
43		49
44	our $SDL_TIMER;	50	our $SDL_ACTIVE;
45	our $SDL_APP;
46	our $SDL_EV;	51	our $SDL_EV;
47	our %SDL_CB;	52	our %SDL_CB;
48		53
49	our $ALT_ENTER_MESSAGE;	54	our $ALT_ENTER_MESSAGE;
50	our $STATUS_LINE;	55	our $STATUS_LINE;
51	our $DEBUG_STATUS;	56	our $DEBUG_STATUS;
52
53	my $last_refresh;
54	my %ANIMATE;
55	my $refresh_handler;
56		57
57	sub status {	58	sub status {
58	$STATUS_LINE->set_text ($_[0]);	59	$STATUS_LINE->set_text ($_[0]);
59	my ($w, $h) = $STATUS_LINE->size_request;	60	my ($w, $h) = $STATUS_LINE->size_request;
60	$STATUS_LINE->size_allocate (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $h, $w, $h);	61	$STATUS_LINE->size_allocate (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $h, $w, $h);
67	}	68	}
68		69
69	sub start_game {	70	sub start_game {
70	status "logging in...";	71	status "logging in...";
71		72
72	my $mapsize = List::Util::min 64, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;	73	my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
73		74
		75	$MAP = new CFClient::Map $mapsize, $mapsize;
		76
		77	my ($host, $port) = split /:/, $CFG->{host};
		78
74	$CONN = new conn	79	$CONN = new conn
75	host => $CFG->{host},	80	host => $host,
76	port => $CFG->{port},	81	port => $port \|\| 13327,
77	user => $CFG->{user},	82	user => $CFG->{user},
78	pass => $CFG->{password},	83	pass => $CFG->{password},
79	mapw => $mapsize,	84	mapw => $mapsize,
80	maph => $mapsize,	85	maph => $mapsize,
81	;	86	;
…		…
87		92
88	sub stop_game {	93	sub stop_game {
89	undef $CONN;	94	undef $CONN;
90	}	95	}
91		96
92	sub config_dialog {	97	sub client_setup {
93	my $dialog = new CFClient::UI::FancyFrame x => 300, y => 100,	98	my $dialog = new CFClient::UI::FancyFrame
94	child => (my $vbox = new CFClient::UI::VBox);	99	child => (my $vbox = new CFClient::UI::VBox);
95	$vbox->add (new CFClient::UI::Label align => 0, text => "Client Setup");	100	$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]);	101	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
97		102
98	$table->add (0, 0, new CFClient::UI::Label align => 1, text => "Video Mode");	103	$table->add (0, 0, new CFClient::UI::Label align => 1, text => "Video Mode");
…		…
113	$table->add (1, 1, new CFClient::UI::CheckBox state => $CFG->{fullscreen}, connect_changed => sub {	118	$table->add (1, 1, new CFClient::UI::CheckBox state => $CFG->{fullscreen}, connect_changed => sub {
114	my ($self, $value) = @_;	119	my ($self, $value) = @_;
115	$CFG->{fullscreen} = $value;	120	$CFG->{fullscreen} = $value;
116	});	121	});
117		122
		123	$table->add (0, 2, new CFClient::UI::Label align => 1, text => "Fast & Ugly");
		124	$table->add (1, 2, new CFClient::UI::CheckBox state => $CFG->{fast}, connect_changed => sub {
		125	my ($self, $value) = @_;
		126	$CFG->{fast} = $value;
		127	});
		128
		129	$table->add (0, 3, new CFClient::UI::Label align => 1, text => "Fog of War");
		130	$table->add (1, 3, new CFClient::UI::CheckBox state => $CFG->{fow_enable}, connect_changed => sub {
		131	my ($self, $value) = @_;
		132	$CFG->{fow_enable} = $value;
		133	});
		134
		135	$table->add (0, 4, new CFClient::UI::Label align => 1, text => "FoW Intensity");
		136	$table->add (1, 4, new CFClient::UI::Slider range => [$CFG->{fow_intensity}, 0, 1 + 0.001, 0.001], connect_changed => sub {
		137	my ($self, $value) = @_;
		138	$CFG->{fow_intensity} = $value;
		139	});
		140
		141	$table->add (0, 5, new CFClient::UI::Label align => 1, text => "FoW Smooth");
		142	$table->add (1, 5, new CFClient::UI::CheckBox state => $CFG->{fow_smooth}, connect_changed => sub {
		143	my ($self, $value) = @_;
		144	$CFG->{fow_smooth} = $value;
		145	});
		146
		147	$table->add (0, 6, new CFClient::UI::Label align => 1, text => "Log Fontsize");
		148	$table->add (1, 6, new CFClient::UI::Slider range => [$CFG->{log_fontsize}, 8, 30, 1], connect_changed => sub {
		149	my ($self, $value) = @_;
		150	$LOGVIEW->set_fontsize ($CFG->{log_fontsize} = int $value);
		151	});
		152
118	$table->add (1, 2, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {	153	$table->add (1, 7, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {
119	destroy_screen ();	154	destroy_screen ();
120	init_screen ();	155	init_screen ();
121	});	156	});
		157
		158	$dialog
		159	}
		160
		161	sub metaserver_dialog {
		162	my $dialog = new CFClient::UI::FancyFrame
		163	child => (my $vbox = new CFClient::UI::VBox);
		164
		165	$vbox->add ($dialog->{table} = new CFClient::UI::Table);
		166
		167	$dialog
		168	}
		169
		170	sub update_metaserver {
		171	status "fetching metaserver list...";
		172
		173	my $buf;
		174
		175	my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0;
		176
		177	Event->io (fd => $fh, poll => 'r', cb => sub {
		178	my $res = sysread $fh, $buf, 8192, length $buf;
		179
		180	if (!defined $res) {
		181	$_[0]->w->cancel;
		182	status "metaserver: $!";
		183	} elsif ($res == 0) {
		184	$_[0]->w->cancel;
		185	status "server list retrieved";
		186
		187	my $table = $METASERVER->{table};
		188
		189	$table->clear;
		190
		191	my @col = qw(#Users Host Uptime Version Description);
		192	$table->add ($_, 0, new CFClient::UI::Label align => 0, fg => [1, 1, 0], text => $col[$_])
		193	for 0 .. $#col;
		194
		195	my @align = qw(1 0 1 1 -1);
		196
		197	my $y = 0;
		198	for my $m (map [split /\\|/], split /\015?\012/, $buf) {
		199	my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = @$m;
		200
		201	for ($desc) {
		202	s/<br>/\n/gi;
		203	s/<li>/\n· /gi;
		204	s/<.*?>//sgi;
		205	s/&/&/g;
		206	s/</</g;
		207	s/>/>/g;
		208	}
		209
		210	$uptime = sprintf "%dd %02d:%02d:%02d",
		211	(int $m->[8] / 86400),
		212	(int $m->[8] / 3600) % 24,
		213	(int $m->[8] / 60) % 60,
		214	$m->[8] % 60;
		215
		216	$m = [$users, $host, $uptime, $version, $desc];
		217
		218	$y++;
		219	$table->add ($_, $y, new CFClient::UI::Label align => $align[$_], text => $m->[$_], fontsize => $FONTSIZE * 0.8)
		220	for 0 .. $#$m;
		221	}
		222	}
		223	});
		224	}
		225
		226	sub server_setup {
		227	my $dialog = new CFClient::UI::FancyFrame
		228	child => (my $vbox = new CFClient::UI::VBox);
122		229
123	$vbox->add (new CFClient::UI::Label align => 0, text => "Server");	230	$vbox->add (new CFClient::UI::Label align => 0, text => "Server Setup");
124	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	231	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
125	$table->add (0, 2, new CFClient::UI::Label align => 1, text => "Host");	232	$table->add (0, 2, new CFClient::UI::Label align => 1, text => "Host:Port");
126	$table->add (1, 2, my $host = new CFClient::UI::Entry text => $CFG->{host});	233
127		234	{
128	$table->add (0, 3, new CFClient::UI::Label align => 1, text => "Port");	235	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);
129	$table->add (1, 3, my $port = new CFClient::UI::Entry text => $CFG->{port});	236
		237	$vbox->add (new CFClient::UI::Entry text => $CFG->{host}, connect_changed => sub {
		238	my ($self, $value) = @_;
		239	$CFG->{host} = $value;
		240	});
		241
		242	$METASERVER = metaserver_dialog;
		243
		244	$vbox->add (new CFClient::UI::Flopper text => "Metaserver", other => $METASERVER, connect_open => sub {
		245	update_metaserver;
		246	});
		247	}
130		248
131	$table->add (0, 4, new CFClient::UI::Label align => 1, text => "Username");	249	$table->add (0, 4, new CFClient::UI::Label align => 1, text => "Username");
132	$table->add (1, 4, my $user = new CFClient::UI::Entry text => $CFG->{user});	250	$table->add (1, 4, my $user = new CFClient::UI::Entry text => $CFG->{user}, connect_changed => sub {
		251	my ($self, $value) = @_;
		252	$CFG->{user} = $value;
		253	});
133		254
134	$table->add (0, 5, new CFClient::UI::Label align => 1, text => "Password");	255	$table->add (0, 5, new CFClient::UI::Label align => 1, text => "Password");
135	$table->add (1, 5, my $pass = new CFClient::UI::Entry text => $CFG->{password}, hidden => 1);	256	$table->add (1, 5, my $pass = new CFClient::UI::Entry text => $CFG->{password}, hidden => 1, connect_changed => sub {
		257	my ($self, $value) = @_;
		258	$CFG->{password} = $value;
		259	});
136		260
		261	$table->add (0, 6, new CFClient::UI::Label align => 1, text => "Def. say cmd");
		262	$table->add (1, 6, my $saycmd = new CFClient::UI::Entry text => $CFG->{say_command}, connect_changed => sub {
		263	my ($self, $value) = @_;
		264	$CFG->{say_command} = $value;
		265	});
		266
137	$table->add (0, 6, new CFClient::UI::Label align => 1, text => "Map Size");	267	$table->add (0, 7, new CFClient::UI::Label align => 1, text => "Map Size");
138	$table->add (1, 6, new CFClient::UI::Slider	268	$table->add (1, 7, new CFClient::UI::Slider
139	req_w => 100,	269	req_w => 100,
140	range => [$CFG->{mapsize}, 10, 100 + 1, 1],	270	range => [$CFG->{mapsize}, 10, 100 + 1, 1],
141	connect_changed => sub {	271	connect_changed => sub {
142	my ($self, $value) = @_;	272	my ($self, $value) = @_;
143		273
144	$CFG->{mapsize} = $self->{range}[0] = $value = int $value;	274	$CFG->{mapsize} = $self->{range}[0] = $value = int $value;
145	},	275	},
146	);	276	);
147		277
148	$table->add (1, 7, new CFClient::UI::Button expand => 1, align => 0, text => "Login", connect_activate => sub {	278	$table->add (1, 8, new CFClient::UI::Button expand => 1, align => 0, text => "Login", connect_activate => sub {
149	start_game;	279	start_game;
150	});	280	});
151		281
152	$vbox->add (my $hbox = new CFClient::UI::HBox);	282	$dialog
		283	}
153		284
154	$hbox->add (new CFClient::UI::Button expand => 1, align => 0, text => "Save", connect_activate => sub {	285	sub message_window {
155	CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";	286	my $window = new CFClient::UI::FancyFrame
156	status "Configuration Saved";	287	border_bg => [1, 1, 1, 0.5],
		288	bg => [0.3, 0.3, 0.3, 0.8],
		289	user_w => $::WIDTH/4,
		290	user_h => $::HEIGHT,
		291	child => (my $vbox = new CFClient::UI::VBox);
		292
		293	$vbox->add ($LOGVIEW = new CFClient::UI::TextView
		294	expand => 1,
		295	fontsize => $::CFG->{log_fontsize},
157	});	296	);
158	$CFClient::UI::TOPLEVEL->add ($dialog);	297
		298	$vbox->add (my $input = new CFClient::UI::LineEntry);
		299	$input->connect (activate => sub {
		300	my ($input, $text) = @_;
		301	$input->set_text ('');
		302
		303	if ($text =~ /^\/(.*)/) {
		304	$::CONN->user_send ("command $1");
		305	} else {
		306	my $say_cmd = $::CFG->{say_command} \|\| 'say';
		307	$::CONN->user_send ("command $say_cmd $text");
		308	}
		309	1
		310	});
		311	$input->connect (escape => sub {
		312	$MAPWIDGET->focus_in
		313	});
		314	$input->focus_in;
		315
		316	$CONSOLE = {
		317	window => $window,
		318	input => $input
		319	};
		320
		321	$window
		322	}
		323
		324	sub sdl_init {
		325	#SDL::Init SDL_INIT_AUDIO \| SDL_INIT_VIDEO \| SDL_INIT_NOPARACHUTE
		326	SDL::Init SDL_INIT_AUDIO \| SDL_INIT_VIDEO
		327	and die "SDL::Init failed!\n";
159	}	328	}
160		329
161	sub init_screen {	330	sub init_screen {
		331	sdl_init;
		332
162	($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };	333	($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
163	$FULLSCREEN = $CFG->{fullscreen};	334	$FULLSCREEN = $CFG->{fullscreen};
		335	$FAST = $CFG->{fast};
164		336
165	$SDL_APP = new SDL::App	337	SDL::GLSetAttribute SDL_GL_RED_SIZE, 5;
166	-flags => SDL_ANYFORMAT \| SDL_HWSURFACE,	338	SDL::GLSetAttribute SDL_GL_GREEN_SIZE, 5;
167	-title => "Crossfire+ Client",	339	SDL::GLSetAttribute SDL_GL_BLUE_SIZE, 5;
168	-width => $WIDTH,	340	SDL::GLSetAttribute SDL_GL_ALPHA_SIZE, 0;
169	-height => $HEIGHT,	341
170	-opengl => 1,	342	SDL::GLSetAttribute SDL_GL_ACCUM_RED_SIZE, 0;
171	-red_size => 5,	343	SDL::GLSetAttribute SDL_GL_ACCUM_GREEN_SIZE, 0;
172	-green_size => 5,	344	SDL::GLSetAttribute SDL_GL_ACCUM_BLUE_SIZE, 0;
173	-blue_size => 5,	345	SDL::GLSetAttribute SDL_GL_ACCUM_ALPHA_SIZE, 0;
174	-alpha_size => 0,	346
175	-double_buffer => 1,	347	SDL::GLSetAttribute SDL_GL_DOUBLEBUFFER, 1;
176	-fullscreen => $FULLSCREEN,	348	SDL::GLSetAttribute SDL_GL_BUFFER_SIZE, 15;
177	-resizeable => 0;	349	SDL::GLSetAttribute SDL_GL_DEPTH_SIZE, 0;
		350
		351	SDL::SetVideoMode $WIDTH, $HEIGHT, 0,
		352	SDL_HWSURFACE \| SDL_ANYFORMAT \| SDL_OPENGL \| SDL_DOUBLEBUF
		353	\| ($FULLSCREEN ? SDL_FULLSCREEN : 0)
		354	or die "SDL::SetVideoMode failed!\n";
		355
		356	SDL::WMSetCaption "Crossfire+ Client", "Crossfire+";
178		357
179	$SDL_EV = new SDL::Event;	358	$SDL_EV = new SDL::Event;
180	$SDL_EV->set_unicode (1);	359	$SDL_EV->set_unicode (1);
181		360
182	$SDL_TIMER = add Glib::Timeout 1000 / $MAX_FPS, sub {	361	$SDL_ACTIVE = 1;
183	($SDL_CB{$SDL_EV->type} \|\| sub { warn "unhandled event ", $SDL_EV->type })->()
184	while $SDL_EV->poll;
185		362
186	1	363	$LAST_REFRESH = time - 0.01;
187	};
188
189	$last_refresh = SDL::GetTicks;
190		364
191	CFClient::gl_init;	365	CFClient::gl_init;
192		366
193	$FONTSIZE = int $HEIGHT / 40;	367	$FONTSIZE = int $HEIGHT / 40;
194		368
195	#############################################################################	369	#############################################################################
196		370
197	$DEBUG_STATUS = new CFClient::UI::Label padding => 0;	371	$DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100;
198	$CFClient::UI::TOPLEVEL->add ($DEBUG_STATUS);	372	$CFClient::UI::ROOT->add ($DEBUG_STATUS);
199		373
200	$STATUS_LINE = new CFClient::UI::Label	374	$STATUS_LINE = new CFClient::UI::Label
201	padding => 0,	375	padding => 0,
202	y => $HEIGHT * 49 / 50 - $FONTSIZE;	376	y => $HEIGHT * 44 / 45 - $FONTSIZE;
203	$CFClient::UI::TOPLEVEL->add ($STATUS_LINE);	377	$CFClient::UI::ROOT->add ($STATUS_LINE);
204		378
205	$ALT_ENTER_MESSAGE = new CFClient::UI::Label	379	$ALT_ENTER_MESSAGE = new CFClient::UI::Label
206	padding => 0,	380	padding => 0,
207	y => $HEIGHT * 49 / 50,	381	y => $HEIGHT * 44 / 45,
208	height => $HEIGHT / 50,	382	height => $HEIGHT / 45,
209	text => "Use <b>Alt-Enter</b> to toggle fullscreen mode";	383	text => "Use <b>Alt-Enter</b> to toggle fullscreen mode";
210	$CFClient::UI::TOPLEVEL->add ($ALT_ENTER_MESSAGE);	384	$CFClient::UI::ROOT->add ($ALT_ENTER_MESSAGE);
211		385
212	$MAPWIDGET = new CFClient::UI::MapWidget;	386	$CFClient::UI::ROOT->add ($MAPWIDGET = new CFClient::UI::MapWidget);
213	$CFClient::UI::TOPLEVEL->add ($MAPWIDGET);
214	$MAPWIDGET->focus_in;	387	$MAPWIDGET->focus_in;
		388	$MAPWIDGET->connect (activate_console => sub {
		389	my ($mapwidget, $preset) = @_;
215		390
216	config_dialog;	391	if ($CONSOLE) {
		392	$CONSOLE->{input}->focus_in;
		393
		394	if ($preset && $CONSOLE->{input}->get_text eq '') {
		395	$CONSOLE->{input}->set_text ($preset);
		396	}
		397	}
		398	});
		399
		400	$CFClient::UI::ROOT->add ($BUTTONBAR = new CFClient::UI::HBox);
		401
		402	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup);
		403	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup);
		404	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window);
		405
		406	$BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub {
		407	CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
		408	status "Configuration Saved";
		409	});
		410
		411	$BUTTONBAR->{children}[0]->emit ("activate");
217	}	412	}
218		413
219	sub destroy_screen {	414	sub destroy_screen {
220	$CFClient::UI::TOPLEVEL->{children} = [];	415	$CFClient::UI::ROOT->{children} = [];
221	remove Glib::Source $SDL_TIMER;
222	remove Glib::Source $refresh_handler if $refresh_handler;
223	undef $refresh_handler;
224	undef $SDL_APP;	416	undef $SDL_ACTIVE;
225	undef $SDL_EV;	417	undef $SDL_EV;
226	SDL::Quit;	418	SDL::Quit;
227	}	419	}
228		420
		421	my %animate_object;
		422	my $animate_timer;
		423
		424	my $want_refresh;
		425	my $can_refresh;
		426
		427	my $fps = 9;
		428
229	sub force_refresh {	429	sub force_refresh {
230	glViewport 0, 0, $WIDTH, $HEIGHT;	430	$fps = $fps * 0.95 + 1 / ($NOW - $LAST_REFRESH) * 0.05;
		431	debug sprintf "%3.2f", $fps;
231		432
232	glMatrixMode GL_PROJECTION;	433	$want_refresh = 0;
233	glLoadIdentity;	434	$can_refresh = 0;
234	glOrtho 0, $WIDTH, $HEIGHT, 0, -10000 , 10000;
235	glMatrixMode GL_MODELVIEW;
236	glLoadIdentity;
237		435
238	glClear GL_COLOR_BUFFER_BIT;
239
240	$CFClient::UI::TOPLEVEL->draw;	436	$CFClient::UI::ROOT->draw;
241		437
242	SDL::GLSwapBuffers;	438	SDL::GLSwapBuffers;
243	}
244		439
245	my $FPS;	440	$LAST_REFRESH = $NOW;
		441	}
		442
		443	my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub {
		444	$NOW = time;
		445
		446	($SDL_CB{$SDL_EV->type} \|\| sub { warn "unhandled event ", $SDL_EV->type })->()
		447	while $SDL_EV->poll;
		448
		449	if (%animate_object) {
		450	$_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
		451	$want_refresh++;
		452	}
		453
		454	if ($want_refresh) {
		455	force_refresh;
		456	} else {
		457	$can_refresh = 1;
		458	}
		459	});
246		460
247	sub refresh {	461	sub refresh {
248	$refresh_handler \|\|= add Glib::Idle sub {	462	$want_refresh++;
249	if ($SDL_APP) {
250	$NOW = SDL::GetTicks;
251
252	if ($NOW - $last_refresh < $TICKS_PER_FRAME) {
253	SDL::Delay $TICKS_PER_FRAME - ($NOW - $last_refresh);
254	$NOW = SDL::GetTicks;
255	}
256
257	my $interval = ($NOW - $last_refresh) * 0.001;
258	$last_refresh = $NOW;
259
260	if ($interval) {
261	$FPS \|\|= 1 / $interval;
262	$FPS = $FPS * 0.9 + (1 / $interval) * 0.1;
263	debug sprintf "%5.02f", $FPS;
264	}
265
266	force_refresh;
267	$_->animate ($interval) for grep $_, values %ANIMATE;
268
269	if (%ANIMATE) {
270	1
271	} else {
272	undef $refresh_handler;
273	0
274	}
275	} else {
276	undef $refresh_handler;
277	0
278	}
279	};
280	}	463	}
281		464
282	sub animation_start {	465	sub animation_start {
283	my ($widget) = @_;	466	my ($widget) = @_;
284	$ANIMATE{$widget} = $widget;	467	$animate_object{$widget} = $widget;
285	Scalar::Util::weaken $ANIMATE{$widget};
286
287	refresh;
288	}	468	}
289		469
290	sub animation_stop {	470	sub animation_stop {
291	my ($widget) = @_;	471	my ($widget) = @_;
292	delete $ANIMATE{$widget};	472	delete $animate_object{$widget};
		473	}
		474
		475	@conn::ISA = Crossfire::Protocol::;
		476
		477	sub conn::user_send {
		478	my ($self, $command) = @_;
		479
		480	$self->send ($command);
		481	status $command;
		482	}
		483
		484	sub conn::feed_map1a {
		485	my ($self, $data) = @_;
		486
		487	# $self->Crossfire::Protocol::feed_map1a ($data);
		488
		489	$MAP->scroll (delete $self->{delayed_scroll_x}, delete $self->{delayed_scroll_y});
		490	$MAP->map1a_update ($data);
		491	$MAPWIDGET->update;
		492	}
		493
		494	#sub conn::map_update {
		495	# my ($self, $dirty) = @_;
		496	#
		497	# $MAPWIDGET->update;
		498	#}
		499
		500	sub conn::map_clear {
		501	my ($self) = @_;
		502
		503	$MAP->clear;
		504
		505	# refresh;
		506	}
		507
		508	sub conn::face_find {
		509	my ($self, $face) = @_;
		510
		511	$FACECACHE->{"$face->{chksum},$face->{name}"}
		512	}
		513
		514	sub conn::face_update {
		515	my ($self, $facenum, $face) = @_;
		516
		517	$FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image};
		518
		519	my $tex = $face->{texture} =
		520	new_from_image CFClient::Texture
		521	delete $face->{image}, minify => 1;
		522
		523	$MAP->set_texture ($facenum, @$tex{qw(name w h s t)}, @{$tex->{minified}});
		524	$MAPWIDGET->update;
		525	}
		526
		527	sub conn::query {
		528	my ($self, $flags, $prompt) = @_;
		529
		530	#TODO
		531	warn "<<<<QUERY:$flags:$prompt>>>\n";#d#
		532	}
		533
		534	sub conn::drawinfo {
		535	my ($self, $color, $text) = @_;
		536
		537	my @color = (
		538	[1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
		539	[1.00, 1.00, 1.00],
		540	[0.00, 0.00, 0.55],
		541	[1.00, 0.00, 0.00],
		542	[1.00, 0.54, 0.00],
		543	[0.11, 0.56, 1.00],
		544	[0.93, 0.46, 0.00],
		545	[0.18, 0.54, 0.34],
		546	[0.56, 0.73, 0.56],
		547	[0.80, 0.80, 0.80],
		548	[0.55, 0.41, 0.13],
		549	[0.99, 0.77, 0.26],
		550	[0.74, 0.65, 0.41],
		551	);
		552
		553	$LOGVIEW->add_paragraph ($color[$color], $text);
293	}	554	}
294		555
295	%SDL_CB = (	556	%SDL_CB = (
296	SDL_QUIT() => sub {	557	SDL_QUIT() => sub {
297	main_quit Gtk2;	558	Event::unloop -1;
298	},	559	},
299	SDL_VIDEORESIZE() => sub {	560	SDL_VIDEORESIZE() => sub {
300	},	561	},
301	SDL_VIDEOEXPOSE() => sub {	562	SDL_VIDEOEXPOSE() => sub {
302	refresh;	563	refresh;
303	},	564	},
304	SDL_KEYDOWN() => sub {	565	SDL_KEYDOWN() => sub {
305	if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {	566	if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {
306	# alt-enter	567	# alt-enter
307	$FULLSCREEN = !$FULLSCREEN;
308	destroy_screen;	568	destroy_screen;
		569	$CFG->{fullscreen} = !$CFG->{fullscreen};
309	init_screen;	570	init_screen;
310	} else {	571	} else {
311	CFClient::UI::feed_sdl_key_down_event ($SDL_EV);	572	CFClient::UI::feed_sdl_key_down_event ($SDL_EV);
312	}	573	}
313	},	574	},
…		…
326	SDL_ACTIVEEVENT() => sub {	587	SDL_ACTIVEEVENT() => sub {
327	# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#	588	# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
328	},	589	},
329	);	590	);
330		591
331	@conn::ISA = Crossfire::Protocol::;
332
333	sub conn::map_update {
334	my ($self, $dirty) = @_;
335
336	$MAPWIDGET->update;
337	}
338
339	sub conn::map_scroll {
340	my ($self, $dx, $dy) = @_;
341
342	# refresh;
343	}
344
345	sub conn::map_clear {
346	my ($self) = @_;
347
348	# refresh;
349	}
350
351	sub conn::face_find {
352	my ($self, $face) = @_;
353
354	$FACECACHE->{"$face->{chksum},$face->{name}"}
355	}
356
357	sub conn::face_update {
358	my ($self, $face) = @_;
359
360	$FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image};
361
362	$face->{texture} = new_from_image CFClient::Texture delete $face->{image};
363	}
364
365	sub conn::query {
366	my ($self, $flags, $prompt) = @_;
367
368	warn "<<<<QUERY:$flags:$prompt>>>\n";#d#
369	}
370
371	sub gtk_add_cfg_field {
372	my ($tbl, $cfg, $klbl, $key, $value) = @_;
373	my $i = $cfg->{_i}++;
374	$tbl->attach_defaults (my $lbl = Gtk2::Label->new ($klbl), 0, 1, $i, $i + 1);
375	$tbl->attach_defaults (my $ent = Gtk2::Entry->new, 1, 2, $i, $i + 1);
376	if ($key eq 'password') {
377	$ent->set_invisible_char ("*");
378	$ent->set (visibility => 0)
379	}
380	$ent->set_text ($value);
381	$ent->signal_connect (changed => sub {
382	my ($ent) = @_;
383	$cfg->{$key} = $ent->get_text;
384	# TODO: Mapsize should be a slider in the game gui
385	if ($key eq 'mapsize' and $cfg->{$key} > 100) {
386	$cfg->{$key} = 100;
387	} elsif ($key eq 'mapsize' and $cfg->{$key} < 50) {
388	$cfg->{$key} = 50;
389	}
390	});
391	}
392
393	sub run_config_dialog {
394	my (%events) = @_;
395
396	my $w = Gtk2::Window->new;
397
398	my @cfg = (
399	[qw/Host host/],
400	[qw/Port port/],
401	[qw/Mapsize% mapsize/],
402	[qw/Username user/],
403	[qw/Password password/],
404	);
405
406	my $cfg = {};
407
408	$w->add (my $vb = Gtk2::VBox->new);
409	$vb->pack_start (my $t = Gtk2::Table->new (2, scalar @cfg), 0, 0, 0);
410	my $selmode = $::CFG->{width} . 'x' . $::CFG->{height};
411	$t->attach_defaults (Gtk2::Label->new ("Modes"), 0, 1, 0, 1);
412	$t->attach_defaults (my $cb = Gtk2::ComboBox->new_text, 1, 2, 0, 1);
413	my $i = 0;
414	my $act = 0;
415	for (map { "$_->[0]x$_->[1]" } @SDL_MODES) {
416	if ($_ eq $selmode) { $act = $i }
417	$cb->append_text ($_);
418	$i++;
419	}
420	$cb->set_active ($act);
421	$cb->signal_connect (changed => sub {
422	my ($cb) = @_;
423	my $txt = $cb->get_active_text;
424	if ($txt =~ m/(\d+)x(\d+)/) {
425	$::CFG->{width} = $1;
426	$::CFG->{height} = $2;
427	}
428	});
429
430	$cfg->{_i} = 1;
431	for (@cfg) {
432	gtk_add_cfg_field ($t, $cfg, $_->[0], $_->[1], $::CFG->{$_->[1]});
433	}
434
435	$vb->pack_start (my $hb = Gtk2::HBox->new, 0, 0, 0);
436	$hb->pack_start (my $cb = Gtk2::Button->new ("save"), 1, 1, 5);
437	$cb->signal_connect (clicked => sub {
438	for (keys %$cfg) {
439	$::CFG->{$_} = $cfg->{$_}
440	if $_ ne '_i';
441	}
442	CFClient::write_cfg "$CFrossfire::VARDIR/pclientrc";
443	});
444	$hb->pack_start (my $cb = Gtk2::Button->new ("login"), 1, 1, 5);
445	$cb->signal_connect (clicked => sub {
446	for (keys %$cfg) {
447	$::CFG->{$_} = $cfg->{$_}
448	if $_ ne '_i';
449	}
450	my $cb = $events{login} \|\| sub {};
451	$cb->($::CFG->{user}, $::CFG->{password});
452	});
453	$hb->pack_start (my $cb = Gtk2::Button->new ("logout"), 1, 1, 5);
454	$cb->signal_connect (clicked => sub {
455	my $cb = $events{logout} \|\| sub {};
456	$cb->();
457	});
458	$hb->pack_start (my $cb = Gtk2::Button->new ("quit"), 1, 1, 5);
459	$cb->signal_connect (clicked => sub { $w->destroy });
460
461	$w->show_all;
462
463	$w->signal_connect (destroy => sub { Gtk2->main_quit });
464	}
465
466
467	#############################################################################	592	#############################################################################
468		593
469	SDL::Init SDL_INIT_EVERYTHING;
470
471	@SDL_MODES = reverse map [SDL::RectW ($_), SDL::RectH ($_)],
472	@{ SDL::ListModes 0, SDL_FULLSCREEN\|SDL_HWSURFACE };
473
474	CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";	594	CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
475		595
476	$CFG \|\|= {	596	my %DEF_CFG = (
		597	sdl_mode => 0,
477	width => 640,	598	width => 640,
478	height => 480,	599	height => 480,
479	fullscreen => 0,	600	fullscreen => 0,
480	sdl_mode => 0,	601	fast => 0,
		602	fow_enable => 1,
		603	fow_intensity => 0.45,
		604	fow_smooth => 0,
		605	log_fontsize => 14,
481	mapsize => 100,	606	mapsize => 100,
482	host => "crossfire.schmorp.de",	607	host => "crossfire.schmorp.de",
483	port => 13327,	608	say_command => 'say',
484	};	609	);
		610
		611	while (my ($k, $v) = each %DEF_CFG) {
		612	$CFG->{$k} = $v unless exists $CFG->{$k};
		613	}
		614
		615	sdl_init;
		616
		617	@SDL_MODES = reverse
		618	grep $_->[0] >= 640 && $_->[1] >= 480,
		619	map [SDL::RectW ($_), SDL::RectH ($_)],
		620	@{ SDL::ListModes 0, SDL_FULLSCREEN \| SDL_HWSURFACE \| SDL_OPENGL };
		621
		622	@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
		623
		624	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
		625
		626	init_screen;
485		627
486	{	628	{
487	my @fonts = map CFClient::find_rcfile $_, qw(uifont.ttf uifontb.ttf uifonti.ttf uifontbi.ttf);	629	my @fonts = map CFClient::find_rcfile $_, qw(uifont.ttf uifontb.ttf uifonti.ttf uifontbi.ttf);
488		630
489	CFClient::add_font $_ for @fonts;	631	CFClient::add_font $_ for @fonts;
490	CFClient::set_font $fonts[0];	632	CFClient::set_font $fonts[0];
491	}	633	}
492		634
493	$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } \|\| {};	635	$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } \|\| {};
494		636
495	init_screen;	637	Event::loop;
496
497	main Gtk2;
498		638
499	Crossfire::save_ref $FACECACHE, "$Crossfire::VARDIR/pclient.faces";	639	Crossfire::save_ref $FACECACHE, "$Crossfire::VARDIR/pclient.faces";
500		640

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents): Revision 1.85 by root, Wed Apr 12 17:11:02 2006 UTC vs. Revision 1.113 by root, Sat Apr 15 19:35:22 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.85 by root, Wed Apr 12 17:11:02 2006 UTC vs.
Revision 1.113 by root, Sat Apr 15 19:35:22 2006 UTC