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

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.35 by root, Sun Apr 9 17:34:15 2006 UTC vs. Revision 1.57 by root, Mon Apr 10 22:53:49 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.35 by root, Sun Apr 9 17:34:15 2006 UTC vs.
Revision 1.57 by root, Mon Apr 10 22:53:49 2006 UTC