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

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.28 by root, Sun Apr 9 00:06:10 2006 UTC vs. Revision 1.50 by root, Sun Apr 9 22:27:24 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.28 by root, Sun Apr 9 00:06:10 2006 UTC vs.
Revision 1.50 by root, Sun Apr 9 22:27:24 2006 UTC