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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.17 by root, Fri Apr 7 18:20:13 2006 UTC vs.
Revision 1.59 by root, Mon Apr 10 11:55:16 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;
10	use SDL::Surface;	12	use SDL::Surface;
11	use SDL::OpenGL;	13	use SDL::OpenGL;
12	use SDL::OpenGL::Constants;	14	use SDL::OpenGL::Constants;
13		15
14	use Crossfire;	16	use Crossfire;
		17	use Crossfire::Protocol;
		18
15	use Crossfire::Client;	19	use Crossfire::Client;
16	use Crossfire::Protocol;
17
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;
25		30
		31	our $WIDTH;
		32	our $HEIGHT;
		33	our $FULLSCREEN;
		34
		35	our $FONTSIZE;
		36
26	our $SDL_TIMER;	37	our $SDL_TIMER;
27	our $SDL_APP;	38	our $SDL_APP;
28	our $SDL_EV = new SDL::Event;	39	our $SDL_EV;
29	our %SDL_CB;	40	our %SDL_CB;
30	our @GL_INIT;	41
		42	our @GL_INIT; # hooks called on every gl init
		43
		44	our $ALT_ENTER_MESSAGE;
		45	our $STATUS_LINE;
		46
		47	my $last_refresh;
		48	my %ANIMATE;
		49	my $refresh_handler;
		50
		51	our ($tw, $te); # Test widget #d#
31		52
32	sub init_screen {	53	sub init_screen {
33	$SDL_APP = new SDL::App	54	$SDL_APP = new SDL::App
34	-flags => SDL_ANYFORMAT \| SDL_HWSURFACE,	55	-flags => SDL_ANYFORMAT \| SDL_HWSURFACE,
35	-title => "Crossfire+ Client",	56	-title => "Crossfire+ Client",
36	-width => $CFG->{width},	57	-width => $WIDTH,
37	-height => $CFG->{height},	58	-height => $HEIGHT,
38	-opengl => 1,	59	-opengl => 1,
39	-red_size => 8,	60	-red_size => 5,
40	-green_size => 8,	61	-green_size => 5,
41	-blue_size => 8,	62	-blue_size => 5,
		63	-alpha_size => 0,
42	-double_buffer => 1,	64	-double_buffer => 1,
43	-fullscreen => $CFG->{fullscreen},	65	-fullscreen => $FULLSCREEN,
44	-resizeable => 0;	66	-resizeable => 0;
45		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
46	glEnable GL_TEXTURE_2D;	84	glEnable GL_TEXTURE_2D;
47	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	85	glEnable GL_COLOR_MATERIAL;
48	glShadeModel GL_FLAT;	86	glShadeModel GL_FLAT;
49	glDisable GL_DEPTH_TEST;	87	glDisable GL_DEPTH_TEST;
50	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	88	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
51	glEnable GL_BLEND;	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	}
		136
		137	sub start_game {
		138	$SDL_TIMER = add Glib::Timeout 1000/50, sub {
		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
		151	my $mapsize = List::Util::min 64, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
		152
		153	$CONN = new conn
		154	host => $CFG->{host},
		155	port => $CFG->{port},
		156	user => $CFG->{user},
		157	pass => $CFG->{password},
		158	mapw => $mapsize,
		159	maph => $mapsize,
		160	;
		161
		162	Crossfire::Client::lowdelay fileno $CONN->{fh};
		163	}
		164
		165	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;
		172	SDL::Quit;
		173	}
		174
		175	sub force_refresh {
		176	glViewport 0, 0, $WIDTH, $HEIGHT;
52		177
53	glMatrixMode GL_PROJECTION;	178	glMatrixMode GL_PROJECTION;
54	glLoadIdentity;	179	glLoadIdentity;
55	glOrtho 0, $CFG->{width} / 32, $CFG->{height} / 32, 0, -1 , 1;	180	glOrtho 0, $WIDTH, $HEIGHT, 0, -10000 , 10000;
		181	glMatrixMode GL_MODELVIEW;
56		182
57	$_->() for @GL_INIT;	183	glClear GL_COLOR_BUFFER_BIT;
58	}
59		184
60	sub start_game {	185	$Crossfire::Client::Widget::TOPLEVEL->draw;
61	$SDL_TIMER = add Glib::Timeout 1000/20, sub {	186
62	while ($SDL_EV->poll) {	187	SDL::GLSwapBuffers;
63	($SDL_CB{$SDL_EV->type} \|\| sub { warn "unhandled event ", $SDL_EV->type })->();	188	}
		189
		190	sub refresh {
		191	$refresh_handler \|\|= add Glib::Idle sub {
		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
64	}	209	}
65
66	1
67	};	210	};
68
69	init_screen;
70
71	$CONN = new conn
72	host => $CFG->{host},
73	port => $CFG->{port};
74	}	211	}
75		212
76	sub stop_game {	213	sub animation_start {
77	remove Glib::Source $SDL_TIMER;	214	my ($widget) = @_;
		215	$ANIMATE{$widget} = $widget;
		216	Scalar::Util::weaken $ANIMATE{$widget};
78		217
79	undef $SDL_APP;	218	refresh;
80	SDL::Quit;
81	}	219	}
82		220
83	sub refresh {	221	sub animation_stop {
84	glClearColor 0, 0, 0, 0;	222	my ($widget) = @_;
85	glClear GL_COLOR_BUFFER_BIT;	223	delete $ANIMATE{$widget};
86
87	for (values %Client::Widget::ACTIVE_WIDGETS) {
88	$_->draw
89	}
90
91	SDL::GLSwapBuffers;
92	}	224	}
93		225
94	%SDL_CB = (	226	%SDL_CB = (
95	SDL_QUIT() => sub {	227	SDL_QUIT() => sub {
96	warn "sdl quit\n";#d#	228	main_quit Gtk2;
97	exit;
98	},	229	},
99	SDL_VIDEORESIZE() => sub {	230	SDL_VIDEORESIZE() => sub {
100	},	231	},
101	SDL_VIDEOEXPOSE() => sub {	232	SDL_VIDEOEXPOSE() => sub {
102	refresh;	233	refresh;
103	},	234	},
104	SDL_KEYDOWN() => sub {	235	SDL_KEYDOWN() => sub {
		236	if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {
		237	# alt-enter
		238	$FULLSCREEN = !$FULLSCREEN;
		239	init_screen;
		240	} else {
105	Client::Widget::feed_sdl_key_down_event ($SDL_EV);	241	Crossfire::Client::Widget::feed_sdl_key_down_event ($SDL_EV);
		242	}
106	},	243	},
107	SDL_KEYUP() => sub {	244	SDL_KEYUP() => sub {
108	Client::Widget::feed_sdl_key_up_event ($SDL_EV);	245	Crossfire::Client::Widget::feed_sdl_key_up_event ($SDL_EV);
109	},	246	},
110	SDL_MOUSEMOTION() => sub {	247	SDL_MOUSEMOTION() => sub {
111	warn "sdl motion\n";#d#	248	Crossfire::Client::Widget::feed_sdl_motion_event ($SDL_EV);
112	},	249	},
113	SDL_MOUSEBUTTONDOWN() => sub {	250	SDL_MOUSEBUTTONDOWN() => sub {
114	Client::Widget::feed_sdl_button_down_event ($SDL_EV);	251	Crossfire::Client::Widget::feed_sdl_button_down_event ($SDL_EV);
115	},	252	},
116	SDL_MOUSEBUTTONUP() => sub {	253	SDL_MOUSEBUTTONUP() => sub {
117	Client::Widget::feed_sdl_button_up_event ($SDL_EV);	254	Crossfire::Client::Widget::feed_sdl_button_up_event ($SDL_EV);
118	},	255	},
119	SDL_ACTIVEEVENT() => sub {	256	SDL_ACTIVEEVENT() => sub {
120	warn "active\n";#d#	257	printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
121	},	258	},
122	);	259	);
123		260
124	@conn::ISA = Crossfire::Protocol::;	261	@conn::ISA = Crossfire::Protocol::;
125		262
…		…
130	}	267	}
131		268
132	sub conn::map_scroll {	269	sub conn::map_scroll {
133	my ($self, $dx, $dy) = @_;	270	my ($self, $dx, $dy) = @_;
134		271
135	refresh;	272	# refresh;
136	}	273	}
137		274
138	sub conn::map_clear {	275	sub conn::map_clear {
139	my ($self) = @_;	276	my ($self) = @_;
140		277
141	refresh;	278	# refresh;
		279	}
		280
		281	sub conn::face_find {
		282	my ($self, $face) = @_;
		283
		284	$FACECACHE->{"$face->{chksum},$face->{name}"}
142	}	285	}
143		286
144	sub conn::face_update {	287	sub conn::face_update {
145	my ($self, $num, $face) = @_;	288	my ($self, $face) = @_;
146		289
		290	$FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image};
		291
		292	$face->{texture} = new_from_image Crossfire::Client::Texture delete $face->{image};
147	}	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
148		399
149	#############################################################################	400	#############################################################################
150		401
		402	SDL::Init SDL_INIT_EVERYTHING;
		403
151	my $mapwidget = Client::MapWidget->new;	404	my $mapwidget = Crossfire::Client::Widget::MapWidget->new;
152		405
153	$mapwidget->activate;	406	$Crossfire::Client::Widget::TOPLEVEL->add ($mapwidget);
154	$mapwidget->focus_in;	407	$mapwidget->focus_in;
155		408
156	Client::Util::read_cfg "$Crossfire::VARDIR/pclientrc";	409	Crossfire::Client::read_cfg "$Crossfire::VARDIR/pclientrc";
157		410
158	$CFG \|\|= {	411	$CFG \|\|= {
159	width => 640,	412	width => 640,
160	height => 480,	413	height => 480,
		414	mapsize => 100,
161	fullscreen => 0,	415	fullscreen => 0,
162	host => "crossfire.schmorp.de",	416	host => "crossfire.schmorp.de",
163	port => 13327,	417	port => 13327,
164	};	418	};
165		419
166	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
167	login => sub { start_game },	425	login => sub { start_game },
168	logout => sub { stop_game };	426	logout => sub { stop_game };
169		427
170	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.17 by root, Fri Apr 7 18:20:13 2006 UTC vs. Revision 1.59 by root, Mon Apr 10 11:55:16 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.17 by root, Fri Apr 7 18:20:13 2006 UTC vs.
Revision 1.59 by root, Mon Apr 10 11:55:16 2006 UTC