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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.20 by elmex, Fri Apr 7 19:58:55 2006 UTC vs.
Revision 1.50 by root, Sun Apr 9 21:05:50 2006 UTC

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents): Revision 1.20 by elmex, Fri Apr 7 19:58:55 2006 UTC vs. Revision 1.50 by root, Sun Apr 9 21:05:50 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.20 by elmex, Fri Apr 7 19:58:55 2006 UTC vs.
Revision 1.50 by root, Sun Apr 9 21:05:50 2006 UTC