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

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents): Revision 1.86 by root, Wed Apr 12 18:09:22 2006 UTC vs. Revision 1.112 by root, Sat Apr 15 13:56:26 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.86 by root, Wed Apr 12 18:09:22 2006 UTC vs.
Revision 1.112 by root, Sat Apr 15 13:56:26 2006 UTC