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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.37 by root, Sat Apr 8 22:25:37 2006 UTC vs.
Revision 1.85 by root, Wed Apr 12 17:11:02 2006 UTC

…		…
12	use SDL::Surface;	12	use SDL::Surface;
13	use SDL::OpenGL;	13	use SDL::OpenGL;
14	use SDL::OpenGL::Constants;	14	use SDL::OpenGL::Constants;
15		15
16	use Crossfire;	16	use Crossfire;
17	use Crossfire::Client;
18	use Crossfire::Protocol;	17	use Crossfire::Protocol;
19		18
20	use Crossfire::Client::Widget;	19	use CFClient;
		20	use CFClient::UI;
		21
		22	our $VERSION = '0.1';
		23
		24	my $MAX_FPS = 60;
		25	my $MIN_FPS = 5; # unused
		26	my $TICKS_PER_FRAME = int 1000 / $MAX_FPS - 1; # min ticks per frame
21		27
22	our $FACECACHE;	28	our $FACECACHE;
23
24	our $VERSION = '0.1';
25
26	our %GL_EXT;
27		29
28	our $CFG;	30	our $CFG;
29	our $CONN;	31	our $CONN;
		32	our $FAST; # fast, low-quality mode, possibly useful for software-rendering
30		33
		34	our @SDL_MODES;
31	our $WIDTH;	35	our $WIDTH;
32	our $HEIGHT;	36	our $HEIGHT;
33	our $FULLSCREEN;	37	our $FULLSCREEN;
34		38
		39	our $NOW;
		40
		41	our $MAPWIDGET;
35	our $UIFONT;	42	our $FONTSIZE;
36		43
37	our $SDL_TIMER;	44	our $SDL_TIMER;
38	our $SDL_APP;	45	our $SDL_APP;
39	our $SDL_EV = new SDL::Event;	46	our $SDL_EV;
40	our %SDL_CB;	47	our %SDL_CB;
41		48
42	our @GL_INIT; # hooks called on every gl init
43
44	our $ALT_ENTER_MESSAGE;	49	our $ALT_ENTER_MESSAGE;
		50	our $STATUS_LINE;
		51	our $DEBUG_STATUS;
45		52
46	our $tw; # Test widget #d#	53	my $last_refresh;
		54	my %ANIMATE;
		55	my $refresh_handler;
		56
		57	sub status {
		58	$STATUS_LINE->set_text ($_[0]);
		59	my ($w, $h) = $STATUS_LINE->size_request;
		60	$STATUS_LINE->size_allocate (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $h, $w, $h);
		61	}
		62
		63	sub debug {
		64	$DEBUG_STATUS->set_text ($_[0]);
		65	my ($w, $h) = $DEBUG_STATUS->size_request;
		66	$DEBUG_STATUS->size_allocate ($WIDTH - $w, 0, $w, $h);
		67	}
		68
		69	sub start_game {
		70	status "logging in...";
		71
		72	my $mapsize = List::Util::min 64, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
		73
		74	$CONN = new conn
		75	host => $CFG->{host},
		76	port => $CFG->{port},
		77	user => $CFG->{user},
		78	pass => $CFG->{password},
		79	mapw => $mapsize,
		80	maph => $mapsize,
		81	;
		82
		83	status "login successful";
		84
		85	CFClient::lowdelay fileno $CONN->{fh};
		86	}
		87
		88	sub stop_game {
		89	undef $CONN;
		90	}
		91
		92	sub config_dialog {
		93	my $dialog = new CFClient::UI::FancyFrame x => 300, y => 100,
		94	child => (my $vbox = new CFClient::UI::VBox);
		95	$vbox->add (new CFClient::UI::Label align => 0, text => "Client Setup");
		96	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
		97
		98	$table->add (0, 0, new CFClient::UI::Label align => 1, text => "Video Mode");
		99	$table->add (1, 0, my $hbox = new CFClient::UI::HBox);
		100
		101	$hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1]);
		102	$hbox->add (my $mode_label = new CFClient::UI::Label height => $FONTSIZE * 0.8);
		103
		104	$mode_slider->connect (changed => sub {
		105	my ($self, $value) = @_;
		106
		107	$CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
		108	$mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});
		109	});
		110	$mode_slider->emit (changed => $mode_slider->{range}[0]);
		111
		112	$table->add (0, 1, new CFClient::UI::Label align => 1, text => "Fullscreen");
		113	$table->add (1, 1, new CFClient::UI::CheckBox state => $CFG->{fullscreen}, connect_changed => sub {
		114	my ($self, $value) = @_;
		115	$CFG->{fullscreen} = $value;
		116	});
		117
		118	$table->add (1, 2, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {
		119	destroy_screen ();
		120	init_screen ();
		121	});
		122
		123	$vbox->add (new CFClient::UI::Label align => 0, text => "Server");
		124	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
		125	$table->add (0, 2, new CFClient::UI::Label align => 1, text => "Host");
		126	$table->add (1, 2, my $host = new CFClient::UI::Entry text => $CFG->{host});
		127
		128	$table->add (0, 3, new CFClient::UI::Label align => 1, text => "Port");
		129	$table->add (1, 3, my $port = new CFClient::UI::Entry text => $CFG->{port});
		130
		131	$table->add (0, 4, new CFClient::UI::Label align => 1, text => "Username");
		132	$table->add (1, 4, my $user = new CFClient::UI::Entry text => $CFG->{user});
		133
		134	$table->add (0, 5, new CFClient::UI::Label align => 1, text => "Password");
		135	$table->add (1, 5, my $pass = new CFClient::UI::Entry text => $CFG->{password}, hidden => 1);
		136
		137	$table->add (0, 6, new CFClient::UI::Label align => 1, text => "Map Size");
		138	$table->add (1, 6, new CFClient::UI::Slider
		139	req_w => 100,
		140	range => [$CFG->{mapsize}, 10, 100 + 1, 1],
		141	connect_changed => sub {
		142	my ($self, $value) = @_;
		143
		144	$CFG->{mapsize} = $self->{range}[0] = $value = int $value;
		145	},
		146	);
		147
		148	$table->add (1, 7, new CFClient::UI::Button expand => 1, align => 0, text => "Login", connect_activate => sub {
		149	start_game;
		150	});
		151
		152	$vbox->add (my $hbox = new CFClient::UI::HBox);
		153
		154	$hbox->add (new CFClient::UI::Button expand => 1, align => 0, text => "Save", connect_activate => sub {
		155	CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
		156	status "Configuration Saved";
		157	});
		158	$CFClient::UI::TOPLEVEL->add ($dialog);
		159	}
47		160
48	sub init_screen {	161	sub init_screen {
		162	($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
		163	$FULLSCREEN = $CFG->{fullscreen};
		164
49	$SDL_APP = new SDL::App	165	$SDL_APP = new SDL::App
50	-flags => SDL_ANYFORMAT \| SDL_HWSURFACE,	166	-flags => SDL_ANYFORMAT \| SDL_HWSURFACE,
51	-title => "Crossfire+ Client",	167	-title => "Crossfire+ Client",
52	-width => $WIDTH,	168	-width => $WIDTH,
53	-height => $HEIGHT,	169	-height => $HEIGHT,
54	-opengl => 1,	170	-opengl => 1,
55	-red_size => 8,	171	-red_size => 5,
56	-green_size => 8,	172	-green_size => 5,
57	-blue_size => 8,	173	-blue_size => 5,
		174	-alpha_size => 0,
58	-double_buffer => 1,	175	-double_buffer => 1,
59	-fullscreen => $FULLSCREEN,	176	-fullscreen => $FULLSCREEN,
60	-resizeable => 0;	177	-resizeable => 0;
61		178
62	%GL_EXT = map +($_ => 1), split /\s+/, Crossfire::Client::gl_extensions;	179	$SDL_EV = new SDL::Event;
		180	$SDL_EV->set_unicode (1);
63		181
64	$GL_EXT{GL_ARB_texture_non_power_of_two}
65	or warn "WARNING: non-power-of-two opengl extension required";
66
67	$UIFONT = SDL::TTFOpenFont Crossfire::Client::find_rcfile "uifont.ttf", $HEIGHT / 40
68	or die "TTFOpenFont: $!";
69
70	$ALT_ENTER_MESSAGE = new Crossfire::Client::Widget::Label 0, $HEIGHT - $HEIGHT / 40, 10, $UIFONT, "Alt-Enter toggles fullscreen mode";
71	$ALT_ENTER_MESSAGE->move (0, $HEIGHT - ($ALT_ENTER_MESSAGE->size_request)[1]);
72	$ALT_ENTER_MESSAGE->activate;
73
74	# Test code #d#
75	my $frm = new Crossfire::Client::Widget::Frame;
76	$tw = new Crossfire::Client::Widget::Window;
77	$frm->add (new Crossfire::Client::Widget::Label 0, 0, 10, $UIFONT, "Foo in the garden!");
78	$tw->add ($frm);
79
80	$tw->move (0, $HEIGHT - 120);
81	$tw->activate;
82	# Test code end #d#
83
84	glClearColor 0, 0, 0, 0;
85
86	glEnable GL_TEXTURE_2D;
87	glEnable GL_COLOR_MATERIAL;
88	glShadeModel GL_FLAT;
89	glDisable GL_DEPTH_TEST;
90	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
91
92	$_->() for @GL_INIT;
93	}
94
95	sub start_game {
96	$SDL_TIMER = add Glib::Timeout 1000/100, sub {	182	$SDL_TIMER = add Glib::Timeout 1000 / $MAX_FPS, sub {
97	($SDL_CB{$SDL_EV->type} \|\| sub { warn "unhandled event ", $SDL_EV->type })->()	183	($SDL_CB{$SDL_EV->type} \|\| sub { warn "unhandled event ", $SDL_EV->type })->()
98	while $SDL_EV->poll;	184	while $SDL_EV->poll;
99		185
100	1	186	1
101	};	187	};
102		188
103	$WIDTH = $CFG->{width};	189	$last_refresh = SDL::GetTicks;
104	$HEIGHT = $CFG->{height};
105	$FULLSCREEN = 0;
106		190
107	init_screen;	191	CFClient::gl_init;
108		192
109	$CONN = new conn	193	$FONTSIZE = int $HEIGHT / 40;
110	host => $CFG->{host},	194
111	port => $CFG->{port},	195	#############################################################################
112	user => $CFG->{user},	196
113	pass => $CFG->{password},	197	$DEBUG_STATUS = new CFClient::UI::Label padding => 0;
114	mapw => 50,	198	$CFClient::UI::TOPLEVEL->add ($DEBUG_STATUS);
115	maph => 37,
116	;	199
117	}	200	$STATUS_LINE = new CFClient::UI::Label
		201	padding => 0,
		202	y => $HEIGHT * 49 / 50 - $FONTSIZE;
		203	$CFClient::UI::TOPLEVEL->add ($STATUS_LINE);
118		204
119	sub stop_game {	205	$ALT_ENTER_MESSAGE = new CFClient::UI::Label
		206	padding => 0,
		207	y => $HEIGHT * 49 / 50,
		208	height => $HEIGHT / 50,
		209	text => "Use <b>Alt-Enter</b> to toggle fullscreen mode";
		210	$CFClient::UI::TOPLEVEL->add ($ALT_ENTER_MESSAGE);
		211
		212	$MAPWIDGET = new CFClient::UI::MapWidget;
		213	$CFClient::UI::TOPLEVEL->add ($MAPWIDGET);
		214	$MAPWIDGET->focus_in;
		215
		216	config_dialog;
		217	}
		218
		219	sub destroy_screen {
		220	$CFClient::UI::TOPLEVEL->{children} = [];
120	remove Glib::Source $SDL_TIMER;	221	remove Glib::Source $SDL_TIMER;
121		222	remove Glib::Source $refresh_handler if $refresh_handler;
		223	undef $refresh_handler;
122	undef $SDL_APP;	224	undef $SDL_APP;
		225	undef $SDL_EV;
123	SDL::Quit;	226	SDL::Quit;
124	}	227	}
125
126		228
127	sub force_refresh {	229	sub force_refresh {
128	glViewport 0, 0, $WIDTH, $HEIGHT;	230	glViewport 0, 0, $WIDTH, $HEIGHT;
129		231
130	glMatrixMode GL_PROJECTION;	232	glMatrixMode GL_PROJECTION;
131	glLoadIdentity;	233	glLoadIdentity;
132	glOrtho 0, $WIDTH, $HEIGHT, 0, -100 , 100;	234	glOrtho 0, $WIDTH, $HEIGHT, 0, -10000 , 10000;
133	glMatrixMode GL_MODELVIEW;	235	glMatrixMode GL_MODELVIEW;
		236	glLoadIdentity;
134		237
135	glClear GL_COLOR_BUFFER_BIT;	238	glClear GL_COLOR_BUFFER_BIT;
136		239
137	$_->draw for @Crossfire::Client::Widget::ACTIVE_WIDGETS;	240	$CFClient::UI::TOPLEVEL->draw;
138		241
139	SDL::GLSwapBuffers;	242	SDL::GLSwapBuffers;
140	}	243	}
141		244
142	my $refresh_handler;	245	my $FPS;
143		246
144	sub refresh {	247	sub refresh {
145	$refresh_handler \|\|= add Glib::Idle sub {	248	$refresh_handler \|\|= add Glib::Idle sub {
		249	if ($SDL_APP) {
		250	$NOW = SDL::GetTicks;
		251
		252	if ($NOW - $last_refresh < $TICKS_PER_FRAME) {
		253	SDL::Delay $TICKS_PER_FRAME - ($NOW - $last_refresh);
		254	$NOW = SDL::GetTicks;
		255	}
		256
		257	my $interval = ($NOW - $last_refresh) * 0.001;
		258	$last_refresh = $NOW;
		259
		260	if ($interval) {
		261	$FPS \|\|= 1 / $interval;
		262	$FPS = $FPS * 0.9 + (1 / $interval) * 0.1;
		263	debug sprintf "%5.02f", $FPS;
		264	}
		265
146	force_refresh;	266	force_refresh;
		267	$_->animate ($interval) for grep $_, values %ANIMATE;
		268
		269	if (%ANIMATE) {
		270	1
		271	} else {
		272	undef $refresh_handler;
		273	0
		274	}
		275	} else {
147	undef $refresh_handler;	276	undef $refresh_handler;
		277	0
148	0	278	}
149	};	279	};
		280	}
		281
		282	sub animation_start {
		283	my ($widget) = @_;
		284	$ANIMATE{$widget} = $widget;
		285	Scalar::Util::weaken $ANIMATE{$widget};
		286
		287	refresh;
		288	}
		289
		290	sub animation_stop {
		291	my ($widget) = @_;
		292	delete $ANIMATE{$widget};
150	}	293	}
151		294
152	%SDL_CB = (	295	%SDL_CB = (
153	SDL_QUIT() => sub {	296	SDL_QUIT() => sub {
154	main_quit Gtk2;	297	main_quit Gtk2;
…		…
160	},	303	},
161	SDL_KEYDOWN() => sub {	304	SDL_KEYDOWN() => sub {
162	if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {	305	if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {
163	# alt-enter	306	# alt-enter
164	$FULLSCREEN = !$FULLSCREEN;	307	$FULLSCREEN = !$FULLSCREEN;
		308	destroy_screen;
165	init_screen;	309	init_screen;
166	} else {	310	} else {
167	Crossfire::Client::Widget::feed_sdl_key_down_event ($SDL_EV);	311	CFClient::UI::feed_sdl_key_down_event ($SDL_EV);
168	}	312	}
169	},	313	},
170	SDL_KEYUP() => sub {	314	SDL_KEYUP() => sub {
171	Crossfire::Client::Widget::feed_sdl_key_up_event ($SDL_EV);	315	CFClient::UI::feed_sdl_key_up_event ($SDL_EV);
172	},	316	},
173	SDL_MOUSEMOTION() => sub {	317	SDL_MOUSEMOTION() => sub {
174	warn "sdl motion\n";#d#	318	CFClient::UI::feed_sdl_motion_event ($SDL_EV);
175	},	319	},
176	SDL_MOUSEBUTTONDOWN() => sub {	320	SDL_MOUSEBUTTONDOWN() => sub {
177	Crossfire::Client::Widget::feed_sdl_button_down_event ($SDL_EV);	321	CFClient::UI::feed_sdl_button_down_event ($SDL_EV);
178	},	322	},
179	SDL_MOUSEBUTTONUP() => sub {	323	SDL_MOUSEBUTTONUP() => sub {
180	Crossfire::Client::Widget::feed_sdl_button_up_event ($SDL_EV);	324	CFClient::UI::feed_sdl_button_up_event ($SDL_EV);
181	},	325	},
182	SDL_ACTIVEEVENT() => sub {	326	SDL_ACTIVEEVENT() => sub {
183	warn "active\n";#d#	327	# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
184	},	328	},
185	);	329	);
186		330
187	@conn::ISA = Crossfire::Protocol::;	331	@conn::ISA = Crossfire::Protocol::;
188		332
189	sub conn::map_update {	333	sub conn::map_update {
190	my ($self, $dirty) = @_;	334	my ($self, $dirty) = @_;
191		335
192	refresh;	336	$MAPWIDGET->update;
193	}	337	}
194		338
195	sub conn::map_scroll {	339	sub conn::map_scroll {
196	my ($self, $dx, $dy) = @_;	340	my ($self, $dx, $dy) = @_;
197		341
198	refresh;	342	# refresh;
199	}	343	}
200		344
201	sub conn::map_clear {	345	sub conn::map_clear {
202	my ($self) = @_;	346	my ($self) = @_;
203		347
204	refresh;	348	# refresh;
205	}	349	}
206		350
207	sub conn::face_find {	351	sub conn::face_find {
208	my ($self, $face) = @_;	352	my ($self, $face) = @_;
209		353
…		…
213	sub conn::face_update {	357	sub conn::face_update {
214	my ($self, $face) = @_;	358	my ($self, $face) = @_;
215		359
216	$FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image};	360	$FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image};
217		361
218	$face->{texture} = new_from_image Crossfire::Client::Texture delete $face->{image};	362	$face->{texture} = new_from_image CFClient::Texture delete $face->{image};
219	}	363	}
220		364
221	sub conn::query {	365	sub conn::query {
222	my ($self, $flags, $prompt) = @_;	366	my ($self, $flags, $prompt) = @_;
223		367
…		…
235	}	379	}
236	$ent->set_text ($value);	380	$ent->set_text ($value);
237	$ent->signal_connect (changed => sub {	381	$ent->signal_connect (changed => sub {
238	my ($ent) = @_;	382	my ($ent) = @_;
239	$cfg->{$key} = $ent->get_text;	383	$cfg->{$key} = $ent->get_text;
		384	# TODO: Mapsize should be a slider in the game gui
		385	if ($key eq 'mapsize' and $cfg->{$key} > 100) {
		386	$cfg->{$key} = 100;
		387	} elsif ($key eq 'mapsize' and $cfg->{$key} < 50) {
		388	$cfg->{$key} = 50;
		389	}
240	});	390	});
241	}	391	}
242		392
243	sub run_config_dialog {	393	sub run_config_dialog {
244	my (%events) = @_;	394	my (%events) = @_;
…		…
246	my $w = Gtk2::Window->new;	396	my $w = Gtk2::Window->new;
247		397
248	my @cfg = (	398	my @cfg = (
249	[qw/Host host/],	399	[qw/Host host/],
250	[qw/Port port/],	400	[qw/Port port/],
		401	[qw/Mapsize% mapsize/],
251	[qw/Username user/],	402	[qw/Username user/],
252	[qw/Password password/],	403	[qw/Password password/],
253	);	404	);
254		405
255	my $cfg = {};	406	my $cfg = {};
256
257	my $a = SDL::ListModes (0, SDL_FULLSCREEN\|SDL_HWSURFACE);
258	my @modes = map { [SDL::RectW ($_), SDL::RectH ($_)] } @$a;
259		407
260	$w->add (my $vb = Gtk2::VBox->new);	408	$w->add (my $vb = Gtk2::VBox->new);
261	$vb->pack_start (my $t = Gtk2::Table->new (2, scalar @cfg), 0, 0, 0);	409	$vb->pack_start (my $t = Gtk2::Table->new (2, scalar @cfg), 0, 0, 0);
262	my $selmode = $::CFG->{width} . 'x' . $::CFG->{height};	410	my $selmode = $::CFG->{width} . 'x' . $::CFG->{height};
263	$t->attach_defaults (Gtk2::Label->new ("Modes"), 0, 1, 0, 1);	411	$t->attach_defaults (Gtk2::Label->new ("Modes"), 0, 1, 0, 1);
264	$t->attach_defaults (my $cb = Gtk2::ComboBox->new_text, 1, 2, 0, 1);	412	$t->attach_defaults (my $cb = Gtk2::ComboBox->new_text, 1, 2, 0, 1);
265	my $i = 0;	413	my $i = 0;
266	my $act = 0;	414	my $act = 0;
267	for (map { "$_->[0]x$_->[1]" } reverse @modes) {	415	for (map { "$_->[0]x$_->[1]" } @SDL_MODES) {
268	if ($_ eq $selmode) { $act = $i }	416	if ($_ eq $selmode) { $act = $i }
269	$cb->append_text ($_);	417	$cb->append_text ($_);
270	$i++;	418	$i++;
271	}	419	}
272	$cb->set_active ($act);	420	$cb->set_active ($act);
…		…
289	$cb->signal_connect (clicked => sub {	437	$cb->signal_connect (clicked => sub {
290	for (keys %$cfg) {	438	for (keys %$cfg) {
291	$::CFG->{$_} = $cfg->{$_}	439	$::CFG->{$_} = $cfg->{$_}
292	if $_ ne '_i';	440	if $_ ne '_i';
293	}	441	}
294	Crossfire::Client::write_cfg "$Crossfire::VARDIR/pclientrc";	442	CFClient::write_cfg "$CFrossfire::VARDIR/pclientrc";
295	});	443	});
296	$hb->pack_start (my $cb = Gtk2::Button->new ("login"), 1, 1, 5);	444	$hb->pack_start (my $cb = Gtk2::Button->new ("login"), 1, 1, 5);
297	$cb->signal_connect (clicked => sub {	445	$cb->signal_connect (clicked => sub {
298	for (keys %$cfg) {	446	for (keys %$cfg) {
299	$::CFG->{$_} = $cfg->{$_}	447	$::CFG->{$_} = $cfg->{$_}
…		…
302	my $cb = $events{login} \|\| sub {};	450	my $cb = $events{login} \|\| sub {};
303	$cb->($::CFG->{user}, $::CFG->{password});	451	$cb->($::CFG->{user}, $::CFG->{password});
304	});	452	});
305	$hb->pack_start (my $cb = Gtk2::Button->new ("logout"), 1, 1, 5);	453	$hb->pack_start (my $cb = Gtk2::Button->new ("logout"), 1, 1, 5);
306	$cb->signal_connect (clicked => sub {	454	$cb->signal_connect (clicked => sub {
307	my $cb = $events{login} \|\| sub {};	455	my $cb = $events{logout} \|\| sub {};
308	$cb->();	456	$cb->();
309	});	457	});
310	$hb->pack_start (my $cb = Gtk2::Button->new ("quit"), 1, 1, 5);	458	$hb->pack_start (my $cb = Gtk2::Button->new ("quit"), 1, 1, 5);
311	$cb->signal_connect (clicked => sub { $w->destroy });	459	$cb->signal_connect (clicked => sub { $w->destroy });
312		460
…		…
317		465
318		466
319	#############################################################################	467	#############################################################################
320		468
321	SDL::Init SDL_INIT_EVERYTHING;	469	SDL::Init SDL_INIT_EVERYTHING;
322	SDL::TTFInit;
323		470
324	my $mapwidget = Crossfire::Client::Widget::MapWidget->new;	471	@SDL_MODES = reverse map [SDL::RectW ($_), SDL::RectH ($_)],
		472	@{ SDL::ListModes 0, SDL_FULLSCREEN\|SDL_HWSURFACE };
325		473
326	$mapwidget->activate;
327	$mapwidget->focus_in;
328
329	Crossfire::Client::read_cfg "$Crossfire::VARDIR/pclientrc";	474	CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
330		475
331	$CFG \|\|= {	476	$CFG \|\|= {
332	width => 640,	477	width => 640,
333	height => 480,	478	height => 480,
334	fullscreen => 0,	479	fullscreen => 0,
		480	sdl_mode => 0,
		481	mapsize => 100,
335	host => "crossfire.schmorp.de",	482	host => "crossfire.schmorp.de",
336	port => 13327,	483	port => 13327,
337	};	484	};
338		485
		486	{
		487	my @fonts = map CFClient::find_rcfile $_, qw(uifont.ttf uifontb.ttf uifonti.ttf uifontbi.ttf);
		488
		489	CFClient::add_font $_ for @fonts;
		490	CFClient::set_font $fonts[0];
		491	}
		492
339	$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } \|\| {};	493	$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } \|\| {};
340		494
341	run_config_dialog	495	init_screen;
342	login => sub { start_game },
343	logout => sub { stop_game };
344		496
345	main Gtk2;	497	main Gtk2;
346		498
347	Crossfire::save_ref $FACECACHE, "$Crossfire::VARDIR/pclient.faces";	499	Crossfire::save_ref $FACECACHE, "$Crossfire::VARDIR/pclient.faces";
		500

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents): Revision 1.37 by root, Sat Apr 8 22:25:37 2006 UTC vs. Revision 1.85 by root, Wed Apr 12 17:11:02 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.37 by root, Sat Apr 8 22:25:37 2006 UTC vs.
Revision 1.85 by root, Wed Apr 12 17:11:02 2006 UTC