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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.33 by root, Sun Apr 9 01:37:58 2006 UTC vs.
Revision 1.64 by root, Tue Apr 11 13:38:22 2006 UTC

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.33 by root, Sun Apr 9 01:37:58 2006 UTC vs. Revision 1.64 by root, Tue Apr 11 13:38:22 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.33 by root, Sun Apr 9 01:37:58 2006 UTC vs.
Revision 1.64 by root, Tue Apr 11 13:38:22 2006 UTC