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

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.34 by elmex, Sun Apr 9 02:44:51 2006 UTC vs. Revision 1.47 by root, Sun Apr 9 22:24:43 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.34 by elmex, Sun Apr 9 02:44:51 2006 UTC vs.
Revision 1.47 by root, Sun Apr 9 22:24:43 2006 UTC