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

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents): Revision 1.16 by elmex, Fri Apr 7 17:37:11 2006 UTC vs. Revision 1.56 by root, Sun Apr 9 22:28:05 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.16 by elmex, Fri Apr 7 17:37:11 2006 UTC vs.
Revision 1.56 by root, Sun Apr 9 22:28:05 2006 UTC