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

Diff Legend

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