ViewVC Help

View File | Revision Log | Show Annotations | Download File

/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.85 by elmex, Wed Apr 12 12:55:56 2006 UTC

1	package Crossfire::Client::Widget;	1	package CFClient::UI;
2		2
3	use strict;	3	use strict;
4		4
5	use Scalar::Util;	5	use Scalar::Util ();
		6	use List::Util ();
		7
		8	use CFClient;
		9
		10	our ($FOCUS, $HOVER, $GRAB); # various widgets
		11
		12	our $TOPLEVEL;
		13	our $BUTTON_STATE;
		14
		15	# class methods for events
		16	sub feed_sdl_key_down_event {
		17	$FOCUS->key_down ($_[0]) if $FOCUS;
		18	}
		19
		20	sub feed_sdl_key_up_event {
		21	$FOCUS->key_up ($_[0]) if $FOCUS;
		22	}
		23
		24	sub feed_sdl_button_down_event {
		25	my ($ev) = @_;
		26	my ($x, $y) = ($ev->motion_x, $ev->motion_y);
		27
		28	if (!$BUTTON_STATE) {
		29	my $widget = $TOPLEVEL->find_widget ($x, $y);
		30
		31	$GRAB = $widget;
		32	$GRAB->update if $GRAB;
		33	}
		34
		35	$BUTTON_STATE |= 1 << ($ev->button - 1);
		36
		37	$GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB;
		38	}
		39
		40	sub feed_sdl_button_up_event {
		41	my ($ev) = @_;
		42	my ($x, $y) = ($ev->motion_x, $ev->motion_y);
		43
		44	my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y);
		45
		46	$BUTTON_STATE &= ~(1 << ($ev->button - 1));
		47
		48	$GRAB->button_up ($ev, $GRAB->translate ($x, $y)) if $GRAB;
		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, $HOVER->translate ($x, $y)) if $HOVER;
		71	}
		72
		73	#############################################################################
		74
		75	package CFClient::UI::Base;
		76
		77	use strict;
6		78
7	use SDL::OpenGL;	79	use SDL::OpenGL;
8	use SDL::OpenGL::Constants;
9
10	our $FOCUS; # the widget with current focus
11	#our @ACTIVE_WIDGETS;
12
13	# class methods for events
14	sub feed_sdl_key_down_event { $FOCUS->key_down ($_[0]) if $FOCUS }
15	sub feed_sdl_key_up_event { $FOCUS->key_up ($_[0]) if $FOCUS }
16	sub feed_sdl_button_down_event { }
17	sub feed_sdl_button_up_event { }
18		80
19	sub new {	81	sub new {
20	my $class = shift;	82	my $class = shift;
21		83
22	bless { @_ }, $class	84	my $self = bless {
23	}	85	x => 0,
		86	y => 0,
		87	z => 0,
		88	w => -1,
		89	h => -1,
		90	@_
		91	}, $class;
24		92
25	#sub activate {	93	for (keys %$self) {
26	# push @ACTIVE_WIDGETS, $_[0];	94	if (/^connect_(.*)$/) {
27	# Scalar::Util::weaken $ACTIVE_WIDGETS[-1];	95	$self->connect ($1 => delete $self->{$_});
28	#}	96	}
		97	}
29		98
30	#sub deactivate {	99	$self
31	# @ACTIVE_WIDGETS =	100	}
32	# sort { $a->{z} <=> $b->{z} }
33	# grep { $_ && $_ != $_[0] }
34	# @ACTIVE_WIDGETS;
35	#}
36		101
37	sub move {	102	sub move {
38	my ($self, $x, $y, $z) = @_;	103	my ($self, $x, $y, $z) = @_;
39	$self->{x} = $x;	104	$self->{x} = $x;
40	$self->{y} = $y;	105	$self->{y} = $y;
…		…
44	sub needs_redraw {	109	sub needs_redraw {
45	0	110	0
46	}	111	}
47		112
48	sub size_request {	113	sub size_request {
		114	require Carp;
49	die "size_request is abtract";	115	Carp::confess "size_request is abtract";
		116	}
		117
		118	sub _size_allocate {
		119	my ($self, $x, $y, $w, $h) = @_;
		120
		121	$self->{x} = $x;
		122	$self->{y} = $y;
		123
		124	return unless $self->{w} != $w || $self->{h} != $h;
		125
		126	$self->{w} = $w;
		127	$self->{h} = $h;
		128
		129	1
		130	}
		131
		132	sub size_allocate {
		133	my ($self, $x, $y, $w, $h) = @_;
		134
		135	$self->_size_allocate ($x, $y, $w, $h);
		136	}
		137
		138	# translate global coordinates to local coordinate system
		139	sub translate {
		140	my ($self, $x, $y) = @_;
		141
		142	$self->{parent}->translate ($x - $self->{x}, $y - $self->{y});
50	}	143	}
51		144
52	sub focus_in {	145	sub focus_in {
53	my ($widget) = @_;	146	my ($self) = @_;
54	$FOCUS = $widget;	147
		148	return if $FOCUS == $self;
		149
		150	my $focus = $FOCUS; $FOCUS = $self;
		151	$focus->update if $focus;
		152	$FOCUS->update;
55	}	153	}
56		154
57	sub focus_out {	155	sub focus_out {
58	my ($widget) = @_;	156	my ($self) = @_;
59	}
60		157
		158	return unless $FOCUS == $self;
		159
		160	my $focus = $FOCUS; undef $FOCUS;
		161	$focus->update if $focus; #?
		162	}
		163
		164	sub mouse_motion { }
		165	sub button_up { }
61	sub key_down {	166	sub key_down { }
62	my ($widget, $sdlev) = @_;
63	}
64
65	sub key_up {	167	sub key_up { }
66	my ($widget, $sdlev) = @_;
67	}
68		168
69	sub button_down {	169	sub button_down {
70	my ($widget, $sdlev) = @_;	170	my ($self, $ev, $x, $y) = @_;
71	}
72		171
73	sub button_up {	172	$self->focus_in;
74	my ($widget, $sdlev) = @_;
75	}	173	}
76		174
77	sub w { $_[0]->{w} }	175	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
78	sub h { $_[0]->{h} }	176	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
79	sub x { $_[0]->{x} = $_[1] if $_[1]; $_[0]->{x} }	177	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
80	sub y { $_[0]->{y} = $_[1] if $_[1]; $_[0]->{y} }	178	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
81	sub z { $_[0]->{z} = $_[1] if $_[1]; $_[0]->{z} }	179	sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
82		180
83	sub draw {	181	sub draw {
84	my ($self) = @_;	182	my ($self) = @_;
		183
		184	return unless $self->{h} && $self->{w};
85		185
86	glPushMatrix;	186	glPushMatrix;
87	glTranslate $self->{x}, $self->{y}, 0;	187	glTranslate $self->{x}, $self->{y}, 0;
88	$self->_draw;	188	$self->_draw;
89	glPopMatrix;	189	glPopMatrix;
		190
		191	if ($self == $HOVER) {
		192	my ($x, $y) = @$self{qw(x y)};
		193
		194	glColor 0, 0, 1, 0.2;
		195	glEnable GL_BLEND;
		196	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		197	glBegin GL_QUADS;
		198	glVertex $x , $y;
		199	glVertex $x + $self->{w}, $y;
		200	glVertex $x + $self->{w}, $y + $self->{h};
		201	glVertex $x , $y + $self->{h};
		202	glEnd;
		203	glDisable GL_BLEND;
		204	}
90	}	205	}
91		206
92	sub _draw {	207	sub _draw {
93	my ($widget) = @_;	208	my ($self) = @_;
94	}
95		209
96	sub bbox {	210	warn "no draw defined for $self\n";
		211	}
		212
		213	sub find_widget {
97	my ($self) = @_;	214	my ($self, $x, $y) = @_;
98	my ($w, $h) = $self->size_request;	215
		216	return $self
		217	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
		218	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
		219
99	(	220	()
100	$self->{x},
101	$self->{y},
102	$self->{x} = $w,
103	$self->{y} = $h
104	)
105	}	221	}
106
107	sub del_parent { $_[0]->{parent} = undef }
108		222
109	sub set_parent {	223	sub set_parent {
110	my ($self, $par) = @_;	224	my ($self, $par) = @_;
111		225
112	$self->{parent} = $par;	226	$self->{parent} = $par;
…		…
122		236
123	$self->{parent}->update	237	$self->{parent}->update
124	if $self->{parent};	238	if $self->{parent};
125	}	239	}
126		240
		241	sub connect {
		242	my ($self, $signal, $cb) = @_;
		243
		244	push @{ $self->{cb}{$signal} }, $cb;
		245	}
		246
		247	sub emit {
		248	my ($self, $signal, @args) = @_;
		249
		250	$_->($self, @args)
		251	for @{$self->{cb}{$signal} || []};
		252	}
		253
127	sub DESTROY {	254	sub DESTROY {
128	my ($self) = @_;	255	my ($self) = @_;
129		256
130	#$self->deactivate;	257	#$self->deactivate;
131	}	258	}
132		259
133	package Crossfire::Client::Widget::Bin;	260	#############################################################################
134		261
135	our @ISA = Crossfire::Client::Widget::;	262	package CFClient::UI::DrawBG;
136		263
137	sub add { $_[0]->{child} = $_[1]; $_[1]->set_parent ($_[0]); $_[1]->update }	264	our @ISA = CFClient::UI::Base::;
138		265
139	sub get { $_[0]->{child} }	266	use strict;
		267	use SDL::OpenGL;
140		268
141	sub remove {	269	sub new {
		270	my $class = shift;
		271
		272	# range [value, low, high, page]
		273
		274	$class->SUPER::new (
		275	bg => [0, 0, 0, 0.2],
		276	active_bg => [1, 1, 1, 0.5],
		277	@_
		278	)
		279	}
		280
		281	sub _draw {
142	my ($self, $chld) = @_;	282	my ($self) = @_;
143	delete $self->{child}	283
144	if $self->{child} == $chld;	284	my ($w, $h) = @$self{qw(w h)};
		285
		286	glEnable GL_BLEND;
		287	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		288	glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };
		289
		290	glBegin GL_QUADS;
		291	glVertex 0 , 0;
		292	glVertex 0 , $h;
		293	glVertex $w, $h;
		294	glVertex $w, 0;
		295	glEnd;
		296
		297	glDisable GL_BLEND;
145	}	298	}
		299
		300	#############################################################################
		301
		302	package CFClient::UI::Empty;
		303
		304	our @ISA = CFClient::UI::Base::;
146		305
147	sub size_request {	306	sub size_request {
148	$_[0]->{child}->size_request if $_[0]->{child}	307	(0, 0)
149	}	308	}
150		309
151	sub _draw {	310	sub draw { }
152	my ($self) = @_;
153		311
154	$self->{child}->draw;	312	#############################################################################
155	}
156		313
157	package Crossfire::Client::Widget::Toplevel;	314	package CFClient::UI::Container;
158		315
159	our @ISA = Crossfire::Client::Widget::;	316	our @ISA = CFClient::UI::Base::;
160		317
161	use SDL::OpenGL;	318	sub new {
		319	my ($class, %arg) = @_;
		320
		321	my $children = delete $arg{children} || [];
		322
		323	my $self = $class->SUPER::new (children => [], %arg);
		324	$self->add ($_) for @$children;
		325
		326	$self
		327	}
162		328
163	sub add {	329	sub add {
164	my ($self, $chld) = @_;	330	my ($self, $chld) = @_;
165		331
166	push @{$self->{childs}}, $chld;	332	$chld->set_parent ($self);
		333
167	@{$self->{childs}} =	334	$self->{children} = [
168	sort { $a->{z} <=> $b->{z} }	335	sort { $a->{z} <=> $b->{z} }
169	@{$self->{childs}};	336	@{$self->{children}}, $chld
		337	];
170		338
171	$chld->set_parent ($self);	339	$self->{w} = $self->{h} = -1;
		340	$self->update;
172	}	341	}
173		342
174	sub remove {	343	sub remove {
175	my ($self, $chld) = @_;	344	my ($self, $widget) = @_;
		345
		346	$self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];
		347
		348	$self->size_allocate (0, 0, $self->{w}, $self->{h});
		349	}
		350
		351	sub find_widget {
		352	my ($self, $x, $y) = @_;
		353
		354	$x -= $self->{x};
		355	$y -= $self->{y};
		356
		357	my $res;
		358
		359	for (reverse @{ $self->{children} }) {
		360	$res = $_->find_widget ($x, $y)
		361	and return $res;
		362	}
		363
		364	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
		365	}
		366
		367	sub _draw {
		368	my ($self) = @_;
		369
		370	$_->draw for @{$self->{children}};
		371	}
		372
		373	#############################################################################
		374
		375	package CFClient::UI::Bin;
		376
		377	our @ISA = CFClient::UI::Container::;
		378
		379	sub new {
		380	my ($class, %arg) = @_;
		381
		382	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;
		383
		384	$class->SUPER::new (children => [$child], %arg)
		385	}
		386
		387	sub add {
		388	my ($self, $widget) = @_;
		389
176	@{$self->{childs}} =	390	$self->{children} = [];
177	sort { $a->{z} <=> $b->{z} }	391
178	grep { $_ && $_ != $_[0] }	392	$self->SUPER::add ($widget);
		393	}
		394
		395	sub remove {
		396	my ($self, $widget) = @_;
		397
		398	$self->SUPER::remove ($widget);
		399
		400	$self->{children} = [new CFClient::UI::Empty]
179	@{$self->{childs}}	401	unless @{$self->{children}};
		402	}
		403
		404	sub child { $_[0]->{children}[0] }
		405
		406	sub size_request {
		407	$_[0]{children}[0]->size_request
		408	}
		409
		410	sub size_allocate {
		411	my ($self, $x, $y, $w, $h) = @_;
		412
		413	$self->_size_allocate ($x, $y, $w, $h) or return;
		414
		415	$self->{children}[0]->size_allocate (0, 0, $w, $h);
		416	}
		417
		418	#############################################################################
		419
		420	package CFClient::UI::Window;
		421
		422	our @ISA = CFClient::UI::Bin::;
		423
		424	use SDL::OpenGL;
		425
		426	sub new {
		427	my ($class, %arg) = @_;
		428
		429	my $self = $class->SUPER::new (%arg);
180	}	430	}
181		431
182	sub update {	432	sub update {
183	my ($self) = @_;	433	my ($self) = @_;
184	::refresh ();	434
		435	# we want to do this delayed...
		436	$self->render_chld;
		437	$self->SUPER::update;
		438	}
		439
		440	sub render_chld {
		441	my ($self) = @_;
		442
		443	$self->{texture} =
		444	CFClient::Texture->new_from_opengl (
		445	$self->{w}, $self->{h}, sub { $self->child->draw }
		446	);
		447	}
		448
		449	sub size_allocate {
		450	my ($self, $x, $y, $w, $h) = @_;
		451
		452	$self->_size_allocate ($x, $y, $w, $h) or return;
		453
		454	$self->child->size_allocate (0, 0, $w, $h);
		455
		456	$self->render_chld;
185	}	457	}
186		458
187	sub _draw {	459	sub _draw {
188	my ($self) = @_;	460	my ($self) = @_;
189		461
190	$_->draw for @{$self->{childs}};	462	my ($w, $h) = ($self->w, $self->h);
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;
215	}
216
217	sub render_chld {
218	my ($self) = @_;
219	my $chld = $self->get;
220	my ($w, $h) = $self->size_request;
221
222	$self->{texture} =
223	Crossfire::Client::Texture->new_from_opengl (
224	$w, $h, sub { $chld->draw }
225	);
226	$self->{texture}->upload;
227	}
228
229	sub size_request {
230	my ($self) = @_;
231	my $chld = $self->get
232	or return (0, 0);
233	$chld->size_request
234	}
235
236	sub _draw {
237	my ($self) = @_;
238
239	my ($w, $h) = $self->size_request;#TODO# use width/height of texture
240		463
241	my $tex = $self->{texture}	464	my $tex = $self->{texture}
242	or return;	465	or return;
243		466
244	glEnable GL_BLEND;	467	glEnable GL_BLEND;
		468	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
245	glEnable GL_TEXTURE_2D;	469	glEnable GL_TEXTURE_2D;
246	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	470	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
247	glBindTexture GL_TEXTURE_2D, $tex->{name};
248		471
249	glBegin GL_QUADS;	472	$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		473
256	glDisable GL_BLEND;	474	glDisable GL_BLEND;
257	glDisable GL_TEXTURE_2D;	475	glDisable GL_TEXTURE_2D;
258	}	476	}
259		477
260	package Crossfire::Client::Widget::Frame;	478	#############################################################################
261		479
262	our @ISA = Crossfire::Client::Widget::Bin::;	480	package CFClient::UI::Frame;
		481
		482	our @ISA = CFClient::UI::Bin::;
263		483
264	use SDL::OpenGL;	484	use SDL::OpenGL;
265		485
266	sub size_request {	486	sub size_request {
267	my ($self) = @_;	487	my ($self) = @_;
268	my $chld = $self->get	488	my $chld = $self->child
269	or return (0, 0);	489	or return (0, 0);
270		490
271	$chld->move (2, 2);	491	$chld->move (2, 2);
272		492
273	map { $_ + 4 } $chld->size_request;	493	map { $_ + 4 } $chld->size_request;
274	}	494	}
275		495
		496	sub size_allocate {
		497	my ($self, $x, $y, $w, $h) = @_;
		498
		499	$self->_size_allocate ($x, $y, $w, $h) or return;
		500
		501	$self->child->size_allocate (2, 2, $w - 4, $h - 4);
		502	}
		503
276	sub _draw {	504	sub _draw {
277	my ($self) = @_;	505	my ($self) = @_;
278		506
279	my $chld = $self->get;	507	my $chld = $self->child;
280		508
281	my ($w, $h) = $chld->size_request;	509	my ($w, $h) = $chld->size_request;
282		510
283	glBegin GL_QUADS;	511	glBegin GL_QUADS;
284	glColor 0, 0, 0;	512	glColor 0, 0, 0;
285	glTexCoord 0, 0; glVertex 0 , 0;	513	glVertex 0 , 0;
286	glTexCoord 0, 1; glVertex 0 , $h + 4;	514	glVertex 0 , $h + 4;
287	glTexCoord 1, 1; glVertex $w + 4 , $h + 4;	515	glVertex $w + 4 , $h + 4;
288	glTexCoord 1, 0; glVertex $w + 4 , 0;	516	glVertex $w + 4 , 0;
289	glEnd;	517	glEnd;
290		518
291	$chld->draw;	519	$chld->draw;
292	}	520	}
293		521
		522	#############################################################################
		523
294	package Crossfire::Client::Widget::FancyFrame;	524	package CFClient::UI::FancyFrame;
295		525
296	our @ISA = Crossfire::Client::Widget::Frame::;	526	our @ISA = CFClient::UI::Bin::;
297		527
298	use SDL::OpenGL;	528	use SDL::OpenGL;
299		529
		530	my @tex =
		531	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
		532	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
		533
		534	sub size_request {
		535	my ($self) = @_;
		536
		537	return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
		538
		539	my ($w, $h) = $self->SUPER::size_request;
		540
		541	$h += $tex[1]->{h};
		542	$h += $tex[4]->{h};
		543	$w += $tex[2]->{w};
		544	$w += $tex[3]->{w};
		545
		546	($w, $h)
		547	}
		548
		549	sub size_allocate {
		550	my ($self, $x, $y, $w, $h) = @_;
		551
		552	$self->_size_allocate ($x, $y, $w, $h) or return;
		553
		554	$h -= $tex[1]{h};
		555	$h -= $tex[4]{h};
		556	$w -= $tex[2]{w};
		557	$w -= $tex[3]{w};
		558
		559	$h = $h < 0 ? 0 : $h;
		560	$w = $w < 0 ? 0 : $w;
		561
		562	my $child = $self->child;
		563
		564	$child->size_allocate ($tex[3]->{w}, $tex[1]->{h}, $w, $h);
		565	}
		566
		567	sub button_down {
		568	my ($self, $ev, $x, $y) = @_;
		569
		570	if ($x < $self->{w} && $x >= $self->{w} - $tex[2]{w}
		571	&& $y < $self->{h} && $y >= $self->{h} - $tex[4]{h}) {
		572
		573	my ($ox, $oy) = ($ev->button_x, $ev->button_y);
		574	my ($bw, $bh) = ($self->{w}, $self->{h});
		575
		576	$self->{motion} = sub {
		577	my ($ev, $x, $y) = @_;
		578
		579	($x, $y) = ($ev->motion_x, $ev->motion_y);
		580
		581	$self->{user_w} = $bw + $x - $ox;
		582	$self->{user_h} = $bh + $y - $oy;
		583	$self->update;
		584	};
		585
		586	} elsif ($x >= 0 && $x < $self->{w}
		587	&& $y >= 0 && $y < $tex[1]{h}) {
		588
		589	my ($ox, $oy) = ($ev->button_x, $ev->button_y);
		590	my ($bx, $by) = ($self->{x}, $self->{y});
		591
		592	$self->{motion} = sub {
		593	my ($ev, $x, $y) = @_;
		594
		595	($x, $y) = ($ev->motion_x, $ev->motion_y);
		596
		597	$self->move ($bx + $x - $ox, $by + $y - $oy);
		598	$self->update;
		599	};
		600	}
		601	}
		602
		603	sub button_up {
		604	my ($self, $ev, $x, $y) = @_;
		605
		606	delete $self->{motion};
		607	}
		608
		609	sub mouse_motion {
		610	my ($self, $ev, $x, $y) = @_;
		611
		612	$self->{motion}->($ev, $x, $y) if $self->{motion};
		613	}
		614
		615	sub _draw {
		616	my ($self) = @_;
		617
		618	my ($w, $h) = ($self->{w}, $self->{h});
		619	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
		620
		621	glEnable GL_BLEND;
		622	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		623	glEnable GL_TEXTURE_2D;
		624	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		625
		626	my $top = $tex[1];
		627	$top->draw_quad (0, 0, $w, $top->{h});
		628
		629	my $left = $tex[3];
		630	$left->draw_quad (0, $top->{h}, $left->{w}, $ch);
		631
		632	my $right = $tex[2];
		633	$right->draw_quad ($w - $right->{w}, $top->{h}, $right->{w}, $ch);
		634
		635	my $bottom = $tex[4];
		636	$bottom->draw_quad (0, $h - $bottom->{h}, $w, $bottom->{h});
		637
		638	my $bg = $tex[0];
		639
		640	glBindTexture GL_TEXTURE_2D, $bg->{name};
		641	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		642
		643	my $rep_x = $cw / $bg->{w};
		644	my $rep_y = $ch / $bg->{h};
		645
		646	$bg->draw_quad ($left->{w}, $top->{h}, $cw, $ch);
		647
		648	glDisable GL_TEXTURE_2D;
		649	glDisable GL_BLEND;
		650
		651	$self->child->draw;
		652
		653	}
		654
		655	#############################################################################
		656
		657	package CFClient::UI::Table;
		658
		659	our @ISA = CFClient::UI::Base::;
		660
		661	use List::Util qw(max sum);
		662
		663	use SDL::OpenGL;
		664
300	sub new {	665	sub new {
		666	my $class = shift;
		667
		668	$class->SUPER::new (
		669	col_expand => [],
		670	@_
		671	)
		672	}
		673
		674	sub add {
		675	my ($self, $x, $y, $chld) = @_;
		676
		677	$self->{children}[$y][$x] = $chld;
		678	$chld->set_parent ($self);
		679
		680	$self->{w} = $self->{h} = -1;
		681	$self->update;
		682	}
		683
		684	sub get_wh {
301	my ($self, $theme) = @_;	685	my ($self) = @_;
		686
		687	my (@w, @h);
		688
		689	for my $y (0 .. $#{$self->{children}}) {
		690	my $row = $self->{children}[$y]
		691	or next;
		692
		693	for my $x (0 .. $#$row) {
		694	my $widget = $row->[$x]
		695	or next;
		696	my ($w, $h) = $widget->size_request;
		697
		698	$w[$x] = max $w[$x], $w;
		699	$h[$y] = max $h[$y], $h;
		700	}
		701	}
		702
		703	(\@w, \@h)
		704	}
		705
		706	sub size_request {
		707	my ($self) = @_;
		708
		709	my ($ws, $hs) = $self->get_wh;
		710
		711	(
		712	(sum @$ws),
		713	(sum @$hs),
		714	)
		715	}
		716
		717	sub size_allocate {
		718	my ($self, $x, $y, $w, $h) = @_;
		719
		720	$self->_size_allocate ($x, $y, $w, $h) or return;
		721
		722	my ($ws, $hs) = $self->get_wh;
		723
		724	my $req_w = sum @$ws;
		725	my $req_h = sum @$hs;
		726
		727	# TODO: nicer code && do row_expand
		728	my @col_expand = @{$self->{col_expand}};
		729	@col_expand = (1) x @$ws unless @col_expand;
		730	my $col_expand = (sum @col_expand) || 1;
		731
		732	# linearly scale sizes
		733	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
		734	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
		735
		736	my $y;
		737
		738	for my $r (0 .. $#{$self->{children}}) {
		739	my $row = $self->{children}[$r]
		740	or next;
		741
		742	my $x = 0;
		743	my $row_h = $hs->[$r];
		744
		745	for my $c (0 .. $#$row) {
		746	my $col_w = $ws->[$c];
		747
		748	if (my $widget = $row->[$c]) {
		749	$widget->size_allocate ($x, $y, $col_w, $row_h);
		750	}
		751
		752	$x += $col_w;
		753	}
		754
		755	$y += $row_h;
		756	}
		757
		758	}
		759
		760	sub find_widget {
		761	my ($self, $x, $y) = @_;
		762
		763	$x -= $self->{x};
		764	$y -= $self->{y};
		765
		766	my $res;
		767
		768	for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
		769	$res = $_->find_widget ($x, $y)
		770	and return $res;
		771	}
		772
		773	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
		774	}
		775
		776	sub _draw {
		777	my ($self) = @_;
		778
		779	for (grep $_, @{$self->{children}}) {
		780	$_->draw for grep $_, @$_;
		781	}
		782	}
		783
		784	#############################################################################
		785
		786	package CFClient::UI::HBox;
		787
		788	# TODO: wrap into common Box base class
		789
		790	our @ISA = CFClient::UI::Container::;
		791
		792	sub size_request {
		793	my ($self) = @_;
		794
		795	my @alloc = map [$_->size_request], @{$self->{children}};
		796
		797	(
		798	(List::Util::sum map $_->[0], @alloc),
		799	(List::Util::max map $_->[1], @alloc),
		800	)
		801	}
		802
		803	sub size_allocate {
		804	my ($self, $x, $y, $w, $h) = @_;
		805
		806	$self->_size_allocate ($x, $y, $w, $h) or return;
		807
		808	return unless $self->{w};
		809
		810	($h, $w) = ($w, $h);
		811
		812	my $children = $self->{children};
		813
		814	my @h = map +($_->size_request)[0], @$children;
		815
		816	my $req_h = List::Util::sum @h;
		817
		818	if ($req_h > $h) {
		819	# ah well, not enough space
		820	$_ *= $h / $req_h for @h;
		821	} else {
		822	my $exp = List::Util::sum map $_->{expand}, @$children;
		823	$exp ||= 1;
		824
		825	for (0 .. $#$children) {
		826	my $child = $children->[$_];
		827
		828	my $alloc_h = $h[$_];
		829	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
		830	$h[$_] = $alloc_h;
		831	}
		832	}
		833
		834	my $y = 0;
		835	for (0 .. $#$children) {
		836	my $child = $children->[$_];
		837	my $h = $h[$_];
		838	$child->size_allocate ($y, 0, $h, $w);
		839
		840	$y += $h;
		841	}
		842	}
		843
		844	#############################################################################
		845
		846	package CFClient::UI::VBox;
		847
		848	# TODO: wrap into common Box base class
		849
		850	our @ISA = CFClient::UI::Container::;
		851
		852	sub size_request {
		853	my ($self) = @_;
		854
		855	my @alloc = map [$_->size_request], @{$self->{children}};
		856
		857	(
		858	(List::Util::max map $_->[0], @alloc),
		859	(List::Util::sum map $_->[1], @alloc),
		860	)
		861	}
		862
		863	sub size_allocate {
		864	my ($self, $x, $y, $w, $h) = @_;
		865
		866	$self->_size_allocate ($x, $y, $w, $h) or return;
		867
		868	return unless $self->{h};
		869
		870	my $children = $self->{children};
		871
		872	my @h = map +($_->size_request)[1], @$children;
		873
		874	my $req_h = List::Util::sum @h;
		875
		876	if ($req_h > $h) {
		877	# ah well, not enough space
		878	$_ *= $h / $req_h for @h;
		879	} else {
		880	my $exp = List::Util::sum map $_->{expand}, @$children;
		881	$exp ||= 1;
		882
		883	for (0 .. $#$children) {
		884	my $child = $children->[$_];
		885
		886	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
		887	}
		888	}
		889
		890	my $y = 0;
		891	for (0 .. $#$children) {
		892	my $child = $children->[$_];
		893	my $h = $h[$_];
		894	$child->size_allocate (0, $y, $w, $h);
		895
		896	$y += $h;
		897	}
		898	}
		899
		900	#############################################################################
		901
		902	package CFClient::UI::Label;
		903
		904	our @ISA = CFClient::UI::Base::;
		905
		906	use SDL::OpenGL;
		907
		908	sub new {
		909	my ($class, %arg) = @_;
		910
302	$self = $self->SUPER::new;	911	my $self = $class->SUPER::new (
303		912	fg => [1, 1, 1],
304	$self->{txts} = [	913	height => $::FONTSIZE,
305	map { new_from_file Crossfire::Client::Texture Crossfire::Client::find_rcfile $_ }	914	text => "",
306	qw/d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png/	915	align => -1,
		916	padding => 2,
		917	layout => new CFClient::Layout,
		918	%arg
307	];	919	);
		920
		921	$self->set_text ($self->{text});
		922
308	$self	923	$self
		924	}
309		925
		926	sub escape_text {
		927	local $_ = $_[1];
		928
		929	s/&/&amp;/g;
		930	s/>/&gt;/g;
		931	s/</&lt;/g;
		932
		933	$_[1]
		934	}
		935
		936	sub set_text {
		937	my ($self, $text) = @_;
		938
		939	$self->{text} = $text;
		940	$self->{layout}->set_markup ($text);
		941
		942	delete $self->{texture};
		943	# $self->{w} = $self->{h} = -1;
		944	$self->update;
		945	}
		946
		947	sub get_text {
		948	my ($self, $text) = @_;
		949
		950	$self->{text}
310	}	951	}
311		952
312	sub size_request {	953	sub size_request {
313	my ($self) = @_;	954	my ($self) = @_;
		955
		956	$self->{layout}->set_width;
		957	$self->{layout}->set_height ($self->{height});
314	my ($w, $h) = $self->get->size_request;	958	my ($w, $h) = $self->{layout}->size;
315		959
316	$h += $self->{txts}->[1]->{height};	960	(
317	$h += $self->{txts}->[4]->{height};	961	$w + $self->{padding} * 2,
318	$w += $self->{txts}->[2]->{width};	962	$h + $self->{padding} * 2,
319	$w += $self->{txts}->[3]->{width};	963	)
		964	}
320		965
321	$self->get->move ($self->{txts}->[3]->{width}, $self->{txts}->[1]->{height});	966	sub size_allocate {
		967	my ($self, $x, $y, $w, $h) = @_;
322		968
323	($w, $h)	969	$self->_size_allocate ($x, $y, $w, $h) or return;
		970
		971	delete $self->{texture};
		972	}
		973
		974	sub update {
		975	my ($self) = @_;
		976
		977	delete $self->{texture};
		978	$self->SUPER::update;
324	}	979	}
325		980
326	sub _draw {	981	sub _draw {
327	my ($self) = @_;	982	my ($self) = @_;
328		983
		984	my $tex = $self->{texture} ||= do {
		985	$self->{layout}->set_width ($self->{w});
		986	$self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height});
		987	new_from_layout CFClient::Texture $self->{layout}
		988	};
		989
		990	glEnable GL_BLEND;
		991	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		992	glEnable GL_TEXTURE_2D;
		993	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
		994
		995	glColor @{$self->{fg}};
		996
		997	my $x =
		998	$self->{align} < 0 ? $self->{padding}
		999	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
		1000	: ($self->{w} - $tex->{w}) * 0.5;
		1001
		1002	glTranslate $x, ($self->{h} - $tex->{h}) * 0.5, 0;
		1003	$tex->draw_quad (0, 0);
		1004
		1005	glDisable GL_TEXTURE_2D;
		1006	glDisable GL_BLEND;
		1007	}
		1008
		1009	#############################################################################
		1010
		1011	package CFClient::UI::Entry;
		1012
		1013	our @ISA = CFClient::UI::Label::;
		1014
		1015	use SDL;
		1016	use SDL::OpenGL;
		1017
		1018	sub new {
		1019	my $class = shift;
		1020
		1021	$class->SUPER::new (
		1022	fg => [1, 1, 1],
		1023	bg => [0, 0, 0, 0.2],
		1024	active_bg => [1, 1, 1, 0.5],
		1025	active_fg => [0, 0, 0],
		1026	@_
		1027	)
		1028	}
		1029
		1030	sub _set_text {
		1031	my ($self, $text) = @_;
		1032
		1033	$self->{last_activity} = $::NOW;
		1034
		1035	$self->{text} = $text;
		1036	$self->{layout}->set_width ($self->{w});
		1037	$self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height});
		1038
		1039	$text =~ s/./*/g if $self->{hidden};
		1040
		1041	$self->{layout}->set_markup ($self->escape_text ($text) . " ");
		1042
		1043	$text = substr $text, 0, $self->{cursor};
		1044	utf8::encode $text;
		1045
		1046	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
		1047	}
		1048
		1049	sub size_request {
		1050	my ($self) = @_;
		1051
329	my ($w, $h) = $self->size_request;	1052	my ($w, $h) = $self->SUPER::size_request;
330	my ($cw, $ch) = $self->get->size_request;	1053
		1054	($w + 1, $h) # add 1 for cursor
		1055	}
		1056
		1057	sub size_allocate {
		1058	my ($self, $x, $y, $w, $h) = @_;
		1059
		1060	$self->SUPER::size_allocate ($x, $y, $w, $h);
		1061
		1062	$self->_set_text ($self->{text});
		1063	}
		1064
		1065	sub set_text {
		1066	my ($self, $text) = @_;
		1067
		1068	$self->{cursor} = length $text;
		1069	$self->_set_text ($text);
		1070	$self->update;
		1071	}
		1072
		1073	sub key_down {
		1074	my ($self, $ev) = @_;
		1075
		1076	my $mod = $ev->key_mod;
		1077	my $sym = $ev->key_sym;
		1078
		1079	my $uni = $ev->key_unicode;
		1080
		1081	my $text = $self->get_text;
		1082
		1083	if ($sym == SDLK_BACKSPACE) {
		1084	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
		1085	} elsif ($sym == SDLK_DELETE) {
		1086	substr $text, $self->{cursor}, 1, "";
		1087	} elsif ($sym == SDLK_LEFT) {
		1088	--$self->{cursor} if $self->{cursor};
		1089	} elsif ($sym == SDLK_RIGHT) {
		1090	++$self->{cursor} if $self->{cursor} < length $self->{text};
		1091	} elsif ($sym == SDLK_HOME) {
		1092	$self->{cursor} = 0;
		1093	} elsif ($sym == SDLK_END) {
		1094	$self->{cursor} = length $text;
		1095	} elsif ($uni) {
		1096	substr $text, $self->{cursor}++, 0, chr $uni;
		1097	}
		1098
		1099	$self->_set_text ($text);
		1100	$self->update;
		1101	}
		1102
		1103	sub focus_in {
		1104	my ($self) = @_;
		1105
		1106	$self->{last_activity} = $::NOW;
		1107
		1108	$self->SUPER::focus_in;
		1109	}
		1110
		1111	sub button_down {
		1112	my ($self, $ev, $x, $y) = @_;
		1113
		1114	$self->SUPER::button_down ($ev, $x, $y);
		1115
		1116	my $idx = $self->{layout}->xy_to_index ($x, $y);
		1117
		1118	# byte-index to char-index
		1119	my $text = $self->{text};
		1120	utf8::encode $text;
		1121	$self->{cursor} = length substr $text, 0, $idx;
		1122
		1123	$self->_set_text ($self->{text});
		1124	$self->update;
		1125	}
		1126
		1127	sub mouse_motion {
		1128	my ($self, $ev, $x, $y) = @_;
		1129	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
		1130	}
		1131
		1132	sub _draw {
		1133	my ($self) = @_;
		1134
		1135	local $self->{fg} = $self->{fg};
		1136
		1137	if ($FOCUS == $self) {
		1138	glColor @{$self->{active_bg}};
		1139	$self->{fg} = $self->{active_fg};
		1140	} else {
		1141	glColor @{$self->{bg}};
		1142	}
		1143
		1144	glEnable GL_BLEND;
		1145	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1146	glBegin GL_QUADS;
		1147	glVertex 0 , 0;
		1148	glVertex 0 , $self->{h};
		1149	glVertex $self->{w}, $self->{h};
		1150	glVertex $self->{w}, 0;
		1151	glEnd;
		1152	glDisable GL_BLEND;
		1153
		1154	$self->SUPER::_draw;
		1155
		1156	#TODO: force update every cursor change :(
		1157	if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
		1158	glColor @{$self->{fg}};
		1159	glBegin GL_LINES;
		1160	glVertex $self->{cur_x}, $self->{cur_y};
		1161	glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h};
		1162	glEnd;
		1163	}
		1164	}
		1165
		1166	#############################################################################
		1167
		1168	package CFClient::UI::Button;
		1169
		1170	our @ISA = CFClient::UI::Label::;
		1171
		1172	use SDL;
		1173	use SDL::OpenGL;
		1174
		1175	my @tex =
		1176	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
		1177	qw(b1_button_active.png);
		1178
		1179	sub new {
		1180	my $class = shift;
		1181
		1182	$class->SUPER::new (
		1183	padding => 4,
		1184	fg => [1, 1, 1],
		1185	bg => [1, 1, 1, 0.2],
		1186	active_fg => [1, 1, 0],
		1187	# active_bg => [0, 0, 0, 0.5],
		1188	# border_fg => [1, 1, 0],
		1189	@_
		1190	)
		1191	}
		1192
		1193	sub button_up {
		1194	my ($self, $ev, $x, $y) = @_;
		1195
		1196	if ($x >= 0 && $x < $self->{w}
		1197	&& $y >= 0 && $y < $self->{h}) {
		1198	$self->emit ("activate");
		1199	}
		1200	}
		1201
		1202	sub _draw {
		1203	my ($self) = @_;
		1204
		1205	local $self->{fg} = $self->{fg};
		1206	my $tex = $tex[0];
331		1207
332	glEnable GL_BLEND;	1208	glEnable GL_BLEND;
333	glEnable GL_TEXTURE_2D;	1209	glEnable GL_TEXTURE_2D;
334	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1210	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
		1211
		1212	if ($GRAB == $self) {
		1213	$self->{fg} = $self->{active_fg};
		1214	}
		1215
		1216	glBindTexture GL_TEXTURE_2D, $tex->{name};
335	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1217	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
336		1218
		1219	$tex->draw_quad (0, 0, $self->{w}, $self->{h});
337		1220
338	my $top = $self->{txts}->[1];	1221	glDisable GL_TEXTURE_2D;
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
405	glDisable GL_BLEND;	1222	glDisable GL_BLEND;
406	glDisable GL_TEXTURE_2D;
407	}
408		1223
409	package Crossfire::Client::Widget::Table;	1224	$self->SUPER::_draw;
		1225	}
410		1226
411	our @ISA = Crossfire::Client::Widget::Bin::;	1227	#############################################################################
		1228
		1229	package CFClient::UI::Slider;
		1230
		1231	use strict;
412		1232
413	use SDL::OpenGL;	1233	use SDL::OpenGL;
414		1234
415	sub add {	1235	our @ISA = CFClient::UI::DrawBG::;
416	my ($self, $x, $y, $chld) = @_;
417	my $old_chld = $self->{childs}[$y][$x];
418		1236
419	$self->{childs}[$y][$x] = $chld;	1237	sub new {
420	$chld->set_parent ($self);	1238	my $class = shift;
421	$self->update;
422	}
423		1239
424	sub max_row_height {	1240	# range [value, low, high, page]
425	my ($self, $row) = @_;
426		1241
427	my $hs = 0;	1242	my $self = $class->SUPER::new (
428	for (my $xi = 0; $xi <= $#{$self->{childs}->[$row] || []}; $xi++) {	1243	fg => [1, 1, 1],
429	my $c = $self->{childs}->[$row]->[$xi];	1244	active_fg => [0, 0, 0],
430	if ($c) {	1245	range => [0, 0, 100, 10],
431	my ($w, $h) = $c->size_request;	1246	req_w => 40,
432	if ($hs < $h) { $hs = $h }	1247	req_h => 10,
		1248	vertical => 0,
433	}	1249	@_
434	}	1250	);
435	return $hs;
436	}
437		1251
438	sub max_col_width {	1252	$self
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	}	1253	}
451		1254
452	sub size_request {	1255	sub size_request {
453	my ($self) = @_;	1256	my ($self) = @_;
454		1257
455	my ($hs, $ws) = (0, 0);	1258	my $w = $self->{req_w};
		1259	my $h = $self->{req_h};
456		1260
457	for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) {	1261	$self->{vertical} ? ($h, $w) : ($w, $h)
458	$hs += $self->max_row_height ($yi);	1262	}
459	}
460		1263
461	for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) {	1264	sub button_down {
462	my $wm = 0;	1265	my ($self, $ev, $x, $y) = @_;
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		1266
469	return ($ws, $hs);	1267	$self->SUPER::button_down ($ev, $x, $y);
		1268	$self->mouse_motion ($ev, $x, $y);
		1269	}
		1270
		1271	sub mouse_motion {
		1272	my ($self, $ev, $x, $y) = @_;
		1273
		1274	if ($GRAB == $self) {
		1275	my ($value, $lo, $hi, $page) = @{$self->{range}};
		1276
		1277	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
		1278
		1279	$x = $x * ($hi - $lo) / $w + $lo;
		1280	$x = $lo if $x < $lo;
		1281	$x = $hi - $page if $x > $hi - $page;
		1282	$self->{range}[0] = $x;
		1283
		1284	$self->emit (changed => $x);
		1285	$self->update;
		1286	}
470	}	1287	}
471		1288
472	sub _draw {	1289	sub _draw {
473	my ($self) = @_;	1290	my ($self) = @_;
474		1291
475	my $y = 0;	1292	$self->SUPER::_draw ();
476	for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) {
477	my $x = 0;
478		1293
479	for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) {	1294	my ($w, $h) = @$self{qw(w h)};
480		1295
481	my $c = $self->{childs}->[$yi]->[$xi];	1296	if ($self->{vertical}) {
482	if ($c) {	1297	# draw a vertical slider like a rotated horizontal slider
483	$c->move ($x, $y, 0); #TODO: Move to size_request	1298
484	$c->draw if $c;	1299	glRotate 90, 0, 0, 1;
485	}	1300	glTranslate 0, -$self->{w}, 0;
486		1301
487	$x += $self->max_col_width ($xi);	1302	($w, $h) = ($h, $w);
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	(	1303	}
568	$self->{texture}{width},
569	$self->{texture}{height},
570	)
571	}
572		1304
573	sub _draw {	1305	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
574	my ($self) = @_;	1306	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
575		1307
576	my $tex = $self->{texture};	1308	my ($value, $lo, $hi, $page) = @{$self->{range}};
577		1309
578	glEnable GL_BLEND;	1310	$page = int $page * $w / ($hi - $lo);
579	glEnable GL_TEXTURE_2D;	1311	$value = int +($value - $lo) * $w / ($hi - $lo);
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		1312
584	glColor 1, 1, 1, 0.6; # TODO color	1313	$w -= $page;
		1314	$page &= ~1;
		1315	glTranslate $page * 0.5, 0, 0;
		1316	$page ||= 2;
		1317
		1318	glColor @$fg;
		1319	glBegin GL_LINES;
		1320	glVertex 0, 0; glVertex 0, $h;
		1321	glVertex $w - 1, 0; glVertex $w - 1, $h;
		1322	glVertex 0, $h * 0.5; glVertex $w, $h * 0.5;
		1323	glEnd;
		1324
		1325	my $knob_a = $value - $page * 0.5;
		1326	my $knob_b = $value + $page * 0.5;
585		1327
586	glBegin GL_QUADS;	1328	glBegin GL_QUADS;
587	glTexCoord 0, 0; glVertex 0 , 0;	1329	glColor @$fg;
588	glTexCoord 0, 1; glVertex 0 , $tex->{height};	1330	glVertex $knob_a, 0;
589	glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height};	1331	glVertex $knob_a, $h;
590	glTexCoord 1, 0; glVertex $tex->{width}, 0;	1332	glVertex $knob_b, $h;
		1333	glVertex $knob_b, 0;
		1334
		1335	if ($knob_a < $knob_b - 2) {
		1336	glColor @$bg;
		1337	glVertex $knob_a + 1, 1;
		1338	glVertex $knob_a + 1, $h - 1;
		1339	glVertex $knob_b - 1, $h - 1;
		1340	glVertex $knob_b - 1, 1;
		1341	}
591	glEnd;	1342	glEnd;
592
593	glDisable GL_BLEND;
594	glDisable GL_TEXTURE_2D;
595	}	1343	}
596		1344
597	package Crossfire::Client::Widget::TextEntry;	1345	#############################################################################
598		1346
599	our @ISA = Crossfire::Client::Widget::Label::;	1347	package CFClient::UI::MapWidget;
		1348
		1349	use strict;
		1350
		1351	use List::Util qw(min max);
600		1352
601	use SDL;	1353	use SDL;
602	use SDL::OpenGL;	1354	use SDL::OpenGL;
603		1355
604	sub key_down {	1356	our @ISA = CFClient::UI::Base::;
605	my ($self, $ev) = @_;
606
607	my $mod = $ev->key_mod;
608	my $sym = $ev->key_sym;
609
610	$ev->set_unicode (1);
611	my $uni = $ev->key_unicode;
612
613	my $text = $self->get_text;
614
615	if ($sym == SDLK_BACKSPACE) {
616	substr $text, -1, 1, '';
617
618	} elsif ($uni) {
619	$text .= chr $uni;
620	}
621	$self->set_text ($text);
622	}
623
624
625	# XXX: TextView isn't neccessary with pango multiline text rendering
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		1357
635	sub new {	1358	sub new {
636	my ($class, $text, $h) = @_;	1359	my $class = shift;
		1360
637	my $self = $class->SUPER::new ();	1361	$class->SUPER::new (
638		1362	z => -1,
639	$self->{txt_height} = $h;	1363	list => (glGenLists 1),
640	@{$self->{lines}} = split /\r?\n/, $text;	1364	@_
641
642	for (split /\r?\n/, $text) {
643	$self->add_line ($_);
644	}	1365	)
645	$self
646	}	1366	}
647
648	#sub render_lines {
649	# my ($self) = @_;
650	#
651	# $self->{txt_lines} = [];
652	#
653	# for (@{$self->{lines}}) {
654	# push @{$self->{txt_lines}},
655	# new_from_ttf Crossfire::Client::Texture $self->{ttf}, $_;
656	# }
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
688	glBegin GL_QUADS;
689	glTexCoord 0, 0; glVertex 0 , $y;
690	glTexCoord 0, 1; glVertex 0 , $y + $tex->{height};
691	glTexCoord 1, 1; glVertex $tex->{width}, $y + $tex->{height};
692	glTexCoord 1, 0; glVertex $tex->{width}, $y;
693	glEnd;
694	}
695
696	sub _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	}
712
713	package Crossfire::Client::Widget::MapWidget;
714
715	use strict;
716
717	use List::Util qw(min max);
718
719	use SDL;
720	use SDL::OpenGL;
721	use SDL::OpenGL::Constants;
722
723	our @ISA = Crossfire::Client::Widget::;
724		1367
725	sub key_down {	1368	sub key_down {
726	print "MAPKEYDOWN\n";	1369	print "MAPKEYDOWN\n";
727	}	1370	}
728		1371
729	sub key_up {	1372	sub key_up {
730	}	1373	}
731		1374
		1375	sub size_request {
		1376	(
		1377	1 + 32 * int $::WIDTH / 32,
		1378	1 + 32 * int $::HEIGHT / 32,
		1379	)
		1380	}
		1381
		1382	sub update {
		1383	my ($self) = @_;
		1384
		1385	$self->{need_update} = 1;
		1386	$self->SUPER::update;
		1387	}
		1388
732	sub _draw {	1389	sub draw {
733	my ($self) = @_;	1390	my ($self) = @_;
734		1391
		1392	if (delete $self->{need_update}) {
		1393	glNewList $self->{list}, GL_COMPILE;
		1394
735	my $mx = $::CONN->{mapx};	1395	my $mx = $::CONN->{mapx};
736	my $my = $::CONN->{mapy};	1396	my $my = $::CONN->{mapy};
737		1397
738	my $map = $::CONN->{map};	1398	my $map = $::CONN->{map};
739		1399
740	my ($xofs, $yofs);	1400	my ($xofs, $yofs);
741		1401
742	my $sw = 1 + int $::WIDTH / 32;	1402	my $sw = 1 + int $::WIDTH / 32;
743	my $sh = 1 + int $::HEIGHT / 32;	1403	my $sh = 1 + int $::HEIGHT / 32;
744		1404
745	if ($::CONN->{mapw} > $sw) {	1405	if ($::CONN->{mapw} > $sw) {
746	$xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5;	1406	$xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5;
747	} else {	1407	} else {
748	$xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};	1408	$xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};
749	}	1409	}
750		1410
751	if ($::CONN->{maph} > $sh) {	1411	if ($::CONN->{maph} > $sh) {
752	$yofs = $my + ($::CONN->{maph} - $sh) * 0.5;	1412	$yofs = $my + ($::CONN->{maph} - $sh) * 0.5;
753	} else {	1413	} else {
754	$yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};	1414	$yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
755	}	1415	}
756		1416
757	glEnable GL_TEXTURE_2D;	1417	glEnable GL_TEXTURE_2D;
758	glEnable GL_BLEND;	1418	glEnable GL_BLEND;
		1419	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
759	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1420	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
760		1421
761	my $sw4 = ($sw + 3) & ~3;	1422	my $sw4 = ($sw + 3) & ~3;
762	my $lighting = "\x00" x ($sw4 * $sh);	1423	my $darkness = "\x00" x ($sw4 * $sh);
763		1424
764	for my $x (0 .. $sw - 1) {	1425	for my $x (0 .. $sw - 1) {
		1426	my $row = $map->[$x + $xofs];
765	for my $y (0 .. $sh - 1) {	1427	for my $y (0 .. $sh - 1) {
766		1428
767	my $cell = $map->[$x + $xofs][$y + $yofs]	1429	my $cell = $row->[$y + $yofs]
768	or next;	1430	or next;
769		1431
770	my $darkness = $cell->[0] * (1 / 255);	1432	my $dark = $cell->[0];
771	if ($darkness < 0) {	1433	if ($dark < 0) {
772	$darkness = 0.15;	1434	substr $darkness, $y * $sw4 + $x, 1, chr 224;
		1435	} else {
		1436	substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark;
773	}	1437	}
774	substr $lighting, $y * $sw4 + $x, 1, chr 255 - $darkness * 255;
775		1438
776	for my $num (grep $_, @$cell[1,2,3]) {	1439	for my $num (grep $_, @$cell[1,2,3]) {
777	my $tex = $::CONN->{face}[$num]{texture} || next;	1440	my $tex = $::CONN->{face}[$num]{texture} || next;
		1441
		1442	my ($w, $h) = @$tex{qw(w h)};
778		1443
779	glBindTexture GL_TEXTURE_2D, $tex->{name};	1444	$tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h);
780
781	my $w = $tex->{width};
782	my $h = $tex->{height};
783
784	my $px = ($x + 1) * 32 - $w;
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;	1445	}
793	}	1446	}
794	}	1447	}
795	}
796		1448
797	# if (1) { # higher quality darkness	1449	# if (1) { # higher quality darkness
798	# $lighting =~ s/(.)/$1$1$1/gs;	1450	# $lighting =~ s/(.)/$1$1$1/gs;
799	# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;	1451	# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
800	#	1452	#
…		…
802	#	1454	#
803	# $lighting = $pb->get_pixels;	1455	# $lighting = $pb->get_pixels;
804	# $lighting =~ s/(.)../$1/gs;	1456	# $lighting =~ s/(.)../$1/gs;
805	# }	1457	# }
806		1458
807	$lighting = new Crossfire::Client::Texture
808	width => $sw4,
809	height => $sh,
810	data => $lighting,
811	internalformat => GL_ALPHA4,
812	format => GL_ALPHA;
813
814	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
815	glColor 0, 0, 0, 0.75;
816	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1459	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		1460
		1461	$darkness = new CFClient::Texture
		1462	w => $sw4,
		1463	h => $sh,
		1464	data => $darkness,
		1465	internalformat => GL_ALPHA,
		1466	format => GL_ALPHA;
		1467
		1468	glColor 0.45, 0.45, 0.45, 1;
		1469	$darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32);
		1470
826	glDisable GL_TEXTURE_2D;	1471	glDisable GL_TEXTURE_2D;
827	glDisable GL_BLEND;	1472	glDisable GL_BLEND;
		1473
		1474	glEndList;
		1475	}
		1476
		1477	glCallList $self->{list};
828	}	1478	}
829		1479
830	my %DIR = (	1480	my %DIR = (
831	SDLK_KP8, [1, "north"],	1481	SDLK_KP8, [1, "north"],
832	SDLK_KP9, [2, "northeast"],	1482	SDLK_KP9, [2, "northeast"],
…		…
849	my $mod = $ev->key_mod;	1499	my $mod = $ev->key_mod;
850	my $sym = $ev->key_sym;	1500	my $sym = $ev->key_sym;
851		1501
852	if ($sym == SDLK_KP5) {	1502	if ($sym == SDLK_KP5) {
853	$::CONN->send ("command stay fire");	1503	$::CONN->send ("command stay fire");
		1504	} elsif ($sym == SDLK_a) {
		1505	$::CONN->send ("command apply");
854	} elsif (exists $DIR{$sym}) {	1506	} elsif (exists $DIR{$sym}) {
855	if ($mod & KMOD_SHIFT) {	1507	if ($mod & KMOD_SHIFT) {
856	$self->{shft}++;	1508	$self->{shft}++;
857	$::CONN->send ("command fire $DIR{$sym}[0]");	1509	$::CONN->send ("command fire $DIR{$sym}[0]");
858	} elsif ($mod & KMOD_CTRL) {	1510	} elsif ($mod & KMOD_CTRL) {
…		…
876	if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {	1528	if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
877	$::CONN->send ("command run_stop");	1529	$::CONN->send ("command run_stop");
878	}	1530	}
879	}	1531	}
880		1532
881	package Crossfire::Client::Widget::Animator;	1533	#############################################################################
		1534
		1535	package CFClient::UI::Animator;
882		1536
883	use SDL::OpenGL;	1537	use SDL::OpenGL;
884		1538
885	our @ISA = Crossfire::Client::Widget::Bin::;	1539	our @ISA = CFClient::UI::Bin::;
886		1540
887	sub moveto {	1541	sub moveto {
888	my ($self, $x, $y) = @_;	1542	my ($self, $x, $y) = @_;
889		1543
890	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	1544	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
891	$self->{speed} = 0.01;	1545	$self->{speed} = 0.001;
892	$self->{time} = 1;	1546	$self->{time} = 1;
893		1547
894	::animation_start $self;	1548	::animation_start $self;
895	}	1549	}
896		1550
…		…
911		1565
912	sub _draw {	1566	sub _draw {
913	my ($self) = @_;	1567	my ($self) = @_;
914		1568
915	glPushMatrix;	1569	glPushMatrix;
916	glRotate $self->{time} * 10000, 0, 1, 0;	1570	glRotate $self->{time} * 1000, 0, 1, 0;
917	$self->{child}->draw;	1571	$self->{children}[0]->draw;
918	glPopMatrix;	1572	glPopMatrix;
919	}	1573	}
920		1574
921	1;	1575	#############################################################################
922		1576
		1577	package CFClient::UI::Toplevel;
		1578
		1579	our @ISA = CFClient::UI::Container::;
		1580
		1581	sub size_request {
		1582	($::WIDTH, $::HEIGHT)
		1583	}
		1584
		1585	sub size_allocate {
		1586	my ($self, $x, $y, $w, $h) = @_;
		1587
		1588	$self->_size_allocate ($x, $y, $w, $h);
		1589
		1590	$_->size_allocate ($_->{x}, $_->{y}, $_->size_request)
		1591	for @{$self->{children}};
		1592	}
		1593
		1594	sub translate {
		1595	my ($self, $x, $y) = @_;
		1596
		1597	($x, $y)
		1598	}
		1599
		1600	sub update {
		1601	my ($self) = @_;
		1602
		1603	$self->size_allocate (0, 0, $::WIDTH, $::HEIGHT);
		1604	::refresh ();
		1605	}
		1606
		1607	sub add {
		1608	my ($self, $widget) = @_;
		1609
		1610	$self->SUPER::add ($widget);
		1611
		1612	$widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request);
		1613	}
		1614
		1615	sub draw {
		1616	my ($self) = @_;
		1617
		1618	$self->_draw;
		1619	}
		1620
		1621	#############################################################################
		1622
		1623	package CFClient::UI;
		1624
		1625	$TOPLEVEL = new CFClient::UI::Toplevel;
		1626
		1627	1
		1628

Diff Legend

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