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

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents): Revision 1.72 by root, Tue Apr 11 18:06:53 2006 UTC vs. Revision 1.88 by root, Wed Apr 12 21:01:47 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.72 by root, Tue Apr 11 18:06:53 2006 UTC vs.
Revision 1.88 by root, Wed Apr 12 21:01:47 2006 UTC