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

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