[ViewVC] Diff of: cvs/deliantra/Deliantra-Client/DC/UI.pm

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.30 by root, Sun Apr 9 00:18:45 2006 UTC vs.
Revision 1.43 by root, Sun Apr 9 22:12:11 2006 UTC

…		…
5	use Scalar::Util;	5	use Scalar::Util;
6		6
7	use SDL::OpenGL;	7	use SDL::OpenGL;
8	use SDL::OpenGL::Constants;	8	use SDL::OpenGL::Constants;
9		9
		10	use Crossfire::Client;
		11
10	our $FOCUS; # the widget with current focus	12	our $FOCUS; # the widget with current focus
11	our @ACTIVE_WIDGETS;
12		13
13	# class methods for events	14	# class methods for events
14	sub feed_sdl_key_down_event { $FOCUS->key_down ($_[0]) if $FOCUS }	15	sub feed_sdl_key_down_event { $FOCUS->key_down ($_[0]) if $FOCUS }
15	sub feed_sdl_key_up_event { $FOCUS->key_up ($_[0]) if $FOCUS }	16	sub feed_sdl_key_up_event { $FOCUS->key_up ($_[0]) if $FOCUS }
16	sub feed_sdl_button_down_event { $FOCUS->button_down ($_[0]) if $FOCUS }	17	sub feed_sdl_button_down_event { }
17	sub feed_sdl_button_up_event { $FOCUS->button_up ($_[0]) if $FOCUS }	18	sub feed_sdl_button_up_event { }
18		19
19	sub new {	20	sub new {
20	my $class = shift;	21	my $class = shift;
21		22
22	bless { @_ }, $class	23	bless { @_ }, $class
23	}
24
25	sub activate {
26	push @ACTIVE_WIDGETS, $_[0];
27	Scalar::Util::weaken $ACTIVE_WIDGETS[-1];
28	}
29
30	sub deactivate {
31	@ACTIVE_WIDGETS =
32	sort { $a->{z} <=> $b->{z} }
33	grep { $_ && $_ != $_[0] }
34	@ACTIVE_WIDGETS;
35	}	24	}
36		25
37	sub move {	26	sub move {
38	my ($self, $x, $y, $z) = @_;	27	my ($self, $x, $y, $z) = @_;
39	$self->{x} = $x;	28	$self->{x} = $x;
…		…
44	sub needs_redraw {	33	sub needs_redraw {
45	0	34	0
46	}	35	}
47		36
48	sub size_request {	37	sub size_request {
		38	require Carp;
49	die "size_request is abtract";	39	Carp::confess "size_request is abtract";
		40	}
		41
		42	sub size_allocate {
		43	my ($self, $w, $h) = @_;
		44
		45	$self->{w} = $w;
		46	$self->{h} = $h;
50	}	47	}
51		48
52	sub focus_in {	49	sub focus_in {
53	my ($widget) = @_;	50	my ($widget) = @_;
54	$FOCUS = $widget;	51	$FOCUS = $widget;
…		…
72		69
73	sub button_up {	70	sub button_up {
74	my ($widget, $sdlev) = @_;	71	my ($widget, $sdlev) = @_;
75	}	72	}
76		73
77	sub w { $_[0]->{w} }	74	sub w { $_[0]->{w} = $_[1] if $_[1]; $_[0]->{w} }
78	sub h { $_[0]->{h} }	75	sub h { $_[0]->{h} = $_[1] if $_[1]; $_[0]->{h} }
79	sub x { $_[0]->{x} = $_[1] if $_[1]; $_[0]->{x} }	76	sub x { $_[0]->{x} = $_[1] if $_[1]; $_[0]->{x} }
80	sub y { $_[0]->{y} = $_[1] if $_[1]; $_[0]->{y} }	77	sub y { $_[0]->{y} = $_[1] if $_[1]; $_[0]->{y} }
81	sub z { $_[0]->{z} = $_[1] if $_[1]; $_[0]->{z} }	78	sub z { $_[0]->{z} = $_[1] if $_[1]; $_[0]->{z} }
82		79
83	sub draw {	80	sub draw {
…		…
88	$self->_draw;	85	$self->_draw;
89	glPopMatrix;	86	glPopMatrix;
90	}	87	}
91		88
92	sub _draw {	89	sub _draw {
93	my ($widget) = @_;	90	my ($self) = @_;
		91
		92	warn "no draw defined for $self\n";
94	}	93	}
95		94
96	sub bbox {	95	sub bbox {
97	my ($widget) = @_;	96	my ($self) = @_;
		97	my ($w, $h) = $self->size_request;
		98	(
		99	$self->{x},
		100	$self->{y},
		101	$self->{x} = $w,
		102	$self->{y} = $h
		103	)
		104	}
		105
		106	sub find_widget {
		107	my ($self, $x, $y) = @_;
		108
		109	return $self
		110	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
		111	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
		112
		113	()
		114	}
		115
		116	sub del_parent { $_[0]->{parent} = undef }
		117
		118	sub set_parent {
		119	my ($self, $par) = @_;
		120
		121	$self->{parent} = $par;
		122	Scalar::Util::weaken $self->{parent};
		123	}
		124
		125	sub get_parent {
		126	$_[0]->{parent}
		127	}
		128
		129	sub update {
		130	my ($self) = @_;
		131
		132	$self->{parent}->update
		133	if $self->{parent};
98	}	134	}
99		135
100	sub DESTROY {	136	sub DESTROY {
101	my ($self) = @_;	137	my ($self) = @_;
102		138
103	$self->deactivate;	139	#$self->deactivate;
104	}	140	}
		141
		142	#############################################################################
105		143
106	package Crossfire::Client::Widget::Container;	144	package Crossfire::Client::Widget::Container;
107		145
108	our @ISA = Crossfire::Client::Widget::;	146	our @ISA = Crossfire::Client::Widget::;
109		147
		148	sub new {
		149	my ($class, @widgets) = @_;
		150
		151	my $self = $class->SUPER::new (children => []);
		152	$self->add ($_) for @widgets;
		153
		154	$self
		155	}
		156
		157	sub add {
		158	my ($self, $chld, $expand) = @_;
		159
		160	$chld->{expand} = $expand;
		161	$chld->set_parent ($self);
		162
		163	@{$self->{children}} =
		164	sort { $a->{z} <=> $b->{z} }
		165	@{$self->{children}}, $chld;
		166
		167	$self->size_allocate ($self->{w}, $self->{h})
		168	if $self->{w}; #TODO: check for "realised state"
		169	}
		170
		171	sub remove {
		172	my ($self, $widget) = @_;
		173
		174	$self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];
		175
		176	$self->size_allocate ($self->{w}, $self->{h});
		177	}
		178
		179	sub find_widget {
		180	my ($self, $x, $y) = @_;
		181
		182	my $res;
		183
		184	for (@{ $self->{children} }) {
		185	$res = $_->find_widget ($x, $y)
		186	and return $res;
		187	}
		188
		189	()
		190	}
		191
		192	sub _draw {
		193	my ($self) = @_;
		194
		195	$_->draw for @{$self->{children}};
		196	}
		197
		198	#############################################################################
		199
		200	package Crossfire::Client::Widget::Bin;
		201
		202	our @ISA = Crossfire::Client::Widget::Container::;
		203
		204	sub child { $_[0]->{children}[0] }
		205
		206	sub size_request {
		207	$_[0]{children}[0]->size_request if $_[0]{children}[0];
		208	}
		209
		210	sub size_allocate {
		211	my ($self, $w, $h) = @_;
		212
		213	$self->SUPER::size_allocate ($w, $h);
		214	$self->{children}[0]->size_allocate ($w, $h)
		215	if $self->{children}[0]
		216	}
		217
		218	#############################################################################
		219
		220	package Crossfire::Client::Widget::Toplevel;
		221
		222	our @ISA = Crossfire::Client::Widget::Container::;
		223
		224	sub update {
		225	my ($self) = @_;
		226
		227	::refresh ();
		228	}
		229
		230	sub add {
		231	my ($self, $widget) = @_;
		232
		233	$self->SUPER::add ($widget);
		234
		235	$widget->size_allocate ($widget->size_request);
		236	}
		237
		238	#############################################################################
		239
		240	package Crossfire::Client::Widget::Window;
		241
		242	our @ISA = Crossfire::Client::Widget::Bin::;
		243
110	use SDL::OpenGL;	244	use SDL::OpenGL;
111		245
112	sub add { $_[0]->{child} = $_[1] }	246	sub new {
113	sub get { $_[0]->{child} }	247	my ($class, $x, $y, $z, $w, $h) = @_;
114		248
115	sub size_request { $_[0]->{child}->size_request if $_[0]->{child} }	249	my $self = $class->SUPER::new;
116		250
117	sub _draw { die "Containers can't be drawn!" }	251	@$self{qw(x y z w h)} = ($x, $y, $z, $w, $h);
		252	}
118		253
119	package Crossfire::Client::Widget::Window;	254	sub update {
120
121	our @ISA = Crossfire::Client::Widget::Container::;
122
123	use SDL::OpenGL;
124
125	sub add {
126	my ($self, $chld) = @_;	255	my ($self) = @_;
127	$self->SUPER::add ($chld);	256
128	$self->render_chld; #TODO: Move this to the size_request event propably?	257	$self->render_chld;
		258	$self->SUPER::update;
129	}	259	}
130		260
131	sub render_chld {	261	sub render_chld {
132	my ($self) = @_;	262	my ($self) = @_;
133	my $chld = $self->get;
134	my ($w, $h) = $self->size_request;
135		263
136	$self->{texture} =	264	$self->{texture} =
137	Crossfire::Client::Texture->new_from_opengl (	265	Crossfire::Client::Texture->new_from_opengl (
138	$w, $h, sub { $chld->draw }	266	$self->{w}, $self->{h}, sub { $self->child->draw }
139	);	267	);
140	$self->{texture}->upload;
141	}	268	}
142		269
143	sub size_request {	270	sub size_allocate {
144	my ($self) = @_;	271	my ($self, $w, $h) = @_;
145	my $chld = $self->get	272
146	or return (0, 0);	273	$self->{w} = $w;
147	$chld->size_request	274	$self->{h} = $h;
		275
		276	$self->child->size_allocate ($w, $h);
		277
		278	$self->render_chld;
148	}	279	}
149		280
150	sub _draw {	281	sub _draw {
151	my ($self) = @_;	282	my ($self) = @_;
152		283
153	my ($w, $h) = $self->size_request;#TODO# use width/height of texture	284	my ($w, $h) = ($self->w, $self->h);
154		285
155	my $tex = $self->{texture}	286	my $tex = $self->{texture}
156	or return;	287	or return;
157		288
158	glEnable GL_BLEND;	289	glEnable GL_BLEND;
159	glEnable GL_TEXTURE_2D;	290	glEnable GL_TEXTURE_2D;
160	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	291	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
161	glBindTexture GL_TEXTURE_2D, $tex->{name};	292	glBindTexture GL_TEXTURE_2D, $tex->{name};
162
163	glColor 1, 1, 1;
164		293
165	glBegin GL_QUADS;	294	glBegin GL_QUADS;
166	glTexCoord 0, 0; glVertex 0, 0;	295	glTexCoord 0, 0; glVertex 0, 0;
167	glTexCoord 0, 1; glVertex 0, $h;	296	glTexCoord 0, 1; glVertex 0, $h;
168	glTexCoord 1, 1; glVertex $w, $h;	297	glTexCoord 1, 1; glVertex $w, $h;
…		…
171		300
172	glDisable GL_BLEND;	301	glDisable GL_BLEND;
173	glDisable GL_TEXTURE_2D;	302	glDisable GL_TEXTURE_2D;
174	}	303	}
175		304
		305	#############################################################################
		306
176	package Crossfire::Client::Widget::Frame;	307	package Crossfire::Client::Widget::Frame;
177		308
178	our @ISA = Crossfire::Client::Widget::Container::;	309	our @ISA = Crossfire::Client::Widget::Bin::;
179		310
180	use SDL::OpenGL;	311	use SDL::OpenGL;
181		312
182	sub size_request {	313	sub size_request {
183	my ($self) = @_;	314	my ($self) = @_;
184	my $chld = $self->get	315	my $chld = $self->child
185	or return (0, 0);	316	or return (0, 0);
186		317
187	$chld->move (2, 2);	318	$chld->move (2, 2);
188		319
189	map { $_ + 4 } $chld->size_request;	320	map { $_ + 4 } $chld->size_request;
190	}	321	}
191		322
		323	sub size_allocate {
		324	my ($self, $w, $h) = @_;
		325
		326	$self->{w} = $w;
		327	$self->{h} = $h;
		328
		329	$self->child->size_allocate ($w - 4, $h - 4);
		330	$self->child->move (2, 2);
		331	}
		332
192	sub _draw {	333	sub _draw {
193	my ($self) = @_;	334	my ($self) = @_;
194		335
195	my $chld = $self->get;	336	my $chld = $self->child;
196		337
197	my ($w, $h) = $chld->size_request;	338	my ($w, $h) = $chld->size_request;
198		339
199	glBegin GL_QUADS;	340	glBegin GL_QUADS;
200	glColor 0, 0, 0;	341	glColor 0, 0, 0;
…		…
205	glEnd;	346	glEnd;
206		347
207	$chld->draw;	348	$chld->draw;
208	}	349	}
209		350
		351	#############################################################################
		352
		353	package Crossfire::Client::Widget::FancyFrame;
		354
		355	our @ISA = Crossfire::Client::Widget::Bin::;
		356
		357	use SDL::OpenGL;
		358
		359	my @tex =
		360	map { new_from_file Crossfire::Client::Texture Crossfire::Client::find_rcfile $_ }
		361	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
		362
		363	sub size_request {
		364	my ($self) = @_;
		365
		366	my ($w, $h) = $self->SUPER::size_request;
		367
		368	$h += $tex[1]->{height};
		369	$h += $tex[4]->{height};
		370	$w += $tex[2]->{width};
		371	$w += $tex[3]->{width};
		372
		373	($w, $h)
		374	}
		375
		376	sub size_allocate {
		377	my ($self, $w, $h) = @_;
		378
		379	$self->SUPER::size_allocate ($w, $h);
		380
		381	$h -= $tex[1]->{height};
		382	$h -= $tex[4]->{height};
		383	$w -= $tex[2]->{width};
		384	$w -= $tex[3]->{width};
		385
		386	$h = $h < 0 ? 0 : $h;
		387	$w = $w < 0 ? 0 : $w;
		388
		389	$self->child->size_allocate ($w, $h);
		390	$self->child->move ($tex[3]->{width}, $tex[1]->{height});
		391	}
		392
		393	sub _draw {
		394	my ($self) = @_;
		395
		396	my ($w, $h) = ($self->{w}, $self->{h});
		397	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
		398
		399	glEnable GL_BLEND;
		400	glEnable GL_TEXTURE_2D;
		401	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		402	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		403
		404	my $top = $tex[1];
		405	glBindTexture GL_TEXTURE_2D, $top->{name};
		406
		407	glBegin GL_QUADS;
		408	glTexCoord 0, 0; glVertex 0 , 0;
		409	glTexCoord 0, 1; glVertex 0 , $top->{height};
		410	glTexCoord 1, 1; glVertex $w , $top->{height};
		411	glTexCoord 1, 0; glVertex $w , 0;
		412	glEnd;
		413
		414	my $left = $tex[3];
		415	glBindTexture GL_TEXTURE_2D, $left->{name};
		416
		417	glBegin GL_QUADS;
		418	glTexCoord 0, 0; glVertex 0 , $top->{height};
		419	glTexCoord 0, 1; glVertex 0 , $top->{height} + $ch;
		420	glTexCoord 1, 1; glVertex $left->{width}, $top->{height} + $ch;
		421	glTexCoord 1, 0; glVertex $left->{width}, $top->{height};
		422	glEnd;
		423
		424	my $right = $tex[2];
		425	glBindTexture GL_TEXTURE_2D, $right->{name};
		426
		427	glBegin GL_QUADS;
		428	glTexCoord 0, 0; glVertex $w - $right->{width}, $top->{height};
		429	glTexCoord 0, 1; glVertex $w - $right->{width}, $top->{height} + $ch;
		430	glTexCoord 1, 1; glVertex $w , $top->{height} + $ch;
		431	glTexCoord 1, 0; glVertex $w , $top->{height};
		432	glEnd;
		433
		434	my $bottom = $tex[4];
		435	glBindTexture GL_TEXTURE_2D, $bottom->{name};
		436
		437	glBegin GL_QUADS;
		438	glTexCoord 0, 0; glVertex 0 , $h - $bottom->{height};
		439	glTexCoord 0, 1; glVertex 0 , $h;
		440	glTexCoord 1, 1; glVertex $w , $h;
		441	glTexCoord 1, 0; glVertex $w , $h - $bottom->{height};
		442	glEnd;
		443
		444	my $bg = $tex[0];
		445	glBindTexture GL_TEXTURE_2D, $bg->{name};
		446	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		447	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
		448	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
		449
		450	my $rep_x = $cw / $bg->{width};
		451	my $rep_y = $ch / $bg->{height};
		452
		453	glBegin GL_QUADS;
		454	glTexCoord 0, 0; glVertex $left->{width}, $top->{height};
		455	glTexCoord 0, $rep_y; glVertex $left->{width}, $top->{height} + $ch;
		456	glTexCoord $rep_x, $rep_y; glVertex $left->{width} + $cw , $top->{height} + $ch;
		457	glTexCoord $rep_x, 0; glVertex $left->{width} + $cw , $top->{height};
		458	glEnd;
		459
		460	glDisable GL_BLEND;
		461	glDisable GL_TEXTURE_2D;
		462
		463	$self->child->draw;
		464
		465	}
		466
		467	#############################################################################
		468
210	package Crossfire::Client::Widget::Table;	469	package Crossfire::Client::Widget::Table;
211		470
212	our @ISA = Crossfire::Client::Widget::Container::;	471	our @ISA = Crossfire::Client::Widget::Bin::;
213		472
214	use SDL::OpenGL;	473	use SDL::OpenGL;
215		474
216	sub add {	475	sub add {
217	my ($self, $x, $y, $chld) = @_;	476	my ($self, $x, $y, $chld) = @_;
		477	my $old_chld = $self->{children}[$y][$x];
		478
218	$self->{childs}[$y][$x] = $chld;	479	$self->{children}[$y][$x] = $chld;
		480	$chld->set_parent ($self);
		481	$self->update;
219	}	482	}
220		483
221	sub max_row_height {	484	sub max_row_height {
222	my ($self, $row) = @_;	485	my ($self, $row) = @_;
223		486
224	my $hs = 0;	487	my $hs = 0;
225	for (my $xi = 0; $xi <= $#{$self->{childs}->[$row] \|\| []}; $xi++) {	488	for (my $xi = 0; $xi <= $#{$self->{children}->[$row] \|\| []}; $xi++) {
226	my $c = $self->{childs}->[$row]->[$xi];	489	my $c = $self->{children}->[$row]->[$xi];
227	if ($c) {	490	if ($c) {
228	my ($w, $h) = $c->size_request;	491	my ($w, $h) = $c->size_request;
229	if ($hs < $h) { $hs = $h }	492	if ($hs < $h) { $hs = $h }
230	}	493	}
231	}	494	}
…		…
234		497
235	sub max_col_width {	498	sub max_col_width {
236	my ($self, $col) = @_;	499	my ($self, $col) = @_;
237		500
238	my $ws = 0;	501	my $ws = 0;
239	for (my $yi = 0; $yi <= $#{$self->{childs} \|\| []}; $yi++) {	502	for (my $yi = 0; $yi <= $#{$self->{children} \|\| []}; $yi++) {
240	my $c = ($self->{childs}->[$yi] \|\| [])->[$col];	503	my $c = ($self->{children}->[$yi] \|\| [])->[$col];
241	if ($c) {	504	if ($c) {
242	my ($w, $h) = $c->size_request;	505	my ($w, $h) = $c->size_request;
243	if ($ws < $w) { $ws = $w }	506	if ($ws < $w) { $ws = $w }
244	}	507	}
245	}	508	}
…		…
249	sub size_request {	512	sub size_request {
250	my ($self) = @_;	513	my ($self) = @_;
251		514
252	my ($hs, $ws) = (0, 0);	515	my ($hs, $ws) = (0, 0);
253		516
254	for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) {	517	for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
255	$hs += $self->max_row_height ($yi);	518	$hs += $self->max_row_height ($yi);
256	}	519	}
257		520
258	for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) {	521	for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
259	my $wm = 0;	522	my $wm = 0;
260	for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) {	523	for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) {
261	$wm += $self->max_col_width ($xi)	524	$wm += $self->max_col_width ($xi)
262	}	525	}
263	if ($ws < $wm) { $ws = $wm }	526	if ($ws < $wm) { $ws = $wm }
264	}	527	}
265		528
…		…
268		531
269	sub _draw {	532	sub _draw {
270	my ($self) = @_;	533	my ($self) = @_;
271		534
272	my $y = 0;	535	my $y = 0;
273	for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) {	536	for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
274	my $x = 0;	537	my $x = 0;
275		538
276	for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) {	539	for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) {
277		540
278	my $c = $self->{childs}->[$yi]->[$xi];	541	my $c = $self->{children}->[$yi]->[$xi];
279	if ($c) {	542	if ($c) {
280	$c->move ($x, $y, 0); #TODO: Move to size_request	543	$c->move ($x, $y, 0); #TODO: Move to size_request
281	$c->draw if $c;	544	$c->draw if $c;
282	}	545	}
283		546
…		…
286		549
287	$y += $self->max_row_height ($yi);	550	$y += $self->max_row_height ($yi);
288	}	551	}
289	}	552	}
290		553
		554	#############################################################################
		555
291	package Crossfire::Client::Widget::VBox;	556	package Crossfire::Client::Widget::VBox;
292		557
293	our @ISA = Crossfire::Client::Widget::Container::;	558	our @ISA = Crossfire::Client::Widget::Container::;
294		559
295	use SDL::OpenGL;	560	use SDL::OpenGL;
296		561
297	sub add {
298	my ($self, $chld) = @_;
299	push @{$self->{childs}}, $chld;
300	}
301
302	sub size_request {	562	sub size_request {
303	my ($self) = @_;	563	my ($self) = @_;
304		564
305	my ($hs, $ws) = (0, 0);	565	my @alloc = map [$_->size_request], @{$self->{children}};
		566
		567	(
		568	(List::Util::max map $_->[0], @alloc),
		569	(List::Util::sum map $_->[1], @alloc),
		570	)
		571	}
		572
		573	sub size_allocate {
		574	my ($self, $w, $h) = @_;
		575
		576	$self->w ($w);
		577	$self->h ($h);
		578
		579	my $exp;
		580	my @oth;
		581	# find expand widget
306	for (@{$self->{childs} \|\| []}) {	582	for (@{$self->{children}}) {
		583	if ($_->{expand}) {
		584	$exp = $_;
		585	last;
		586	}
		587	push @oth, $_;
		588	}
		589
		590	my ($ow, $oh);
		591
		592	# get sizes of other widgets
		593	for (@oth) {
307	my ($w, $h) = $_->size_request;	594	my ($w, $h) = $_->size_request;
308	$hs += $h;	595	$oh += $h;
309	if ($ws < $w) { $ws = $w }	596	if ($ow < $w) { $ow = $w }
310	}	597	}
311		598
312	return ($ws, $hs);	599	my $y = 0;
313	}
314
315	sub _draw {
316	my ($self) = @_;
317
318	my ($x, $y);
319	for (@{$self->{childs} \|\| []}) {	600	for (@{$self->{children}}) {
320	$_->move (0, $y, 0); #TODO: move to size_request	601	$_->move (0, $y);
321	$_->draw;	602
		603	if ($_ == $exp) {
		604	$_->size_allocate ($w, $h - $oh);
		605	$y += $h - $oh;
		606	} else {
322	my ($w, $h) = $_->size_request;	607	my ($cw, $h) = $_->size_request;
		608	$_->size_allocate ($w, $h);
323	$y += $h;	609	$y += $h;
		610	}
324	}	611	}
325	}	612	}
		613
		614	#############################################################################
326		615
327	package Crossfire::Client::Widget::Label;	616	package Crossfire::Client::Widget::Label;
328		617
329	our @ISA = Crossfire::Client::Widget::;	618	our @ISA = Crossfire::Client::Widget::;
330		619
331	use SDL::OpenGL;	620	use SDL::OpenGL;
332		621
333	sub new {	622	sub new {
334	my ($class, $x, $y, $z, $height, $text) = @_;	623	my ($class, $x, $y, $z, $height, $text) = @_;
335		624
		625	# TODO: color, and make height, xyz etc. optional
336	my $self = $class->SUPER::new (x => $x, y => $y, z => $z, height => $height);	626	my $self = $class->SUPER::new (x => $x, y => $y, z => $z, height => $height);
337		627
338	$self->set_text ($text);	628	$self->set_text ($text);
339		629
340	$self	630	$self
…		…
342		632
343	sub set_text {	633	sub set_text {
344	my ($self, $text) = @_;	634	my ($self, $text) = @_;
345		635
346	$self->{text} = $text;	636	$self->{text} = $text;
347
348	$self->{texture} = new_from_text Crossfire::Client::Texture $text, $self->{height};	637	$self->{texture} = new_from_text Crossfire::Client::Texture $text, $self->{height};
		638
		639	$self->update;
349	}	640	}
350		641
351	sub get_text {	642	sub get_text {
352	my ($self, $text) = @_;	643	my ($self, $text) = @_;
353		644
…		…
372	glEnable GL_TEXTURE_2D;	663	glEnable GL_TEXTURE_2D;
373	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	664	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
374	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	665	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
375	glBindTexture GL_TEXTURE_2D, $tex->{name};	666	glBindTexture GL_TEXTURE_2D, $tex->{name};
376		667
377	glColor 1, 1, 1, 0.8;	668	glColor 1, 0, 0, 1; # TODO color
378		669
379	glBegin GL_QUADS;	670	glBegin GL_QUADS;
380	glTexCoord 0, 0; glVertex 0 , 0;	671	glTexCoord 0, 0; glVertex 0 , 0;
381	glTexCoord 0, 1; glVertex 0 , $tex->{height};	672	glTexCoord 0, 1; glVertex 0 , $tex->{height};
382	glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height};	673	glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height};
…		…
385		676
386	glDisable GL_BLEND;	677	glDisable GL_BLEND;
387	glDisable GL_TEXTURE_2D;	678	glDisable GL_TEXTURE_2D;
388	}	679	}
389		680
		681	#############################################################################
		682
390	package Crossfire::Client::Widget::TextView;	683	package Crossfire::Client::Widget::TextEntry;
391		684
392	use strict;
393
394	our @ISA = qw/Crossfire::Client::Widget/;	685	our @ISA = Crossfire::Client::Widget::Label::;
395		686
		687	use SDL;
396	use SDL::OpenGL;	688	use SDL::OpenGL;
397	use SDL::OpenGL::Constants;
398		689
399	sub add_line {	690	sub key_down {
400	my ($self, $line) = @_;	691	my ($self, $ev) = @_;
401	push @{$self->{lines}}, $line;
402	}
403		692
404	sub _draw {	693	my $mod = $ev->key_mod;
405	my ($self) = @_;	694	my $sym = $ev->key_sym;
406		695
		696	$ev->set_unicode (1);
		697	my $uni = $ev->key_unicode;
		698
		699	my $text = $self->get_text;
		700
		701	if ($sym == SDLK_BACKSPACE) {
		702	substr $text, -1, 1, '';
		703
		704	} elsif ($uni) {
		705	$text .= chr $uni;
		706	}
		707	$self->set_text ($text);
407	}	708	}
		709
		710	#############################################################################
408		711
409	package Crossfire::Client::Widget::MapWidget;	712	package Crossfire::Client::Widget::MapWidget;
410		713
411	use strict;	714	use strict;
412		715
…		…
421	sub key_down {	724	sub key_down {
422	print "MAPKEYDOWN\n";	725	print "MAPKEYDOWN\n";
423	}	726	}
424		727
425	sub key_up {	728	sub key_up {
		729	}
		730
		731	sub size_request {
		732
		733	}
		734
		735	sub size_allocate {
426	}	736	}
427		737
428	sub _draw {	738	sub _draw {
429	my ($self) = @_;	739	my ($self) = @_;
430		740
…		…
450	$yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};	760	$yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
451	}	761	}
452		762
453	glEnable GL_TEXTURE_2D;	763	glEnable GL_TEXTURE_2D;
454	glEnable GL_BLEND;	764	glEnable GL_BLEND;
455	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	765	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		766
		767	my $sw4 = ($sw + 3) & ~3;
		768	my $lighting = "\x00" x ($sw4 * $sh);
456		769
457	for my $x (0 .. $sw - 1) {	770	for my $x (0 .. $sw - 1) {
458	for my $y (0 .. $sh - 1) {	771	for my $y (0 .. $sh - 1) {
459		772
460	my $cell = $map->[$x + $xofs][$y + $yofs]	773	my $cell = $map->[$x + $xofs][$y + $yofs]
461	or next;	774	or next;
462		775
463	my $darkness = $cell->[0] * (1 / 255);	776	my $darkness = $cell->[0] * (1 / 255);
464	if ($darkness < 0) {	777	if ($darkness < 0) {
465	glColor 0.3, 0.3, 0.3;	778	$darkness = 0.15;
466	} else {
467	glColor $darkness, $darkness, $darkness;
468	}	779	}
		780	substr $lighting, $y * $sw4 + $x, 1, chr 255 - $darkness * 255;
469		781
470	for my $num (grep $_, @$cell[1,2,3]) {	782	for my $num (grep $_, @$cell[1,2,3]) {
471	my $tex = $::CONN->{face}[$num]{texture} \|\| next;	783	my $tex = $::CONN->{face}[$num]{texture} \|\| next;
472		784
473	glBindTexture GL_TEXTURE_2D, $tex->{name};	785	glBindTexture GL_TEXTURE_2D, $tex->{name};
…		…
485	glTexCoord 1, 0; glVertex $px + $w, $py;	797	glTexCoord 1, 0; glVertex $px + $w, $py;
486	glEnd;	798	glEnd;
487	}	799	}
488	}	800	}
489	}	801	}
		802
		803	# if (1) { # higher quality darkness
		804	# $lighting =~ s/(.)/$1$1$1/gs;
		805	# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
		806	#
		807	# $pb = $pb->scale_simple ($sw4 * 0.5, $sh * 0.5, "bilinear");
		808	#
		809	# $lighting = $pb->get_pixels;
		810	# $lighting =~ s/(.)../$1/gs;
		811	# }
		812
		813	$lighting = new Crossfire::Client::Texture
		814	width => $sw4,
		815	height => $sh,
		816	data => $lighting,
		817	internalformat => GL_ALPHA4,
		818	format => GL_ALPHA;
		819
		820	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		821	glColor 0, 0, 0, 0.75;
		822	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
		823	glBindTexture GL_TEXTURE_2D, $lighting->{name};
		824	glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
		825	glBegin GL_QUADS;
		826	glTexCoord 0, 0; glVertex 0 , 0;
		827	glTexCoord 0, 1; glVertex 0 , $sh * 32;
		828	glTexCoord 1, 1; glVertex $sw4 * 32, $sh * 32;
		829	glTexCoord 1, 0; glVertex $sw4 * 32, 0;
		830	glEnd;
490		831
491	glDisable GL_TEXTURE_2D;	832	glDisable GL_TEXTURE_2D;
492	glDisable GL_BLEND;	833	glDisable GL_BLEND;
493	}	834	}
494		835
…		…
541	if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {	882	if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
542	$::CONN->send ("command run_stop");	883	$::CONN->send ("command run_stop");
543	}	884	}
544	}	885	}
545		886
		887	#############################################################################
		888
		889	package Crossfire::Client::Widget::Animator;
		890
		891	use SDL::OpenGL;
		892
		893	our @ISA = Crossfire::Client::Widget::Bin::;
		894
		895	sub moveto {
		896	my ($self, $x, $y) = @_;
		897
		898	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
		899	$self->{speed} = 0.2;
		900	$self->{time} = 1;
		901
		902	::animation_start $self;
		903	}
		904
		905	sub animate {
		906	my ($self, $interval) = @_;
		907
		908	$self->{time} -= $interval * $self->{speed};
		909	if ($self->{time} <= 0) {
		910	$self->{time} = 0;
		911	::animation_stop $self;
		912	}
		913
		914	my ($x0, $y0, $x1, $y1) = @{$self->{moveto}};
		915
		916	$self->{x} = $x0 * $self->{time} + $x1 * (1 - $self->{time});
		917	$self->{y} = $y0 * $self->{time} + $y1 * (1 - $self->{time});
		918	}
		919
		920	sub _draw {
		921	my ($self) = @_;
		922
		923	glPushMatrix;
		924	glRotate $self->{time} * 10000, 0, 1, 0;
		925	$self->{children}[0]->draw;
		926	glPopMatrix;
		927	}
		928
546	1;	929	1;
547		930

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.30 by root, Sun Apr 9 00:18:45 2006 UTC vs. Revision 1.43 by root, Sun Apr 9 22:12:11 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.30 by root, Sun Apr 9 00:18:45 2006 UTC vs.
Revision 1.43 by root, Sun Apr 9 22:12:11 2006 UTC