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.158 by root, Mon Apr 24 02:41:48 2006 UTC vs.
Revision 1.254 by root, Mon May 29 01:53:23 2006 UTC

1	package CFClient::UI;	1	package CFClient::UI;
2		2
		3	use utf8;
3	use strict;	4	use strict;
4		5
5	use Scalar::Util ();	6	use Scalar::Util ();
6	use List::Util ();	7	use List::Util ();
7		8
8	use CFClient;	9	use CFClient;
		10	use CFClient::Texture;
9		11
10	our ($FOCUS, $HOVER, $GRAB); # various widgets	12	our ($FOCUS, $HOVER, $GRAB); # various widgets
11		13
		14	our $LAYOUT;
12	our $ROOT;	15	our $ROOT;
13	our $TOOLTIP;	16	our $TOOLTIP;
14	our $BUTTON_STATE;	17	our $BUTTON_STATE;
15		18
		19	our %WIDGET; # all widgets, weak-referenced
		20
		21	sub get_layout {
		22	for (grep { $_->{name} } values %WIDGET) {
		23	$LAYOUT->{$_->{name}} = {
		24	x => $_->{x} / $::WIDTH,
		25	y => $_->{y} / $::HEIGHT,
		26	w => $_->{w} / $::WIDTH,
		27	h => $_->{h} / $::HEIGHT
		28	};
		29	}
		30
		31	return $LAYOUT;
		32	}
		33
		34	sub set_layout {
		35	my ($layout) = @_;
		36	$LAYOUT = $layout;
		37	}
		38
16	sub check_tooltip {	39	sub check_tooltip {
17	if (!$GRAB) {	40	if (!$GRAB) {
18	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	41	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19	if (exists $widget->{tooltip}) {	42	if (length $widget->{tooltip}) {
20		43
21	if ($TOOLTIP->{owner} != $widget) {	44	if ($TOOLTIP->{owner} != $widget) {
		45	$TOOLTIP->hide;
		46
22	$TOOLTIP->{owner} = $widget;	47	$TOOLTIP->{owner} = $widget;
23		48
24	my $tip = $widget->{tooltip};	49	my $tip = $widget->{tooltip};
25		50
26	$tip = $tip->($widget) if CODE:: eq ref $tip;	51	$tip = $tip->($widget) if CODE:: eq ref $tip;
27		52
28	$TOOLTIP->set_text ($widget->{tooltip});	53	$TOOLTIP->set_tooltip_from ($widget);
29	$TOOLTIP->move ($widget->coord2global ($widget->{w}, 0));
30	$TOOLTIP->show;	54	$TOOLTIP->show;
31	}	55	}
32		56
33	return;	57	return;
34	}	58	}
…		…
39	delete $TOOLTIP->{owner};	63	delete $TOOLTIP->{owner};
40	}	64	}
41		65
42	# class methods for events	66	# class methods for events
43	sub feed_sdl_key_down_event {	67	sub feed_sdl_key_down_event {
44	$FOCUS->key_down ($_[0]) if $FOCUS;	68	$FOCUS->emit (key_down => $_[0])
		69	if $FOCUS;
45	}	70	}
46		71
47	sub feed_sdl_key_up_event {	72	sub feed_sdl_key_up_event {
48	$FOCUS->key_up ($_[0]) if $FOCUS;	73	$FOCUS->emit (key_up => $_[0])
		74	if $FOCUS;
49	}	75	}
50		76
51	sub feed_sdl_button_down_event {	77	sub feed_sdl_button_down_event {
52	my ($ev) = @_;	78	my ($ev) = @_;
53	my ($x, $y) = ($ev->{x}, $ev->{y});	79	my ($x, $y) = ($ev->{x}, $ev->{y});
…		…
61	check_tooltip;	87	check_tooltip;
62	}	88	}
63		89
64	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	90	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
65		91
66	$GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;	92	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
		93	if $GRAB;
67	}	94	}
68		95
69	sub feed_sdl_button_up_event {	96	sub feed_sdl_button_up_event {
70	my ($ev) = @_;	97	my ($ev) = @_;
71	my ($x, $y) = ($ev->{x}, $ev->{y});	98	my ($x, $y) = ($ev->{x}, $ev->{y});
72		99
73	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	100	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
74		101
75	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	102	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
76		103
77	$GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;	104	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
		105	if $GRAB;
78		106
79	if (!$BUTTON_STATE) {	107	if (!$BUTTON_STATE) {
80	my $grab = $GRAB; undef $GRAB;	108	my $grab = $GRAB; undef $GRAB;
81	$grab->update if $grab;	109	$grab->update if $grab;
82	$GRAB->update if $GRAB;	110	$GRAB->update if $GRAB;
…		…
98	$HOVER->update if $HOVER && $HOVER->{can_hover};	126	$HOVER->update if $HOVER && $HOVER->{can_hover};
99		127
100	check_tooltip;	128	check_tooltip;
101	}	129	}
102		130
103	$HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER;	131	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
		132	if $HOVER;
104	}	133	}
105		134
106	# convert position array to integers	135	# convert position array to integers
107	sub harmonize {	136	sub harmonize {
108	my ($vals) = @_;	137	my ($vals) = @_;
…		…
114	$rem += $_ - $i;	143	$rem += $_ - $i;
115	$_ = $i;	144	$_ = $i;
116	}	145	}
117	}	146	}
118		147
		148	sub full_refresh {
		149	# make a copy, otherwise for complains about freed values.
		150	my @widgets = values %WIDGET;
		151
		152	$_->update
		153	for @widgets;
		154	}
		155
		156	sub reconfigure_widgets {
		157	# make a copy, otherwise C<for> complains about freed values.
		158	my @widgets = values %WIDGET;
		159
		160	$_->reconfigure
		161	for @widgets;
		162	}
		163
		164	# call when resolution changes etc.
		165	sub rescale_widgets {
		166	my ($sx, $sy) = @_;
		167
		168	for my $widget (values %WIDGET) {
		169	if ($widget->{is_toplevel}) {
		170	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
		171	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
		172	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
		173	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
		174	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
		175	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
		176	}
		177	}
		178
		179	reconfigure_widgets;
		180	}
		181
119	#############################################################################	182	#############################################################################
120		183
121	package CFClient::UI::Base;	184	package CFClient::UI::Base;
122		185
123	use strict;	186	use strict;
…		…
126		189
127	sub new {	190	sub new {
128	my $class = shift;	191	my $class = shift;
129		192
130	my $self = bless {	193	my $self = bless {
131	x => 0,	194	x => 0,
132	y => 0,	195	y => 0,
133	z => 0,	196	z => 0,
134	can_events => 1,	197	can_events => 1,
135	@_	198	@_
136	}, $class;	199	}, $class;
137		200
138	for (keys %$self) {	201	for (keys %$self) {
139	if (/^connect_(.*)$/) {	202	if (/^on_(.*)$/) {
140	$self->connect ($1 => delete $self->{$_});	203	$self->connect ($1 => delete $self->{$_});
141	}	204	}
142	}	205	}
143		206
		207	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
		208
		209	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
		210	$self->{req_x} = $layout->{x} * $::WIDTH;
		211	$self->{req_y} = $layout->{y} * $::HEIGHT;
		212	$self->{def_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH;
		213	$self->{def_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT;
		214	}
		215
144	$self	216	$self
145	}	217	}
146		218
		219	sub destroy {
		220	my ($self) = @_;
		221
		222	$self->hide;
		223	%$self = ();
		224	}
		225
147	sub show {	226	sub show {
148	my ($self) = @_;	227	my ($self) = @_;
149		228
150	return if $self->{parent};	229	return if $self->{parent};
151		230
152	$CFClient::UI::ROOT->add ($self);	231	$CFClient::UI::ROOT->add ($self);
153	}	232	}
154		233
		234	sub center {
		235	my ($self) = @_;
		236
		237	$CFClient::UI::ROOT->on_post_alloc (
		238	"center_$self" => sub {
		239	$self->move (($self->{parent}{w} - $self->{w}) * 0.5, ($self->{parent}{h} - $self->{h}) * 0.5);
		240	},
		241	);
		242
		243	$self->update;
		244	}
		245
		246	sub set_visible {
		247	my ($self) = @_;
		248
		249	return if $self->{visible};
		250
		251	$self->{root} = $self->{parent}{root};
		252	$self->{visible} = $self->{parent}{visible} + 1;
		253
		254	$self->emit (visibility_change => 1);
		255
		256	$self->realloc if !exists $self->{req_w};
		257
		258	$_->set_visible for $self->children;
		259	}
		260
		261	sub set_invisible {
		262	my ($self) = @_;
		263
		264	return unless $self->{visible};
		265
		266	$_->set_invisible for $self->children;
		267
		268	delete $self->{root};
		269	delete $self->{visible};
		270
		271	undef $GRAB if $GRAB == $self;
		272	undef $HOVER if $HOVER == $self;
		273
		274	CFClient::UI::check_tooltip
		275	if $TOOLTIP->{owner} == $self;
		276
		277	$self->focus_out;
		278
		279	$self->emit (visibility_change => 0);
		280	}
		281
		282	sub set_visibility {
		283	my ($self, $visible) = @_;
		284
		285	return if $self->{visible} == $visible;
		286
		287	$visible ? $self->hide
		288	: $self->show;
		289	}
		290
		291	sub toggle_visibility {
		292	my ($self) = @_;
		293
		294	$self->{visible}
		295	? $self->hide
		296	: $self->show;
		297	}
		298
155	sub hide {	299	sub hide {
156	my ($self) = @_;	300	my ($self) = @_;
157		301
158	return unless $self->{parent};	302	$self->set_invisible;
159		303
160	$self->{parent}->remove ($self);	304	$self->{parent}->remove ($self)
		305	if $self->{parent};
161	}	306	}
162		307
163	sub move {	308	sub move {
164	my ($self, $x, $y, $z) = @_;	309	my ($self, $x, $y, $z) = @_;
165		310
…		…
171	}	316	}
172		317
173	sub set_size {	318	sub set_size {
174	my ($self, $w, $h) = @_;	319	my ($self, $w, $h) = @_;
175		320
176	$self->{user_w} = $w;	321	$self->{def_w} = $w;
177	$self->{user_h} = $h;	322	$self->{def_h} = $h;
178		323
179	$self->check_size;	324	$self->realloc;
180	}	325	}
181		326
182	sub size_request {	327	sub size_request {
183	require Carp;	328	require Carp;
184	Carp::confess "size_request is abstract";	329	Carp::confess "size_request is abstract";
…		…
204	$self->{y} = $y;	349	$self->{y} = $y;
205	$self->update;	350	$self->update;
206	}	351	}
207		352
208	if ($self->{w} != $w || $self->{h} != $h) {	353	if ($self->{w} != $w || $self->{h} != $h) {
209	$self->{w} = $w;	354	return unless $self->{visible};
210	$self->{h} = $h;
211		355
212	$self->size_allocate ($w, $h);	356	$self->{root}->{size_alloc}{$self+0} = [$self, $w, $h];
213	$self->update;
214	}	357	}
215	}	358	}
216		359
217	sub size_allocate {	360	sub size_allocate {
218	# nothing to be done	361	# nothing to be done
219	}	362	}
220		363
		364	sub children {
		365	}
		366
221	sub set_max_size {	367	sub set_max_size {
222	my ($self, $w, $h) = @_;	368	my ($self, $w, $h) = @_;
223		369
224	delete $self->{max_w}; $self->{max_w} = $w if $w;	370	delete $self->{max_w}; $self->{max_w} = $w if $w;
225	delete $self->{max_h}; $self->{max_h} = $h if $h;	371	delete $self->{max_h}; $self->{max_h} = $h if $h;
226	}	372	}
227		373
228	# return top left coordinates	374	sub set_tooltip {
229	sub _topleft {
230	my ($self, $x, $y) = @_;	375	my ($self, $tooltip) = @_;
231		376
232	$self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});	377	$tooltip =~ s/^\s+//;
		378	$tooltip =~ s/\s+$//;
		379
		380	return if $self->{tooltip} eq $tooltip;
		381
		382	$self->{tooltip} = $tooltip;
		383
		384	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
		385	delete $CFClient::UI::TOOLTIP->{owner};
		386	CFClient::UI::check_tooltip;
		387	}
233	}	388	}
234		389
235	# translate global coordinates to local coordinate system	390	# translate global coordinates to local coordinate system
236	sub coord2local {	391	sub coord2local {
237	my ($self, $x, $y) = @_;	392	my ($self, $x, $y) = @_;
238		393
239	my ($X, $Y) = $self->_topleft;	394	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
240	($x - $X, $y - $Y)
241	}	395	}
242		396
243	# translate local coordinates to global coordinate system	397	# translate local coordinates to global coordinate system
244	sub coord2global {	398	sub coord2global {
245	my ($self, $x, $y) = @_;	399	my ($self, $x, $y) = @_;
246		400
247	my ($X, $Y) = $self->_topleft;	401	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
248	($x + $X, $y + $Y)
249	}	402	}
250		403
251	sub focus_in {	404	sub focus_in {
252	my ($self) = @_;	405	my ($self) = @_;
253		406
254	return if $FOCUS == $self;	407	return if $FOCUS == $self;
255	return unless $self->{can_focus};	408	return unless $self->{can_focus};
256		409
257	my $focus = $FOCUS; $FOCUS = $self;	410	my $focus = $FOCUS; $FOCUS = $self;
258		411
259	$self->emit (focus_in => $focus);	412	$self->_emit (focus_in => $focus);
260		413
261	$focus->update if $focus;	414	$focus->update if $focus;
262	$FOCUS->update;	415	$FOCUS->update;
263	}	416	}
264		417
…		…
267		420
268	return unless $FOCUS == $self;	421	return unless $FOCUS == $self;
269		422
270	my $focus = $FOCUS; undef $FOCUS;	423	my $focus = $FOCUS; undef $FOCUS;
271		424
272	$self->emit (focus_out => $focus);	425	$self->_emit (focus_out => $focus);
273		426
274	$focus->update if $focus; #?	427	$focus->update if $focus; #?
		428
		429	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
		430	unless $FOCUS;
275	}	431	}
276		432
277	sub mouse_motion { }	433	sub mouse_motion { }
278	sub button_up { }	434	sub button_up { }
279	sub key_down { }	435	sub key_down { }
280	sub key_up { }	436	sub key_up { }
281		437
282	sub button_down {	438	sub button_down {
283	my ($self, $ev, $x, $y) = @_;	439	my ($self, $ev, $x, $y) = @_;
284		440
285	$self->focus_in;	441	$self->focus_in;
…		…
288	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	444	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
289	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	445	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
290	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }	446	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
291	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }	447	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
292	sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }	448	sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
		449
		450	sub find_widget {
		451	my ($self, $x, $y) = @_;
		452
		453	return () unless $self->{can_events};
		454
		455	return $self
		456	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
		457	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
		458
		459	()
		460	}
		461
		462	sub set_parent {
		463	my ($self, $parent) = @_;
		464
		465	Scalar::Util::weaken ($self->{parent} = $parent);
		466
		467	$self->set_visible if $parent->{visible};
		468	}
		469
		470	sub connect {
		471	my ($self, $signal, $cb) = @_;
		472
		473	push @{ $self->{signal_cb}{$signal} }, $cb;
		474	}
		475
		476	sub _emit {
		477	my ($self, $signal, @args) = @_;
		478
		479	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
		480	}
		481
		482	sub emit {
		483	my ($self, $signal, @args) = @_;
		484
		485	$self->_emit ($signal, @args)
		486	|| $self->$signal (@args);
		487	}
		488
		489	sub visibility_change {
		490	#my ($self, $visible) = @_;
		491	}
		492
		493	sub realloc {
		494	my ($self) = @_;
		495
		496	if ($self->{visible}) {
		497	return if $self->{root}{realloc}{$self};
		498
		499	$self->{root}{realloc}{$self} = $self;
		500	$self->{root}->update;
		501	} else {
		502	delete $self->{req_w};
		503	}
		504	}
		505
		506	sub update {
		507	my ($self) = @_;
		508
		509	$self->{parent}->update
		510	if $self->{parent};
		511	}
293		512
294	sub draw {	513	sub draw {
295	my ($self) = @_;	514	my ($self) = @_;
296		515
297	return unless $self->{h} && $self->{w};	516	return unless $self->{h} && $self->{w};
…		…
313	glVertex $x + $self->{w}, $y + $self->{h};	532	glVertex $x + $self->{w}, $y + $self->{h};
314	glVertex $x , $y + $self->{h};	533	glVertex $x , $y + $self->{h};
315	glEnd;	534	glEnd;
316	glDisable GL_BLEND;	535	glDisable GL_BLEND;
317	}	536	}
		537
		538	if ($ENV{PCLIENT_DEBUG}) {
		539	glPushMatrix;
		540	glColor 1, 1, 0, 1;
		541	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
		542	glBegin GL_LINE_LOOP;
		543	glVertex 0 , 0;
		544	glVertex $self->{w} - 1, 0;
		545	glVertex $self->{w} - 1, $self->{h} - 1;
		546	glVertex 0 , $self->{h} - 1;
		547	glEnd;
		548	glPopMatrix;
		549	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
		550	}
318	}	551	}
319		552
320	sub _draw {	553	sub _draw {
321	my ($self) = @_;	554	my ($self) = @_;
322		555
323	warn "no draw defined for $self\n";	556	warn "no draw defined for $self\n";
324	}	557	}
325		558
326	sub find_widget {
327	my ($self, $x, $y) = @_;
328
329	return () unless $self->{can_events};
330
331	return $self
332	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
333	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
334
335	()
336	}
337
338	sub set_parent {
339	my ($self, $parent) = @_;
340
341	Scalar::Util::weaken ($self->{parent} = $parent);
342	}
343
344	sub check_size {
345	my ($self) = @_;
346
347	$self->{parent}
348	or return 1;
349
350	my ($w, $h) = $self->{user_w} && $self->{user_h}
351	? @$self{qw(user_w user_h)}
352	: $self->size_request;
353
354	if ($w != $self->{req_w} || $h != $self->{req_h}) {
355	$self->{req_w} = $w;
356	$self->{req_h} = $h;
357
358	$self->{parent}->check_size
359	or $self->size_allocate (
360	(List::Util::max $self->{w}, $w),
361	(List::Util::max $self->{h}, $h),
362	);
363
364	1
365	} else {
366	0
367	}
368	}
369
370	sub update {
371	my ($self) = @_;
372
373	$self->{parent}->update
374	if $self->{parent};
375	}
376
377	sub connect {
378	my ($self, $signal, $cb) = @_;
379
380	push @{ $self->{signal_cb}{$signal} }, $cb;
381	}
382
383	sub emit {
384	my ($self, $signal, @args) = @_;
385
386	for my $cb (@{$self->{signal_cb}{$signal} || []}) {
387	$cb->($self, @args);
388	}
389	}
390
391	sub DESTROY {	559	sub DESTROY {
392	my ($self) = @_;	560	my ($self) = @_;
393		561
		562	delete $WIDGET{$self+0};
394	#$self->deactivate;	563	#$self->deactivate;
395	}	564	}
396		565
397	#############################################################################	566	#############################################################################
398		567
…		…
407	my $class = shift;	576	my $class = shift;
408		577
409	# range [value, low, high, page]	578	# range [value, low, high, page]
410		579
411	$class->SUPER::new (	580	$class->SUPER::new (
412	bg => [0, 0, 0, 0.2],	581	#bg => [0, 0, 0, 0.2],
413	active_bg => [1, 1, 1, 0.5],	582	#active_bg => [1, 1, 1, 0.5],
414	@_	583	@_
415	)	584	)
416	}	585	}
417		586
418	sub _draw {	587	sub _draw {
419	my ($self) = @_;	588	my ($self) = @_;
420		589
		590	my $color = $FOCUS == $self && $self->{active_bg}
		591	? $self->{active_bg}
		592	: $self->{bg};
		593
		594	if ($color && (@$color < 4 || $color->[3])) {
421	my ($w, $h) = @$self{qw(w h)};	595	my ($w, $h) = @$self{qw(w h)};
422		596
423	glEnable GL_BLEND;	597	glEnable GL_BLEND;
424	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	598	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
425	glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };	599	glColor @$color;
426		600
427	glBegin GL_QUADS;	601	glBegin GL_QUADS;
428	glVertex 0 , 0;	602	glVertex 0 , 0;
429	glVertex 0 , $h;	603	glVertex 0 , $h;
430	glVertex $w, $h;	604	glVertex $w, $h;
431	glVertex $w, 0;	605	glVertex $w, 0;
432	glEnd;	606	glEnd;
433		607
434	glDisable GL_BLEND;	608	glDisable GL_BLEND;
		609	}
435	}	610	}
436		611
437	#############################################################################	612	#############################################################################
438		613
439	package CFClient::UI::Empty;	614	package CFClient::UI::Empty;
…		…
460	sub new {	635	sub new {
461	my ($class, %arg) = @_;	636	my ($class, %arg) = @_;
462		637
463	my $children = delete $arg{children} || [];	638	my $children = delete $arg{children} || [];
464		639
465	my $self = $class->SUPER::new (children => [], can_events => 0, %arg);	640	my $self = $class->SUPER::new (
		641	children => [],
		642	can_events => 0,
		643	%arg,
		644	);
466	$self->add ($_) for @$children;	645	$self->add ($_) for @$children;
467		646
468	$self	647	$self
469	}	648	}
470		649
471	sub add {	650	sub add {
472	my ($self, $child) = @_;	651	my ($self, @widgets) = @_;
473		652
474	$child->set_parent ($self);	653	$_->set_parent ($self)
		654	for @widgets;
475		655
476	use sort 'stable';	656	use sort 'stable';
477		657
478	$self->{children} = [	658	$self->{children} = [
479	sort { $a->{z} <=> $b->{z} }	659	sort { $a->{z} <=> $b->{z} }
480	@{$self->{children}}, $child	660	@{$self->{children}}, @widgets
481	];	661	];
482		662
483	$child->check_size;	663	$self->realloc;
		664	}
		665
		666	sub children {
		667	@{ $_[0]{children} }
484	}	668	}
485		669
486	sub remove {	670	sub remove {
487	my ($self, $child) = @_;	671	my ($self, $child) = @_;
488		672
489	delete $child->{parent};	673	delete $child->{parent};
		674	$child->hide;
490		675
491	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	676	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
492		677
493	$self->check_size;	678	$self->realloc;
494	$self->update;	679	}
		680
		681	sub clear {
		682	my ($self) = @_;
		683
		684	my $children = delete $self->{children};
		685	$self->{children} = [];
		686
		687	for (@$children) {
		688	delete $_->{parent};
		689	$_->hide;
		690	}
		691
		692	$self->realloc;
495	}	693	}
496		694
497	sub find_widget {	695	sub find_widget {
498	my ($self, $x, $y) = @_;	696	my ($self, $x, $y) = @_;
499		697
…		…
552	sub size_request {	750	sub size_request {
553	$_[0]{children}[0]->size_request	751	$_[0]{children}[0]->size_request
554	}	752	}
555		753
556	sub size_allocate {	754	sub size_allocate {
557	my ($self, $w, $h) = @_;	755	my ($self, $w, $h, $changed) = @_;
558		756
559	$self->{children}[0]->configure (0, 0, $w, $h);	757	$self->{children}[0]->configure (0, 0, $w, $h);
560	}	758	}
561		759
562	#############################################################################	760	#############################################################################
…		…
574	}	772	}
575		773
576	sub update {	774	sub update {
577	my ($self) = @_;	775	my ($self) = @_;
578		776
579	# we want to do this delayed...	777	$ROOT->on_post_alloc ($self => sub { $self->render_child });
580	$self->render_chld;
581	$self->SUPER::update;	778	$self->SUPER::update;
582	}	779	}
583		780
		781	sub size_allocate {
		782	my ($self, $w, $h, $changed) = @_;
		783
		784	$self->SUPER::size_allocate ($w, $h, $changed);
		785	$self->update
		786	if $changed;
		787	}
		788
		789	sub _render {
		790	$_[0]{children}[0]->draw;
		791	}
		792
584	sub render_chld {	793	sub render_child {
585	my ($self) = @_;	794	my ($self) = @_;
586		795
587	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	796	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
588	glClearColor 0, 0, 0, 1;	797	glClearColor 0, 0, 0, 0;
589	glClear GL_COLOR_BUFFER_BIT;	798	glClear GL_COLOR_BUFFER_BIT;
590	$self->child->draw;	799
		800	$self->_render;
591	};	801	};
592	}
593
594	sub size_allocate {
595	my ($self, $w, $h) = @_;
596
597	$self->child->configure (0, 0, $w, $h);
598
599	$self->render_chld;
600	}	802	}
601		803
602	sub _draw {	804	sub _draw {
603	my ($self) = @_;	805	my ($self) = @_;
604		806
605	my ($w, $h) = ($self->w, $self->h);	807	my ($w, $h) = ($self->w, $self->h);
606		808
607	my $tex = $self->{texture}	809	my $tex = $self->{texture}
608	or return;	810	or return;
609		811
610	glEnable GL_BLEND;
611	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
612	glEnable GL_TEXTURE_2D;	812	glEnable GL_TEXTURE_2D;
613	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	813	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		814	glColor 1, 1, 1, 1;
614		815
615	$tex->draw_quad (0, 0, $w, $h);	816	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
616		817
617	glDisable GL_BLEND;
618	glDisable GL_TEXTURE_2D;	818	glDisable GL_TEXTURE_2D;
619	}	819	}
620		820
621	#############################################################################	821	#############################################################################
622		822
623	package CFClient::UI::ViewPort;	823	package CFClient::UI::ViewPort;
624		824
625	our @ISA = CFClient::UI::Window::;	825	our @ISA = CFClient::UI::Window::;
626
627	sub new { die }
628
629	sub size_request {
630	my ($self) = @_;
631
632	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
633	$self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
634
635	@$self{qw(child_w child_h)}
636	}
637
638	sub _draw {
639	my ($self) = @_;
640
641	$self->{children}[1]->draw;
642	}
643
644
645	#############################################################################
646
647	package CFClient::UI::Frame;
648
649	our @ISA = CFClient::UI::Bin::;
650
651	use CFClient::OpenGL;
652		826
653	sub new {	827	sub new {
654	my $class = shift;	828	my $class = shift;
655		829
		830	$class->SUPER::new (
		831	scroll_x => 0,
		832	scroll_y => 1,
		833	@_,
		834	)
		835	}
		836
		837	sub size_request {
		838	my ($self) = @_;
		839
		840	my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
		841
		842	$w = 10 if $self->{scroll_x};
		843	$h = 10 if $self->{scroll_y};
		844
		845	($w, $h)
		846	}
		847
		848	sub size_allocate {
		849	my ($self, $w, $h, $changed) = @_;
		850
		851	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
		852	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
		853
		854	$self->child->configure (0, 0, $w, $h);
		855	$self->update;
		856	}
		857
		858	sub set_offset {
		859	my ($self, $x, $y) = @_;
		860
		861	$self->{view_x} = int $x;
		862	$self->{view_y} = int $y;
		863
		864	$self->update;
		865	}
		866
		867	# hmm, this does not work for topleft of $self... but we should not ask for that
		868	sub coord2local {
		869	my ($self, $x, $y) = @_;
		870
		871	$self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
		872	}
		873
		874	sub coord2global {
		875	my ($self, $x, $y) = @_;
		876
		877	$x = List::Util::min $self->{w}, $x - $self->{view_x};
		878	$y = List::Util::min $self->{h}, $y - $self->{view_y};
		879
		880	$self->SUPER::coord2global ($x, $y)
		881	}
		882
		883	sub find_widget {
		884	my ($self, $x, $y) = @_;
		885
		886	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
		887	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
		888	) {
		889	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
		890	} else {
		891	$self->CFClient::UI::Base::find_widget ($x, $y)
		892	}
		893	}
		894
		895	sub _render {
		896	my ($self) = @_;
		897
		898	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
		899
		900	$self->SUPER::_render;
		901	}
		902
		903	#############################################################################
		904
		905	package CFClient::UI::ScrolledWindow;
		906
		907	our @ISA = CFClient::UI::HBox::;
		908
		909	sub new {
		910	my $class = shift;
		911
		912	my $self;
		913
		914	my $slider = new CFClient::UI::Slider
		915	vertical => 1,
		916	range => [0, 0, 1, 0.01], # HACK fix
		917	on_changed => sub {
		918	$self->{vp}->set_offset (0, $_[1]);
		919	},
		920	;
		921
656	my $self = $class->SUPER::new (	922	$self = $class->SUPER::new (
657	bg => [1, 1, 1, 1],	923	vp => (new CFClient::UI::ViewPort expand => 1),
658	border_bg => [1, 1, 1, 1],	924	slider => $slider,
659	border => 0.8,
660	@_	925	@_,
661	);	926	);
662		927
		928	$self->{vp}->add ($self->{scrolled});
		929	$self->add ($self->{vp});
		930	$self->add ($self->{slider});
		931
663	$self	932	$self
664	}	933	}
665		934
		935	sub update {
		936	my ($self) = @_;
		937
		938	$self->SUPER::update;
		939
		940	# todo: overwrite size_allocate of child
		941	my $child = $self->{vp}->child;
		942	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
		943	}
		944
		945	sub size_allocate {
		946	my ($self, $w, $h, $changed) = @_;
		947
		948	$self->SUPER::size_allocate ($w, $h, $changed);
		949
		950	my $child = $self->{vp}->child;
		951	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
		952	}
		953
		954	#TODO# update range on size_allocate depending on child
		955	# update viewport offset on scroll
		956
		957	#############################################################################
		958
		959	package CFClient::UI::Frame;
		960
		961	our @ISA = CFClient::UI::Bin::;
		962
		963	use CFClient::OpenGL;
		964
		965	sub new {
		966	my $class = shift;
		967
		968	$class->SUPER::new (
		969	bg => undef,
		970	@_,
		971	)
		972	}
		973
666	sub _draw {	974	sub _draw {
667	my ($self) = @_;	975	my ($self) = @_;
668		976
669	my ($w, $h) = ($self->{w}, $self->{h});	977	if ($self->{bg}) {
		978	my ($w, $h) = @$self{qw(w h)};
670		979
671	glEnable GL_BLEND;	980	glEnable GL_BLEND;
672	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	981	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
673	glEnable GL_TEXTURE_2D;	982	glColor @{ $self->{bg} };
674	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
675		983
676	# glBegin GL_QUADS;	984	glBegin GL_QUADS;
677	# glColor 0, 0, 0, 0;
678	# glVertex 0 , 0;	985	glVertex 0 , 0;
679	# glVertex 0 , $h;	986	glVertex 0 , $h;
680	# glVertex $w, $h;	987	glVertex $w, $h;
681	# glVertex $w, 0;	988	glVertex $w, 0;
682	# glEnd;	989	glEnd;
683		990
684
685	$self->child->draw;
686	glDisable GL_BLEND;	991	glDisable GL_BLEND;
687	glDisable GL_TEXTURE_2D;	992	}
		993
		994	$self->SUPER::_draw;
688	}	995	}
689		996
690	#############################################################################	997	#############################################################################
691		998
692	package CFClient::UI::FancyFrame;	999	package CFClient::UI::FancyFrame;
…		…
700	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1007	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
701		1008
702	sub new {	1009	sub new {
703	my $class = shift;	1010	my $class = shift;
704		1011
705	# TODO: user_x, user_y, overwrite moveto?
706
707	my $self = $class->SUPER::new (	1012	my $self = $class->SUPER::new (
708	bg => [1, 1, 1, 1],	1013	bg => [1, 1, 1, 1],
709	border_bg => [1, 1, 1, 1],	1014	border_bg => [1, 1, 1, 1],
710	border => 0.8,	1015	border => 0.6,
		1016	is_toplevel => 1,
711	can_events => 1,	1017	can_events => 1,
712	@_	1018	@_
713	);	1019	);
714		1020
715	$self->{title} &&= new CFClient::UI::Label	1021	$self->{title} &&= new CFClient::UI::Label
716	align => 0,	1022	align => 0,
717	valign => 1,	1023	valign => 1,
718	text => $self->{title},	1024	text => $self->{title},
719	fontsize => 1;	1025	fontsize => $self->{border};
720		1026
721	$self	1027	$self
722	}	1028	}
723		1029
724	sub border {	1030	sub border {
…		…
735	$h + $self->border * 2,	1041	$h + $self->border * 2,
736	)	1042	)
737	}	1043	}
738		1044
739	sub size_allocate {	1045	sub size_allocate {
740	my ($self, $w, $h) = @_;	1046	my ($self, $w, $h, $changed) = @_;
		1047
		1048	return unless $changed;
741		1049
742	$h -= List::Util::max 0, $self->border * 2;	1050	$h -= List::Util::max 0, $self->border * 2;
743	$w -= List::Util::max 0, $self->border * 2;	1051	$w -= List::Util::max 0, $self->border * 2;
744		1052
745	$self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)	1053	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
746	if $self->{title};	1054	if $self->{title};
747		1055
748	$self->child->configure ($self->border, $self->border, $w, $h);	1056	$self->child->configure ($self->border, $self->border, $w, $h);
749	}	1057	}
750		1058
751	sub button_down {	1059	sub button_down {
752	my ($self, $ev, $x, $y) = @_;	1060	my ($self, $ev, $x, $y) = @_;
753		1061
		1062	my ($w, $h) = @$self{qw(w h)};
754	my $border = $self->border;	1063	my $border = $self->border;
755		1064
756	if ($x < $self->{w} && $x >= $self->{w} - $border	1065	my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
757	&& $y < $self->{h} && $y >= $self->{h} - $border) {	1066	my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
758		1067
		1068	if ($lr & $td) {
		1069	my ($wx, $wy) = ($self->{x}, $self->{y});
759	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1070	my ($ox, $oy) = ($ev->{x}, $ev->{y});
760	my ($bw, $bh) = ($self->{w}, $self->{h});	1071	my ($bw, $bh) = ($self->{w}, $self->{h});
761		1072
		1073	my $mx = $x < $border;
		1074	my $my = $y < $border;
		1075
762	$self->{motion} = sub {	1076	$self->{motion} = sub {
763	my ($ev, $x, $y) = @_;	1077	my ($ev, $x, $y) = @_;
764		1078
765	($x, $y) = ($ev->{x}, $ev->{y});	1079	my $dx = $ev->{x} - $ox;
		1080	my $dy = $ev->{y} - $oy;
766		1081
767	$self->{user_w} = $bw + $x - $ox;	1082	$self->{user_x} = $wx + $dx * $mx;
768	$self->{user_h} = $bh + $y - $oy;	1083	$self->{user_y} = $wy + $dy * $my;
769	$self->check_size;	1084	$self->{def_w} = $bw + $dx * ($mx ? -1 : 1);
		1085	$self->{def_h} = $bh + $dy * ($my ? -1 : 1);
		1086	$self->move ($self->{user_x}, $self->{user_y});
		1087	$self->realloc;
770	};	1088	};
771		1089
772	} elsif ($x >= 0 && $x < $self->{w}	1090	} elsif ($lr ^ $td) {
773	&& $y >= 0 && $y < $border) {
774
775	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1091	my ($ox, $oy) = ($ev->{x}, $ev->{y});
776	my ($bx, $by) = ($self->{x}, $self->{y});	1092	my ($bx, $by) = ($self->{x}, $self->{y});
777		1093
778	$self->{motion} = sub {	1094	$self->{motion} = sub {
779	my ($ev, $x, $y) = @_;	1095	my ($ev, $x, $y) = @_;
780		1096
781	($x, $y) = ($ev->{x}, $ev->{y});	1097	($x, $y) = ($ev->{x}, $ev->{y});
782		1098
783	$self->move ($bx + $x - $ox, $by + $y - $oy);	1099	$self->{user_x} = $bx + $x - $ox;
		1100	$self->{user_y} = $by + $y - $oy;
		1101
		1102	$self->move ($self->{user_x}, $self->{user_y});
784	$self->update;	1103	$self->realloc;
785	};	1104	};
786	}	1105	}
787	}	1106	}
788		1107
789	sub button_up {	1108	sub button_up {
…		…
802	my ($self) = @_;	1121	my ($self) = @_;
803		1122
804	my ($w, $h ) = ($self->{w}, $self->{h});	1123	my ($w, $h ) = ($self->{w}, $self->{h});
805	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1124	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
806		1125
807	glEnable GL_BLEND;
808	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
809	glEnable GL_TEXTURE_2D;	1126	glEnable GL_TEXTURE_2D;
810	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1127	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
811		1128
812	my $border = $self->border;	1129	my $border = $self->border;
813		1130
814	glColor @{ $self->{border_bg} };	1131	glColor @{ $self->{border_bg} };
815	$tex[1]->draw_quad (0, 0, $w, $border);	1132	$tex[1]->draw_quad_alpha (0, 0, $w, $border);
816	$tex[3]->draw_quad (0, $border, $border, $ch);	1133	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);
817	$tex[2]->draw_quad ($w - $border, $border, $border, $ch);	1134	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
818	$tex[4]->draw_quad (0, $h - $border, $w, $border);	1135	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
819		1136
		1137	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
820	my $bg = $tex[0];	1138	my $bg = $tex[0];
821		1139
822	# TODO: repeat texture not scale	1140	# TODO: repeat texture not scale
823	my $rep_x = $cw / $bg->{w};	1141	my $rep_x = $cw / $bg->{w};
824	my $rep_y = $ch / $bg->{h};	1142	my $rep_y = $ch / $bg->{h};
825		1143
826	glColor @{ $self->{bg} };	1144	glColor @{ $self->{bg} };
827		1145
828	$bg->{s} = $rep_x;	1146	$bg->{s} = $rep_x;
829	$bg->{t} = $rep_y;	1147	$bg->{t} = $rep_y;
830	$bg->{wrap_mode} = 1;	1148	$bg->{wrap_mode} = 1;
831	$bg->draw_quad ($border, $border, $cw, $ch);	1149	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
		1150	}
832		1151
833	glDisable GL_TEXTURE_2D;	1152	glDisable GL_TEXTURE_2D;
834	glDisable GL_BLEND;
835		1153
836	$self->{title}->draw if $self->{title};	1154	$self->{title}->draw if $self->{title};
		1155
837	$self->child->draw;	1156	$self->child->draw;
838	}	1157	}
839		1158
840	#############################################################################	1159	#############################################################################
841		1160
…		…
850	sub new {	1169	sub new {
851	my $class = shift;	1170	my $class = shift;
852		1171
853	$class->SUPER::new (	1172	$class->SUPER::new (
854	col_expand => [],	1173	col_expand => [],
855	@_	1174	@_,
856	)	1175	)
		1176	}
		1177
		1178	sub children {
		1179	grep $_, map @$_, grep $_, @{ $_[0]{children} }
857	}	1180	}
858		1181
859	sub add {	1182	sub add {
860	my ($self, $x, $y, $child) = @_;	1183	my ($self, $x, $y, $child) = @_;
861		1184
862	$child->set_parent ($self);	1185	$child->set_parent ($self);
863	$self->{children}[$y][$x] = $child;	1186	$self->{children}[$y][$x] = $child;
864		1187
865	$child->check_size;	1188	$self->realloc;
866	}	1189	}
867		1190
868	# TODO: move to container class maybe? send childs a signal on removal?	1191	# TODO: move to container class maybe? send children a signal on removal?
869	sub clear {	1192	sub clear {
870	my ($self) = @_;	1193	my ($self) = @_;
871		1194
		1195	my @children = $self->children;
872	delete $self->{children};	1196	delete $self->{children};
873	$self->update;	1197
		1198	for (@children) {
		1199	delete $_->{parent};
		1200	$_->hide;
		1201	}
		1202
		1203	$self->realloc;
874	}	1204	}
875		1205
876	sub get_wh {	1206	sub get_wh {
877	my ($self) = @_;	1207	my ($self) = @_;
878		1208
…		…
905	(sum @$hs),	1235	(sum @$hs),
906	)	1236	)
907	}	1237	}
908		1238
909	sub size_allocate {	1239	sub size_allocate {
910	my ($self, $w, $h) = @_;	1240	my ($self, $w, $h, $changed) = @_;
911		1241
912	my ($ws, $hs) = $self->get_wh;	1242	my ($ws, $hs) = $self->get_wh;
913		1243
914	my $req_w = sum @$ws;	1244	my $req_w = (sum @$ws) || 1;
915	my $req_h = sum @$hs;	1245	my $req_h = (sum @$hs) || 1;
916		1246
917	# TODO: nicer code && do row_expand	1247	# TODO: nicer code && do row_expand
918	my @col_expand = @{$self->{col_expand}};	1248	my @col_expand = @{$self->{col_expand}};
919	@col_expand = (1) x @$ws unless @col_expand;	1249	@col_expand = (1) x @$ws unless @col_expand;
920	my $col_expand = (sum @col_expand) || 1;	1250	my $col_expand = (sum @col_expand) || 1;
…		…
974	}	1304	}
975	}	1305	}
976		1306
977	#############################################################################	1307	#############################################################################
978		1308
		1309	package CFClient::UI::Box;
		1310
		1311	our @ISA = CFClient::UI::Container::;
		1312
		1313	sub size_request {
		1314	my ($self) = @_;
		1315
		1316	$self->{vertical}
		1317	? (
		1318	(List::Util::max map $_->{req_w}, @{$self->{children}}),
		1319	(List::Util::sum map $_->{req_h}, @{$self->{children}}),
		1320	)
		1321	: (
		1322	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
		1323	(List::Util::max map $_->{req_h}, @{$self->{children}}),
		1324	)
		1325	}
		1326
		1327	sub size_allocate {
		1328	my ($self, $w, $h, $changed) = @_;
		1329
		1330	my $space = $self->{vertical} ? $h : $w;
		1331	my $children = $self->{children};
		1332
		1333	my @req;
		1334
		1335	if ($self->{homogeneous}) {
		1336	@req = ($space / (@$children || 1)) x @$children;
		1337	} else {
		1338	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
		1339	my $req = List::Util::sum @req;
		1340
		1341	if ($req > $space) {
		1342	# ah well, not enough space
		1343	$_ *= $space / $req for @req;
		1344	} else {
		1345	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
		1346
		1347	$space = ($space - $req) / $expand; # remaining space to give away
		1348
		1349	$req[$_] += $space * $children->[$_]{expand}
		1350	for 0 .. $#$children;
		1351	}
		1352	}
		1353
		1354	CFClient::UI::harmonize \@req;
		1355
		1356	my $pos = 0;
		1357	for (0 .. $#$children) {
		1358	my $alloc = $req[$_];
		1359	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
		1360
		1361	$pos += $alloc;
		1362	}
		1363
		1364	1
		1365	}
		1366
		1367	#############################################################################
		1368
979	package CFClient::UI::HBox;	1369	package CFClient::UI::HBox;
980		1370
981	# TODO: wrap into common Box base class
982
983	our @ISA = CFClient::UI::Container::;	1371	our @ISA = CFClient::UI::Box::;
984		1372
985	sub size_request {	1373	sub new {
986	my ($self) = @_;	1374	my $class = shift;
987		1375
988	my @alloc = map [$_->size_request], @{$self->{children}};	1376	$class->SUPER::new (
989		1377	vertical => 0,
990	(	1378	@_,
991	(List::Util::sum map $_->[0], @alloc),
992	(List::Util::max map $_->[1], @alloc),
993	)	1379	)
994	}	1380	}
995		1381
996	sub size_allocate {
997	my ($self, $w, $h) = @_;
998
999	($h, $w) = ($w, $h);
1000
1001	my $children = $self->{children};
1002
1003	my @h = map $_->{req_w}, @$children;
1004
1005	my $req_h = List::Util::sum @h;
1006
1007	if ($req_h > $h) {
1008	# ah well, not enough space
1009	$_ *= $h / $req_h for @h;
1010	} else {
1011	my $exp = List::Util::sum map $_->{expand}, @$children;
1012	$exp ||= 1;
1013
1014	for (0 .. $#$children) {
1015	my $child = $children->[$_];
1016
1017	my $alloc_h = $h[$_];
1018	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1019	$h[$_] = $alloc_h;
1020	}
1021	}
1022
1023	CFClient::UI::harmonize \@h;
1024
1025	my $y = 0;
1026	for (0 .. $#$children) {
1027	my $child = $children->[$_];
1028	my $h = $h[$_];
1029	$child->configure ($y, 0, $h, $w);
1030
1031	$y += $h;
1032	}
1033
1034	1
1035	}
1036
1037	#############################################################################	1382	#############################################################################
1038		1383
1039	package CFClient::UI::VBox;	1384	package CFClient::UI::VBox;
1040		1385
1041	# TODO: wrap into common Box base class
1042
1043	our @ISA = CFClient::UI::Container::;	1386	our @ISA = CFClient::UI::Box::;
1044		1387
1045	sub size_request {	1388	sub new {
1046	my ($self) = @_;	1389	my $class = shift;
1047		1390
1048	my @alloc = map [$_->size_request], @{$self->{children}};	1391	$class->SUPER::new (
1049		1392	vertical => 1,
1050	(	1393	@_,
1051	(List::Util::max map $_->[0], @alloc),
1052	(List::Util::sum map $_->[1], @alloc),
1053	)	1394	)
1054	}	1395	}
1055		1396
1056	sub size_allocate {
1057	my ($self, $w, $h) = @_;
1058
1059	my $children = $self->{children};
1060
1061	my @h = map $_->{req_h}, @$children;
1062
1063	my $req_h = List::Util::sum @h;
1064
1065	if ($req_h > $h) {
1066	# ah well, not enough space
1067	$_ *= $h / $req_h for @h;
1068	} else {
1069	my $exp = List::Util::sum map $_->{expand}, @$children;
1070	$exp ||= 1;
1071
1072	for (0 .. $#$children) {
1073	my $child = $children->[$_];
1074
1075	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1076	}
1077	}
1078
1079	CFClient::UI::harmonize \@h;
1080
1081	my $y = 0;
1082	for (0 .. $#$children) {
1083	my $child = $children->[$_];
1084	my $h = $h[$_];
1085	$child->configure (0, $y, $w, $h);
1086
1087	$y += $h;
1088	}
1089
1090	1
1091	}
1092
1093	#############################################################################	1397	#############################################################################
1094		1398
1095	package CFClient::UI::Label;	1399	package CFClient::UI::Label;
1096		1400
1097	our @ISA = CFClient::UI::Base::;	1401	our @ISA = CFClient::UI::DrawBG::;
1098		1402
1099	use CFClient::OpenGL;	1403	use CFClient::OpenGL;
1100		1404
1101	sub new {	1405	sub new {
1102	my ($class, %arg) = @_;	1406	my ($class, %arg) = @_;
1103		1407
1104	my $self = $class->SUPER::new (	1408	my $self = $class->SUPER::new (
1105	fg => [1, 1, 1],	1409	fg => [1, 1, 1],
		1410	#bg => none
		1411	#active_bg => none
1106	#font => default_font	1412	#font => default_font
		1413	#text => initial text
		1414	#markup => initial narkup
		1415	#max_w => maximum pixel width
		1416	ellipsise => 3, # end
		1417	layout => (new CFClient::Layout),
1107	fontsize => 1,	1418	fontsize => 1,
1108	text => "",
1109	align => -1,	1419	align => -1,
1110	valign => -1,	1420	valign => -1,
1111	padding => 2,	1421	padding => 2,
1112	layout => new CFClient::Layout,
1113	can_events => 0,	1422	can_events => 0,
1114	%arg	1423	%arg
1115	);	1424	);
1116		1425
1117	if (exists $self->{template}) {	1426	if (exists $self->{template}) {
1118	my $layout = new CFClient::Layout;	1427	my $layout = new CFClient::Layout;
1119	$layout->set_text (delete $self->{template});	1428	$layout->set_text (delete $self->{template});
1120	$self->{template} = $layout;	1429	$self->{template} = $layout;
1121	}	1430	}
1122		1431
1123	$self->set_text (delete $self->{text}) if exists $self->{text};	1432	if (exists $self->{markup}) {
1124	$self->set_markup (delete $self->{markup}) if exists $self->{markup};	1433	$self->set_markup (delete $self->{markup});
		1434	} else {
		1435	$self->set_text (delete $self->{text});
		1436	}
1125		1437
1126	$self	1438	$self
1127	}	1439	}
1128		1440
1129	sub escape_text {	1441	sub escape($) {
1130	local $_ = $_[1];	1442	local $_ = $_[0];
1131		1443
1132	s/&/&amp;/g;	1444	s/&/&amp;/g;
1133	s/>/&gt;/g;	1445	s/>/&gt;/g;
1134	s/</&lt;/g;	1446	s/</&lt;/g;
1135		1447
1136	$_[1]	1448	$_
		1449	}
		1450
		1451	sub update {
		1452	my ($self) = @_;
		1453
		1454	delete $self->{texture};
		1455	$self->SUPER::update;
1137	}	1456	}
1138		1457
1139	sub set_text {	1458	sub set_text {
1140	my ($self, $text) = @_;	1459	my ($self, $text) = @_;
1141		1460
		1461	return if $self->{text} eq "T$text";
		1462	$self->{text} = "T$text";
		1463
		1464	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1142	$self->{layout}->set_text ($text);	1465	$self->{layout}->set_text ($text);
1143		1466
1144	delete $self->{texture};	1467	$self->realloc;
1145	$self->check_size;
1146	$self->update;	1468	$self->update;
1147	}	1469	}
1148		1470
1149	sub set_markup {	1471	sub set_markup {
1150	my ($self, $markup) = @_;	1472	my ($self, $markup) = @_;
1151		1473
		1474	return if $self->{text} eq "M$markup";
		1475	$self->{text} = "M$markup";
		1476
		1477	my $rgba = $markup =~ /span.*(?:foreground|background)/;
		1478
		1479	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1152	$self->{layout}->set_markup ($markup);	1480	$self->{layout}->set_markup ($markup);
1153		1481
1154	delete $self->{texture};	1482	$self->realloc;
1155	$self->check_size;
1156	$self->update;	1483	$self->update;
1157	}	1484	}
1158		1485
1159	sub size_request {	1486	sub size_request {
1160	my ($self) = @_;	1487	my ($self) = @_;
1161		1488
1162	$self->{layout}->set_font ($self->{font}) if $self->{font};	1489	$self->{layout}->set_font ($self->{font}) if $self->{font};
1163	$self->{layout}->set_width ($self->{max_w} || -1);	1490	$self->{layout}->set_width ($self->{max_w} || -1);
		1491	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1492	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1164	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1493	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1165		1494
1166	my ($w, $h) = $self->{layout}->size;	1495	my ($w, $h) = $self->{layout}->size;
1167		1496
1168	if (exists $self->{template}) {	1497	if (exists $self->{template}) {
…		…
1180	$h + $self->{padding} * 2,	1509	$h + $self->{padding} * 2,
1181	)	1510	)
1182	}	1511	}
1183		1512
1184	sub size_allocate {	1513	sub size_allocate {
1185	my ($self, $w, $h) = @_;	1514	my ($self, $w, $h, $changed) = @_;
1186		1515
1187	delete $self->{texture};	1516	delete $self->{texture}
		1517	if $changed;
1188	}	1518	}
1189		1519
1190	sub set_fontsize {	1520	sub set_fontsize {
1191	my ($self, $fontsize) = @_;	1521	my ($self, $fontsize) = @_;
1192		1522
1193	$self->{fontsize} = $fontsize;	1523	$self->{fontsize} = $fontsize;
1194	delete $self->{texture};	1524	delete $self->{texture};
1195	$self->check_size;	1525
1196	$self->update;	1526	$self->realloc;
1197	}	1527	}
1198		1528
1199	sub _draw {	1529	sub _draw {
1200	my ($self) = @_;	1530	my ($self) = @_;
1201		1531
		1532	$self->SUPER::_draw; # draw background, if applicable
		1533
1202	my $tex = $self->{texture} ||= do {	1534	my $tex = $self->{texture} ||= do {
		1535	$self->{layout}->set_foreground (@{$self->{fg}});
1203	$self->{layout}->set_font ($self->{font}) if $self->{font};	1536	$self->{layout}->set_font ($self->{font}) if $self->{font};
1204	$self->{layout}->set_width ($self->{w});	1537	$self->{layout}->set_width ($self->{w});
		1538	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1539	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1205	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);	1540	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
		1541
1206	new_from_layout CFClient::Texture $self->{layout}	1542	my $tex = new_from_layout CFClient::Texture $self->{layout};
		1543
		1544	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}
		1545	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
		1546	: ($self->{w} - $tex->{w}) * 0.5);
		1547
		1548	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
		1549	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
		1550	: ($self->{h} - $tex->{h}) * 0.5);
		1551
		1552	$tex
1207	};	1553	};
1208		1554
1209	glEnable GL_BLEND;
1210	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1211	glEnable GL_TEXTURE_2D;	1555	glEnable GL_TEXTURE_2D;
1212	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1556	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1213		1557
		1558	if ($tex->{format} == GL_ALPHA) {
1214	glColor @{$self->{fg}};	1559	glColor @{$self->{fg}};
1215
1216	$self->{ox} = int (
1217	$self->{align} < 0 ? $self->{padding}
1218	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1219	: ($self->{w} - $tex->{w}) * 0.5
1220	);
1221
1222	$self->{oy} = int (
1223	$self->{valign} < 0 ? $self->{padding}
1224	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1225	: ($self->{h} - $tex->{h}) * 0.5
1226	);
1227
1228	$tex->draw_quad ($self->{ox}, $self->{oy});	1560	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});
		1561	} else {
		1562	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
		1563	}
1229		1564
1230	glDisable GL_TEXTURE_2D;	1565	glDisable GL_TEXTURE_2D;
1231	glDisable GL_BLEND;
1232	}	1566	}
1233		1567
1234	#############################################################################	1568	#############################################################################
1235		1569
1236	package CFClient::UI::EntryBase;	1570	package CFClient::UI::EntryBase;
…		…
1241		1575
1242	sub new {	1576	sub new {
1243	my $class = shift;	1577	my $class = shift;
1244		1578
1245	$class->SUPER::new (	1579	$class->SUPER::new (
1246	fg => [1, 1, 1],	1580	fg => [1, 1, 1],
1247	bg => [0, 0, 0, 0.2],	1581	bg => [0, 0, 0, 0.2],
1248	active_bg => [1, 1, 1, 0.5],	1582	active_bg => [1, 1, 1, 0.5],
1249	active_fg => [0, 0, 0],	1583	active_fg => [0, 0, 0],
1250	can_hover => 1,	1584	can_hover => 1,
1251	can_focus => 1,	1585	can_focus => 1,
1252	valign => 0,	1586	valign => 0,
1253	can_events => 1,	1587	can_events => 1,
		1588	#text => ...
1254	@_	1589	@_
1255	)	1590	)
1256	}	1591	}
1257		1592
1258	sub _set_text {	1593	sub _set_text {
…		…
1268	$self->{text} = $text;	1603	$self->{text} = $text;
1269		1604
1270	$text =~ s/./*/g if $self->{hidden};	1605	$text =~ s/./*/g if $self->{hidden};
1271	$self->{layout}->set_text ("$text ");	1606	$self->{layout}->set_text ("$text ");
1272		1607
1273	$self->emit (changed => $self->{text});	1608	$self->_emit (changed => $self->{text});
		1609	}
		1610
		1611	sub set_text {
		1612	my ($self, $text) = @_;
		1613
		1614	$self->{cursor} = length $text;
		1615	$self->_set_text ($text);
		1616
		1617	$self->realloc;
1274	}	1618	}
1275		1619
1276	sub get_text {	1620	sub get_text {
1277	$_[0]{text}	1621	$_[0]{text}
1278	}	1622	}
…		…
1281	my ($self) = @_;	1625	my ($self) = @_;
1282		1626
1283	my ($w, $h) = $self->SUPER::size_request;	1627	my ($w, $h) = $self->SUPER::size_request;
1284		1628
1285	($w + 1, $h) # add 1 for cursor	1629	($w + 1, $h) # add 1 for cursor
1286	}
1287
1288	sub size_allocate {
1289	my ($self, $w, $h) = @_;
1290
1291	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1292	}
1293
1294	sub set_text {
1295	my ($self, $text) = @_;
1296
1297	$self->{cursor} = length $text;
1298	$self->_set_text ($text);
1299	$self->update;
1300	}	1630	}
1301		1631
1302	sub key_down {	1632	sub key_down {
1303	my ($self, $ev) = @_;	1633	my ($self, $ev) = @_;
1304		1634
…		…
1306	my $sym = $ev->{sym};	1636	my $sym = $ev->{sym};
1307	my $uni = $ev->{unicode};	1637	my $uni = $ev->{unicode};
1308		1638
1309	my $text = $self->get_text;	1639	my $text = $self->get_text;
1310		1640
1311	if ($sym == 8) {	1641	if ($uni == 8) {
1312	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1642	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1313	} elsif ($sym == 127) {	1643	} elsif ($uni == 127) {
1314	substr $text, $self->{cursor}, 1, "";	1644	substr $text, $self->{cursor}, 1, "";
1315	} elsif ($sym == CFClient::SDLK_LEFT) {	1645	} elsif ($sym == CFClient::SDLK_LEFT) {
1316	--$self->{cursor} if $self->{cursor};	1646	--$self->{cursor} if $self->{cursor};
1317	} elsif ($sym == CFClient::SDLK_RIGHT) {	1647	} elsif ($sym == CFClient::SDLK_RIGHT) {
1318	++$self->{cursor} if $self->{cursor} < length $self->{text};	1648	++$self->{cursor} if $self->{cursor} < length $self->{text};
1319	} elsif ($sym == CFClient::SDLK_HOME) {	1649	} elsif ($sym == CFClient::SDLK_HOME) {
1320	$self->{cursor} = 0;	1650	$self->{cursor} = 0;
1321	} elsif ($sym == CFClient::SDLK_END) {	1651	} elsif ($sym == CFClient::SDLK_END) {
1322	$self->{cursor} = length $text;	1652	$self->{cursor} = length $text;
1323	} elsif ($sym == 27) {	1653	} elsif ($uni == 27) {
1324	$self->emit ('escape');	1654	$self->_emit ('escape');
1325	} elsif ($uni) {	1655	} elsif ($uni) {
1326	substr $text, $self->{cursor}++, 0, chr $uni;	1656	substr $text, $self->{cursor}++, 0, chr $uni;
1327	}	1657	}
1328		1658
1329	$self->_set_text ($text);	1659	$self->_set_text ($text);
1330	$self->update;	1660
		1661	$self->realloc;
1331	}	1662	}
1332		1663
1333	sub focus_in {	1664	sub focus_in {
1334	my ($self) = @_;	1665	my ($self) = @_;
1335		1666
…		…
1411	my ($self, $ev) = @_;	1742	my ($self, $ev) = @_;
1412		1743
1413	my $sym = $ev->{sym};	1744	my $sym = $ev->{sym};
1414		1745
1415	if ($sym == 13) {	1746	if ($sym == 13) {
		1747	unshift @{$self->{history}},
		1748	my $txt = $self->get_text;
		1749	$self->{history_pointer} = -1;
		1750	$self->{history_saveback} = '';
1416	$self->emit (activate => $self->get_text);	1751	$self->_emit (activate => $txt);
1417	$self->update;	1752	$self->update;
		1753
		1754	} elsif ($sym == CFClient::SDLK_UP) {
		1755	if ($self->{history_pointer} < 0) {
		1756	$self->{history_saveback} = $self->get_text;
		1757	}
		1758	if (@{$self->{history} || []} > 0) {
		1759	$self->{history_pointer}++;
		1760	if ($self->{history_pointer} >= @{$self->{history} || []}) {
		1761	$self->{history_pointer} = @{$self->{history} || []} - 1;
		1762	}
		1763	$self->set_text ($self->{history}->[$self->{history_pointer}]);
		1764	}
		1765
		1766	} elsif ($sym == CFClient::SDLK_DOWN) {
		1767	$self->{history_pointer}--;
		1768	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
		1769
		1770	if ($self->{history_pointer} >= 0) {
		1771	$self->set_text ($self->{history}->[$self->{history_pointer}]);
		1772	} else {
		1773	$self->set_text ($self->{history_saveback});
		1774	}
1418		1775
1419	} else {	1776	} else {
1420	$self->SUPER::key_down ($ev);	1777	$self->SUPER::key_down ($ev);
1421	}	1778	}
1422		1779
…		…
1436		1793
1437	sub new {	1794	sub new {
1438	my $class = shift;	1795	my $class = shift;
1439		1796
1440	$class->SUPER::new (	1797	$class->SUPER::new (
1441	padding => 4,	1798	padding => 4,
1442	fg => [1, 1, 1],	1799	fg => [1, 1, 1],
1443	bg => [1, 1, 1, 0.2],
1444	active_fg => [0, 0, 1],	1800	active_fg => [0, 0, 1],
1445	can_hover => 1,	1801	can_hover => 1,
1446	align => 0,	1802	align => 0,
1447	valign => 0,	1803	valign => 0,
1448	can_events => 1,	1804	can_events => 1,
1449	@_	1805	@_
1450	)	1806	)
1451	}	1807	}
1452		1808
		1809	sub activate { }
		1810
1453	sub button_up {	1811	sub button_up {
1454	my ($self, $ev, $x, $y) = @_;	1812	my ($self, $ev, $x, $y) = @_;
1455		1813
		1814	$self->emit ("activate")
1456	if ($x >= 0 && $x < $self->{w}	1815	if $x >= 0 && $x < $self->{w}
1457	&& $y >= 0 && $y < $self->{h}) {	1816	&& $y >= 0 && $y < $self->{h};
1458	$self->emit ("activate");
1459	}
1460	}	1817	}
1461		1818
1462	sub _draw {	1819	sub _draw {
1463	my ($self) = @_;	1820	my ($self) = @_;
1464		1821
…		…
1466		1823
1467	if ($GRAB == $self) {	1824	if ($GRAB == $self) {
1468	$self->{fg} = $self->{active_fg};	1825	$self->{fg} = $self->{active_fg};
1469	}	1826	}
1470		1827
1471	glEnable GL_BLEND;
1472	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1473	glEnable GL_TEXTURE_2D;	1828	glEnable GL_TEXTURE_2D;
1474	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1829	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1475	glColor 0, 0, 0, 1;	1830	glColor 0, 0, 0, 1;
1476		1831
1477	$tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});	1832	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1478		1833
1479	glDisable GL_TEXTURE_2D;	1834	glDisable GL_TEXTURE_2D;
1480	glDisable GL_BLEND;
1481		1835
1482	$self->SUPER::_draw;	1836	$self->SUPER::_draw;
1483	}	1837	}
1484		1838
1485	#############################################################################	1839	#############################################################################
…		…
1499		1853
1500	$class->SUPER::new (	1854	$class->SUPER::new (
1501	padding => 2,	1855	padding => 2,
1502	fg => [1, 1, 1],	1856	fg => [1, 1, 1],
1503	active_fg => [1, 1, 0],	1857	active_fg => [1, 1, 0],
		1858	bg => [0, 0, 0, 0.2],
		1859	active_bg => [1, 1, 1, 0.5],
1504	state => 0,	1860	state => 0,
1505	can_hover => 1,	1861	can_hover => 1,
1506	@_	1862	@_
1507	)	1863	)
1508	}	1864	}
…		…
1517	my ($self, $ev, $x, $y) = @_;	1873	my ($self, $ev, $x, $y) = @_;
1518		1874
1519	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1875	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1520	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1876	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1521	$self->{state} = !$self->{state};	1877	$self->{state} = !$self->{state};
1522	$self->emit (changed => $self->{state});	1878	$self->_emit (changed => $self->{state});
1523	}	1879	}
1524	}	1880	}
1525		1881
1526	sub _draw {	1882	sub _draw {
1527	my ($self) = @_;	1883	my ($self) = @_;
…		…
1532		1888
1533	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1889	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1534		1890
1535	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1891	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1536		1892
1537	glEnable GL_BLEND;	1893	my $tex = $self->{state} ? $tex[1] : $tex[0];
		1894
1538	glEnable GL_TEXTURE_2D;	1895	glEnable GL_TEXTURE_2D;
1539	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1540
1541	my $tex = $self->{state} ? $tex[1] : $tex[0];
1542
1543	$tex->draw_quad (0, 0, $s, $s);	1896	$tex->draw_quad_alpha (0, 0, $s, $s);
1544
1545	glDisable GL_TEXTURE_2D;	1897	glDisable GL_TEXTURE_2D;
1546	glDisable GL_BLEND;
1547	}	1898	}
1548		1899
1549	#############################################################################	1900	#############################################################################
1550		1901
1551	package CFClient::UI::Image;	1902	package CFClient::UI::Image;
…		…
1594	glTranslate 0, -$self->{w}, 0;	1945	glTranslate 0, -$self->{w}, 0;
1595		1946
1596	($w, $h) = ($h, $w);	1947	($w, $h) = ($h, $w);
1597	}	1948	}
1598		1949
1599	glEnable GL_BLEND;
1600	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1601	glEnable GL_TEXTURE_2D;	1950	glEnable GL_TEXTURE_2D;
1602	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1951	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1603		1952
1604	$tex->draw_quad (0, 0, $w, $h);	1953	$tex->draw_quad_alpha (0, 0, $w, $h);
1605		1954
1606	glDisable GL_BLEND;
1607	glDisable GL_TEXTURE_2D;	1955	glDisable GL_TEXTURE_2D;
1608	}	1956	}
1609		1957
1610	#############################################################################	1958	#############################################################################
1611		1959
…		…
1659	}	2007	}
1660		2008
1661	sub set_max {	2009	sub set_max {
1662	my ($self, $max) = @_;	2010	my ($self, $max) = @_;
1663		2011
		2012	return if $self->{max_val} == $max;
		2013
1664	$self->{max_val} = $max;	2014	$self->{max_val} = $max;
		2015	$self->update;
1665	}	2016	}
1666		2017
1667	sub set_value {	2018	sub set_value {
1668	my ($self, $val, $max) = @_;	2019	my ($self, $val, $max) = @_;
1669		2020
1670	$self->set_max ($max)	2021	$self->set_max ($max)
1671	if defined $max;	2022	if defined $max;
1672		2023
1673	$max = $self->{max_val};	2024	return if $self->{val} == $val;
		2025
1674	$self->{val} = $val;	2026	$self->{val} = $val;
1675
1676	$self->update;	2027	$self->update;
1677	}	2028	}
1678		2029
1679	sub _draw {	2030	sub _draw {
1680	my ($self) = @_;	2031	my ($self) = @_;
…		…
1743		2094
1744	sub new {	2095	sub new {
1745	my ($class, %arg) = @_;	2096	my ($class, %arg) = @_;
1746		2097
1747	my $self = $class->SUPER::new (	2098	my $self = $class->SUPER::new (
1748	tooltip => $arg{type},	2099	tooltip => $arg{type},
		2100	can_hover => 1,
		2101	can_events => 1,
1749	%arg,	2102	%arg,
1750	);	2103	);
1751		2104
1752	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999", can_events => 1, can_hover => 1);	2105	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1753	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_events => 1, can_hover => 1);	2106	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1754	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999", can_events => 1, can_hover => 1);	2107	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1755		2108
1756	$self	2109	$self
1757	}	2110	}
1758		2111
1759	sub set_fontsize {	2112	sub set_fontsize {
…		…
1761		2114
1762	$self->{value}->set_fontsize ($fsize);	2115	$self->{value}->set_fontsize ($fsize);
1763	$self->{max} ->set_fontsize ($fsize);	2116	$self->{max} ->set_fontsize ($fsize);
1764	}	2117	}
1765		2118
		2119	sub set_max {
		2120	my ($self, $max) = @_;
		2121
		2122	$self->{gauge}->set_max ($max);
		2123	$self->{max}->set_text ($max);
		2124	}
		2125
1766	sub set_value {	2126	sub set_value {
1767	my ($self, $val, $max) = @_;	2127	my ($self, $val, $max) = @_;
1768		2128
1769	$self->set_max ($max)	2129	$self->set_max ($max)
1770	if defined $max;	2130	if defined $max;
1771		2131
1772	$self->{gauge}->set_value ($val, $max);	2132	$self->{gauge}->set_value ($val, $max);
1773	$self->{value}->set_text ($val);	2133	$self->{value}->set_text ($val);
1774	}
1775
1776	sub set_max {
1777	my ($self, $max) = @_;
1778
1779	$self->{gauge}->set_max ($max);
1780	$self->{max}->set_text ($max);
1781	}	2134	}
1782		2135
1783	#############################################################################	2136	#############################################################################
1784		2137
1785	package CFClient::UI::Slider;	2138	package CFClient::UI::Slider;
…		…
1795	qw(s1_slider.png s1_slider_bg.png);	2148	qw(s1_slider.png s1_slider_bg.png);
1796		2149
1797	sub new {	2150	sub new {
1798	my $class = shift;	2151	my $class = shift;
1799		2152
1800	# range [value, low, high, page]	2153	# range [value, low, high, page, unit]
1801		2154
1802	# TODO: 0-width page	2155	# TODO: 0-width page
1803	# TODO: req_w/h are wrong with vertical	2156	# TODO: req_w/h are wrong with vertical
1804	# TODO: calculations are off	2157	# TODO: calculations are off
1805	my $self = $class->SUPER::new (	2158	my $self = $class->SUPER::new (
1806	fg => [1, 1, 1],	2159	fg => [1, 1, 1],
1807	active_fg => [0, 0, 0],	2160	active_fg => [0, 0, 0],
		2161	bg => [0, 0, 0, 0.2],
		2162	active_bg => [1, 1, 1, 0.5],
1808	range => [0, 0, 100, 10],	2163	range => [0, 0, 100, 10, 0],
1809	req_w => 20,	2164	req_w => $::WIDTH / 80,
1810	req_h => 20,	2165	req_h => $::WIDTH / 80,
1811	vertical => 0,	2166	vertical => 0,
1812	can_hover => 1,	2167	can_hover => 1,
1813	inner_pad => 5,	2168	inner_pad => 0.02,
1814	@_	2169	@_
1815	);	2170	);
1816		2171
		2172	$self->set_value ($self->{range}[0]);
		2173	$self->update;
		2174
1817	$self	2175	$self
		2176	}
		2177
		2178	sub changed { }
		2179
		2180	sub set_range {
		2181	my ($self, $range) = @_;
		2182
		2183	($range, $self->{range}) = ($self->{range}, $range);
		2184
		2185	$self->update
		2186	if "@$range" ne "@{$self->{range}}";
		2187	}
		2188
		2189	sub set_value {
		2190	my ($self, $value) = @_;
		2191
		2192	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
		2193
		2194	$hi = $lo + 1 if $hi <= $lo;
		2195
		2196	$page = $hi - $lo if $page > $hi - $lo;
		2197
		2198	$value = $lo if $value < $lo;
		2199	$value = $hi - $page if $value > $hi - $page;
		2200
		2201	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
		2202	if $unit;
		2203
		2204	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
		2205
		2206	if ($value != $old_value) {
		2207	$self->_emit (changed => $value);
		2208	$self->update;
		2209	}
1818	}	2210	}
1819		2211
1820	sub size_request {	2212	sub size_request {
1821	my ($self) = @_;	2213	my ($self) = @_;
1822		2214
…		…
1828		2220
1829	sub button_down {	2221	sub button_down {
1830	my ($self, $ev, $x, $y) = @_;	2222	my ($self, $ev, $x, $y) = @_;
1831		2223
1832	$self->SUPER::button_down ($ev, $x, $y);	2224	$self->SUPER::button_down ($ev, $x, $y);
		2225
		2226	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
		2227
1833	$self->mouse_motion ($ev, $x, $y);	2228	$self->mouse_motion ($ev, $x, $y);
1834	}	2229	}
1835		2230
1836	sub mouse_motion {	2231	sub mouse_motion {
1837	my ($self, $ev, $x, $y) = @_;	2232	my ($self, $ev, $x, $y) = @_;
1838		2233
1839	if ($GRAB == $self) {	2234	if ($GRAB == $self) {
		2235	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
		2236
		2237	my (undef, $lo, $hi, $page) = @{$self->{range}};
		2238
		2239	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
		2240
		2241	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2242	}
		2243	}
		2244
		2245	sub update {
		2246	my ($self) = @_;
		2247
		2248	$CFClient::UI::ROOT->on_post_alloc ($self => sub {
		2249	$self->set_value ($self->{range}[0]);
		2250
1840	my ($value, $lo, $hi, $page) = @{$self->{range}};	2251	my ($value, $lo, $hi, $page) = @{$self->{range}};
		2252	my $range = ($hi - $page - $lo) || 1e-100;
1841		2253
1842	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2254	my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1843		2255
1844	my $inner_pad_px = $self->_calc_inner_pad_px ($w);	2256	$self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
1845	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right	2257	$self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1846		2258
1847	$x -= $inner_pad_px; # substract the padding	2259	$value = ($value - $lo) / $range;
1848	$x = $x * ($hi - $lo) / $inner_w + $lo;	2260	$value = $value * $self->{scale} + $self->{offset};
1849	$x = $lo if $x < $lo;
1850	$x = $hi - $page if $x > $hi - $page;
1851	$self->{range}[0] = $x;
1852		2261
1853	$self->emit (changed => $x);	2262	$self->{knob_x} = $value - $knob_w * 0.5;
1854	$self->update;	2263	$self->{knob_w} = $knob_w;
1855	}	2264	});
1856	}
1857		2265
1858	# the inner_* stuff is for generating a padding for the slider handle,	2266	$self->SUPER::update;
1859	# so that the handle doesn't leave the texture. This calculation isn't 100%
1860	# correct propably, but it does the job for now
1861	sub _calc_inner_pad_px {
1862	my ($self, $w) = @_;
1863	($w / 100) * $self->{inner_pad} # % to pixels
1864	}	2267	}
1865		2268
1866	sub _draw {	2269	sub _draw {
1867	my ($self) = @_;	2270	my ($self) = @_;
1868		2271
1869	$self->SUPER::_draw ();	2272	$self->SUPER::_draw ();
1870		2273
1871	my ($w, $h) = @$self{qw(w h)};	2274	glScale $self->{w}, $self->{h};
1872		2275
1873	if ($self->{vertical}) {	2276	if ($self->{vertical}) {
1874	# draw a vertical slider like a rotated horizontal slider	2277	# draw a vertical slider like a rotated horizontal slider
1875		2278
		2279	glTranslate 1, 0, 0;
1876	glRotate 90, 0, 0, 1;	2280	glRotate 90, 0, 0, 1;
1877	glTranslate 0, -$self->{w}, 0;
1878
1879	($w, $h) = ($h, $w);
1880	}	2281	}
1881		2282
1882	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	2283	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1883	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	2284	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1884		2285
1885	my ($value, $lo, $hi, $page) = @{$self->{range}};
1886
1887	$hi = $value + 1 if $lo == $hi;
1888
1889	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1890	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1891
1892	$page = int $page * $inner_w / ($hi - $lo);
1893	$value = int +($value - $lo) * $inner_w / ($hi - $lo);
1894
1895	$w -= $page;
1896	$page &= ~1;
1897	glTranslate $page * 0.5, 0, 0;
1898	$page ||= 2;
1899
1900	my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1901	my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1902
1903	glEnable GL_BLEND;
1904	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1905	glEnable GL_TEXTURE_2D;	2286	glEnable GL_TEXTURE_2D;
1906	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2287	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1907		2288
1908	# draw background	2289	# draw background
1909	$tex[1]->draw_quad (0, 0, $w, $h);	2290	$tex[1]->draw_quad_alpha (0, 0, 1, 1);
1910		2291
1911	# draw handle	2292	# draw handle
1912	$tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);	2293	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
1913		2294
1914	glDisable GL_BLEND;
1915	glDisable GL_TEXTURE_2D;	2295	glDisable GL_TEXTURE_2D;
1916	}	2296	}
		2297
		2298	#############################################################################
		2299
		2300	package CFClient::UI::ValSlider;
		2301
		2302	our @ISA = CFClient::UI::HBox::;
		2303
		2304	sub new {
		2305	my ($class, %arg) = @_;
		2306
		2307	my $range = delete $arg{range};
		2308
		2309	my $self = $class->SUPER::new (
		2310	slider => (new CFClient::UI::Slider expand => 1, range => $range),
		2311	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
		2312	to_value => sub { shift },
		2313	from_value => sub { shift },
		2314	%arg,
		2315	);
		2316
		2317	$self->{slider}->connect (changed => sub {
		2318	my ($self, $value) = @_;
		2319	$self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
		2320	$self->{parent}->emit (changed => $value);
		2321	});
		2322
		2323	# $self->{entry}->connect (changed => sub {
		2324	# my ($self, $value) = @_;
		2325	# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
		2326	# $self->{parent}->emit (changed => $value);
		2327	# });
		2328
		2329	$self->add ($self->{slider}, $self->{entry});
		2330
		2331	$self->{slider}->emit (changed => $self->{slider}{range}[0]);
		2332
		2333	$self
		2334	}
		2335
		2336	sub set_range { shift->{slider}->set_range (@_) }
		2337	sub set_value { shift->{slider}->set_value (@_) }
1917		2338
1918	#############################################################################	2339	#############################################################################
1919		2340
1920	package CFClient::UI::TextView;	2341	package CFClient::UI::TextView;
1921		2342
…		…
1925		2346
1926	sub new {	2347	sub new {
1927	my $class = shift;	2348	my $class = shift;
1928		2349
1929	my $self = $class->SUPER::new (	2350	my $self = $class->SUPER::new (
1930	fontsize => 1,	2351	fontsize => 1,
		2352	can_events => 0,
1931	#font => default_font	2353	#font => default_font
1932	@_,	2354	@_,
1933		2355
1934	layout => (new CFClient::Layout),	2356	layout => (new CFClient::Layout 1),
1935	par => [],	2357	par => [],
1936	height => 0,	2358	height => 0,
1937	children => [	2359	children => [
1938	(new CFClient::UI::Empty expand => 1),	2360	(new CFClient::UI::Empty expand => 1),
1939	(new CFClient::UI::Slider vertical => 1),	2361	(new CFClient::UI::Slider vertical => 1),
1940	],	2362	],
1941	);	2363	);
1942		2364
1943	$self->{children}[1]->connect (changed => sub {	2365	$self->{children}[1]->connect (changed => sub { $self->update });
1944	$self->update;
1945	});
1946		2366
1947	$self	2367	$self
1948	}	2368	}
1949		2369
1950	sub set_fontsize {	2370	sub set_fontsize {
…		…
1952		2372
1953	$self->{fontsize} = $fontsize;	2373	$self->{fontsize} = $fontsize;
1954	$self->reflow;	2374	$self->reflow;
1955	}	2375	}
1956		2376
1957	sub text_height {
1958	my ($self, $text) = @_;
1959
1960	my $layout = $self->{layout};
1961
1962	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
1963	$layout->set_width ($self->{w});
1964	$layout->set_text ($text);
1965
1966	($layout->size)[1]
1967	}
1968
1969	sub reflow {
1970	my ($self) = @_;
1971
1972	$self->{need_reflow}++;
1973	$self->update;
1974	}
1975
1976	sub size_allocate {	2377	sub size_allocate {
1977	my ($self, $w, $h) = @_;	2378	my ($self, $w, $h, $changed) = @_;
1978		2379
1979	$self->SUPER::size_allocate ($w, $h);	2380	$self->SUPER::size_allocate ($w, $h, $changed);
		2381
		2382	return unless $changed;
1980		2383
1981	$self->{layout}->set_font ($self->{font}) if $self->{font};	2384	$self->{layout}->set_font ($self->{font}) if $self->{font};
1982	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2385	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1983	$self->{layout}->set_width ($self->{children}[0]{w});	2386	$self->{layout}->set_width ($self->{children}[0]{w});
1984		2387
1985	$self->reflow;	2388	$self->reflow;
1986	}	2389	}
1987		2390
		2391	sub text_size {
		2392	my ($self, $text, $indent) = @_;
		2393
		2394	my $layout = $self->{layout};
		2395
		2396	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2397	$layout->set_width ($self->{children}[0]{w} - $indent);
		2398	$layout->set_markup ($text);
		2399
		2400	$layout->size
		2401	}
		2402
		2403	sub reflow {
		2404	my ($self) = @_;
		2405
		2406	$self->{need_reflow}++;
		2407	$self->update;
		2408	}
		2409
		2410	sub set_offset {
		2411	my ($self, $offset) = @_;
		2412
		2413	# todo: base offset on lines or so, not on pixels
		2414	$self->{children}[1]->set_value ($offset);
		2415	}
		2416
		2417	sub clear {
		2418	my ($self) = @_;
		2419
		2420	$self->{par} = [];
		2421	$self->{height} = 0;
		2422	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
		2423	}
		2424
1988	sub add_paragraph {	2425	sub add_paragraph {
1989	my ($self, $color, $text) = @_;	2426	my ($self, $color, $text, $indent) = @_;
1990		2427
1991	#TODO: intelligently "reformat" paragraph	2428	for my $line (split /\n/, $text) {
1992		2429	my ($w, $h) = $self->text_size ($line);
1993	my $height = $self->text_height ($text);
1994
1995	$self->{height} += $height;	2430	$self->{height} += $h;
		2431	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
		2432	}
1996		2433
1997	push @{$self->{par}}, [$height, $color, $text];
1998
1999	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];	2434	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2000	$self->{children}[1]->update;
2001	}	2435	}
2002		2436
2003	sub update {	2437	sub update {
2004	my ($self) = @_;	2438	my ($self) = @_;
2005		2439
…		…
2007		2441
2008	return unless $self->{h} > 0;	2442	return unless $self->{h} > 0;
2009		2443
2010	delete $self->{texture};	2444	delete $self->{texture};
2011		2445
2012	$ROOT->on_refresh ($self, sub {	2446	$ROOT->on_post_alloc ($self, sub {
		2447	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2448
2013	if (delete $self->{need_reflow}) {	2449	if (delete $self->{need_reflow}) {
2014	my $height = 0;	2450	my $height = 0;
2015		2451
2016	$height += $_->[0] = $self->text_height ($_->[2])	2452	my $layout = $self->{layout};
		2453
		2454	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2455
2017	for @{$self->{par}};	2456	for (@{$self->{par}}) {
		2457	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
		2458	$layout->set_width ($W - $_->[3]);
		2459	$layout->set_markup ($_->[4]);
		2460	my ($w, $h) = $layout->size;
		2461	$_->[0] = $w + $_->[3];
		2462	$_->[1] = $h;
		2463	}
		2464
		2465	$height += $_->[1];
		2466	}
2018		2467
2019	$self->{height} = $height;	2468	$self->{height} = $height;
2020		2469
2021	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2470	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2022		2471
2023	delete $self->{texture};	2472	delete $self->{texture};
2024	}	2473	}
2025		2474
2026	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	2475	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2027	glClearColor 0, 0, 0, 1;	2476	glClearColor 0.5, 0.5, 0.5, 0;
2028	glClear GL_COLOR_BUFFER_BIT;	2477	glClear GL_COLOR_BUFFER_BIT;
2029		2478
		2479	my $top = int $self->{children}[1]{range}[0];
		2480
		2481	my $y0 = $top;
		2482	my $y1 = $top + $H;
		2483
		2484	my $y = 0;
		2485
		2486	my $layout = $self->{layout};
		2487
		2488	$layout->set_font ($self->{font}) if $self->{font};
		2489
2030	glEnable GL_BLEND;	2490	glEnable GL_BLEND;
		2491	#TODO# not correct in windows where rgba is forced off
2031	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	2492	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2032	glEnable GL_TEXTURE_2D;
2033	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2034
2035	my $top = int $self->{children}[1]{range}[0];
2036
2037	my $y0 = $top;
2038	my $y1 = $top + $self->{h};
2039
2040	my $y = 0;
2041
2042	my $layout = $self->{layout};
2043
2044	$layout->set_font ($self->{font}) if $self->{font};
2045		2493
2046	for my $par (@{$self->{par}}) {	2494	for my $par (@{$self->{par}}) {
2047	my $h = $par->[0];	2495	my $h = $par->[1];
2048		2496
2049	if ($y0 < $y + $h && $y < $y1) {	2497	if ($y0 < $y + $h && $y < $y1) {
		2498	$layout->set_foreground (@{ $par->[2] });
		2499	$layout->set_width ($W - $par->[3]);
2050	$layout->set_text ($par->[2]);	2500	$layout->set_markup ($par->[4]);
2051		2501
2052	glColor @{ $par->[1] };	2502	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2053	my ($W, $H) = $layout->size;	2503
2054	CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);	2504	glRasterPos $par->[3], $y - $y0;
		2505	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2055	}	2506	}
2056		2507
2057	$y += $h;	2508	$y += $h;
2058	}	2509	}
2059		2510
2060	glDisable GL_TEXTURE_2D;
2061	glDisable GL_BLEND;	2511	glDisable GL_BLEND;
2062	};	2512	};
2063	});	2513	});
2064	}	2514	}
2065		2515
2066	sub _draw {	2516	sub _draw {
2067	my ($self) = @_;	2517	my ($self) = @_;
2068		2518
2069	if ($self->{texture}) {
2070	glEnable GL_TEXTURE_2D;	2519	glEnable GL_TEXTURE_2D;
2071	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2520	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2521	glColor 1, 1, 1, 1;
2072	$self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});	2522	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2073	glDisable GL_TEXTURE_2D;	2523	glDisable GL_TEXTURE_2D;
2074	}
2075		2524
2076	$self->{children}[1]->draw;	2525	$self->{children}[1]->draw;
2077		2526
2078	}	2527	}
2079		2528
…		…
2127		2576
2128	sub new {	2577	sub new {
2129	my $class = shift;	2578	my $class = shift;
2130		2579
2131	my $self = $class->SUPER::new (	2580	my $self = $class->SUPER::new (
2132	state => 0,	2581	state => 0,
2133	connect_activate => \&toggle_flopper,	2582	on_activate => \&toggle_flopper,
2134	can_events => 1,
2135	@_	2583	@_
2136	);	2584	);
2137		2585
2138	if ($self->{state}) {
2139	$self->{state} = 0;
2140	$self->toggle_flopper;
2141	}
2142
2143	$self	2586	$self
2144	}	2587	}
2145		2588
2146	sub toggle_flopper {	2589	sub toggle_flopper {
2147	my ($self) = @_;	2590	my ($self) = @_;
2148		2591
2149	# TODO: use animation	2592	$self->{other}->toggle_visibility;
2150	if ($self->{state} = !$self->{state}) {
2151	$CFClient::UI::ROOT->add ($self->{other});
2152	$self->{other}->move ($self->coord2global (0, $self->{h}));
2153	$self->emit ("open");
2154	} else {
2155	$CFClient::UI::ROOT->remove ($self->{other});
2156	$self->emit ("close");
2157	}
2158
2159	$self->emit (changed => $self->{state});
2160	}	2593	}
2161		2594
2162	#############################################################################	2595	#############################################################################
2163		2596
2164	package CFClient::UI::Tooltip;	2597	package CFClient::UI::Tooltip;
…		…
2174	@_,	2607	@_,
2175	can_events => 0,	2608	can_events => 0,
2176	)	2609	)
2177	}	2610	}
2178		2611
2179	sub set_text {	2612	sub set_tooltip_from {
2180	my ($self, $text) = @_;	2613	my ($self, $widget) = @_;
2181		2614
2182	$self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];	2615	$self->add (new CFClient::UI::Label
2183	$self->{label}->set_text ($text);	2616	markup => $widget->{tooltip},
2184	$self->add ($self->{label});	2617	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
		2618	fontsize => 0.8,
		2619	fg => [0, 0, 0, 1],
		2620	ellipsise => 0,
		2621	font => ($widget->{tooltip_font} || $::FONT_PROP),
		2622	);
2185	}	2623	}
2186		2624
2187	sub size_request {	2625	sub size_request {
2188	my ($self) = @_;	2626	my ($self) = @_;
2189		2627
2190	$self->child->set_max_size ($::WIDTH * 0.2);
2191
2192	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	2628	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2193		2629
2194	($w + 4, $h + 4)	2630	($w + 4, $h + 4)
2195	}	2631	}
2196		2632
		2633	sub size_allocate {
		2634	my ($self, $w, $h, $changed) = @_;
		2635
		2636	return unless $changed;
		2637
		2638	$self->SUPER::size_allocate ($w - 4, $h - 4, $changed);
		2639	}
		2640
		2641	sub visibility_change {
		2642	my ($self, $visible) = @_;
		2643
		2644	return unless $visible;
		2645
		2646	$self->{root}->on_post_alloc ("move_$self" => sub {
		2647	my $widget = $self->{owner}
		2648	or return;
		2649
		2650	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
		2651
		2652	($x, $y) = $widget->coord2global (-$self->{w}, 0)
		2653	if $x + $self->{w} > $::WIDTH;
		2654
		2655	$self->move ($x, $y);
		2656	});
		2657	}
		2658
2197	sub _draw {	2659	sub _draw {
2198	my ($self) = @_;	2660	my ($self) = @_;
2199		2661
2200	glPushMatrix;
2201	glTranslate 0.375, 0.375;	2662	glTranslate 0.375, 0.375;
2202		2663
2203	my ($w, $h) = @$self{qw(w h)};	2664	my ($w, $h) = @$self{qw(w h)};
2204		2665
2205	glColor 1, 0.8, 0.4;	2666	glColor 1, 0.8, 0.4;
…		…
2216	glVertex 0 , $h;	2677	glVertex 0 , $h;
2217	glVertex $w, $h;	2678	glVertex $w, $h;
2218	glVertex $w, 0;	2679	glVertex $w, 0;
2219	glEnd;	2680	glEnd;
2220		2681
2221	glPopMatrix;	2682	glTranslate 2 - 0.375, 2 - 0.375;
2222		2683
2223	glTranslate 2, 2;
2224	$self->SUPER::_draw;	2684	$self->SUPER::_draw;
2225	}	2685	}
2226		2686
2227	#############################################################################	2687	#############################################################################
2228		2688
		2689	package CFClient::UI::Face;
		2690
		2691	our @ISA = CFClient::UI::Base::;
		2692
		2693	use CFClient::OpenGL;
		2694
		2695	sub new {
		2696	my $class = shift;
		2697
		2698	my $self = $class->SUPER::new (
		2699	aspect => 1,
		2700	can_events => 0,
		2701	@_,
		2702	);
		2703
		2704	if ($self->{anim} && $self->{animspeed}) {
		2705	Scalar::Util::weaken (my $widget = $self);
		2706
		2707	$self->{timer} = Event->timer (
		2708	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
		2709	hard => 1,
		2710	interval => $self->{animspeed},
		2711	cb => sub {
		2712	++$widget->{frame};
		2713	$widget->update;
		2714	},
		2715	);
		2716	}
		2717
		2718	$self
		2719	}
		2720
		2721	sub size_request {
		2722	(32, 8)
		2723	}
		2724
		2725	sub update {
		2726	my ($self) = @_;
		2727
		2728	return unless $self->{visible};
		2729
		2730	$self->SUPER::update;
		2731	}
		2732
		2733	sub _draw {
		2734	my ($self) = @_;
		2735
		2736	return unless $::CONN;
		2737
		2738	my $face;
		2739
		2740	if ($self->{frame}) {
		2741	my $anim = $::CONN->{anim}[$self->{anim}];
		2742
		2743	$face = $anim->[ $self->{frame} % @$anim ]
		2744	if $anim && @$anim;
		2745	}
		2746
		2747	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
		2748
		2749	if ($tex) {
		2750	glEnable GL_TEXTURE_2D;
		2751	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2752	glColor 1, 1, 1, 1;
		2753	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
		2754	glDisable GL_TEXTURE_2D;
		2755	}
		2756	}
		2757
		2758	sub DESTROY {
		2759	my ($self) = @_;
		2760
		2761	$self->{timer}->cancel
		2762	if $self->{timer};
		2763
		2764	$self->SUPER::DESTROY;
		2765	}
		2766
		2767	#############################################################################
		2768
		2769	package CFClient::UI::Inventory;
		2770
		2771	our @ISA = CFClient::UI::ScrolledWindow::;
		2772
		2773	sub new {
		2774	my $class = shift;
		2775
		2776	my $self = $class->SUPER::new (
		2777	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
		2778	@_,
		2779	);
		2780
		2781	$self
		2782	}
		2783
		2784	sub set_items {
		2785	my ($self, $items) = @_;
		2786
		2787	$self->{scrolled}->clear;
		2788	return unless $items;
		2789
		2790	my @items = sort {
		2791	($a->{type} <=> $b->{type})
		2792	or ($a->{name} cmp $b->{name})
		2793	} @$items;
		2794
		2795	$self->{real_items} = \@items;
		2796
		2797	my $row = 0;
		2798	for my $item (@items) {
		2799	CFClient::Item::update_widgets $item;
		2800
		2801	$self->{scrolled}->add (0, $row, $item->{face_widget});
		2802	$self->{scrolled}->add (1, $row, $item->{desc_widget});
		2803	$self->{scrolled}->add (2, $row, $item->{weight_widget});
		2804
		2805	$row++;
		2806	}
		2807	}
		2808
		2809	#############################################################################
		2810
		2811	package CFClient::UI::Menu;
		2812
		2813	our @ISA = CFClient::UI::FancyFrame::;
		2814
		2815	use CFClient::OpenGL;
		2816
		2817	sub new {
		2818	my $class = shift;
		2819
		2820	my $self = $class->SUPER::new (
		2821	items => [],
		2822	z => 100,
		2823	@_,
		2824	);
		2825
		2826	$self->add ($self->{vbox} = new CFClient::UI::VBox);
		2827
		2828	for my $item (@{ $self->{items} }) {
		2829	my ($widget, $cb) = @$item;
		2830
		2831	# handle various types of items, only text for now
		2832	if (!ref $widget) {
		2833	$widget = new CFClient::UI::Label
		2834	can_hover => 1,
		2835	can_events => 1,
		2836	text => $widget;
		2837	}
		2838
		2839	$self->{item}{$widget} = $item;
		2840
		2841	$self->{vbox}->add ($widget);
		2842	}
		2843
		2844	$self
		2845	}
		2846
		2847	# popup given the event (must be a mouse button down event currently)
		2848	sub popup {
		2849	my ($self, $ev) = @_;
		2850
		2851	$self->_emit ("popdown");
		2852
		2853	# maybe save $GRAB? must be careful about events...
		2854	$GRAB = $self;
		2855	$self->{button} = $ev->{button};
		2856
		2857	$self->show;
		2858	$self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
		2859	}
		2860
		2861	sub mouse_motion {
		2862	my ($self, $ev, $x, $y) = @_;
		2863
		2864	# TODO: should use vbox->find_widget or so
		2865	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
		2866	$self->{hover} = $self->{item}{$HOVER};
		2867	}
		2868
		2869	sub button_up {
		2870	my ($self, $ev, $x, $y) = @_;
		2871
		2872	if ($ev->{button} == $self->{button}) {
		2873	undef $GRAB;
		2874	$self->hide;
		2875
		2876	$self->_emit ("popdown");
		2877	$self->{hover}[1]->() if $self->{hover};
		2878	}
		2879	}
		2880
		2881	#############################################################################
		2882
		2883	package CFClient::UI::Statusbox;
		2884
		2885	our @ISA = CFClient::UI::VBox::;
		2886
		2887	sub new {
		2888	my $class = shift;
		2889
		2890	$class->SUPER::new (
		2891	fontsize => 0.8,
		2892	@_,
		2893	)
		2894	}
		2895
		2896	sub reorder {
		2897	my ($self) = @_;
		2898	my $NOW = time;
		2899
		2900	while (my ($k, $v) = each %{ $self->{item} }) {
		2901	delete $self->{item}{$k} if $v->{timeout} < $NOW;
		2902	}
		2903
		2904	my @widgets;
		2905
		2906	my @items = sort {
		2907	$a->{pri} <=> $b->{pri}
		2908	or $b->{id} <=> $a->{id}
		2909	} values %{ $self->{item} };
		2910
		2911	my $count = 10 + 1;
		2912	for my $item (@items) {
		2913	last unless --$count;
		2914
		2915	push @widgets, $item->{label} ||= do {
		2916	# TODO: doesn't handle markup well (read as: at all)
		2917	my $short = $item->{count} > 1
		2918	? "<b>$item->{count} ×</b> $item->{text}"
		2919	: $item->{text};
		2920
		2921	for ($short) {
		2922	s/^\s+//;
		2923	s/\s+/ /g;
		2924	}
		2925
		2926	new CFClient::UI::Label
		2927	markup => $short,
		2928	tooltip => $item->{tooltip},
		2929	tooltip_font => $::FONT_PROP,
		2930	tooltip_width => 0.67,
		2931	fontsize => $item->{fontsize} || $self->{fontsize},
		2932	max_w => $::WIDTH * 0.44,
		2933	fg => $item->{fg},
		2934	can_events => 1,
		2935	can_hover => 1
		2936	};
		2937	}
		2938
		2939	$self->clear;
		2940	$self->SUPER::add (reverse @widgets);
		2941	}
		2942
		2943	sub add {
		2944	my ($self, $text, %arg) = @_;
		2945
		2946	$text =~ s/^\s+//;
		2947	$text =~ s/\s+$//;
		2948
		2949	return unless $text;
		2950
		2951	my $timeout = time + ((delete $arg{timeout}) || 60);
		2952
		2953	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
		2954
		2955	if (my $item = $self->{item}{$group}) {
		2956	if ($item->{text} eq $text) {
		2957	$item->{count}++;
		2958	} else {
		2959	$item->{count} = 1;
		2960	$item->{text} = $item->{tooltip} = $text;
		2961	}
		2962	$item->{id} = ++$self->{id};
		2963	$item->{timeout} = $timeout;
		2964	delete $item->{label};
		2965	} else {
		2966	$self->{item}{$group} = {
		2967	id => ++$self->{id},
		2968	text => $text,
		2969	timeout => $timeout,
		2970	tooltip => $text,
		2971	fg => [0.8, 0.8, 0.8, 0.8],
		2972	pri => 0,
		2973	count => 1,
		2974	%arg,
		2975	};
		2976	}
		2977
		2978	$self->reorder;
		2979	}
		2980
		2981	sub reconfigure {
		2982	my ($self) = @_;
		2983
		2984	delete $_->{label}
		2985	for values %{ $self->{item} || {} };
		2986
		2987	$self->reorder;
		2988	$self->SUPER::reconfigure;
		2989	}
		2990
		2991	#############################################################################
		2992
2229	package CFClient::UI::Root;	2993	package CFClient::UI::Root;
2230		2994
2231	our @ISA = CFClient::UI::Container::;	2995	our @ISA = CFClient::UI::Container::;
2232		2996
2233	use CFClient::OpenGL;	2997	use CFClient::OpenGL;
2234		2998
2235	sub check_size {	2999	sub new {
2236	my ($self) = @_;	3000	my $class = shift;
2237		3001
2238	$self->configure (0, 0, $::WIDTH, $::HEIGHT);	3002	my $self = $class->SUPER::new (
2239	}	3003	visible => 1,
		3004	@_,
		3005	);
2240		3006
2241	sub size_request {	3007	Scalar::Util::weaken ($self->{root} = $self);
2242	($::WIDTH, $::HEIGHT)	3008
		3009	$self
2243	}	3010	}
2244		3011
2245	sub configure {	3012	sub configure {
2246	my ($self, $x, $y, $w, $h) = @_;	3013	my ($self, $x, $y, $w, $h) = @_;
2247		3014
2248	$self->SUPER::configure ($x, $y, $w, $h);	3015	$self->{w} = $w;
		3016	$self->{h} = $h;
		3017	}
2249		3018
		3019	sub reconfigure {
		3020	my ($self) = @_;
		3021
		3022	$self->SUPER::reconfigure;
		3023
		3024	$self->size_allocate ($self->{w}, $self->{h}, 1)
		3025	if $self->{w};
		3026	}
		3027
		3028	sub size_request {
		3029	my ($self) = @_;
		3030
		3031	($self->{w}, $self->{h})
		3032	}
		3033
		3034	sub size_allocate {
		3035	my ($self, $w, $h, $changed) = @_;
		3036
2250	for my $child (@{$self->{children}}) {	3037	for my $child ($self->children) {
2251	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3038	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2252		3039
		3040	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
		3041	if exists $child->{req_x};
		3042
		3043	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
		3044	if exists $child->{req_y};
		3045
		3046	#delete @$child{qw(req_x req_y)};#d# def_x, def_y
		3047
2253	$X = List::Util::max 0, List::Util::min $w - $W, $X;	3048	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2254	$Y = List::Util::max 0, List::Util::min $h - $H, $Y;	3049	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
		3050
2255	$child->configure ($X, $Y, $W,$H);	3051	$child->configure ($X, $Y, $W, $H);
2256	}	3052	}
2257	}	3053	}
2258		3054
2259	sub _topleft {	3055	sub coord2local {
2260	my ($self, $x, $y) = @_;	3056	my ($self, $x, $y) = @_;
2261		3057
2262	($x, $y)	3058	($x, $y)
2263	}	3059	}
2264		3060
		3061	sub coord2global {
		3062	my ($self, $x, $y) = @_;
		3063
		3064	($x, $y)
		3065	}
		3066
2265	sub update {	3067	sub update {
2266	my ($self) = @_;	3068	my ($self) = @_;
2267		3069
2268	$self->check_size;	3070	$::WANT_REFRESH++;
2269	::refresh ();
2270	}	3071	}
2271		3072
2272	sub add {	3073	sub add {
2273	my ($self, $child) = @_;	3074	my ($self, @children) = @_;
2274		3075
		3076	for my $child (@children) {
		3077	$child->{is_toplevel} = 1;
		3078
2275	# integerize window positions	3079	# integerise window positions
2276	$child->{x} = int $child->{x};	3080	$child->{x} = int $child->{x};
2277	$child->{y} = int $child->{y};	3081	$child->{y} = int $child->{y};
		3082	}
2278		3083
2279	$self->SUPER::add ($child);	3084	$self->SUPER::add (@children);
		3085	}
		3086
		3087	sub remove {
		3088	my ($self, @children) = @_;
		3089
		3090	$self->SUPER::remove (@children);
		3091
		3092	while (@children) {
		3093	my $w = pop @children;
		3094	push @children, $w->children;
		3095	$w->set_invisible;
		3096	}
2280	}	3097	}
2281		3098
2282	sub on_refresh {	3099	sub on_refresh {
2283	my ($self, $id, $cb) = @_;	3100	my ($self, $id, $cb) = @_;
2284		3101
2285	$self->{refresh_hook}{$id} = $cb;	3102	$self->{refresh_hook}{$id} = $cb;
2286	}	3103	}
2287		3104
		3105	sub on_post_alloc {
		3106	my ($self, $id, $cb) = @_;
		3107
		3108	$self->{post_alloc_hook}{$id} = $cb;
		3109	}
		3110
2288	sub draw {	3111	sub draw {
2289	my ($self) = @_;	3112	my ($self) = @_;
2290		3113
2291	while (my $rcb = delete $self->{refresh_hook}) {	3114	while ($self->{refresh_hook}) {
2292	$_->() for values %$rcb;	3115	$_->()
		3116	for values %{delete $self->{refresh_hook}};
		3117	}
		3118
		3119	if ($self->{realloc}) {
		3120	my @queue;
		3121
		3122	while () {
		3123	if ($self->{realloc}) {
		3124	#TODO use array-of-depth approach
		3125
		3126	@queue = sort { $a->{visible} <=> $b->{visible} }
		3127	@queue, values %{delete $self->{realloc}};
		3128	}
		3129
		3130	my $widget = pop @queue || last;
		3131
		3132	$widget->{visible} or last; # do not resize invisible widgets
		3133
		3134	my ($w, $h) = $widget->{def_w} && $widget->{def_h}
		3135	? @$widget{qw(def_w def_h)}
		3136	: $widget->size_request;
		3137
		3138	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
		3139
		3140	$widget->{req_w} = $w;
		3141	$widget->{req_h} = $h;
		3142
		3143	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
		3144
		3145	push @queue, $widget->{parent}
		3146	if $widget->{parent};
		3147	}
		3148	}
		3149
		3150	while (my $size_alloc = delete $self->{size_alloc}) {
		3151	my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
		3152	values %$size_alloc;
		3153
		3154	while () {
		3155	my ($widget, $w, $h) = @{ pop @queue or last };
		3156
		3157	$w = 0 if $w < 0;
		3158	$h = 0 if $h < 0;
		3159
		3160	my $changed = $widget->{w} != $w || $widget->{h} != $h;
		3161
		3162	$widget->{w} = $w;
		3163	$widget->{h} = $h;
		3164
		3165	$widget->emit (size_allocate => $w, $h, $changed);
		3166	}
		3167	}
		3168
		3169	while ($self->{post_alloc_hook}) {
		3170	$_->()
		3171	for values %{delete $self->{post_alloc_hook}};
2293	}	3172	}
2294		3173
2295	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3174	glViewport 0, 0, $::WIDTH, $::HEIGHT;
2296	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3175	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2297	glClear GL_COLOR_BUFFER_BIT;	3176	glClear GL_COLOR_BUFFER_BIT;
2298		3177
2299	glMatrixMode GL_PROJECTION;	3178	glMatrixMode GL_PROJECTION;
2300	glLoadIdentity;	3179	glLoadIdentity;
2301	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;	3180	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2302	glMatrixMode GL_MODELVIEW;	3181	glMatrixMode GL_MODELVIEW;
2303	glLoadIdentity;	3182	glLoadIdentity;
2304		3183
2305	$self->_draw;	3184	$self->_draw;
2306	}	3185	}
…		…
2308	#############################################################################	3187	#############################################################################
2309		3188
2310	package CFClient::UI;	3189	package CFClient::UI;
2311		3190
2312	$ROOT = new CFClient::UI::Root;	3191	$ROOT = new CFClient::UI::Root;
2313	$TOOLTIP = new CFClient::UI::Tooltip;	3192	$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2314		3193
2315	1	3194	1
2316		3195

Diff Legend

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