[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.25 by root, Fri Apr 7 20:55:32 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;	20	use Crossfire::Client::Util;
19	use Client::Widget;	21	use Crossfire::Client::Widget;
		22
		23	our $FACECACHE;
20		24
21	our $VERSION = '0.1';	25	our $VERSION = '0.1';
22		26
23	our $CFG;	27	our $CFG;
24	our $CONN;	28	our $CONN;
		29
		30	our $UIFONT;
25		31
26	our $SDL_TIMER;	32	our $SDL_TIMER;
27	our $SDL_APP;	33	our $SDL_APP;
28	our $SDL_EV = new SDL::Event;	34	our $SDL_EV = new SDL::Event;
29	our %SDL_CB;	35	our %SDL_CB;
30	our @GL_INIT;	36
		37	our @GL_INIT; # hooks called on every gl init
31		38
32	sub init_screen {	39	sub init_screen {
33	$SDL_APP = new SDL::App	40	$SDL_APP = new SDL::App
34	-flags => SDL_ANYFORMAT \| SDL_HWSURFACE,	41	-flags => SDL_ANYFORMAT \| SDL_HWSURFACE,
35	-title => "Crossfire+ Client",	42	-title => "Crossfire+ Client",
…		…
41	-blue_size => 8,	48	-blue_size => 8,
42	-double_buffer => 1,	49	-double_buffer => 1,
43	-fullscreen => $CFG->{fullscreen},	50	-fullscreen => $CFG->{fullscreen},
44	-resizeable => 0;	51	-resizeable => 0;
45		52
		53	glClearColor 0, 0, 0, 0;
		54
46	glEnable GL_TEXTURE_2D;	55	glEnable GL_TEXTURE_2D;
47	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
48	glShadeModel GL_FLAT;	56	glShadeModel GL_FLAT;
49	glDisable GL_DEPTH_TEST;	57	glDisable GL_DEPTH_TEST;
50	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	58	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
51	glEnable GL_BLEND;
52		59
53	glMatrixMode GL_PROJECTION;	60	glMatrixMode GL_PROJECTION;
54	glLoadIdentity;	61	glLoadIdentity;
55	glOrtho 0, $CFG->{width} / 32, $CFG->{height} / 32, 0, -1 , 1;	62	glOrtho 0, $CFG->{width}, $CFG->{height}, 0, -100 , 100;
		63
		64	glMatrixMode GL_MODELVIEW;
56		65
57	$_->() for @GL_INIT;	66	$_->() for @GL_INIT;
58	}	67	}
		68
		69	my $label;#d#
59		70
60	sub start_game {	71	sub start_game {
61	$SDL_TIMER = add Glib::Timeout 1000/20, sub {	72	$SDL_TIMER = add Glib::Timeout 1000/20, sub {
62	while ($SDL_EV->poll) {	73	while ($SDL_EV->poll) {
63	($SDL_CB{$SDL_EV->type} \|\| sub { warn "unhandled event ", $SDL_EV->type })->();	74	($SDL_CB{$SDL_EV->type} \|\| sub { warn "unhandled event ", $SDL_EV->type })->();
…		…
66	1	77	1
67	};	78	};
68		79
69	init_screen;	80	init_screen;
70		81
		82	$label = new Crossfire::Client::Widget::Label 500, 10, 1, $UIFONT, "Testü[]";
		83	$label->activate;
		84
71	$CONN = new conn	85	$CONN = new conn
72	host => $CFG->{host},	86	host => $CFG->{host},
73	port => $CFG->{port};	87	port => $CFG->{port};
74	}	88	}
75		89
…		…
79	undef $SDL_APP;	93	undef $SDL_APP;
80	SDL::Quit;	94	SDL::Quit;
81	}	95	}
82		96
83	sub refresh {	97	sub refresh {
84	glClearColor 0, 0, 0, 0;
85	glClear GL_COLOR_BUFFER_BIT;	98	glClear GL_COLOR_BUFFER_BIT;
86		99
87	for (values %Client::Widget::ACTIVE_WIDGETS) {	100	$_->draw for values %Crossfire::Client::Widget::ACTIVE_WIDGETS;
88	$_->draw
89	}
90		101
91	SDL::GLSwapBuffers;	102	SDL::GLSwapBuffers;
92	}	103	}
93		104
94	%SDL_CB = (	105	%SDL_CB = (
95	SDL_QUIT() => sub {	106	SDL_QUIT() => sub {
96	warn "sdl quit\n";#d#	107	main_quit Gtk2;
97	exit;
98	},	108	},
99	SDL_VIDEORESIZE() => sub {	109	SDL_VIDEORESIZE() => sub {
100	},	110	},
101	SDL_VIDEOEXPOSE() => sub {	111	SDL_VIDEOEXPOSE() => sub {
102	refresh;	112	refresh;
103	},	113	},
104	SDL_KEYDOWN() => sub {	114	SDL_KEYDOWN() => sub {
		115	if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {
		116	# alt-enter
		117	$CFG->{fullscreen} = !$CFG->{fullscreen};
		118	init_screen;
		119	} else {
105	Client::Widget::feed_sdl_key_down_event ($SDL_EV);	120	Crossfire::Client::Widget::feed_sdl_key_down_event ($SDL_EV);
		121	}
106	},	122	},
107	SDL_KEYUP() => sub {	123	SDL_KEYUP() => sub {
108	Client::Widget::feed_sdl_key_up_event ($SDL_EV);	124	Crossfire::Client::Widget::feed_sdl_key_up_event ($SDL_EV);
109	},	125	},
110	SDL_MOUSEMOTION() => sub {	126	SDL_MOUSEMOTION() => sub {
111	warn "sdl motion\n";#d#	127	warn "sdl motion\n";#d#
112	},	128	},
113	SDL_MOUSEBUTTONDOWN() => sub {	129	SDL_MOUSEBUTTONDOWN() => sub {
114	Client::Widget::feed_sdl_button_down_event ($SDL_EV);	130	Crossfire::Client::Widget::feed_sdl_button_down_event ($SDL_EV);
115	},	131	},
116	SDL_MOUSEBUTTONUP() => sub {	132	SDL_MOUSEBUTTONUP() => sub {
117	Client::Widget::feed_sdl_button_up_event ($SDL_EV);	133	Crossfire::Client::Widget::feed_sdl_button_up_event ($SDL_EV);
118	},	134	},
119	SDL_ACTIVEEVENT() => sub {	135	SDL_ACTIVEEVENT() => sub {
120	warn "active\n";#d#	136	warn "active\n";#d#
121	},	137	},
122	);	138	);
…		…
139	my ($self) = @_;	155	my ($self) = @_;
140		156
141	refresh;	157	refresh;
142	}	158	}
143		159
		160	sub conn::face_find {
		161	my ($self, $face) = @_;
		162
		163	$FACECACHE->{"$face->{chksum},$face->{name}"}
		164	}
		165
144	sub conn::face_update {	166	sub conn::face_update {
145	my ($self, $num, $face) = @_;	167	my ($self, $face) = @_;
146		168
		169	$FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image};
		170
		171	$face->{texture} = new_from_image Crossfire::Client::Texture delete $face->{image};
147	}	172	}
		173
		174	sub gtk_add_cfg_field {
		175	my ($tbl, $cfg, $klbl, $key, $value) = @_;
		176	my $i = $cfg->{_i}++;
		177	$tbl->attach_defaults (my $lbl = Gtk2::Label->new ($klbl), 0, 1, $i, $i + 1);
		178	$tbl->attach_defaults (my $ent = Gtk2::Entry->new, 1, 2, $i, $i + 1);
		179	if ($key eq 'password') {
		180	$ent->set_invisible_char ("*");
		181	$ent->set (visibility => 0)
		182	}
		183	$ent->set_text ($value);
		184	$ent->signal_connect (changed => sub {
		185	my ($ent) = @_;
		186	$cfg->{$key} = $ent->get_text;
		187	});
		188	}
		189
		190	sub run_config_dialog {
		191	my (%events) = @_;
		192
		193	my $w = Gtk2::Window->new;
		194
		195	my @cfg = (
		196	[qw/Host host/],
		197	[qw/Port port/],
		198	[qw/Username user/],
		199	[qw/Password password/],
		200	);
		201
		202	my $cfg = {};
		203
		204	my $a = SDL::ListModes (0, SDL_FULLSCREEN\|SDL_HWSURFACE);
		205	my @modes = map { [SDL::RectW ($_), SDL::RectH ($_)] } @$a;
		206
		207	$w->add (my $vb = Gtk2::VBox->new);
		208	$vb->pack_start (my $t = Gtk2::Table->new (2, scalar @cfg), 0, 0, 0);
		209	my $selmode = $::CFG->{width} . 'x' . $::CFG->{height};
		210	$t->attach_defaults (Gtk2::Label->new ("Modes"), 0, 1, 0, 1);
		211	$t->attach_defaults (my $cb = Gtk2::ComboBox->new_text, 1, 2, 0, 1);
		212	my $i = 0;
		213	my $act = 0;
		214	for (map { "$_->[0]x$_->[1]" } reverse @modes) {
		215	if ($_ eq $selmode) { $act = $i }
		216	$cb->append_text ($_);
		217	$i++;
		218	}
		219	$cb->set_active ($act);
		220	$cb->signal_connect (changed => sub {
		221	my ($cb) = @_;
		222	my $txt = $cb->get_active_text;
		223	if ($txt =~ m/(\d+)x(\d+)/) {
		224	$::CFG->{width} = $1;
		225	$::CFG->{height} = $2;
		226	}
		227	});
		228
		229	$cfg->{_i} = 1;
		230	for (@cfg) {
		231	gtk_add_cfg_field ($t, $cfg, $_->[0], $_->[1], $::CFG->{$_->[1]});
		232	}
		233
		234	$vb->pack_start (my $hb = Gtk2::HBox->new, 0, 0, 0);
		235	$hb->pack_start (my $cb = Gtk2::Button->new ("save"), 1, 1, 5);
		236	$cb->signal_connect (clicked => sub {
		237	for (keys %$cfg) {
		238	$::CFG->{$_} = $cfg->{$_}
		239	if $_ ne '_i';
		240	}
		241	Crossfire::Client::write_cfg "$Crossfire::VARDIR/pclientrc";
		242	});
		243	$hb->pack_start (my $cb = Gtk2::Button->new ("login"), 1, 1, 5);
		244	$cb->signal_connect (clicked => sub {
		245	for (keys %$cfg) {
		246	$::CFG->{$_} = $cfg->{$_}
		247	if $_ ne '_i';
		248	}
		249	my $cb = $events{login} \|\| sub {};
		250	$cb->($::CFG->{user}, $::CFG->{password});
		251	});
		252	$hb->pack_start (my $cb = Gtk2::Button->new ("logout"), 1, 1, 5);
		253	$cb->signal_connect (clicked => sub {
		254	my $cb = $events{login} \|\| sub {};
		255	$cb->();
		256	});
		257	$hb->pack_start (my $cb = Gtk2::Button->new ("quit"), 1, 1, 5);
		258	$cb->signal_connect (clicked => sub { $w->destroy });
		259
		260	$w->show_all;
		261
		262	$w->signal_connect (destroy => sub { Gtk2->main_quit });
		263	}
		264
148		265
149	#############################################################################	266	#############################################################################
150		267
		268	SDL::Init SDL_INIT_EVERYTHING;
		269
151	my $mapwidget = Client::MapWidget->new;	270	my $mapwidget = Crossfire::Client::Widget::MapWidget->new;
152		271
153	$mapwidget->activate;	272	$mapwidget->activate;
154	$mapwidget->focus_in;	273	$mapwidget->focus_in;
155		274
156	Client::Util::read_cfg "$Crossfire::VARDIR/pclientrc";	275	Crossfire::Client::read_cfg "$Crossfire::VARDIR/pclientrc";
157		276
158	$CFG \|\|= {	277	$CFG \|\|= {
159	width => 640,	278	width => 640,
160	height => 480,	279	height => 480,
161	fullscreen => 0,	280	fullscreen => 0,
162	host => "crossfire.schmorp.de",	281	host => "crossfire.schmorp.de",
163	port => 13327,	282	port => 13327,
164	};	283	};
165		284
166	Client::Util::run_config_dialog	285	$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } \|\| {};
		286
		287	SDL::TTFInit;
		288
		289	$UIFONT = SDL::TTFOpenFont Crossfire::Client::find_rcfile "uifont.ttf", 24
		290	or die "TTFOpenFont: $!";
		291
		292	run_config_dialog
167	login => sub { start_game },	293	login => sub { start_game },
168	logout => sub { stop_game };	294	logout => sub { stop_game };
169		295
170	main Gtk2;	296	main Gtk2;
		297
		298	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.25 by root, Fri Apr 7 20:55:32 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.25 by root, Fri Apr 7 20:55:32 2006 UTC