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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.71 by root, Tue Apr 11 17:02:36 2006 UTC vs.
Revision 1.90 by root, Wed Apr 12 21:35:11 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::Widget;	19	use CFClient::UI;
21		20
22	our $VERSION = '0.1';	21	our $VERSION = '0.1';
23		22
24	my $MAX_FPS = 30;	23	my $MAX_FPS = 60;
25	my $TICKS_PER_FRAME = int 1000 / $MAX_FPS - 1; # min ticks per frame	24	my $MIN_FPS = 5; # unused as of yet
26		25
27	our $FACECACHE;	26	our $FACECACHE;
		27
		28	our $LAST_REFRESH;
		29	our $NOW;
28		30
29	our $CFG;	31	our $CFG;
30	our $CONN;	32	our $CONN;
		33	our $FAST; # fast, low-quality mode, possibly useful for software-rendering
31		34
		35	our @SDL_MODES;
32	our $WIDTH;	36	our $WIDTH;
33	our $HEIGHT;	37	our $HEIGHT;
34	our $FULLSCREEN;	38	our $FULLSCREEN;
35		39
36	our $NOW;
37
38	our $MAPWIDGET;	40	our $MAPWIDGET;
39	our $FONTSIZE;	41	our $FONTSIZE;
40		42
41	our $SDL_TIMER;	43	our $SDL_ACTIVE;
42	our $SDL_APP;
43	our $SDL_EV;	44	our $SDL_EV;
44	our %SDL_CB;	45	our %SDL_CB;
45		46
46	our $ALT_ENTER_MESSAGE;	47	our $ALT_ENTER_MESSAGE;
47	our $STATUS_LINE;	48	our $STATUS_LINE;
48	our $DEBUG_STATUS;	49	our $DEBUG_STATUS;
49		50
50	my $last_refresh;	51	sub status {
51	my %ANIMATE;	52	$STATUS_LINE->set_text ($_[0]);
52	my $refresh_handler;	53	my ($w, $h) = $STATUS_LINE->size_request;
53		54	$STATUS_LINE->size_allocate (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $h, $w, $h);
54	our ($tw, $te); # Test widget #d#
55
56	sub init_screen {
57	$SDL_APP = new SDL::App
58	-flags => SDL_ANYFORMAT \| SDL_HWSURFACE,
59	-title => "Crossfire+ Client",
60	-width => $WIDTH,
61	-height => $HEIGHT,
62	-opengl => 1,
63	-red_size => 5,
64	-green_size => 5,
65	-blue_size => 5,
66	-alpha_size => 0,
67	-double_buffer => 1,
68	-fullscreen => $FULLSCREEN,
69	-resizeable => 0;
70
71	$SDL_EV = new SDL::Event;
72	$SDL_EV->set_unicode (1);
73
74	$SDL_TIMER = add Glib::Timeout 1000/50, sub {
75	($SDL_CB{$SDL_EV->type} \|\| sub { warn "unhandled event ", $SDL_EV->type })->()
76	while $SDL_EV->poll;
77
78	1
79	};
80
81	$last_refresh = SDL::GetTicks;
82
83	CFClient::gl_init;
84
85	$FONTSIZE = int $HEIGHT / 50;
86
87	#############################################################################
88
89	glClearColor 0.45, 0.45, 0.45, 1;
90
91	glEnable GL_TEXTURE_2D;
92	glEnable GL_COLOR_MATERIAL;
93	glShadeModel GL_FLAT;
94	glDisable GL_DEPTH_TEST;
95	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
96
97	#############################################################################
98
99	$DEBUG_STATUS = new CFClient::Widget::Label;
100	$CFClient::Widget::TOPLEVEL->add ($DEBUG_STATUS);
101
102	$STATUS_LINE = new CFClient::Widget::Label
103	y => $HEIGHT * 59 / 60 - $FONTSIZE;
104	$CFClient::Widget::TOPLEVEL->add ($STATUS_LINE);
105
106	$ALT_ENTER_MESSAGE = new CFClient::Widget::Label
107	y => $HEIGHT * 59 / 60,
108	height => $HEIGHT / 60,
109	text => "Use <b>Alt-Enter</b> to toggle fullscreen mode";
110	$CFClient::Widget::TOPLEVEL->add ($ALT_ENTER_MESSAGE);
111
112	$MAPWIDGET = new CFClient::Widget::MapWidget;
113	$CFClient::Widget::TOPLEVEL->add ($MAPWIDGET);
114	$MAPWIDGET->focus_in;
115
116	# Test code #d#
117	unless ($tw) { # haha...
118	my $w = new CFClient::Widget::Window
119	w => 300, h => 300,
120	child => (my $frame = new CFClient::Widget::FancyFrame);
121	$CFClient::Widget::TOPLEVEL->add ($w);
122
123	$frame->add (my $vbox = new CFClient::Widget::VBox);
124
125	$vbox->add (new CFClient::Widget::Entry text => "hallo");
126	$vbox->add (new CFClient::Widget::Slider);
127
128	$tw = new CFClient::Widget::Animator x => $WIDTH - 200, w => 600, h => 300;
129	my $lbl1 = new CFClient::Widget::Label text => "<i>This</i> is a\n<u>TEST</u>!\nOf a themed\nFrame!";
130	my $lbl2 = new CFClient::Widget::Label text => "LBL2";
131	my $vb = new CFClient::Widget::VBox;
132	my $f = new CFClient::Widget::FancyFrame;
133	my $f2 = new CFClient::Widget::FancyFrame;
134	$f->add ($lbl1);
135	$f2->add ($lbl2);
136	$vb->add ($f);
137	$vb->add ($f2, 1);
138
139	$tw->add ($vb);
140	$tw->moveto (0, 0);
141	$CFClient::Widget::TOPLEVEL->add ($tw);
142
143	# $f->move ($WIDTH - 200, 0);
144	# $CFClient::Widget::TOPLEVEL->add ($f);
145	}
146	}	55	}
147		56
148	sub destroy_screen {	57	sub debug {
149	remove Glib::Source $SDL_TIMER;	58	$DEBUG_STATUS->set_text ($_[0]);
150	undef $SDL_APP;	59	my ($w, $h) = $DEBUG_STATUS->size_request;
151	undef $SDL_EV;	60	$DEBUG_STATUS->size_allocate ($WIDTH - $w, 0, $w, $h);
152	SDL::Quit;
153	}	61	}
154		62
155	sub start_game {	63	sub start_game {
156	$WIDTH = $CFG->{width};	64	status "logging in...";
157	$HEIGHT = $CFG->{height};
158	$FULLSCREEN = 0;
159
160	init_screen;
161		65
162	my $mapsize = List::Util::min 64, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;	66	my $mapsize = List::Util::min 64, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
163		67
164	$CONN = new conn	68	$CONN = new conn
165	host => $CFG->{host},	69	host => $CFG->{host},
168	pass => $CFG->{password},	72	pass => $CFG->{password},
169	mapw => $mapsize,	73	mapw => $mapsize,
170	maph => $mapsize,	74	maph => $mapsize,
171	;	75	;
172		76
		77	status "login successful";
		78
173	CFClient::lowdelay fileno $CONN->{fh};	79	CFClient::lowdelay fileno $CONN->{fh};
174	}	80	}
175		81
176	sub stop_game {	82	sub stop_game {
177	remove Glib::Source $refresh_handler if $refresh_handler;
178	undef $refresh_handler;
179
180	undef $CONN;	83	undef $CONN;
		84	}
		85
		86	sub config_dialog {
		87	my $dialog = new CFClient::UI::FancyFrame x => 300, y => 100,
		88	child => (my $vbox = new CFClient::UI::VBox);
		89	$vbox->add (new CFClient::UI::Label align => 0, text => "Client Setup");
		90	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
		91
		92	$table->add (0, 0, new CFClient::UI::Label align => 1, text => "Video Mode");
		93	$table->add (1, 0, my $hbox = new CFClient::UI::HBox);
		94
		95	$hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1]);
		96	$hbox->add (my $mode_label = new CFClient::UI::Label height => $FONTSIZE * 0.8);
		97
		98	$mode_slider->connect (changed => sub {
		99	my ($self, $value) = @_;
		100
		101	$CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
		102	$mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});
		103	});
		104	$mode_slider->emit (changed => $mode_slider->{range}[0]);
		105
		106	$table->add (0, 1, new CFClient::UI::Label align => 1, text => "Fullscreen");
		107	$table->add (1, 1, new CFClient::UI::CheckBox state => $CFG->{fullscreen}, connect_changed => sub {
		108	my ($self, $value) = @_;
		109	$CFG->{fullscreen} = $value;
		110	});
		111
		112	$table->add (0, 2, new CFClient::UI::Label align => 1, text => "Fast & Ugly");
		113	$table->add (1, 2, new CFClient::UI::CheckBox state => $CFG->{fast}, connect_changed => sub {
		114	my ($self, $value) = @_;
		115	$CFG->{fast} = $value;
		116	});
		117
		118	$table->add (0, 2, new CFClient::UI::Label align => 1, text => "Fog of War");
		119	$table->add (1, 2, new CFClient::UI::Slider range => [$CFG->{fow_intensity}, 0, 1 + 0.001, 0.001], connect_changed => sub {
		120	my ($self, $value) = @_;
		121	$CFG->{fow_intensity} = $value;
		122	});
		123
		124	$table->add (1, 4, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {
181	destroy_screen;	125	destroy_screen ();
		126	init_screen ();
		127	});
		128
		129	$vbox->add (new CFClient::UI::Label align => 0, text => "Server Setup");
		130	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
		131	$table->add (0, 2, new CFClient::UI::Label align => 1, text => "Host");
		132	$table->add (1, 2, my $host = new CFClient::UI::Entry text => $CFG->{host});
		133
		134	$table->add (0, 3, new CFClient::UI::Label align => 1, text => "Port");
		135	$table->add (1, 3, my $port = new CFClient::UI::Entry text => $CFG->{port});
		136
		137	$table->add (0, 4, new CFClient::UI::Label align => 1, text => "Username");
		138	$table->add (1, 4, my $user = new CFClient::UI::Entry text => $CFG->{user});
		139
		140	$table->add (0, 5, new CFClient::UI::Label align => 1, text => "Password");
		141	$table->add (1, 5, my $pass = new CFClient::UI::Entry text => $CFG->{password}, hidden => 1);
		142
		143	$table->add (0, 6, new CFClient::UI::Label align => 1, text => "Map Size");
		144	$table->add (1, 6, new CFClient::UI::Slider
		145	req_w => 100,
		146	range => [$CFG->{mapsize}, 10, 100 + 1, 1],
		147	connect_changed => sub {
		148	my ($self, $value) = @_;
		149
		150	$CFG->{mapsize} = $self->{range}[0] = $value = int $value;
		151	},
		152	);
		153
		154	$table->add (1, 7, new CFClient::UI::Button expand => 1, align => 0, text => "Login", connect_activate => sub {
		155	start_game;
		156	});
		157
		158	$vbox->add (my $hbox = new CFClient::UI::HBox);
		159
		160	$hbox->add (new CFClient::UI::Button expand => 1, align => 0, text => "Save", connect_activate => sub {
		161	CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
		162	status "Configuration Saved";
		163	});
		164	$CFClient::UI::TOPLEVEL->add ($dialog);
182	}	165	}
		166
		167	sub sdl_init {
		168	SDL::Init SDL_INIT_TIMER \| SDL_INIT_AUDIO \| SDL_INIT_VIDEO
		169	and die "SDL::Init failed!\n";
		170	}
		171
		172	sub init_screen {
		173	sdl_init;
		174
		175	($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
		176	$FULLSCREEN = $CFG->{fullscreen};
		177	$FAST = $CFG->{fast};
		178
		179	SDL::GLSetAttribute SDL_GL_RED_SIZE, 5;
		180	SDL::GLSetAttribute SDL_GL_GREEN_SIZE, 5;
		181	SDL::GLSetAttribute SDL_GL_BLUE_SIZE, 5;
		182	SDL::GLSetAttribute SDL_GL_ALPHA_SIZE, 0;
		183
		184	SDL::GLSetAttribute SDL_GL_ACCUM_RED_SIZE, 0;
		185	SDL::GLSetAttribute SDL_GL_ACCUM_GREEN_SIZE, 0;
		186	SDL::GLSetAttribute SDL_GL_ACCUM_BLUE_SIZE, 0;
		187	SDL::GLSetAttribute SDL_GL_ACCUM_ALPHA_SIZE, 0;
		188
		189	SDL::GLSetAttribute SDL_GL_DOUBLEBUFFER, 1;
		190	SDL::GLSetAttribute SDL_GL_BUFFER_SIZE, 15;
		191	SDL::GLSetAttribute SDL_GL_DEPTH_SIZE, 0;
		192
		193	SDL::SetVideoMode $WIDTH, $HEIGHT, 0,
		194	SDL_HWSURFACE \| SDL_ANYFORMAT \| SDL_OPENGL \| SDL_DOUBLEBUF
		195	\| ($FULLSCREEN ? SDL_FULLSCREEN : 0)
		196	or die "SDL::SetVideoMode failed!\n";
		197
		198	SDL::WMSetCaption "Crossfire+ Client", "Crossfire+";
		199
		200	$SDL_EV = new SDL::Event;
		201	$SDL_EV->set_unicode (1);
		202
		203	$SDL_ACTIVE = 1;
		204
		205	$LAST_REFRESH = time - 0.01;
		206
		207	CFClient::gl_init;
		208
		209	$FONTSIZE = int $HEIGHT / 40;
		210
		211	#############################################################################
		212
		213	$DEBUG_STATUS = new CFClient::UI::Label padding => 0;
		214	$CFClient::UI::TOPLEVEL->add ($DEBUG_STATUS);
		215
		216	$STATUS_LINE = new CFClient::UI::Label
		217	padding => 0,
		218	y => $HEIGHT * 49 / 50 - $FONTSIZE;
		219	$CFClient::UI::TOPLEVEL->add ($STATUS_LINE);
		220
		221	$ALT_ENTER_MESSAGE = new CFClient::UI::Label
		222	padding => 0,
		223	y => $HEIGHT * 49 / 50,
		224	height => $HEIGHT / 50,
		225	text => "Use <b>Alt-Enter</b> to toggle fullscreen mode";
		226	$CFClient::UI::TOPLEVEL->add ($ALT_ENTER_MESSAGE);
		227
		228	$MAPWIDGET = new CFClient::UI::MapWidget;
		229	$CFClient::UI::TOPLEVEL->add ($MAPWIDGET);
		230	$MAPWIDGET->focus_in;
		231
		232	config_dialog;
		233	}
		234
		235	sub destroy_screen {
		236	$CFClient::UI::TOPLEVEL->{children} = [];
		237	undef $SDL_ACTIVE;
		238	undef $SDL_EV;
		239	SDL::Quit;
		240	}
		241
		242	my %animate_object;
		243	my $animate_timer;
		244
		245	my $want_refresh;
		246	my $can_refresh;
		247
		248	my $fps = 9;
183		249
184	sub force_refresh {	250	sub force_refresh {
		251	$fps = $fps * 0.95 + 1 / ($NOW - $LAST_REFRESH) * 0.05;
		252	debug sprintf "%3.2f", $fps;
		253
		254	$want_refresh = 0;
		255	$can_refresh = 0;
		256
185	glViewport 0, 0, $WIDTH, $HEIGHT;	257	glViewport 0, 0, $WIDTH, $HEIGHT;
186		258
187	glMatrixMode GL_PROJECTION;	259	glMatrixMode GL_PROJECTION;
188	glLoadIdentity;	260	glLoadIdentity;
189	glOrtho 0, $WIDTH, $HEIGHT, 0, -10000 , 10000;	261	glOrtho 0, $WIDTH, $HEIGHT, 0, -10000 , 10000;
190	glMatrixMode GL_MODELVIEW;	262	glMatrixMode GL_MODELVIEW;
		263	glLoadIdentity;
191		264
		265	glClearColor +($CFG->{fow_intensity}) x 3, 1;
192	glClear GL_COLOR_BUFFER_BIT;	266	glClear GL_COLOR_BUFFER_BIT;
193		267
194	$CFClient::Widget::TOPLEVEL->draw;	268	$CFClient::UI::TOPLEVEL->draw;
195		269
196	SDL::GLSwapBuffers;	270	SDL::GLSwapBuffers;
197	}
198		271
199	sub debug {	272	$LAST_REFRESH = $NOW;
200	$DEBUG_STATUS->set_text ($_[0]);
201	$DEBUG_STATUS->size_allocate ($DEBUG_STATUS->size_request);
202	$DEBUG_STATUS->move ($WIDTH - $DEBUG_STATUS->{w}, 0);
203	}	273	}
204		274
205	my $FPS;	275	my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub {
		276	$NOW = time;
		277
		278	($SDL_CB{$SDL_EV->type} \|\| sub { warn "unhandled event ", $SDL_EV->type })->()
		279	while $SDL_EV->poll;
		280
		281	if (%animate_object) {
		282	$_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
		283	$want_refresh++;
		284	}
		285
		286	if ($want_refresh) {
		287	force_refresh;
		288	} else {
		289	$can_refresh = 1;
		290	}
		291	});
206		292
207	sub refresh {	293	sub refresh {
208	$refresh_handler \|\|= add Glib::Idle sub {	294	$want_refresh++;
209	if ($SDL_APP) {
210	$NOW = SDL::GetTicks;
211
212	if ($NOW - $last_refresh < $TICKS_PER_FRAME) {
213	SDL::Delay $TICKS_PER_FRAME - ($NOW - $last_refresh);
214	$NOW = SDL::GetTicks;
215	}
216
217	my $interval = ($NOW - $last_refresh) * 0.001;
218	$last_refresh = $NOW;
219
220	if ($interval) {
221	$FPS \|\|= 1 / $interval;
222	$FPS = $FPS * 0.96 + (1 / $interval) * 0.04;
223	debug sprintf "%5.02f", $FPS;
224	}
225
226	force_refresh;
227	$_->animate ($interval) for grep $_, values %ANIMATE;
228
229	if (%ANIMATE) {
230	1
231	} else {
232	undef $refresh_handler;
233	0
234	}
235	} else {
236	undef $refresh_handler;
237	0
238	}
239	};
240	}	295	}
241		296
242	sub animation_start {	297	sub animation_start {
243	my ($widget) = @_;	298	my ($widget) = @_;
244	$ANIMATE{$widget} = $widget;	299	$animate_object{$widget} = $widget;
245	Scalar::Util::weaken $ANIMATE{$widget};
246
247	refresh;
248	}	300	}
249		301
250	sub animation_stop {	302	sub animation_stop {
251	my ($widget) = @_;	303	my ($widget) = @_;
252	delete $ANIMATE{$widget};	304	delete $animate_object{$widget};
		305	}
		306
		307	@conn::ISA = Crossfire::Protocol::;
		308
		309	sub conn::user_send {
		310	my ($self, $command) = @_;
		311
		312	$self->send ($command);
		313	status $command;
		314	}
		315
		316	sub conn::map_update {
		317	my ($self, $dirty) = @_;
		318
		319	$MAPWIDGET->update;
		320	}
		321
		322	sub conn::map_scroll {
		323	my ($self, $dx, $dy) = @_;
		324
		325	# refresh;
		326	}
		327
		328	sub conn::map_clear {
		329	my ($self) = @_;
		330
		331	# refresh;
		332	}
		333
		334	sub conn::face_find {
		335	my ($self, $face) = @_;
		336
		337	$FACECACHE->{"$face->{chksum},$face->{name}"}
		338	}
		339
		340	sub conn::face_update {
		341	my ($self, $face) = @_;
		342
		343	$FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image};
		344
		345	$face->{texture} = new_from_image CFClient::Texture delete $face->{image};
		346	}
		347
		348	sub conn::query {
		349	my ($self, $flags, $prompt) = @_;
		350
		351	warn "<<<<QUERY:$flags:$prompt>>>\n";#d#
253	}	352	}
254		353
255	%SDL_CB = (	354	%SDL_CB = (
256	SDL_QUIT() => sub {	355	SDL_QUIT() => sub {
257	main_quit Gtk2;	356	Event::unloop -1;
258	},	357	},
259	SDL_VIDEORESIZE() => sub {	358	SDL_VIDEORESIZE() => sub {
260	},	359	},
261	SDL_VIDEOEXPOSE() => sub {	360	SDL_VIDEOEXPOSE() => sub {
262	refresh;	361	refresh;
263	},	362	},
264	SDL_KEYDOWN() => sub {	363	SDL_KEYDOWN() => sub {
265	if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {	364	if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {
266	# alt-enter	365	# alt-enter
267	$FULLSCREEN = !$FULLSCREEN;	366	$FULLSCREEN = !$FULLSCREEN;
		367	destroy_screen;
268	init_screen;	368	init_screen;
269	} else {	369	} else {
270	CFClient::Widget::feed_sdl_key_down_event ($SDL_EV);	370	CFClient::UI::feed_sdl_key_down_event ($SDL_EV);
271	}	371	}
272	},	372	},
273	SDL_KEYUP() => sub {	373	SDL_KEYUP() => sub {
274	CFClient::Widget::feed_sdl_key_up_event ($SDL_EV);	374	CFClient::UI::feed_sdl_key_up_event ($SDL_EV);
275	},	375	},
276	SDL_MOUSEMOTION() => sub {	376	SDL_MOUSEMOTION() => sub {
277	CFClient::Widget::feed_sdl_motion_event ($SDL_EV);	377	CFClient::UI::feed_sdl_motion_event ($SDL_EV);
278	},	378	},
279	SDL_MOUSEBUTTONDOWN() => sub {	379	SDL_MOUSEBUTTONDOWN() => sub {
280	CFClient::Widget::feed_sdl_button_down_event ($SDL_EV);	380	CFClient::UI::feed_sdl_button_down_event ($SDL_EV);
281	},	381	},
282	SDL_MOUSEBUTTONUP() => sub {	382	SDL_MOUSEBUTTONUP() => sub {
283	CFClient::Widget::feed_sdl_button_up_event ($SDL_EV);	383	CFClient::UI::feed_sdl_button_up_event ($SDL_EV);
284	},	384	},
285	SDL_ACTIVEEVENT() => sub {	385	SDL_ACTIVEEVENT() => sub {
286	# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#	386	# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
287	},	387	},
288	);	388	);
289		389
290	@conn::ISA = Crossfire::Protocol::;
291
292	sub conn::map_update {
293	my ($self, $dirty) = @_;
294
295	$MAPWIDGET->update;
296	}
297
298	sub conn::map_scroll {
299	my ($self, $dx, $dy) = @_;
300
301	# refresh;
302	}
303
304	sub conn::map_clear {
305	my ($self) = @_;
306
307	# refresh;
308	}
309
310	sub conn::face_find {
311	my ($self, $face) = @_;
312
313	$FACECACHE->{"$face->{chksum},$face->{name}"}
314	}
315
316	sub conn::face_update {
317	my ($self, $face) = @_;
318
319	$FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image};
320
321	$face->{texture} = new_from_image CFClient::Texture delete $face->{image};
322	}
323
324	sub conn::query {
325	my ($self, $flags, $prompt) = @_;
326
327	warn "<<<<QUERY:$flags:$prompt>>>\n";#d#
328	}
329
330	sub gtk_add_cfg_field {
331	my ($tbl, $cfg, $klbl, $key, $value) = @_;
332	my $i = $cfg->{_i}++;
333	$tbl->attach_defaults (my $lbl = Gtk2::Label->new ($klbl), 0, 1, $i, $i + 1);
334	$tbl->attach_defaults (my $ent = Gtk2::Entry->new, 1, 2, $i, $i + 1);
335	if ($key eq 'password') {
336	$ent->set_invisible_char ("*");
337	$ent->set (visibility => 0)
338	}
339	$ent->set_text ($value);
340	$ent->signal_connect (changed => sub {
341	my ($ent) = @_;
342	$cfg->{$key} = $ent->get_text;
343	# TODO: Mapsize should be a slider in the game gui
344	if ($key eq 'mapsize' and $cfg->{$key} > 100) {
345	$cfg->{$key} = 100;
346	} elsif ($key eq 'mapsize' and $cfg->{$key} < 50) {
347	$cfg->{$key} = 50;
348	}
349	});
350	}
351
352	sub run_config_dialog {
353	my (%events) = @_;
354
355	my $w = Gtk2::Window->new;
356
357	my @cfg = (
358	[qw/Host host/],
359	[qw/Port port/],
360	[qw/Mapsize% mapsize/],
361	[qw/Username user/],
362	[qw/Password password/],
363	);
364
365	my $cfg = {};
366
367	my $a = SDL::ListModes (0, SDL_FULLSCREEN\|SDL_HWSURFACE);
368	my @modes = map { [SDL::RectW ($_), SDL::RectH ($_)] } @$a;
369
370	$w->add (my $vb = Gtk2::VBox->new);
371	$vb->pack_start (my $t = Gtk2::Table->new (2, scalar @cfg), 0, 0, 0);
372	my $selmode = $::CFG->{width} . 'x' . $::CFG->{height};
373	$t->attach_defaults (Gtk2::Label->new ("Modes"), 0, 1, 0, 1);
374	$t->attach_defaults (my $cb = Gtk2::ComboBox->new_text, 1, 2, 0, 1);
375	my $i = 0;
376	my $act = 0;
377	for (map { "$_->[0]x$_->[1]" } reverse @modes) {
378	if ($_ eq $selmode) { $act = $i }
379	$cb->append_text ($_);
380	$i++;
381	}
382	$cb->set_active ($act);
383	$cb->signal_connect (changed => sub {
384	my ($cb) = @_;
385	my $txt = $cb->get_active_text;
386	if ($txt =~ m/(\d+)x(\d+)/) {
387	$::CFG->{width} = $1;
388	$::CFG->{height} = $2;
389	}
390	});
391
392	$cfg->{_i} = 1;
393	for (@cfg) {
394	gtk_add_cfg_field ($t, $cfg, $_->[0], $_->[1], $::CFG->{$_->[1]});
395	}
396
397	$vb->pack_start (my $hb = Gtk2::HBox->new, 0, 0, 0);
398	$hb->pack_start (my $cb = Gtk2::Button->new ("save"), 1, 1, 5);
399	$cb->signal_connect (clicked => sub {
400	for (keys %$cfg) {
401	$::CFG->{$_} = $cfg->{$_}
402	if $_ ne '_i';
403	}
404	CFClient::write_cfg "$CFrossfire::VARDIR/pclientrc";
405	});
406	$hb->pack_start (my $cb = Gtk2::Button->new ("login"), 1, 1, 5);
407	$cb->signal_connect (clicked => sub {
408	for (keys %$cfg) {
409	$::CFG->{$_} = $cfg->{$_}
410	if $_ ne '_i';
411	}
412	my $cb = $events{login} \|\| sub {};
413	$cb->($::CFG->{user}, $::CFG->{password});
414	});
415	$hb->pack_start (my $cb = Gtk2::Button->new ("logout"), 1, 1, 5);
416	$cb->signal_connect (clicked => sub {
417	my $cb = $events{logout} \|\| sub {};
418	$cb->();
419	});
420	$hb->pack_start (my $cb = Gtk2::Button->new ("quit"), 1, 1, 5);
421	$cb->signal_connect (clicked => sub { $w->destroy });
422
423	$w->show_all;
424
425	$w->signal_connect (destroy => sub { Gtk2->main_quit });
426	}
427
428
429	#############################################################################	390	#############################################################################
430		391
431	SDL::Init SDL_INIT_EVERYTHING;
432
433	CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";	392	CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
434		393
435	$CFG \|\|= {	394	my %DEF_CFG = (
436	width => 640,	395	width => 640,
437	height => 480,	396	height => 480,
		397	fast => 0,
		398	fow_intensity => 0.45,
		399	fullscreen => 0,
		400	sdl_mode => 0,
438	mapsize => 100,	401	mapsize => 100,
439	fullscreen => 0,
440	host => "crossfire.schmorp.de",	402	host => "crossfire.schmorp.de",
441	port => 13327,	403	port => 13327,
442	};	404	);
		405
		406	while (my ($k, $v) = each %DEF_CFG) {
		407	$CFG->{$k} = $v unless exists $CFG->{$k};
		408	}
		409
		410	sdl_init;
		411
		412	@SDL_MODES = reverse map [SDL::RectW ($_), SDL::RectH ($_)],
		413	@{ SDL::ListModes 0, SDL_FULLSCREEN \| SDL_HWSURFACE \| SDL_OPENGL };
		414
		415	@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
		416
		417	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
		418
		419	init_screen;
443		420
444	{	421	{
445	my @fonts = map CFClient::find_rcfile $_, qw(uifont.ttf uifontb.ttf uifonti.ttf uifontbi.ttf);	422	my @fonts = map CFClient::find_rcfile $_, qw(uifont.ttf uifontb.ttf uifonti.ttf uifontbi.ttf);
446		423
447	CFClient::add_font $_ for @fonts;	424	CFClient::add_font $_ for @fonts;
448	CFClient::set_font $fonts[0];	425	CFClient::set_font $fonts[0];
449	}	426	}
450		427
451	$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } \|\| {};	428	$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } \|\| {};
452		429
453	run_config_dialog	430	Event::loop;
454	login => sub { start_game },
455	logout => sub { stop_game };
456
457	main Gtk2;
458		431
459	Crossfire::save_ref $FACECACHE, "$Crossfire::VARDIR/pclient.faces";	432	Crossfire::save_ref $FACECACHE, "$Crossfire::VARDIR/pclient.faces";
		433

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents): Revision 1.71 by root, Tue Apr 11 17:02:36 2006 UTC vs. Revision 1.90 by root, Wed Apr 12 21:35:11 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.71 by root, Tue Apr 11 17:02:36 2006 UTC vs.
Revision 1.90 by root, Wed Apr 12 21:35:11 2006 UTC