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

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents): Revision 1.69 by root, Tue Apr 11 14:04:27 2006 UTC vs. Revision 1.93 by root, Wed Apr 12 23:37:38 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.69 by root, Tue Apr 11 14:04:27 2006 UTC vs.
Revision 1.93 by root, Wed Apr 12 23:37:38 2006 UTC