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

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

Diff Legend

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.18 by root, Fri Apr 7 18:49:53 2006 UTC vs.
Revision 1.36 by elmex, Sat Apr 8 22:23:57 2006 UTC