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.179 by elmex, Fri Apr 28 05:17:21 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_markup ($widget->{tooltip});	53	$TOOLTIP->set_tooltip_from ($widget);
29
30	$TOOLTIP->show;	54	$TOOLTIP->show;
31
32	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33
34	if ($x + $TOOLTIP->{w} > $::WIDTH) {
35	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);
36	}
37
38	$TOOLTIP->move ($x, $y);
39	}	55	}
40		56
41	return;	57	return;
42	}	58	}
43	}	59	}
…		…
47	delete $TOOLTIP->{owner};	63	delete $TOOLTIP->{owner};
48	}	64	}
49		65
50	# class methods for events	66	# class methods for events
51	sub feed_sdl_key_down_event {	67	sub feed_sdl_key_down_event {
52	$FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])	68	$FOCUS->emit (key_down => $_[0])
53	if $FOCUS;	69	if $FOCUS;
54	}	70	}
55		71
56	sub feed_sdl_key_up_event {	72	sub feed_sdl_key_up_event {
57	$FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])	73	$FOCUS->emit (key_up => $_[0])
58	if $FOCUS;	74	if $FOCUS;
59	}	75	}
60		76
61	sub feed_sdl_button_down_event {	77	sub feed_sdl_button_down_event {
62	my ($ev) = @_;	78	my ($ev) = @_;
…		…
71	check_tooltip;	87	check_tooltip;
72	}	88	}
73		89
74	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	90	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
75		91
76	if ($GRAB) {	92	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
77	($x, $y) = $GRAB->coord2local ($x, $y);	93	if $GRAB;
78	$GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
79	}
80	}	94	}
81		95
82	sub feed_sdl_button_up_event {	96	sub feed_sdl_button_up_event {
83	my ($ev) = @_;	97	my ($ev) = @_;
84	my ($x, $y) = ($ev->{x}, $ev->{y});	98	my ($x, $y) = ($ev->{x}, $ev->{y});
85		99
86	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	100	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
87		101
88	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	102	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
89		103
90	if ($GRAB) {	104	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
91	($x, $y) = $GRAB->coord2local ($x, $y);	105	if $GRAB;
92	$GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
93	}
94		106
95	if (!$BUTTON_STATE) {	107	if (!$BUTTON_STATE) {
96	my $grab = $GRAB; undef $GRAB;	108	my $grab = $GRAB; undef $GRAB;
97	$grab->update if $grab;	109	$grab->update if $grab;
98	$GRAB->update if $GRAB;	110	$GRAB->update if $GRAB;
…		…
114	$HOVER->update if $HOVER && $HOVER->{can_hover};	126	$HOVER->update if $HOVER && $HOVER->{can_hover};
115		127
116	check_tooltip;	128	check_tooltip;
117	}	129	}
118		130
119	if ($HOVER) {
120	($x, $y) = $HOVER->coord2local ($x, $y);
121	$HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);	131	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
122	}	132	if $HOVER;
123	}	133	}
124		134
125	# convert position array to integers	135	# convert position array to integers
126	sub harmonize {	136	sub harmonize {
127	my ($vals) = @_;	137	my ($vals) = @_;
…		…
131	for (@$vals) {	141	for (@$vals) {
132	my $i = int $_ + $rem;	142	my $i = int $_ + $rem;
133	$rem += $_ - $i;	143	$rem += $_ - $i;
134	$_ = $i;	144	$_ = $i;
135	}	145	}
		146	}
		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;
136	}	180	}
137		181
138	#############################################################################	182	#############################################################################
139		183
140	package CFClient::UI::Base;	184	package CFClient::UI::Base;
…		…
153	can_events => 1,	197	can_events => 1,
154	@_	198	@_
155	}, $class;	199	}, $class;
156		200
157	for (keys %$self) {	201	for (keys %$self) {
158	if (/^connect_(.*)$/) {	202	if (/^on_(.*)$/) {
159	$self->connect ($1 => delete $self->{$_});	203	$self->connect ($1 => delete $self->{$_});
160	}	204	}
161	}	205	}
162		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
163	$self	216	$self
164	}	217	}
165		218
166	sub destroy {	219	sub destroy {
167	my ($self) = @_;	220	my ($self) = @_;
…		…
176	return if $self->{parent};	229	return if $self->{parent};
177		230
178	$CFClient::UI::ROOT->add ($self);	231	$CFClient::UI::ROOT->add ($self);
179	}	232	}
180		233
181	sub hide {	234	sub center {
182	my ($self) = @_;	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};
183		270
184	undef $GRAB if $GRAB == $self;	271	undef $GRAB if $GRAB == $self;
185	undef $HOVER if $HOVER == $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
		299	sub hide {
		300	my ($self) = @_;
		301
		302	$self->set_invisible;
186		303
187	$self->{parent}->remove ($self)	304	$self->{parent}->remove ($self)
188	if $self->{parent};	305	if $self->{parent};
189	}	306	}
190		307
…		…
199	}	316	}
200		317
201	sub set_size {	318	sub set_size {
202	my ($self, $w, $h) = @_;	319	my ($self, $w, $h) = @_;
203		320
204	$self->{user_w} = $w;	321	$self->{def_w} = $w;
205	$self->{user_h} = $h;	322	$self->{def_h} = $h;
206		323
207	$self->check_size;	324	$self->realloc;
208	}	325	}
209		326
210	sub size_request {	327	sub size_request {
211	require Carp;	328	require Carp;
212	Carp::confess "size_request is abstract";	329	Carp::confess "size_request is abstract";
…		…
232	$self->{y} = $y;	349	$self->{y} = $y;
233	$self->update;	350	$self->update;
234	}	351	}
235		352
236	if ($self->{w} != $w || $self->{h} != $h) {	353	if ($self->{w} != $w || $self->{h} != $h) {
237	$self->{w} = $w;	354	return unless $self->{visible};
238	$self->{h} = $h;
239		355
240	$self->size_allocate ($w, $h);	356	$self->{root}->{size_alloc}{$self+0} = [$self, $w, $h];
241	$self->update;
242	}	357	}
243	}	358	}
244		359
245	sub size_allocate {	360	sub size_allocate {
246	# nothing to be done	361	# nothing to be done
247	}	362	}
248		363
249	sub children {	364	sub children {
250	}	365	}
251		366
252	# call when resoltuion changes etc.
253	sub reconfigure {
254	my ($self) = @_;
255
256	$_->reconfigure
257	for $self->children;
258
259	$_->check_size;
260	}
261
262	sub set_max_size {	367	sub set_max_size {
263	my ($self, $w, $h) = @_;	368	my ($self, $w, $h) = @_;
264		369
265	delete $self->{max_w}; $self->{max_w} = $w if $w;	370	delete $self->{max_w}; $self->{max_w} = $w if $w;
266	delete $self->{max_h}; $self->{max_h} = $h if $h;	371	delete $self->{max_h}; $self->{max_h} = $h if $h;
267	}	372	}
268		373
269	# return top left coordinates	374	sub set_tooltip {
270	sub _topleft {
271	my ($self, $x, $y) = @_;	375	my ($self, $tooltip) = @_;
272		376
273	$self->{parent}	377	$tooltip =~ s/^\s+//;
274	or Carp::confess "no parent widget in _topleft\n";#d#	378	$tooltip =~ s/\s+$//;
275		379
276	$self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});	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	}
277	}	388	}
278		389
279	# translate global coordinates to local coordinate system	390	# translate global coordinates to local coordinate system
280	sub coord2local {	391	sub coord2local {
281	my ($self, $x, $y) = @_;	392	my ($self, $x, $y) = @_;
282		393
283	my ($X, $Y) = $self->_topleft;	394	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
284	($x - $X, $y - $Y)
285	}	395	}
286		396
287	# translate local coordinates to global coordinate system	397	# translate local coordinates to global coordinate system
288	sub coord2global {	398	sub coord2global {
289	my ($self, $x, $y) = @_;	399	my ($self, $x, $y) = @_;
290		400
291	my ($X, $Y) = $self->_topleft;	401	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
292	($x + $X, $y + $Y)
293	}	402	}
294		403
295	sub focus_in {	404	sub focus_in {
296	my ($self) = @_;	405	my ($self) = @_;
297		406
298	return if $FOCUS == $self;	407	return if $FOCUS == $self;
299	return unless $self->{can_focus};	408	return unless $self->{can_focus};
300		409
301	my $focus = $FOCUS; $FOCUS = $self;	410	my $focus = $FOCUS; $FOCUS = $self;
302		411
303	$self->emit (focus_in => $focus);	412	$self->_emit (focus_in => $focus);
304		413
305	$focus->update if $focus;	414	$focus->update if $focus;
306	$FOCUS->update;	415	$FOCUS->update;
307	}	416	}
308		417
…		…
311		420
312	return unless $FOCUS == $self;	421	return unless $FOCUS == $self;
313		422
314	my $focus = $FOCUS; undef $FOCUS;	423	my $focus = $FOCUS; undef $FOCUS;
315		424
316	$self->emit (focus_out => $focus);	425	$self->_emit (focus_out => $focus);
317		426
318	$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;
319	}	431	}
320		432
321	sub mouse_motion { }	433	sub mouse_motion { }
322	sub button_up { }	434	sub button_up { }
323	sub key_down { }	435	sub key_down { }
324	sub key_up { }	436	sub key_up { }
325		437
326	sub button_down {	438	sub button_down {
327	my ($self, $ev, $x, $y) = @_;	439	my ($self, $ev, $x, $y) = @_;
328		440
329	$self->focus_in;	441	$self->focus_in;
…		…
332	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	444	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
333	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	445	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
334	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }	446	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
335	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }	447	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
336	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	}
337		512
338	sub draw {	513	sub draw {
339	my ($self) = @_;	514	my ($self) = @_;
340		515
341	return unless $self->{h} && $self->{w};	516	return unless $self->{h} && $self->{w};
…		…
363	if ($ENV{PCLIENT_DEBUG}) {	538	if ($ENV{PCLIENT_DEBUG}) {
364	glPushMatrix;	539	glPushMatrix;
365	glColor 1, 1, 0, 1;	540	glColor 1, 1, 0, 1;
366	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	541	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
367	glBegin GL_LINE_LOOP;	542	glBegin GL_LINE_LOOP;
368	glVertex 0 , 0;	543	glVertex 0 , 0;
369	glVertex $self->{w}, 0;	544	glVertex $self->{w} - 1, 0;
370	glVertex $self->{w}, $self->{h};	545	glVertex $self->{w} - 1, $self->{h} - 1;
371	glVertex 0 , $self->{h};	546	glVertex 0 , $self->{h} - 1;
372	glEnd;	547	glEnd;
373	glPopMatrix;	548	glPopMatrix;
374	CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	549	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
375	}	550	}
376	}	551	}
377		552
378	sub _draw {	553	sub _draw {
379	my ($self) = @_;	554	my ($self) = @_;
380		555
381	warn "no draw defined for $self\n";	556	warn "no draw defined for $self\n";
382	}	557	}
383		558
384	sub find_widget {
385	my ($self, $x, $y) = @_;
386
387	return () unless $self->{can_events};
388
389	return $self
390	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
391	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
392
393	()
394	}
395
396	sub set_parent {
397	my ($self, $parent) = @_;
398
399	Scalar::Util::weaken ($self->{parent} = $parent);
400	}
401
402	sub check_size {
403	my ($self) = @_;
404
405	$self->{parent}
406	or return 1;
407
408	my ($w, $h) = $self->{user_w} && $self->{user_h}
409	? @$self{qw(user_w user_h)}
410	: $self->size_request;
411
412	if ($w != $self->{req_w} || $h != $self->{req_h}) {
413	$self->{req_w} = $w;
414	$self->{req_h} = $h;
415
416	$self->{parent}->check_size
417	or $self->size_allocate (
418	(List::Util::max $self->{w}, $w),
419	(List::Util::max $self->{h}, $h),
420	);
421
422	1
423	} else {
424	0
425	}
426	}
427
428	sub update {
429	my ($self) = @_;
430
431	$self->{parent}->update
432	if $self->{parent};
433	}
434
435	sub connect {
436	my ($self, $signal, $cb) = @_;
437
438	push @{ $self->{signal_cb}{$signal} }, $cb;
439	}
440
441	sub emit {
442	my ($self, $signal, @args) = @_;
443
444	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
445	}
446
447	sub DESTROY {	559	sub DESTROY {
448	my ($self) = @_;	560	my ($self) = @_;
449		561
		562	delete $WIDGET{$self+0};
450	#$self->deactivate;	563	#$self->deactivate;
451	}	564	}
452		565
453	#############################################################################	566	#############################################################################
454		567
…		…
463	my $class = shift;	576	my $class = shift;
464		577
465	# range [value, low, high, page]	578	# range [value, low, high, page]
466		579
467	$class->SUPER::new (	580	$class->SUPER::new (
468	bg => [0, 0, 0, 0.2],	581	#bg => [0, 0, 0, 0.2],
469	active_bg => [1, 1, 1, 0.5],	582	#active_bg => [1, 1, 1, 0.5],
470	@_	583	@_
471	)	584	)
472	}	585	}
473		586
474	sub _draw {	587	sub _draw {
475	my ($self) = @_;	588	my ($self) = @_;
476		589
		590	my $color = $FOCUS == $self && $self->{active_bg}
		591	? $self->{active_bg}
		592	: $self->{bg};
		593
		594	if ($color && (@$color < 4 || $color->[3])) {
477	my ($w, $h) = @$self{qw(w h)};	595	my ($w, $h) = @$self{qw(w h)};
478		596
479	glEnable GL_BLEND;	597	glEnable GL_BLEND;
480	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	598	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
481	glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };	599	glColor @$color;
482		600
483	glBegin GL_QUADS;	601	glBegin GL_QUADS;
484	glVertex 0 , 0;	602	glVertex 0 , 0;
485	glVertex 0 , $h;	603	glVertex 0 , $h;
486	glVertex $w, $h;	604	glVertex $w, $h;
487	glVertex $w, 0;	605	glVertex $w, 0;
488	glEnd;	606	glEnd;
489		607
490	glDisable GL_BLEND;	608	glDisable GL_BLEND;
		609	}
491	}	610	}
492		611
493	#############################################################################	612	#############################################################################
494		613
495	package CFClient::UI::Empty;	614	package CFClient::UI::Empty;
…		…
527		646
528	$self	647	$self
529	}	648	}
530		649
531	sub add {	650	sub add {
532	my ($self, $child) = @_;	651	my ($self, @widgets) = @_;
533		652
534	$child->set_parent ($self);	653	$_->set_parent ($self)
		654	for @widgets;
535		655
536	use sort 'stable';	656	use sort 'stable';
537		657
538	$self->{children} = [	658	$self->{children} = [
539	sort { $a->{z} <=> $b->{z} }	659	sort { $a->{z} <=> $b->{z} }
540	@{$self->{children}}, $child	660	@{$self->{children}}, @widgets
541	];	661	];
542		662
543	$child->check_size;	663	$self->realloc;
544	}	664	}
545		665
546	sub children {	666	sub children {
547	@{ $_[0]{children} }	667	@{ $_[0]{children} }
548	}	668	}
…		…
553	delete $child->{parent};	673	delete $child->{parent};
554	$child->hide;	674	$child->hide;
555		675
556	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	676	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
557		677
558	$self->check_size;	678	$self->realloc;
559	$self->update;
560	}	679	}
561		680
562	sub clear {	681	sub clear {
563	my ($self) = @_;	682	my ($self) = @_;
564		683
…		…
567		686
568	for (@$children) {	687	for (@$children) {
569	delete $_->{parent};	688	delete $_->{parent};
570	$_->hide;	689	$_->hide;
571	}	690	}
		691
		692	$self->realloc;
572	}	693	}
573		694
574	sub find_widget {	695	sub find_widget {
575	my ($self, $x, $y) = @_;	696	my ($self, $x, $y) = @_;
576		697
…		…
629	sub size_request {	750	sub size_request {
630	$_[0]{children}[0]->size_request	751	$_[0]{children}[0]->size_request
631	}	752	}
632		753
633	sub size_allocate {	754	sub size_allocate {
634	my ($self, $w, $h) = @_;	755	my ($self, $w, $h, $changed) = @_;
635		756
636	$self->{children}[0]->configure (0, 0, $w, $h);	757	$self->{children}[0]->configure (0, 0, $w, $h);
637	}	758	}
638		759
639	#############################################################################	760	#############################################################################
…		…
651	}	772	}
652		773
653	sub update {	774	sub update {
654	my ($self) = @_;	775	my ($self) = @_;
655		776
656	$ROOT->on_refresh ($self => sub { $self->render_child });	777	$ROOT->on_post_alloc ($self => sub { $self->render_child });
657	$self->SUPER::update;	778	$self->SUPER::update;
658	}	779	}
659		780
660	sub size_allocate {	781	sub size_allocate {
661	my ($self, $w, $h) = @_;	782	my ($self, $w, $h, $changed) = @_;
662		783
663	$self->SUPER::size_allocate ($w, $h);	784	$self->SUPER::size_allocate ($w, $h, $changed);
664	$self->update;	785	$self->update
		786	if $changed;
		787	}
		788
		789	sub _render {
		790	$_[0]{children}[0]->draw;
665	}	791	}
666		792
667	sub render_child {	793	sub render_child {
668	my ($self) = @_;	794	my ($self) = @_;
669		795
670	$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 {
671	glClearColor 0, 0, 0, 0;	797	glClearColor 0, 0, 0, 0;
672	glClear GL_COLOR_BUFFER_BIT;	798	glClear GL_COLOR_BUFFER_BIT;
673	$self->child->draw;	799
674	# glColorMask 1, 1, 1, 0;	800	$self->_render;
675	# glEnable GL_BLEND;
676	# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
677	# glRasterPos 0, 0;
678	# glCopyPixels 0, 0, $self->{w}, $self->{h};
679	# glDisable GL_BLEND;
680	# glColorMask 1, 1, 1, 1;
681	};	801	};
682	}	802	}
683		803
684	sub _draw {	804	sub _draw {
685	my ($self) = @_;	805	my ($self) = @_;
…		…
687	my ($w, $h) = ($self->w, $self->h);	807	my ($w, $h) = ($self->w, $self->h);
688		808
689	my $tex = $self->{texture}	809	my $tex = $self->{texture}
690	or return;	810	or return;
691		811
692	glEnable GL_BLEND;
693	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
694	glEnable GL_TEXTURE_2D;	812	glEnable GL_TEXTURE_2D;
695	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	813	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
696	glColor 0, 0, 0, 1;	814	glColor 1, 1, 1, 1;
697		815
698	$tex->draw_quad (0, 0, $w, $h);	816	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
699		817
700	glDisable GL_BLEND;
701	glDisable GL_TEXTURE_2D;	818	glDisable GL_TEXTURE_2D;
702	}	819	}
703		820
704	#############################################################################	821	#############################################################################
705		822
706	package CFClient::UI::ViewPort;	823	package CFClient::UI::ViewPort;
707		824
708	our @ISA = CFClient::UI::Window::;	825	our @ISA = CFClient::UI::Window::;
709
710	sub new { die }
711
712	sub size_request {
713	my ($self) = @_;
714
715	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
716	$self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
717
718	@$self{qw(child_w child_h)}
719	}
720
721	sub _draw {
722	my ($self) = @_;
723
724	$self->{children}[1]->draw;
725	}
726
727
728	#############################################################################
729
730	package CFClient::UI::Frame;
731
732	our @ISA = CFClient::UI::Bin::;
733
734	use CFClient::OpenGL;
735		826
736	sub new {	827	sub new {
737	my $class = shift;	828	my $class = shift;
738		829
739	my $self = $class->SUPER::new (	830	$class->SUPER::new (
740	bg => [1, 1, 1, 1],	831	scroll_x => 0,
741	border_bg => [1, 1, 1, 1],	832	scroll_y => 1,
742	border => 0.8,
743	@_	833	@_,
744	);	834	)
745
746	$self
747	}	835	}
748		836
749	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 {
750	my ($self) = @_;	859	my ($self, $x, $y) = @_;
751		860
752	my ($w, $h) = ($self->{w}, $self->{h});	861	$self->{view_x} = int $x;
		862	$self->{view_y} = int $y;
753		863
754	glEnable GL_BLEND;	864	$self->update;
755	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
756	glEnable GL_TEXTURE_2D;
757	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
758
759	# glBegin GL_QUADS;
760	# glColor 0, 0, 0, 0;
761	# glVertex 0 , 0;
762	# glVertex 0 , $h;
763	# glVertex $w, $h;
764	# glVertex $w, 0;
765	# glEnd;
766
767
768	$self->child->draw;
769	glDisable GL_BLEND;
770	glDisable GL_TEXTURE_2D;
771	}	865	}
772		866
773	#############################################################################	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) = @_;
774		870
775	package CFClient::UI::FancyFrame;	871	$self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
		872	}
776		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
777	our @ISA = CFClient::UI::Bin::;	907	our @ISA = CFClient::UI::HBox::;
778
779	use CFClient::OpenGL;
780
781	my @tex =
782	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
783	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
784		908
785	sub new {	909	sub new {
786	my $class = shift;	910	my $class = shift;
787		911
788	# 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;
789		1015
790	my $self = $class->SUPER::new (	1016	my $self = $class->SUPER::new (
791	bg => [1, 1, 1, 1],	1017	bg => [1, 1, 1, 1],
792	border_bg => [1, 1, 1, 1],	1018	border_bg => [1, 1, 1, 1],
793	border => 0.6,	1019	border => 0.6,
		1020	is_toplevel => 1,
794	can_events => 1,	1021	can_events => 1,
795	@_	1022	@_
796	);	1023	);
797		1024
798	$self->{title} &&= new CFClient::UI::Label	1025	$self->{title} &&= new CFClient::UI::Label
799	align => 0,	1026	align => 0,
…		…
818	$h + $self->border * 2,	1045	$h + $self->border * 2,
819	)	1046	)
820	}	1047	}
821		1048
822	sub size_allocate {	1049	sub size_allocate {
823	my ($self, $w, $h) = @_;	1050	my ($self, $w, $h, $changed) = @_;
		1051
		1052	return unless $changed;
824		1053
825	$h -= List::Util::max 0, $self->border * 2;	1054	$h -= List::Util::max 0, $self->border * 2;
826	$w -= List::Util::max 0, $self->border * 2;	1055	$w -= List::Util::max 0, $self->border * 2;
827		1056
828	$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)
829	if $self->{title};	1058	if $self->{title};
830		1059
831	$self->child->configure ($self->border, $self->border, $w, $h);	1060	$self->child->configure ($self->border, $self->border, $w, $h);
832	}	1061	}
833		1062
…		…
852	my ($ev, $x, $y) = @_;	1081	my ($ev, $x, $y) = @_;
853		1082
854	my $dx = $ev->{x} - $ox;	1083	my $dx = $ev->{x} - $ox;
855	my $dy = $ev->{y} - $oy;	1084	my $dy = $ev->{y} - $oy;
856		1085
		1086	$self->{user_x} = $wx + $dx * $mx;
		1087	$self->{user_y} = $wy + $dy * $my;
857	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1088	$self->{def_w} = $bw + $dx * ($mx ? -1 : 1);
858	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1089	$self->{def_h} = $bh + $dy * ($my ? -1 : 1);
859	$self->move ($wx + $dx * $mx, $wy + $dy * $my);	1090	$self->move ($self->{user_x}, $self->{user_y});
860	$self->check_size;	1091	$self->realloc;
861	};	1092	};
862		1093
863	} elsif ($lr ^ $td) {	1094	} elsif ($lr ^ $td) {
864	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1095	my ($ox, $oy) = ($ev->{x}, $ev->{y});
865	my ($bx, $by) = ($self->{x}, $self->{y});	1096	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
867	$self->{motion} = sub {	1098	$self->{motion} = sub {
868	my ($ev, $x, $y) = @_;	1099	my ($ev, $x, $y) = @_;
869		1100
870	($x, $y) = ($ev->{x}, $ev->{y});	1101	($x, $y) = ($ev->{x}, $ev->{y});
871		1102
872	$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});
873	$self->update;	1107	$self->realloc;
874	};	1108	};
875	}	1109	}
876	}	1110	}
877		1111
878	sub button_up {	1112	sub button_up {
…		…
891	my ($self) = @_;	1125	my ($self) = @_;
892		1126
893	my ($w, $h ) = ($self->{w}, $self->{h});	1127	my ($w, $h ) = ($self->{w}, $self->{h});
894	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1128	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
895		1129
896	glEnable GL_BLEND;
897	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
898	glEnable GL_TEXTURE_2D;	1130	glEnable GL_TEXTURE_2D;
899	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1131	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
900		1132
901	my $border = $self->border;	1133	my $border = $self->border;
902		1134
903	glColor @{ $self->{border_bg} };	1135	glColor @{ $self->{border_bg} };
904	$tex[1]->draw_quad (0, 0, $w, $border);	1136	$border[0]->draw_quad_alpha (0, 0, $w, $border);
905	$tex[3]->draw_quad (0, $border, $border, $ch);	1137	$border[1]->draw_quad_alpha (0, $border, $border, $ch);
906	$tex[2]->draw_quad ($w - $border, $border, $border, $ch);	1138	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
907	$tex[4]->draw_quad (0, $h - $border, $w, $border);	1139	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
908		1140
909	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1141	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
910	my $bg = $tex[0];	1142	glColor @{ $self->{bg} };
911		1143
912	# TODO: repeat texture not scale	1144	# TODO: repeat texture not scale
		1145	# solve this better(?)
913	my $rep_x = $cw / $bg->{w};	1146	$bg->{s} = $cw / $bg->{w};
914	my $rep_y = $ch / $bg->{h};	1147	$bg->{t} = $ch / $bg->{h};
915
916	glColor @{ $self->{bg} };
917
918	$bg->{s} = $rep_x;
919	$bg->{t} = $rep_y;
920	$bg->{wrap_mode} = 1;
921	$bg->draw_quad ($border, $border, $cw, $ch);	1148	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
		1149	}
922		1150
923	glDisable GL_TEXTURE_2D;	1151	glDisable GL_TEXTURE_2D;
924	glDisable GL_BLEND;
925	}
926		1152
927	$self->{title}->draw if $self->{title};	1153	$self->{title}->draw if $self->{title};
928		1154
929	$self->child->draw;	1155	$self->child->draw;
930	}	1156	}
…		…
942	sub new {	1168	sub new {
943	my $class = shift;	1169	my $class = shift;
944		1170
945	$class->SUPER::new (	1171	$class->SUPER::new (
946	col_expand => [],	1172	col_expand => [],
947	@_	1173	@_,
948	)	1174	)
		1175	}
		1176
		1177	sub children {
		1178	grep $_, map @$_, grep $_, @{ $_[0]{children} }
949	}	1179	}
950		1180
951	sub add {	1181	sub add {
952	my ($self, $x, $y, $child) = @_;	1182	my ($self, $x, $y, $child) = @_;
953		1183
954	$child->set_parent ($self);	1184	$child->set_parent ($self);
955	$self->{children}[$y][$x] = $child;	1185	$self->{children}[$y][$x] = $child;
956		1186
957	$child->check_size;	1187	$self->realloc;
958	}	1188	}
959		1189
960	sub children {
961	grep $_, map @$_, grep $_, @{ $_[0]{children} }
962	}
963
964	# 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?
965	sub clear {	1191	sub clear {
966	my ($self) = @_;	1192	my ($self) = @_;
967		1193
968	my @children = $self->children;	1194	my @children = $self->children;
969	delete $self->{children};	1195	delete $self->{children};
…		…
971	for (@children) {	1197	for (@children) {
972	delete $_->{parent};	1198	delete $_->{parent};
973	$_->hide;	1199	$_->hide;
974	}	1200	}
975		1201
976	$self->update;	1202	$self->realloc;
977	}	1203	}
978		1204
979	sub get_wh {	1205	sub get_wh {
980	my ($self) = @_;	1206	my ($self) = @_;
981		1207
…		…
1008	(sum @$hs),	1234	(sum @$hs),
1009	)	1235	)
1010	}	1236	}
1011		1237
1012	sub size_allocate {	1238	sub size_allocate {
1013	my ($self, $w, $h) = @_;	1239	my ($self, $w, $h, $changed) = @_;
1014		1240
1015	my ($ws, $hs) = $self->get_wh;	1241	my ($ws, $hs) = $self->get_wh;
1016		1242
1017	my $req_w = sum @$ws;	1243	my $req_w = (sum @$ws) || 1;
1018	my $req_h = sum @$hs;	1244	my $req_h = (sum @$hs) || 1;
1019		1245
1020	# TODO: nicer code && do row_expand	1246	# TODO: nicer code && do row_expand
1021	my @col_expand = @{$self->{col_expand}};	1247	my @col_expand = @{$self->{col_expand}};
1022	@col_expand = (1) x @$ws unless @col_expand;	1248	@col_expand = (1) x @$ws unless @col_expand;
1023	my $col_expand = (sum @col_expand) || 1;	1249	my $col_expand = (sum @col_expand) || 1;
…		…
1077	}	1303	}
1078	}	1304	}
1079		1305
1080	#############################################################################	1306	#############################################################################
1081		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
1082	package CFClient::UI::HBox;	1368	package CFClient::UI::HBox;
1083		1369
1084	# TODO: wrap into common Box base class
1085
1086	our @ISA = CFClient::UI::Container::;	1370	our @ISA = CFClient::UI::Box::;
1087		1371
1088	sub size_request {	1372	sub new {
1089	my ($self) = @_;	1373	my $class = shift;
1090		1374
1091	my @alloc = map [$_->size_request], @{$self->{children}};	1375	$class->SUPER::new (
1092		1376	vertical => 0,
1093	(	1377	@_,
1094	(List::Util::sum map $_->[0], @alloc),
1095	(List::Util::max map $_->[1], @alloc),
1096	)	1378	)
1097	}	1379	}
1098		1380
1099	sub size_allocate {
1100	my ($self, $w, $h) = @_;
1101
1102	($h, $w) = ($w, $h);
1103
1104	my $children = $self->{children};
1105
1106	my @h = map $_->{req_w}, @$children;
1107
1108	my $req_h = List::Util::sum @h;
1109
1110	if ($req_h > $h) {
1111	# ah well, not enough space
1112	$_ *= $h / $req_h for @h;
1113	} else {
1114	my $exp = List::Util::sum map $_->{expand}, @$children;
1115	$exp ||= 1;
1116
1117	for (0 .. $#$children) {
1118	my $child = $children->[$_];
1119
1120	my $alloc_h = $h[$_];
1121	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1122	$h[$_] = $alloc_h;
1123	}
1124	}
1125
1126	CFClient::UI::harmonize \@h;
1127
1128	my $y = 0;
1129	for (0 .. $#$children) {
1130	my $child = $children->[$_];
1131	my $h = $h[$_];
1132	$child->configure ($y, 0, $h, $w);
1133
1134	$y += $h;
1135	}
1136
1137	1
1138	}
1139
1140	#############################################################################	1381	#############################################################################
1141		1382
1142	package CFClient::UI::VBox;	1383	package CFClient::UI::VBox;
1143		1384
1144	# TODO: wrap into common Box base class
1145
1146	our @ISA = CFClient::UI::Container::;	1385	our @ISA = CFClient::UI::Box::;
1147		1386
1148	sub size_request {	1387	sub new {
1149	my ($self) = @_;	1388	my $class = shift;
1150		1389
1151	my @alloc = map [$_->size_request], @{$self->{children}};	1390	$class->SUPER::new (
1152		1391	vertical => 1,
1153	(	1392	@_,
1154	(List::Util::max map $_->[0], @alloc),
1155	(List::Util::sum map $_->[1], @alloc),
1156	)	1393	)
1157	}	1394	}
1158		1395
1159	sub size_allocate {
1160	my ($self, $w, $h) = @_;
1161
1162	my $children = $self->{children};
1163
1164	my @h = map $_->{req_h}, @$children;
1165
1166	my $req_h = List::Util::sum @h;
1167
1168	if ($req_h > $h) {
1169	# ah well, not enough space
1170	$_ *= $h / $req_h for @h;
1171	} else {
1172	my $exp = List::Util::sum map $_->{expand}, @$children;
1173	$exp ||= 1;
1174
1175	for (0 .. $#$children) {
1176	my $child = $children->[$_];
1177
1178	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1179	}
1180	}
1181
1182	CFClient::UI::harmonize \@h;
1183
1184	my $y = 0;
1185	for (0 .. $#$children) {
1186	my $child = $children->[$_];
1187	my $h = $h[$_];
1188	$child->configure (0, $y, $w, $h);
1189
1190	$y += $h;
1191	}
1192
1193	1
1194	}
1195
1196	#############################################################################	1396	#############################################################################
1197		1397
1198	package CFClient::UI::Label;	1398	package CFClient::UI::Label;
1199		1399
1200	our @ISA = CFClient::UI::Base::;	1400	our @ISA = CFClient::UI::DrawBG::;
1201		1401
1202	use CFClient::OpenGL;	1402	use CFClient::OpenGL;
1203		1403
1204	sub new {	1404	sub new {
1205	my ($class, %arg) = @_;	1405	my ($class, %arg) = @_;
1206		1406
1207	my $self = $class->SUPER::new (	1407	my $self = $class->SUPER::new (
1208	fg => [1, 1, 1],	1408	fg => [1, 1, 1],
		1409	#bg => none
		1410	#active_bg => none
1209	#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),
1210	fontsize => 1,	1417	fontsize => 1,
1211	text => "",
1212	align => -1,	1418	align => -1,
1213	valign => -1,	1419	valign => -1,
1214	padding => 2,	1420	padding => 2,
1215	layout => new CFClient::Layout,
1216	can_events => 0,	1421	can_events => 0,
1217	%arg	1422	%arg
1218	);	1423	);
1219		1424
1220	if (exists $self->{template}) {	1425	if (exists $self->{template}) {
1221	my $layout = new CFClient::Layout;	1426	my $layout = new CFClient::Layout;
1222	$layout->set_text (delete $self->{template});	1427	$layout->set_text (delete $self->{template});
1223	$self->{template} = $layout;	1428	$self->{template} = $layout;
1224	}	1429	}
1225		1430
1226	$self->set_text (delete $self->{text}) if exists $self->{text};	1431	if (exists $self->{markup}) {
1227	$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	}
1228		1436
1229	$self	1437	$self
1230	}	1438	}
1231		1439
1232	sub escape {	1440	sub escape($) {
1233	local $_ = $_[1];	1441	local $_ = $_[0];
1234		1442
1235	s/&/&amp;/g;	1443	s/&/&amp;/g;
1236	s/>/&gt;/g;	1444	s/>/&gt;/g;
1237	s/</&lt;/g;	1445	s/</&lt;/g;
1238		1446
1239	$_[1]	1447	$_
1240	}	1448	}
1241		1449
1242	sub update {	1450	sub update {
1243	my ($self) = @_;	1451	my ($self) = @_;
1244		1452
1245	delete $self->{texture};	1453	delete $self->{texture};
1246	$self->SUPER::update;	1454	$self->SUPER::update;
1247	}	1455	}
1248		1456
1249	sub reconfigure {
1250	my ($self) = @_;
1251
1252	delete $self->{texture};
1253	}
1254
1255	sub set_text {	1457	sub set_text {
1256	my ($self, $text) = @_;	1458	my ($self, $text) = @_;
1257		1459
1258	return if $self->{text} eq "T$text";	1460	return if $self->{text} eq "T$text";
1259	$self->{text} = "T$text";	1461	$self->{text} = "T$text";
1260		1462
		1463	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1261	$self->{layout}->set_text ($text);	1464	$self->{layout}->set_text ($text);
1262		1465
1263	delete $self->{texture};	1466	$self->realloc;
1264	$self->update;	1467	$self->update;
1265	$self->check_size;
1266	}	1468	}
1267		1469
1268	sub set_markup {	1470	sub set_markup {
1269	my ($self, $markup) = @_;	1471	my ($self, $markup) = @_;
1270		1472
1271	return if $self->{text} eq "M$markup";	1473	return if $self->{text} eq "M$markup";
1272	$self->{text} = "M$markup";	1474	$self->{text} = "M$markup";
1273		1475
		1476	my $rgba = $markup =~ /span.*(?:foreground|background)/;
		1477
		1478	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1274	$self->{layout}->set_markup ($markup);	1479	$self->{layout}->set_markup ($markup);
1275		1480
1276	delete $self->{texture};	1481	$self->realloc;
1277	$self->update;	1482	$self->update;
1278	$self->check_size;
1279	}	1483	}
1280		1484
1281	sub size_request {	1485	sub size_request {
1282	my ($self) = @_;	1486	my ($self) = @_;
1283		1487
1284	$self->{layout}->set_font ($self->{font}) if $self->{font};	1488	$self->{layout}->set_font ($self->{font}) if $self->{font};
1285	$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});
1286	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1492	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1287		1493
1288	my ($w, $h) = $self->{layout}->size;	1494	my ($w, $h) = $self->{layout}->size;
1289		1495
1290	if (exists $self->{template}) {	1496	if (exists $self->{template}) {
…		…
1302	$h + $self->{padding} * 2,	1508	$h + $self->{padding} * 2,
1303	)	1509	)
1304	}	1510	}
1305		1511
1306	sub size_allocate {	1512	sub size_allocate {
1307	my ($self, $w, $h) = @_;	1513	my ($self, $w, $h, $changed) = @_;
1308		1514
1309	delete $self->{texture};	1515	delete $self->{texture}
		1516	if $changed;
1310	}	1517	}
1311		1518
1312	sub set_fontsize {	1519	sub set_fontsize {
1313	my ($self, $fontsize) = @_;	1520	my ($self, $fontsize) = @_;
1314		1521
1315	$self->{fontsize} = $fontsize;	1522	$self->{fontsize} = $fontsize;
1316	delete $self->{texture};	1523	delete $self->{texture};
1317	$self->check_size;	1524
1318	$self->update;	1525	$self->realloc;
1319	}	1526	}
1320		1527
1321	sub _draw {	1528	sub _draw {
1322	my ($self) = @_;	1529	my ($self) = @_;
1323		1530
		1531	$self->SUPER::_draw; # draw background, if applicable
		1532
1324	my $tex = $self->{texture} ||= do {	1533	my $tex = $self->{texture} ||= do {
		1534	$self->{layout}->set_foreground (@{$self->{fg}});
1325	$self->{layout}->set_font ($self->{font}) if $self->{font};	1535	$self->{layout}->set_font ($self->{font}) if $self->{font};
1326	$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});
1327	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);	1539	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
		1540
1328	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
1329	};	1552	};
1330		1553
1331	glEnable GL_BLEND;
1332	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1333	glEnable GL_TEXTURE_2D;	1554	glEnable GL_TEXTURE_2D;
1334	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1555	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1335		1556
		1557	if ($tex->{format} == GL_ALPHA) {
1336	glColor @{$self->{fg}};	1558	glColor @{$self->{fg}};
1337
1338	$self->{ox} = int (
1339	$self->{align} < 0 ? $self->{padding}
1340	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1341	: ($self->{w} - $tex->{w}) * 0.5
1342	);
1343
1344	$self->{oy} = int (
1345	$self->{valign} < 0 ? $self->{padding}
1346	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1347	: ($self->{h} - $tex->{h}) * 0.5
1348	);
1349
1350	$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	}
1351		1563
1352	glDisable GL_TEXTURE_2D;	1564	glDisable GL_TEXTURE_2D;
1353	glDisable GL_BLEND;
1354	}	1565	}
1355		1566
1356	#############################################################################	1567	#############################################################################
1357		1568
1358	package CFClient::UI::EntryBase;	1569	package CFClient::UI::EntryBase;
…		…
1371	active_fg => [0, 0, 0],	1582	active_fg => [0, 0, 0],
1372	can_hover => 1,	1583	can_hover => 1,
1373	can_focus => 1,	1584	can_focus => 1,
1374	valign => 0,	1585	valign => 0,
1375	can_events => 1,	1586	can_events => 1,
		1587	#text => ...
1376	@_	1588	@_
1377	)	1589	)
1378	}	1590	}
1379		1591
1380	sub _set_text {	1592	sub _set_text {
…		…
1390	$self->{text} = $text;	1602	$self->{text} = $text;
1391		1603
1392	$text =~ s/./*/g if $self->{hidden};	1604	$text =~ s/./*/g if $self->{hidden};
1393	$self->{layout}->set_text ("$text ");	1605	$self->{layout}->set_text ("$text ");
1394		1606
1395	$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;
1396	}	1617	}
1397		1618
1398	sub get_text {	1619	sub get_text {
1399	$_[0]{text}	1620	$_[0]{text}
1400	}	1621	}
…		…
1403	my ($self) = @_;	1624	my ($self) = @_;
1404		1625
1405	my ($w, $h) = $self->SUPER::size_request;	1626	my ($w, $h) = $self->SUPER::size_request;
1406		1627
1407	($w + 1, $h) # add 1 for cursor	1628	($w + 1, $h) # add 1 for cursor
1408	}
1409
1410	sub size_allocate {
1411	my ($self, $w, $h) = @_;
1412
1413	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1414	}
1415
1416	sub set_text {
1417	my ($self, $text) = @_;
1418
1419	$self->{cursor} = length $text;
1420	$self->_set_text ($text);
1421	$self->update;
1422	}	1629	}
1423		1630
1424	sub key_down {	1631	sub key_down {
1425	my ($self, $ev) = @_;	1632	my ($self, $ev) = @_;
1426		1633
…		…
1428	my $sym = $ev->{sym};	1635	my $sym = $ev->{sym};
1429	my $uni = $ev->{unicode};	1636	my $uni = $ev->{unicode};
1430		1637
1431	my $text = $self->get_text;	1638	my $text = $self->get_text;
1432		1639
1433	if ($sym == 8) {	1640	if ($uni == 8) {
1434	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1641	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1435	} elsif ($sym == 127) {	1642	} elsif ($uni == 127) {
1436	substr $text, $self->{cursor}, 1, "";	1643	substr $text, $self->{cursor}, 1, "";
1437	} elsif ($sym == CFClient::SDLK_LEFT) {	1644	} elsif ($sym == CFClient::SDLK_LEFT) {
1438	--$self->{cursor} if $self->{cursor};	1645	--$self->{cursor} if $self->{cursor};
1439	} elsif ($sym == CFClient::SDLK_RIGHT) {	1646	} elsif ($sym == CFClient::SDLK_RIGHT) {
1440	++$self->{cursor} if $self->{cursor} < length $self->{text};	1647	++$self->{cursor} if $self->{cursor} < length $self->{text};
1441	} elsif ($sym == CFClient::SDLK_HOME) {	1648	} elsif ($sym == CFClient::SDLK_HOME) {
1442	$self->{cursor} = 0;	1649	$self->{cursor} = 0;
1443	} elsif ($sym == CFClient::SDLK_END) {	1650	} elsif ($sym == CFClient::SDLK_END) {
1444	$self->{cursor} = length $text;	1651	$self->{cursor} = length $text;
1445	} elsif ($sym == 27) {	1652	} elsif ($uni == 27) {
1446	$self->emit ('escape');	1653	$self->_emit ('escape');
1447	} elsif ($uni) {	1654	} elsif ($uni) {
1448	substr $text, $self->{cursor}++, 0, chr $uni;	1655	substr $text, $self->{cursor}++, 0, chr $uni;
1449	}	1656	}
1450		1657
1451	$self->_set_text ($text);	1658	$self->_set_text ($text);
1452	$self->update;	1659
		1660	$self->realloc;
1453	}	1661	}
1454		1662
1455	sub focus_in {	1663	sub focus_in {
1456	my ($self) = @_;	1664	my ($self) = @_;
1457		1665
…		…
1537	if ($sym == 13) {	1745	if ($sym == 13) {
1538	unshift @{$self->{history}},	1746	unshift @{$self->{history}},
1539	my $txt = $self->get_text;	1747	my $txt = $self->get_text;
1540	$self->{history_pointer} = -1;	1748	$self->{history_pointer} = -1;
1541	$self->{history_saveback} = '';	1749	$self->{history_saveback} = '';
1542	$self->emit (activate => $txt);	1750	$self->_emit (activate => $txt);
1543	$self->update;	1751	$self->update;
1544		1752
1545	} elsif ($sym == CFClient::SDLK_UP) {	1753	} elsif ($sym == CFClient::SDLK_UP) {
1546	if ($self->{history_pointer} < 0) {	1754	if ($self->{history_pointer} < 0) {
1547	$self->{history_saveback} = $self->get_text;	1755	$self->{history_saveback} = $self->get_text;
…		…
1586	my $class = shift;	1794	my $class = shift;
1587		1795
1588	$class->SUPER::new (	1796	$class->SUPER::new (
1589	padding => 4,	1797	padding => 4,
1590	fg => [1, 1, 1],	1798	fg => [1, 1, 1],
1591	bg => [1, 1, 1, 0.2],
1592	active_fg => [0, 0, 1],	1799	active_fg => [0, 0, 1],
1593	can_hover => 1,	1800	can_hover => 1,
1594	align => 0,	1801	align => 0,
1595	valign => 0,	1802	valign => 0,
1596	can_events => 1,	1803	can_events => 1,
1597	@_	1804	@_
1598	)	1805	)
1599	}	1806	}
1600		1807
		1808	sub activate { }
		1809
1601	sub button_up {	1810	sub button_up {
1602	my ($self, $ev, $x, $y) = @_;	1811	my ($self, $ev, $x, $y) = @_;
1603		1812
		1813	$self->emit ("activate")
1604	if ($x >= 0 && $x < $self->{w}	1814	if $x >= 0 && $x < $self->{w}
1605	&& $y >= 0 && $y < $self->{h}) {	1815	&& $y >= 0 && $y < $self->{h};
1606	$self->emit ("activate");
1607	}
1608	}	1816	}
1609		1817
1610	sub _draw {	1818	sub _draw {
1611	my ($self) = @_;	1819	my ($self) = @_;
1612		1820
…		…
1614		1822
1615	if ($GRAB == $self) {	1823	if ($GRAB == $self) {
1616	$self->{fg} = $self->{active_fg};	1824	$self->{fg} = $self->{active_fg};
1617	}	1825	}
1618		1826
1619	glEnable GL_BLEND;
1620	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1621	glEnable GL_TEXTURE_2D;	1827	glEnable GL_TEXTURE_2D;
1622	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1828	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1623	glColor 0, 0, 0, 1;	1829	glColor 0, 0, 0, 1;
1624		1830
1625	$tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});	1831	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1626		1832
1627	glDisable GL_TEXTURE_2D;	1833	glDisable GL_TEXTURE_2D;
1628	glDisable GL_BLEND;
1629		1834
1630	$self->SUPER::_draw;	1835	$self->SUPER::_draw;
1631	}	1836	}
1632		1837
1633	#############################################################################	1838	#############################################################################
…		…
1647		1852
1648	$class->SUPER::new (	1853	$class->SUPER::new (
1649	padding => 2,	1854	padding => 2,
1650	fg => [1, 1, 1],	1855	fg => [1, 1, 1],
1651	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],
1652	state => 0,	1859	state => 0,
1653	can_hover => 1,	1860	can_hover => 1,
1654	@_	1861	@_
1655	)	1862	)
1656	}	1863	}
…		…
1665	my ($self, $ev, $x, $y) = @_;	1872	my ($self, $ev, $x, $y) = @_;
1666		1873
1667	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1874	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1668	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1875	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1669	$self->{state} = !$self->{state};	1876	$self->{state} = !$self->{state};
1670	$self->emit (changed => $self->{state});	1877	$self->_emit (changed => $self->{state});
1671	}	1878	}
1672	}	1879	}
1673		1880
1674	sub _draw {	1881	sub _draw {
1675	my ($self) = @_;	1882	my ($self) = @_;
…		…
1680		1887
1681	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;
1682		1889
1683	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1890	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1684		1891
1685	glEnable GL_BLEND;	1892	my $tex = $self->{state} ? $tex[1] : $tex[0];
		1893
1686	glEnable GL_TEXTURE_2D;	1894	glEnable GL_TEXTURE_2D;
1687	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1688
1689	my $tex = $self->{state} ? $tex[1] : $tex[0];
1690
1691	$tex->draw_quad (0, 0, $s, $s);	1895	$tex->draw_quad_alpha (0, 0, $s, $s);
1692
1693	glDisable GL_TEXTURE_2D;	1896	glDisable GL_TEXTURE_2D;
1694	glDisable GL_BLEND;
1695	}	1897	}
1696		1898
1697	#############################################################################	1899	#############################################################################
1698		1900
1699	package CFClient::UI::Image;	1901	package CFClient::UI::Image;
…		…
1742	glTranslate 0, -$self->{w}, 0;	1944	glTranslate 0, -$self->{w}, 0;
1743		1945
1744	($w, $h) = ($h, $w);	1946	($w, $h) = ($h, $w);
1745	}	1947	}
1746		1948
1747	glEnable GL_BLEND;
1748	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1749	glEnable GL_TEXTURE_2D;	1949	glEnable GL_TEXTURE_2D;
1750	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1950	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1751		1951
1752	$tex->draw_quad (0, 0, $w, $h);	1952	$tex->draw_quad_alpha (0, 0, $w, $h);
1753		1953
1754	glDisable GL_BLEND;
1755	glDisable GL_TEXTURE_2D;	1954	glDisable GL_TEXTURE_2D;
1756	}	1955	}
1757		1956
1758	#############################################################################	1957	#############################################################################
1759		1958
…		…
1948	qw(s1_slider.png s1_slider_bg.png);	2147	qw(s1_slider.png s1_slider_bg.png);
1949		2148
1950	sub new {	2149	sub new {
1951	my $class = shift;	2150	my $class = shift;
1952		2151
1953	# range [value, low, high, page]	2152	# range [value, low, high, page, unit]
1954		2153
1955	# TODO: 0-width page	2154	# TODO: 0-width page
1956	# TODO: req_w/h are wrong with vertical	2155	# TODO: req_w/h are wrong with vertical
1957	# TODO: calculations are off	2156	# TODO: calculations are off
1958	my $self = $class->SUPER::new (	2157	my $self = $class->SUPER::new (
1959	fg => [1, 1, 1],	2158	fg => [1, 1, 1],
1960	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],
1961	range => [0, 0, 100, 10],	2162	range => [0, 0, 100, 10, 0],
1962	req_w => 20,	2163	req_w => $::WIDTH / 80,
1963	req_h => 20,	2164	req_h => $::WIDTH / 80,
1964	vertical => 0,	2165	vertical => 0,
1965	can_hover => 1,	2166	can_hover => 1,
1966	inner_pad => 5,	2167	inner_pad => 0.02,
1967	@_	2168	@_
1968	);	2169	);
1969		2170
		2171	$self->set_value ($self->{range}[0]);
		2172	$self->update;
		2173
1970	$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	}
1971	}	2209	}
1972		2210
1973	sub size_request {	2211	sub size_request {
1974	my ($self) = @_;	2212	my ($self) = @_;
1975		2213
…		…
1981		2219
1982	sub button_down {	2220	sub button_down {
1983	my ($self, $ev, $x, $y) = @_;	2221	my ($self, $ev, $x, $y) = @_;
1984		2222
1985	$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
1986	$self->mouse_motion ($ev, $x, $y);	2227	$self->mouse_motion ($ev, $x, $y);
1987	}	2228	}
1988		2229
1989	sub mouse_motion {	2230	sub mouse_motion {
1990	my ($self, $ev, $x, $y) = @_;	2231	my ($self, $ev, $x, $y) = @_;
1991		2232
1992	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
1993	my ($value, $lo, $hi, $page) = @{$self->{range}};	2250	my ($value, $lo, $hi, $page) = @{$self->{range}};
		2251	my $range = ($hi - $page - $lo) || 1e-100;
1994		2252
1995	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2253	my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1996		2254
1997	my $inner_pad_px = $self->_calc_inner_pad_px ($w);	2255	$self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
1998	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right	2256	$self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1999		2257
2000	$x -= $inner_pad_px; # substract the padding	2258	$value = ($value - $lo) / $range;
2001	$x = $x * ($hi - $lo) / $inner_w + $lo;	2259	$value = $value * $self->{scale} + $self->{offset};
2002	$x = $lo if $x < $lo;
2003	$x = $hi - $page if $x > $hi - $page;
2004	$self->{range}[0] = $x;
2005		2260
2006	$self->emit (changed => $x);	2261	$self->{knob_x} = $value - $knob_w * 0.5;
2007	$self->update;	2262	$self->{knob_w} = $knob_w;
2008	}	2263	});
2009	}
2010		2264
2011	# the inner_* stuff is for generating a padding for the slider handle,	2265	$self->SUPER::update;
2012	# so that the handle doesn't leave the texture. This calculation isn't 100%
2013	# correct propably, but it does the job for now
2014	sub _calc_inner_pad_px {
2015	my ($self, $w) = @_;
2016	($w / 100) * $self->{inner_pad} # % to pixels
2017	}	2266	}
2018		2267
2019	sub _draw {	2268	sub _draw {
2020	my ($self) = @_;	2269	my ($self) = @_;
2021		2270
2022	$self->SUPER::_draw ();	2271	$self->SUPER::_draw ();
2023		2272
2024	my ($w, $h) = @$self{qw(w h)};	2273	glScale $self->{w}, $self->{h};
2025		2274
2026	if ($self->{vertical}) {	2275	if ($self->{vertical}) {
2027	# draw a vertical slider like a rotated horizontal slider	2276	# draw a vertical slider like a rotated horizontal slider
2028		2277
		2278	glTranslate 1, 0, 0;
2029	glRotate 90, 0, 0, 1;	2279	glRotate 90, 0, 0, 1;
2030	glTranslate 0, -$self->{w}, 0;
2031
2032	($w, $h) = ($h, $w);
2033	}	2280	}
2034		2281
2035	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	2282	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2036	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	2283	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2037		2284
2038	my ($value, $lo, $hi, $page) = @{$self->{range}};
2039
2040	$hi = $value + 1 if $lo == $hi;
2041
2042	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2043	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2044
2045	$page = int $page * $inner_w / ($hi - $lo);
2046	$value = int +($value - $lo) * $inner_w / ($hi - $lo);
2047
2048	$w -= $page;
2049	$page &= ~1;
2050	glTranslate $page * 0.5, 0, 0;
2051	$page ||= 2;
2052
2053	my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2054	my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2055
2056	glEnable GL_BLEND;
2057	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2058	glEnable GL_TEXTURE_2D;	2285	glEnable GL_TEXTURE_2D;
2059	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2286	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2060		2287
2061	# draw background	2288	# draw background
2062	$tex[1]->draw_quad (0, 0, $w, $h);	2289	$tex[1]->draw_quad_alpha (0, 0, 1, 1);
2063		2290
2064	# draw handle	2291	# draw handle
2065	$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);
2066		2293
2067	glDisable GL_BLEND;
2068	glDisable GL_TEXTURE_2D;	2294	glDisable GL_TEXTURE_2D;
2069	}	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 (@_) }
2070		2337
2071	#############################################################################	2338	#############################################################################
2072		2339
2073	package CFClient::UI::TextView;	2340	package CFClient::UI::TextView;
2074		2341
…		…
2083	fontsize => 1,	2350	fontsize => 1,
2084	can_events => 0,	2351	can_events => 0,
2085	#font => default_font	2352	#font => default_font
2086	@_,	2353	@_,
2087		2354
2088	layout => (new CFClient::Layout),	2355	layout => (new CFClient::Layout 1),
2089	par => [],	2356	par => [],
2090	height => 0,	2357	height => 0,
2091	children => [	2358	children => [
2092	(new CFClient::UI::Empty expand => 1),	2359	(new CFClient::UI::Empty expand => 1),
2093	(new CFClient::UI::Slider vertical => 1),	2360	(new CFClient::UI::Slider vertical => 1),
…		…
2104		2371
2105	$self->{fontsize} = $fontsize;	2372	$self->{fontsize} = $fontsize;
2106	$self->reflow;	2373	$self->reflow;
2107	}	2374	}
2108		2375
2109	sub text_height {
2110	my ($self, $text) = @_;
2111
2112	my $layout = $self->{layout};
2113
2114	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2115	$layout->set_width ($self->{children}[0]{w});
2116	$layout->set_text ($text);
2117
2118	($layout->size)[1]
2119	}
2120
2121	sub reflow {
2122	my ($self) = @_;
2123
2124	$self->{need_reflow}++;
2125	$self->update;
2126	}
2127
2128	sub size_allocate {	2376	sub size_allocate {
2129	my ($self, $w, $h) = @_;	2377	my ($self, $w, $h, $changed) = @_;
2130		2378
2131	$self->SUPER::size_allocate ($w, $h);	2379	$self->SUPER::size_allocate ($w, $h, $changed);
		2380
		2381	return unless $changed;
2132		2382
2133	$self->{layout}->set_font ($self->{font}) if $self->{font};	2383	$self->{layout}->set_font ($self->{font}) if $self->{font};
2134	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2384	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2135	$self->{layout}->set_width ($self->{children}[0]{w});	2385	$self->{layout}->set_width ($self->{children}[0]{w});
2136		2386
2137	$self->reflow;	2387	$self->reflow;
2138	}	2388	}
2139		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
2140	sub add_paragraph {	2424	sub add_paragraph {
2141	my ($self, $color, $text) = @_;	2425	my ($self, $color, $text, $indent) = @_;
2142		2426
2143	#TODO: intelligently "reformat" paragraph	2427	for my $line (split /\n/, $text) {
2144		2428	my ($w, $h) = $self->text_size ($line);
2145	my $height = $self->text_height ($text);
2146
2147	$self->{height} += $height;	2429	$self->{height} += $h;
		2430	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
		2431	}
2148		2432
2149	push @{$self->{par}}, [$height, $color, $text];
2150
2151	$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]);
2152	$self->{children}[1]->update;
2153	}	2434	}
2154		2435
2155	sub update {	2436	sub update {
2156	my ($self) = @_;	2437	my ($self) = @_;
2157		2438
…		…
2159		2440
2160	return unless $self->{h} > 0;	2441	return unless $self->{h} > 0;
2161		2442
2162	delete $self->{texture};	2443	delete $self->{texture};
2163		2444
2164	$ROOT->on_refresh ($self, sub {	2445	$ROOT->on_post_alloc ($self, sub {
		2446	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2447
2165	if (delete $self->{need_reflow}) {	2448	if (delete $self->{need_reflow}) {
2166	my $height = 0;	2449	my $height = 0;
2167		2450
2168	$height += $_->[0] = $self->text_height ($_->[2])	2451	my $layout = $self->{layout};
		2452
		2453	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2454
2169	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	}
2170		2466
2171	$self->{height} = $height;	2467	$self->{height} = $height;
2172		2468
2173	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2469	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2174		2470
2175	delete $self->{texture};	2471	delete $self->{texture};
2176	}	2472	}
2177		2473
2178	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {	2474	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2179	glClearColor 0, 0, 0, 0;	2475	glClearColor 0.5, 0.5, 0.5, 0;
2180	glClear GL_COLOR_BUFFER_BIT;	2476	glClear GL_COLOR_BUFFER_BIT;
2181		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
2182	glEnable GL_BLEND;	2489	glEnable GL_BLEND;
		2490	#TODO# not correct in windows where rgba is forced off
2183	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	2491	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2184	glEnable GL_TEXTURE_2D;
2185	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2186
2187	my $top = int $self->{children}[1]{range}[0];
2188
2189	my $y0 = $top;
2190	my $y1 = $top + $self->{h};
2191
2192	my $y = 0;
2193
2194	my $layout = $self->{layout};
2195
2196	$layout->set_font ($self->{font}) if $self->{font};
2197		2492
2198	for my $par (@{$self->{par}}) {	2493	for my $par (@{$self->{par}}) {
2199	my $h = $par->[0];	2494	my $h = $par->[1];
2200		2495
2201	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]);
2202	$layout->set_text ($par->[2]);	2499	$layout->set_markup ($par->[4]);
2203		2500
2204	glColor @{ $par->[1] };	2501	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2205	my ($W, $H) = $layout->size;	2502
2206	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;
2207	}	2505	}
2208		2506
2209	$y += $h;	2507	$y += $h;
2210	}	2508	}
2211		2509
2212	glDisable GL_TEXTURE_2D;
2213	glDisable GL_BLEND;	2510	glDisable GL_BLEND;
2214	};	2511	};
2215	});	2512	});
2216	}	2513	}
2217		2514
2218	sub _draw {	2515	sub _draw {
2219	my ($self) = @_;	2516	my ($self) = @_;
2220		2517
2221	glEnable GL_BLEND;
2222	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2223	glEnable GL_TEXTURE_2D;	2518	glEnable GL_TEXTURE_2D;
2224	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2519	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2225	glColor 1, 1, 1, 1;	2520	glColor 1, 1, 1, 1;
2226	$self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2521	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2227	glDisable GL_TEXTURE_2D;	2522	glDisable GL_TEXTURE_2D;
2228	glDisable GL_BLEND;
2229		2523
2230	$self->{children}[1]->draw;	2524	$self->{children}[1]->draw;
2231		2525
2232	}	2526	}
2233		2527
…		…
2281		2575
2282	sub new {	2576	sub new {
2283	my $class = shift;	2577	my $class = shift;
2284		2578
2285	my $self = $class->SUPER::new (	2579	my $self = $class->SUPER::new (
2286	state => 0,	2580	state => 0,
2287	connect_activate => \&toggle_flopper,	2581	on_activate => \&toggle_flopper,
2288	@_	2582	@_
2289	);	2583	);
2290		2584
2291	if ($self->{state}) {
2292	$self->{state} = 0;
2293	$self->toggle_flopper;
2294	}
2295
2296	$self	2585	$self
2297	}	2586	}
2298		2587
2299	sub toggle_flopper {	2588	sub toggle_flopper {
2300	my ($self) = @_;	2589	my ($self) = @_;
2301		2590
2302	# TODO: use animation	2591	$self->{other}->toggle_visibility;
2303	if ($self->{state} = !$self->{state}) {
2304	$CFClient::UI::ROOT->add ($self->{other});
2305	$self->{other}->move ($self->coord2global (0, $self->{h}));
2306	$self->emit ("open");
2307	} else {
2308	$CFClient::UI::ROOT->remove ($self->{other});
2309	$self->emit ("close");
2310	}
2311
2312	$self->emit (changed => $self->{state});
2313	}	2592	}
2314		2593
2315	#############################################################################	2594	#############################################################################
2316		2595
2317	package CFClient::UI::Tooltip;	2596	package CFClient::UI::Tooltip;
…		…
2327	@_,	2606	@_,
2328	can_events => 0,	2607	can_events => 0,
2329	)	2608	)
2330	}	2609	}
2331		2610
2332	sub set_markup {	2611	sub set_tooltip_from {
2333	my ($self, $text) = @_;	2612	my ($self, $widget) = @_;
2334		2613
2335	$self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];	2614	$self->add (new CFClient::UI::Label
2336	$self->{label}->set_markup ($text);	2615	markup => $widget->{tooltip},
2337	$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	);
2338	}	2622	}
2339		2623
2340	sub size_request {	2624	sub size_request {
2341	my ($self) = @_;	2625	my ($self) = @_;
2342		2626
2343	$self->child->set_max_size ($::WIDTH * 0.3);
2344
2345	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	2627	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2346		2628
2347	($w + 4, $h + 4)	2629	($w + 4, $h + 4)
2348	}	2630	}
2349		2631
2350	sub size_allocate {	2632	sub size_allocate {
2351	my ($self, $w, $h) = @_;	2633	my ($self, $w, $h, $changed) = @_;
2352		2634
		2635	return unless $changed;
		2636
2353	$self->SUPER::size_allocate ($w - 4, $h - 4);	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	});
2354	}	2656	}
2355		2657
2356	sub _draw {	2658	sub _draw {
2357	my ($self) = @_;	2659	my ($self) = @_;
2358		2660
2359	glPushMatrix;
2360	glTranslate 0.375, 0.375;	2661	glTranslate 0.375, 0.375;
2361		2662
2362	my ($w, $h) = @$self{qw(w h)};	2663	my ($w, $h) = @$self{qw(w h)};
2363		2664
2364	glColor 1, 0.8, 0.4;	2665	glColor 1, 0.8, 0.4;
…		…
2375	glVertex 0 , $h;	2676	glVertex 0 , $h;
2376	glVertex $w, $h;	2677	glVertex $w, $h;
2377	glVertex $w, 0;	2678	glVertex $w, 0;
2378	glEnd;	2679	glEnd;
2379		2680
2380	glPopMatrix;	2681	glTranslate 2 - 0.375, 2 - 0.375;
2381		2682
2382	glTranslate 2, 2;
2383	$self->SUPER::_draw;	2683	$self->SUPER::_draw;
2384	}	2684	}
2385		2685
2386	#############################################################################	2686	#############################################################################
2387		2687
…		…
2392	use CFClient::OpenGL;	2692	use CFClient::OpenGL;
2393		2693
2394	sub new {	2694	sub new {
2395	my $class = shift;	2695	my $class = shift;
2396		2696
2397	$class->SUPER::new (	2697	my $self = $class->SUPER::new (
2398	aspect => 1,	2698	aspect => 1,
		2699	can_events => 0,
2399	@_,	2700	@_,
2400	)	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
2401	}	2718	}
2402		2719
2403	sub size_request {	2720	sub size_request {
2404	(32, 8)	2721	(32, 8)
2405	}	2722	}
2406		2723
		2724	sub update {
		2725	my ($self) = @_;
		2726
		2727	return unless $self->{visible};
		2728
		2729	$self->SUPER::update;
		2730	}
		2731
2407	sub _draw {	2732	sub _draw {
2408	my ($self) = @_;	2733	my ($self) = @_;
2409		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
2410	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];	2746	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2411		2747
2412	# TODO animation
2413	if ($tex) {	2748	if ($tex) {
2414	glEnable GL_BLEND;
2415	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2416	glEnable GL_TEXTURE_2D;	2749	glEnable GL_TEXTURE_2D;
2417	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2750	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2418	glColor 1, 1, 1, 1;	2751	glColor 1, 1, 1, 1;
2419	$tex->draw_quad (0, 0, $self->{w}, $self->{h});	2752	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2420	glDisable GL_TEXTURE_2D;	2753	glDisable GL_TEXTURE_2D;
2421	glDisable GL_BLEND;	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++;
2422	}	2805	}
2423	}	2806	}
2424		2807
2425	#############################################################################	2808	#############################################################################
2426		2809
…		…
2462		2845
2463	# popup given the event (must be a mouse button down event currently)	2846	# popup given the event (must be a mouse button down event currently)
2464	sub popup {	2847	sub popup {
2465	my ($self, $ev) = @_;	2848	my ($self, $ev) = @_;
2466		2849
2467	$self->emit ("popdown");	2850	$self->_emit ("popdown");
2468		2851
2469	# maybe save $GRAB? must be careful about events...	2852	# maybe save $GRAB? must be careful about events...
2470	$GRAB = $self;	2853	$GRAB = $self;
2471	$self->{button} = $ev->{button};	2854	$self->{button} = $ev->{button};
2472		2855
…		…
2475	}	2858	}
2476		2859
2477	sub mouse_motion {	2860	sub mouse_motion {
2478	my ($self, $ev, $x, $y) = @_;	2861	my ($self, $ev, $x, $y) = @_;
2479		2862
2480	# TODO: should use vbox->fdind_widget or so	2863	# TODO: should use vbox->find_widget or so
2481	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	2864	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2482	$self->{hover} = $self->{item}{$HOVER};	2865	$self->{hover} = $self->{item}{$HOVER};
2483	}	2866	}
2484		2867
2485	sub button_up {	2868	sub button_up {
…		…
2487		2870
2488	if ($ev->{button} == $self->{button}) {	2871	if ($ev->{button} == $self->{button}) {
2489	undef $GRAB;	2872	undef $GRAB;
2490	$self->hide;	2873	$self->hide;
2491		2874
2492	$self->emit ("popdown");	2875	$self->_emit ("popdown");
2493	$self->{hover}[1]->() if $self->{hover};	2876	$self->{hover}[1]->() if $self->{hover};
2494	}	2877	}
2495	}	2878	}
2496		2879
2497	#############################################################################	2880	#############################################################################
2498		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
2499	package CFClient::UI::Root;	2992	package CFClient::UI::Root;
2500		2993
2501	our @ISA = CFClient::UI::Container::;	2994	our @ISA = CFClient::UI::Container::;
2502		2995
2503	use CFClient::OpenGL;	2996	use CFClient::OpenGL;
2504		2997
2505	sub check_size {	2998	sub new {
2506	my ($self) = @_;	2999	my $class = shift;
2507		3000
2508	$self->configure (0, 0, $::WIDTH, $::HEIGHT);	3001	my $self = $class->SUPER::new (
2509	}	3002	visible => 1,
		3003	@_,
		3004	);
2510		3005
2511	sub size_request {	3006	Scalar::Util::weaken ($self->{root} = $self);
2512	($::WIDTH, $::HEIGHT)	3007
		3008	$self
2513	}	3009	}
2514		3010
2515	sub configure {	3011	sub configure {
2516	my ($self, $x, $y, $w, $h) = @_;	3012	my ($self, $x, $y, $w, $h) = @_;
2517		3013
2518	$self->SUPER::configure ($x, $y, $w, $h);	3014	$self->{w} = $w;
		3015	$self->{h} = $h;
		3016	}
2519		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
2520	for my $child (@{$self->{children}}) {	3036	for my $child ($self->children) {
2521	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)};
2522		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
2523	$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;
2524	$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
2525	$child->configure ($X, $Y, $W,$H);	3050	$child->configure ($X, $Y, $W, $H);
2526	}	3051	}
2527	}	3052	}
2528		3053
2529	sub _topleft {	3054	sub coord2local {
2530	my ($self, $x, $y) = @_;	3055	my ($self, $x, $y) = @_;
2531		3056
2532	($x, $y)	3057	($x, $y)
2533	}	3058	}
2534		3059
		3060	sub coord2global {
		3061	my ($self, $x, $y) = @_;
		3062
		3063	($x, $y)
		3064	}
		3065
2535	sub update {	3066	sub update {
2536	my ($self) = @_;	3067	my ($self) = @_;
2537		3068
2538	$self->check_size;	3069	$::WANT_REFRESH++;
2539	::refresh ();
2540	}	3070	}
2541		3071
2542	sub add {	3072	sub add {
2543	my ($self, $child) = @_;	3073	my ($self, @children) = @_;
2544		3074
		3075	for my $child (@children) {
		3076	$child->{is_toplevel} = 1;
		3077
2545	# integerize window positions	3078	# integerise window positions
2546	$child->{x} = int $child->{x};	3079	$child->{x} = int $child->{x};
2547	$child->{y} = int $child->{y};	3080	$child->{y} = int $child->{y};
		3081	}
2548		3082
2549	$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	}
2550	}	3096	}
2551		3097
2552	sub on_refresh {	3098	sub on_refresh {
2553	my ($self, $id, $cb) = @_;	3099	my ($self, $id, $cb) = @_;
2554		3100
2555	$self->{refresh_hook}{$id} = $cb;	3101	$self->{refresh_hook}{$id} = $cb;
2556	}	3102	}
2557		3103
		3104	sub on_post_alloc {
		3105	my ($self, $id, $cb) = @_;
		3106
		3107	$self->{post_alloc_hook}{$id} = $cb;
		3108	}
		3109
2558	sub draw {	3110	sub draw {
2559	my ($self) = @_;	3111	my ($self) = @_;
2560		3112
2561	while (my $rcb = delete $self->{refresh_hook}) {	3113	while ($self->{refresh_hook}) {
2562	$_->() 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}};
2563	}	3171	}
2564		3172
2565	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3173	glViewport 0, 0, $::WIDTH, $::HEIGHT;
2566	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3174	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2567	glClear GL_COLOR_BUFFER_BIT;	3175	glClear GL_COLOR_BUFFER_BIT;
2568		3176
2569	glMatrixMode GL_PROJECTION;	3177	glMatrixMode GL_PROJECTION;
2570	glLoadIdentity;	3178	glLoadIdentity;
2571	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;	3179	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2572	glMatrixMode GL_MODELVIEW;	3180	glMatrixMode GL_MODELVIEW;
2573	glLoadIdentity;	3181	glLoadIdentity;
2574		3182
2575	$self->_draw;	3183	$self->_draw;
2576	}	3184	}
2577		3185
2578	#############################################################################	3186	#############################################################################
2579		3187
2580	package CFClient::UI::Inventory;
2581
2582	our @ISA = CFClient::UI::Container::;
2583
2584	use CFClient::OpenGL;
2585
2586	sub new {
2587	my $class = shift;
2588
2589	my $self = $class->SUPER::new (@_);
2590
2591	$self
2592	}
2593
2594	sub size_allocate {
2595	my ($self, $w, $h) = @_;
2596
2597	$self->{w} = $w;
2598	$self->{h} = $h;
2599
2600	$self->check_size;
2601	}
2602
2603	sub set_items {
2604	my ($self, $items) = @_;
2605	my @items = values %{$items};
2606	@items = sort { $a->{type} <=> $b->{type} } @items;
2607
2608	$self->{real_items} = \@items;
2609
2610	for my $item (@items) {
2611	my $desc = $item->{nrof} < 2
2612	? $item->{name}
2613	: "$item->{nrof} $item->{name_pl}";
2614
2615	$self->add (my $hb = new CFClient::UI::HBox);
2616
2617	$hb->add (my $f = new CFClient::UI::Face
2618	can_events => 0,
2619	face => $item->{face},
2620	anim => $item->{anim},
2621	animspeed => $item->{animspeed},
2622	expand => 1
2623	);
2624	$hb->add (new CFClient::UI::Label text => $desc, expand => 1);
2625	}
2626
2627	$self->{max_pos} = (scalar @items) - 1;
2628
2629	my $range = $self->{range};
2630	my $page = $self->{h} / 32; # waht information souce to use for face size?
2631	# it should be configurable i guess...
2632	$range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2633	$range->update;
2634	}
2635
2636	sub size_request {
2637	my ($self) = @_;
2638	(100, 200)
2639	}
2640
2641	sub set_range {
2642	my ($self, $range) = @_;
2643
2644	$self->{range} = $range;
2645	$range->connect (changed => sub { $self->update });
2646
2647	my $page = $self->{h} / 32; # waht information souce to use for face size?
2648	# it should be configurable i guess...
2649
2650	$range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2651	$range->update;
2652
2653	$self->update;
2654	}
2655
2656	sub _draw {
2657	my ($self) = @_;
2658
2659	my ($w, $h) = ($self->{w}, $self->{h});
2660
2661	$self->{pos} = int $self->{range}{range}[0];
2662
2663	my $y = 0;
2664	my $cnt = 0;
2665	my $hrem = $self->{h}; # horiz. remaining space
2666
2667	for (my $i = $self->{pos}; $i < @{$self->{children} || []}; $i++) {
2668	my $chld = $self->{children}->[$i];
2669
2670	if ($hrem >= $chld->{h}) {
2671	$chld->configure (0, $y, $chld->{w}, $chld->{h});
2672
2673	$chld->show;
2674	$chld->draw;
2675
2676	$hrem -= $chld->{h};
2677	$y += $chld->{h};
2678	} else {
2679	last
2680	}
2681	}
2682	}
2683
2684
2685	#############################################################################
2686
2687	package CFClient::UI;	3188	package CFClient::UI;
2688		3189
2689	$ROOT = new CFClient::UI::Root;	3190	$ROOT = new CFClient::UI::Root;
2690	$TOOLTIP = new CFClient::UI::Tooltip;	3191	$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2691		3192
2692	1	3193	1
2693		3194

Diff Legend

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