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

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