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.189 by root, Mon May 8 22:17:24 2006 UTC vs.
Revision 1.354 by root, Sat Nov 18 23:31:23 2006 UTC

1	package CFClient::UI;	1	package CFPlus::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 ();
		8	use Event;
7		9
8	use CFClient;	10	use CFPlus;
		11	use CFPlus::Pod;
		12	use CFPlus::Texture;
9		13
10	our ($FOCUS, $HOVER, $GRAB); # various widgets	14	our ($FOCUS, $HOVER, $GRAB); # various widgets
11		15
		16	our $LAYOUT;
12	our $ROOT;	17	our $ROOT;
13	our $TOOLTIP;	18	our $TOOLTIP;
14	our $BUTTON_STATE;	19	our $BUTTON_STATE;
15		20
16	sub check_tooltip {	21	our %WIDGET; # all widgets, weak-referenced
		22
		23	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
17	if (!$GRAB) {	24	if (!$GRAB) {
18	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	25	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19	if (length $widget->{tooltip}) {	26	if (length $widget->{tooltip}) {
20
21	if ($TOOLTIP->{owner} != $widget) {	27	if ($TOOLTIP->{owner} != $widget) {
		28	$TOOLTIP->hide;
		29
22	$TOOLTIP->{owner} = $widget;	30	$TOOLTIP->{owner} = $widget;
		31
		32	return if $ENV{CFPLUS_DEBUG} & 8;
23		33
24	my $tip = $widget->{tooltip};	34	my $tip = $widget->{tooltip};
25		35
26	$tip = $tip->($widget) if CODE:: eq ref $tip;	36	$tip = $tip->($widget) if CODE:: eq ref $tip;
27		37
28	$TOOLTIP->set_markup ($widget->{tooltip});	38	$TOOLTIP->set_tooltip_from ($widget);
29
30	$TOOLTIP->show;	39	$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	}	40	}
40		41
41	return;	42	return;
42	}	43	}
43	}	44	}
44	}	45	}
45		46
46	$TOOLTIP->hide;	47	$TOOLTIP->hide;
47	delete $TOOLTIP->{owner};	48	delete $TOOLTIP->{owner};
		49	});
		50
		51	sub get_layout {
		52	my $layout;
		53
		54	for (grep { $_->{name} } values %WIDGET) {
		55	my $win = $layout->{$_->{name}} = { };
		56
		57	$win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
		58	$win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
		59	$win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
		60	$win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
		61
		62	$win->{show} = $_->{visible} && $_->{is_toplevel};
		63	}
		64
		65	$layout
		66	}
		67
		68	sub set_layout {
		69	my ($layout) = @_;
		70
		71	$LAYOUT = $layout;
48	}	72	}
49		73
50	# class methods for events	74	# class methods for events
51	sub feed_sdl_key_down_event {	75	sub feed_sdl_key_down_event {
52	$FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])	76	$FOCUS->emit (key_down => $_[0])
53	if $FOCUS;	77	if $FOCUS;
54	}	78	}
55		79
56	sub feed_sdl_key_up_event {	80	sub feed_sdl_key_up_event {
57	$FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])	81	$FOCUS->emit (key_up => $_[0])
58	if $FOCUS;	82	if $FOCUS;
		83	}
		84
		85	sub check_hover {
		86	my ($widget) = @_;
		87
		88	if ($widget != $HOVER) {
		89	my $hover = $HOVER; $HOVER = $widget;
		90
		91	$hover->update if $hover && $hover->{can_hover};
		92	$HOVER->update if $HOVER && $HOVER->{can_hover};
		93
		94	$TOOLTIP_WATCHER->start;
		95	}
59	}	96	}
60		97
61	sub feed_sdl_button_down_event {	98	sub feed_sdl_button_down_event {
62	my ($ev) = @_;	99	my ($ev) = @_;
63	my ($x, $y) = ($ev->{x}, $ev->{y});	100	my ($x, $y) = ($ev->{x}, $ev->{y});
64		101
65	if (!$BUTTON_STATE) {	102	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
		103
		104	unless ($GRAB) {
66	my $widget = $ROOT->find_widget ($x, $y);	105	my $widget = $ROOT->find_widget ($x, $y);
67		106
68	$GRAB = $widget;	107	$GRAB = $widget;
69	$GRAB->update if $GRAB;	108	$GRAB->update if $GRAB;
70		109
71	check_tooltip;	110	$TOOLTIP_WATCHER->cb->();
72	}	111	}
73
74	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
75		112
76	if ($GRAB) {	113	if ($GRAB) {
77	($x, $y) = $GRAB->coord2local ($x, $y);	114	if ($ev->{button} == 4 || $ev->{button} == 5) {
78	$GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);	115	# mousewheel
		116	$ev->{dx} = 0;
		117	$ev->{dy} = $ev->{button} * 2 - 9;
		118	$GRAB->emit (mouse_wheel => $ev);
		119	} else {
		120	$GRAB->emit (button_down => $ev)
		121	}
79	}	122	}
80	}	123	}
81		124
82	sub feed_sdl_button_up_event {	125	sub feed_sdl_button_up_event {
83	my ($ev) = @_;	126	my ($ev) = @_;
84	my ($x, $y) = ($ev->{x}, $ev->{y});
85		127
86	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	128	my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
87		129
88	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	130	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
89		131
90	if ($GRAB) {	132	$GRAB->emit (button_up => $ev)
91	($x, $y) = $GRAB->coord2local ($x, $y);	133	if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
92	$GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
93	}
94		134
95	if (!$BUTTON_STATE) {	135	unless ($BUTTON_STATE) {
96	my $grab = $GRAB; undef $GRAB;	136	my $grab = $GRAB; undef $GRAB;
97	$grab->update if $grab;	137	$grab->update if $grab;
98	$GRAB->update if $GRAB;	138	$GRAB->update if $GRAB;
99		139
100	check_tooltip;	140	check_hover $widget;
		141	$TOOLTIP_WATCHER->cb->();
101	}	142	}
102	}	143	}
103		144
104	sub feed_sdl_motion_event {	145	sub feed_sdl_motion_event {
105	my ($ev) = @_;	146	my ($ev) = @_;
106	my ($x, $y) = ($ev->{x}, $ev->{y});	147	my ($x, $y) = ($ev->{x}, $ev->{y});
107		148
108	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	149	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
109		150
110	if ($widget != $HOVER) {	151	check_hover $widget;
111	my $hover = $HOVER; $HOVER = $widget;
112		152
113	$hover->update if $hover && $hover->{can_hover};	153	$HOVER->emit (mouse_motion => $ev)
114	$HOVER->update if $HOVER && $HOVER->{can_hover};
115
116	check_tooltip;
117	}
118
119	if ($HOVER) {	154	if $HOVER;
120	($x, $y) = $HOVER->coord2local ($x, $y);
121	$HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);
122	}
123	}	155	}
124		156
125	# convert position array to integers	157	# convert position array to integers
126	sub harmonize {	158	sub harmonize {
127	my ($vals) = @_;	159	my ($vals) = @_;
…		…
133	$rem += $_ - $i;	165	$rem += $_ - $i;
134	$_ = $i;	166	$_ = $i;
135	}	167	}
136	}	168	}
137		169
		170	sub full_refresh {
		171	# make a copy, otherwise for complains about freed values.
		172	my @widgets = values %WIDGET;
		173
		174	$_->update
		175	for @widgets;
		176	}
		177
		178	sub reconfigure_widgets {
		179	# make a copy, otherwise C<for> complains about freed values.
		180	my @widgets = values %WIDGET;
		181
		182	$_->reconfigure
		183	for @widgets;
		184	}
		185
		186	# call when resolution changes etc.
		187	sub rescale_widgets {
		188	my ($sx, $sy) = @_;
		189
		190	for my $widget (values %WIDGET) {
		191	if ($widget->{is_toplevel}) {
		192	$widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
		193	$widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
		194
		195	$widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
		196	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
		197	$widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
		198	$widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
		199	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
		200	$widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
		201
		202	$widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
		203	$widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
		204
		205	}
		206	}
		207
		208	reconfigure_widgets;
		209	}
		210
138	#############################################################################	211	#############################################################################
139		212
		213	package CFPlus::UI::Event;
		214
		215	sub xy {
		216	$_[1]->coord2local ($_[0]{x}, $_[0]{y})
		217	}
		218
		219	#############################################################################
		220
140	package CFClient::UI::Base;	221	package CFPlus::UI::Base;
141		222
142	use strict;	223	use strict;
143		224
144	use CFClient::OpenGL;	225	use CFPlus::OpenGL;
145		226
146	sub new {	227	sub new {
147	my $class = shift;	228	my $class = shift;
148		229
149	my $self = bless {	230	my $self = bless {
150	x => 0,	231	x => "center",
151	y => 0,	232	y => "center",
152	z => 0,	233	z => 0,
		234	w => undef,
		235	h => undef,
153	can_events => 1,	236	can_events => 1,
154	@_	237	@_
155	}, $class;	238	}, $class;
156		239
		240	Scalar::Util::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
		241
157	for (keys %$self) {	242	for (keys %$self) {
158	if (/^connect_(.*)$/) {	243	if (/^on_(.*)$/) {
159	$self->connect ($1 => delete $self->{$_});	244	$self->connect ($1 => delete $self->{$_});
160	}	245	}
161	}	246	}
162		247
		248	if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
		249	$self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
		250	$self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
		251	$self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
		252	$self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
		253
		254	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
		255	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
		256
		257	$self->show if $layout->{show};
		258	}
		259
163	$self	260	$self
164	}	261	}
165		262
166	sub destroy {	263	sub destroy {
167	my ($self) = @_;	264	my ($self) = @_;
…		…
173	sub show {	270	sub show {
174	my ($self) = @_;	271	my ($self) = @_;
175		272
176	return if $self->{parent};	273	return if $self->{parent};
177		274
178	$CFClient::UI::ROOT->add ($self);	275	$CFPlus::UI::ROOT->add ($self);
179	}	276	}
180		277
181	sub hide {	278	sub set_visible {
182	my ($self) = @_;	279	my ($self) = @_;
		280
		281	return if $self->{visible};
		282
		283	$self->{root} = $self->{parent}{root};
		284	$self->{visible} = $self->{parent}{visible} + 1;
		285
		286	$self->emit (visibility_change => 1);
		287
		288	$self->realloc if !exists $self->{req_w};
		289
		290	$_->set_visible for $self->children;
		291	}
		292
		293	sub set_invisible {
		294	my ($self) = @_;
		295
		296	return unless $self->{visible};
		297
		298	$_->set_invisible for $self->children;
		299
		300	delete $self->{visible};
		301	delete $self->{root};
183		302
184	undef $GRAB if $GRAB == $self;	303	undef $GRAB if $GRAB == $self;
185	undef $HOVER if $HOVER == $self;	304	undef $HOVER if $HOVER == $self;
186		305
		306	$CFPlus::UI::TOOLTIP_WATCHER->cb->()
		307	if $TOOLTIP->{owner} == $self;
		308
		309	$self->emit ("focus_out");
		310	$self->emit (visibility_change => 0);
		311	}
		312
		313	sub set_visibility {
		314	my ($self, $visible) = @_;
		315
		316	return if $self->{visible} == $visible;
		317
		318	$visible ? $self->hide
		319	: $self->show;
		320	}
		321
		322	sub toggle_visibility {
		323	my ($self) = @_;
		324
		325	$self->{visible}
		326	? $self->hide
		327	: $self->show;
		328	}
		329
		330	sub hide {
		331	my ($self) = @_;
		332
		333	$self->set_invisible;
		334
187	$self->{parent}->remove ($self)	335	$self->{parent}->remove ($self)
188	if $self->{parent};	336	if $self->{parent};
189	}	337	}
190		338
191	sub move {	339	sub move_abs {
192	my ($self, $x, $y, $z) = @_;	340	my ($self, $x, $y, $z) = @_;
193		341
194	$self->{x} = int $x;	342	$self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
195	$self->{y} = int $y;	343	$self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
196	$self->{z} = $z if defined $z;	344	$self->{z} = $z if defined $z;
197		345
198	$self->update;	346	$self->update;
199	}	347	}
200		348
201	sub set_size {	349	sub set_size {
202	my ($self, $w, $h) = @_;	350	my ($self, $w, $h) = @_;
203		351
204	$self->{user_w} = $w;	352	$self->{force_w} = $w;
205	$self->{user_h} = $h;	353	$self->{force_h} = $h;
206		354
207	$self->check_size;	355	$self->realloc;
208	}	356	}
209		357
210	sub size_request {	358	sub size_request {
211	require Carp;	359	require Carp;
212	Carp::confess "size_request is abstract";	360	Carp::confess "size_request is abstract";
213	}	361	}
214		362
		363	sub baseline_shift {
		364	0
		365	}
		366
215	sub configure {	367	sub configure {
216	my ($self, $x, $y, $w, $h) = @_;	368	my ($self, $x, $y, $w, $h) = @_;
217		369
218	if ($self->{aspect}) {	370	if ($self->{aspect}) {
		371	my ($ow, $oh) = ($w, $h);
		372
219	my $w2 = List::Util::min $w, int $h * $self->{aspect};	373	$w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
220	my $h2 = List::Util::min $h, int $w / $self->{aspect};	374	$h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
221		375
222	# use alignment to adjust x, y	376	# use alignment to adjust x, y
223		377
224	$x += int +($w - $w2) * 0.5;	378	$x += int 0.5 * ($ow - $w);
225	$y += int +($h - $h2) * 0.5;	379	$y += int 0.5 * ($oh - $h);
226
227	($w, $h) = ($w2, $h2);
228	}	380	}
229		381
230	if ($self->{x} != $x || $self->{y} != $y) {	382	if ($self->{x} ne $x || $self->{y} ne $y) {
231	$self->{x} = $x;	383	$self->{x} = $x;
232	$self->{y} = $y;	384	$self->{y} = $y;
233	$self->update;	385	$self->update;
234	}	386	}
235		387
236	if ($self->{w} != $w || $self->{h} != $h) {	388	if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
		389	return unless $self->{visible};
		390
237	$self->{w} = $w;	391	$self->{alloc_w} = $w;
238	$self->{h} = $h;	392	$self->{alloc_h} = $h;
239		393
240	$self->size_allocate ($w, $h);	394	$self->{root}{size_alloc}{$self+0} = $self;
241	$self->update;
242	$self->emit (size_allocate => $w, $h);
243	}	395	}
244	}
245
246	sub size_allocate {
247	# nothing to be done
248	}	396	}
249		397
250	sub children {	398	sub children {
		399	# nop
251	}	400	}
252		401
253	# call when resolution changes etc.	402	sub visible_children {
254	sub reconfigure {	403	$_[0]->children
255	my ($self) = @_;
256
257	$_->reconfigure
258	for $self->children;
259
260	$self->check_size;
261	$self->size_allocate ($self->{w}, $self->{h});
262	$self->update;
263	}	404	}
264		405
265	sub set_max_size {	406	sub set_max_size {
266	my ($self, $w, $h) = @_;	407	my ($self, $w, $h) = @_;
267		408
268	delete $self->{max_w}; $self->{max_w} = $w if $w;	409	$self->{max_w} = int $w if defined $w;
269	delete $self->{max_h}; $self->{max_h} = $h if $h;	410	$self->{max_h} = int $h if defined $h;
270	}
271		411
272	# return top left coordinates	412	$self->realloc;
273	sub _topleft {	413	}
		414
		415	sub set_tooltip {
274	my ($self, $x, $y) = @_;	416	my ($self, $tooltip) = @_;
275		417
276	$self->{parent}	418	$tooltip =~ s/^\s+//;
277	or Carp::confess "no parent widget in _topleft\n";#d#	419	$tooltip =~ s/\s+$//;
278		420
279	$self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});	421	return if $self->{tooltip} eq $tooltip;
		422
		423	$self->{tooltip} = $tooltip;
		424
		425	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
		426	delete $CFPlus::UI::TOOLTIP->{owner};
		427	$CFPlus::UI::TOOLTIP_WATCHER->cb->();
		428	}
280	}	429	}
281		430
282	# translate global coordinates to local coordinate system	431	# translate global coordinates to local coordinate system
283	sub coord2local {	432	sub coord2local {
284	my ($self, $x, $y) = @_;	433	my ($self, $x, $y) = @_;
285		434
286	my ($X, $Y) = $self->_topleft;	435	Carp::confess unless $self->{parent};#d#
287	($x - $X, $y - $Y)	436
		437	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
288	}	438	}
289		439
290	# translate local coordinates to global coordinate system	440	# translate local coordinates to global coordinate system
291	sub coord2global {	441	sub coord2global {
292	my ($self, $x, $y) = @_;	442	my ($self, $x, $y) = @_;
293		443
294	my ($X, $Y) = $self->_topleft;	444	Carp::confess unless $self->{parent};#d#
295	($x + $X, $y + $Y)
296	}
297		445
		446	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
		447	}
		448
298	sub focus_in {	449	sub invoke_focus_in {
299	my ($self) = @_;	450	my ($self) = @_;
300		451
301	return if $FOCUS == $self;	452	return if $FOCUS == $self;
302	return unless $self->{can_focus};	453	return unless $self->{can_focus};
303		454
304	my $focus = $FOCUS; $FOCUS = $self;	455	$FOCUS = $self;
305		456
306	$self->emit (focus_in => $focus);	457	$self->update;
307		458
308	$focus->update if $focus;	459	0
309	$FOCUS->update;
310	}	460	}
311		461
312	sub focus_out {	462	sub invoke_focus_out {
313	my ($self) = @_;	463	my ($self) = @_;
314		464
315	return unless $FOCUS == $self;	465	return unless $FOCUS == $self;
316		466
317	my $focus = $FOCUS; undef $FOCUS;	467	undef $FOCUS;
318		468
319	$self->emit (focus_out => $focus);	469	$self->update;
320		470
321	$focus->update if $focus; #?	471	$::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
322	}	472	unless $FOCUS;
323		473
		474	0
		475	}
		476
		477	sub grab_focus {
		478	my ($self) = @_;
		479
		480	$FOCUS->emit ("focus_out") if $FOCUS;
		481	$self->emit ("focus_in");
		482	}
		483
324	sub mouse_motion { }	484	sub invoke_mouse_motion { 0 }
325	sub button_up { }	485	sub invoke_button_up { 0 }
326	sub key_down { }	486	sub invoke_key_down { 0 }
327	sub key_up { }	487	sub invoke_key_up { 0 }
		488	sub invoke_mouse_wheel { 0 }
328		489
329	sub button_down {	490	sub invoke_button_down {
330	my ($self, $ev, $x, $y) = @_;	491	my ($self, $ev, $x, $y) = @_;
331		492
332	$self->focus_in;	493	$self->grab_focus;
333	}
334		494
335	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	495	0
336	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	496	}
337	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }	497
338	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }	498	sub connect {
339	sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }	499	my ($self, $signal, $cb) = @_;
		500
		501	push @{ $self->{signal_cb}{$signal} }, $cb;
		502
		503	defined wantarray and CFPlus::guard {
		504	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
		505	@{ $self->{signal_cb}{$signal} };
		506	}
		507	}
		508
		509	my %has_coords = (
		510	button_down => 1,
		511	button_up => 1,
		512	mouse_motion => 1,
		513	mouse_wheel => 1,
		514	);
		515
		516	sub emit {
		517	my ($self, $signal, @args) = @_;
		518
		519	# I do not really like this solution, but I do not like duplication
		520	# and needlessly verbose code, either.
		521	my @append
		522	= $has_coords{$signal}
		523	? $args[0]->xy ($self)
		524	: ();
		525
		526	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
		527
		528	if ($self->{tooltip} =~ /Apply.*audio/) {
		529	warn "2 ", join ":", @{ $self->{signal_cb}{$signal} || []}, "\n";#d#
		530	warn "3 $self->{parent}\n";#d#
		531	}
		532
		533	#d##TODO# stop propagating at first true, do not use sum
		534	my $res =
		535	(List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before
		536	|| ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure
		537	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
		538	;
		539	if ($self->{tooltip} =~ /Apply.*audio/) {
		540	warn "4 ", join ":", @{ $self->{signal_cb}{$signal} || []}, "\n";#d#
		541	warn "5 $self->{parent}\n";#d#
		542	}
		543
		544	$res
		545	}
		546
		547	sub find_widget {
		548	my ($self, $x, $y) = @_;
		549
		550	return () unless $self->{can_events};
		551
		552	return $self
		553	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
		554	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
		555
		556	()
		557	}
		558
		559	sub set_parent {
		560	my ($self, $parent) = @_;
		561
		562	Scalar::Util::weaken ($self->{parent} = $parent);
		563	$self->set_visible if $parent->{visible};
		564	}
		565
		566	sub realloc {
		567	my ($self) = @_;
		568
		569	if ($self->{visible}) {
		570	return if $self->{root}{realloc}{$self+0};
		571
		572	$self->{root}{realloc}{$self+0} = $self;
		573	$self->{root}->update;
		574	} else {
		575	delete $self->{req_w};
		576	delete $self->{req_h};
		577	}
		578	}
		579
		580	sub update {
		581	my ($self) = @_;
		582
		583	$self->{parent}->update
		584	if $self->{parent};
		585	}
		586
		587	sub reconfigure {
		588	my ($self) = @_;
		589
		590	$self->realloc;
		591	$self->update;
		592	}
		593
		594	# using global variables seems a bit hacky, but passing through all drawing
		595	# functions seems pointless.
		596	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
340		597
341	sub draw {	598	sub draw {
342	my ($self) = @_;	599	my ($self) = @_;
343		600
344	return unless $self->{h} && $self->{w};	601	return unless $self->{h} && $self->{w};
		602
		603	# update screen rectangle
		604	local $draw_x = $draw_x + $self->{x};
		605	local $draw_y = $draw_y + $self->{y};
		606
		607	# skip widgets that are entirely outside the drawing area
		608	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
		609	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
345		610
346	glPushMatrix;	611	glPushMatrix;
347	glTranslate $self->{x}, $self->{y}, 0;	612	glTranslate $self->{x}, $self->{y}, 0;
348	$self->_draw;
349	glPopMatrix;
350		613
351	if ($self == $HOVER && $self->{can_hover}) {	614	if ($self == $HOVER && $self->{can_hover}) {
352	my ($x, $y) = @$self{qw(x y)};
353
354	glColor 1, 0.8, 0.5, 0.2;	615	glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
355	glEnable GL_BLEND;	616	glEnable GL_BLEND;
356	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	617	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
357	glBegin GL_QUADS;	618	glBegin GL_QUADS;
358	glVertex $x , $y;
359	glVertex $x + $self->{w}, $y;
360	glVertex $x + $self->{w}, $y + $self->{h};
361	glVertex $x , $y + $self->{h};
362	glEnd;
363	glDisable GL_BLEND;
364	}
365
366	if ($ENV{PCLIENT_DEBUG}) {
367	glPushMatrix;
368	glColor 1, 1, 0, 1;
369	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
370	glBegin GL_LINE_LOOP;
371	glVertex 0 , 0;	619	glVertex 0 , 0;
372	glVertex $self->{w}, 0;	620	glVertex $self->{w}, 0;
373	glVertex $self->{w}, $self->{h};	621	glVertex $self->{w}, $self->{h};
374	glVertex 0 , $self->{h};	622	glVertex 0 , $self->{h};
375	glEnd;	623	glEnd;
		624	glDisable GL_BLEND;
		625	}
		626
		627	if ($ENV{CFPLUS_DEBUG} & 1) {
		628	glPushMatrix;
		629	glColor 1, 1, 0, 1;
		630	glTranslate 0.375, 0.375;
		631	glBegin GL_LINE_LOOP;
		632	glVertex 0 , 0;
		633	glVertex $self->{w} - 1, 0;
		634	glVertex $self->{w} - 1, $self->{h} - 1;
		635	glVertex 0 , $self->{h} - 1;
		636	glEnd;
376	glPopMatrix;	637	glPopMatrix;
377	CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	638	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
378	}	639	}
		640
		641	$self->_draw;
		642	glPopMatrix;
379	}	643	}
380		644
381	sub _draw {	645	sub _draw {
382	my ($self) = @_;	646	my ($self) = @_;
383		647
384	warn "no draw defined for $self\n";	648	warn "no draw defined for $self\n";
385	}	649	}
386		650
387	sub find_widget {
388	my ($self, $x, $y) = @_;
389
390	return () unless $self->{can_events};
391
392	return $self
393	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
394	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
395
396	()
397	}
398
399	sub set_parent {
400	my ($self, $parent) = @_;
401
402	Scalar::Util::weaken ($self->{parent} = $parent);
403	}
404
405	sub check_size {
406	my ($self) = @_;
407
408	$self->_check_size;
409	return;
410	my $check_size = $CFClient::UI::ROOT->{_check_size} ||= {};
411
412	$check_size->{$self} = $self;
413
414	$CFClient::UI::ROOT->on_refresh (_check_size => sub {
415	while (%$check_size) {
416	my @widgets = values %$check_size;
417	$_->_check_size
418	for @widgets;
419	}
420	});
421	}
422
423	sub _check_size {
424	my ($self) = @_;
425
426	delete $CFClient::UI::ROOT->{_check_size}{$self};
427
428	$self->{parent}
429	or return 1;
430
431	my ($w, $h) = $self->{user_w} && $self->{user_h}
432	? @$self{qw(user_w user_h)}
433	: $self->size_request;
434
435	if ($w != $self->{req_w} || $h != $self->{req_h}) {
436	$self->{req_w} = $w;
437	$self->{req_h} = $h;
438
439	$self->{parent}->_check_size
440	or $self->size_allocate (
441	(List::Util::max $self->{w}, $w),
442	(List::Util::max $self->{h}, $h),
443	);
444
445	1
446	} else {
447	0
448	}
449	}
450
451	sub update {
452	my ($self) = @_;
453
454	my $update = $CFClient::UI::ROOT->{_update} ||= {};
455
456	$update->{$self} = $self;
457
458	$CFClient::UI::ROOT->on_refresh (_update => sub {
459	while (%$update) {
460	my @widgets = values %$update;
461	%$update = ();
462
463	$_->{parent} && $_->{parent}->update
464	for @widgets;
465	}
466	});
467	}
468
469	sub connect {
470	my ($self, $signal, $cb) = @_;
471
472	push @{ $self->{signal_cb}{$signal} }, $cb;
473	}
474
475	sub emit {
476	my ($self, $signal, @args) = @_;
477
478	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
479	}
480
481	sub DESTROY {	651	sub DESTROY {
482	my ($self) = @_;	652	my ($self) = @_;
483		653
484	#$self->deactivate;	654	return if CFPlus::in_destruct;
		655
		656	delete $WIDGET{$self+0};
		657
		658	eval { $self->destroy };
		659	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
485	}	660	}
486		661
487	#############################################################################	662	#############################################################################
488		663
489	package CFClient::UI::DrawBG;	664	package CFPlus::UI::DrawBG;
490		665
491	our @ISA = CFClient::UI::Base::;	666	our @ISA = CFPlus::UI::Base::;
492		667
493	use strict;	668	use strict;
494	use CFClient::OpenGL;	669	use CFPlus::OpenGL;
495		670
496	sub new {	671	sub new {
497	my $class = shift;	672	my $class = shift;
498		673
499	# range [value, low, high, page]	674	# range [value, low, high, page]
500		675
501	$class->SUPER::new (	676	$class->SUPER::new (
502	bg => [0, 0, 0, 0.2],	677	#bg => [0, 0, 0, 0.2],
503	active_bg => [1, 1, 1, 0.5],	678	#active_bg => [1, 1, 1, 0.5],
504	@_	679	@_
505	)	680	)
506	}	681	}
507		682
508	sub _draw {	683	sub _draw {
509	my ($self) = @_;	684	my ($self) = @_;
510		685
		686	my $color = $FOCUS == $self && $self->{active_bg}
		687	? $self->{active_bg}
		688	: $self->{bg};
		689
		690	if ($color && (@$color < 4 || $color->[3])) {
511	my ($w, $h) = @$self{qw(w h)};	691	my ($w, $h) = @$self{qw(w h)};
512		692
513	glEnable GL_BLEND;	693	glEnable GL_BLEND;
514	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	694	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
515	glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };	695	glColor_premultiply @$color;
516		696
517	glBegin GL_QUADS;	697	glBegin GL_QUADS;
518	glVertex 0 , 0;	698	glVertex 0 , 0;
519	glVertex 0 , $h;	699	glVertex 0 , $h;
520	glVertex $w, $h;	700	glVertex $w, $h;
521	glVertex $w, 0;	701	glVertex $w, 0;
522	glEnd;	702	glEnd;
523		703
524	glDisable GL_BLEND;	704	glDisable GL_BLEND;
		705	}
525	}	706	}
526		707
527	#############################################################################	708	#############################################################################
528		709
529	package CFClient::UI::Empty;	710	package CFPlus::UI::Empty;
530		711
531	our @ISA = CFClient::UI::Base::;	712	our @ISA = CFPlus::UI::Base::;
532		713
533	sub new {	714	sub new {
534	my ($class, %arg) = @_;	715	my ($class, %arg) = @_;
535	$class->SUPER::new (can_events => 0, %arg);	716	$class->SUPER::new (can_events => 0, %arg);
536	}	717	}
537		718
538	sub size_request {	719	sub size_request {
539	(0, 0)	720	my ($self) = @_;
		721
		722	($self->{w} + 0, $self->{h} + 0)
540	}	723	}
541		724
542	sub draw { }	725	sub draw { }
543		726
544	#############################################################################	727	#############################################################################
545		728
546	package CFClient::UI::Container;	729	package CFPlus::UI::Container;
547		730
548	our @ISA = CFClient::UI::Base::;	731	our @ISA = CFPlus::UI::Base::;
549		732
550	sub new {	733	sub new {
551	my ($class, %arg) = @_;	734	my ($class, %arg) = @_;
552		735
553	my $children = delete $arg{children} || [];	736	my $children = delete $arg{children};
554		737
555	my $self = $class->SUPER::new (	738	my $self = $class->SUPER::new (
556	children => [],	739	children => [],
557	can_events => 0,	740	can_events => 0,
558	%arg,	741	%arg,
559	);	742	);
		743
560	$self->add ($_) for @$children;	744	$self->add (@$children)
		745	if $children;
561		746
562	$self	747	$self
		748	}
		749
		750	sub realloc {
		751	my ($self) = @_;
		752
		753	$self->{force_realloc} = 1;
		754	$self->{force_size_alloc} = 1;
		755	$self->SUPER::realloc;
563	}	756	}
564		757
565	sub add {	758	sub add {
566	my ($self, @widgets) = @_;	759	my ($self, @widgets) = @_;
567		760
…		…
573	$self->{children} = [	766	$self->{children} = [
574	sort { $a->{z} <=> $b->{z} }	767	sort { $a->{z} <=> $b->{z} }
575	@{$self->{children}}, @widgets	768	@{$self->{children}}, @widgets
576	];	769	];
577		770
578	$_->check_size	771	$self->realloc;
579	for @widgets;
580
581	$self->update;
582	}	772	}
583		773
584	sub children {	774	sub children {
585	@{ $_[0]{children} }	775	@{ $_[0]{children} }
586	}	776	}
…		…
591	delete $child->{parent};	781	delete $child->{parent};
592	$child->hide;	782	$child->hide;
593		783
594	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	784	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
595		785
596	$self->check_size;	786	$self->realloc;
597	$self->update;
598	}	787	}
599		788
600	sub clear {	789	sub clear {
601	my ($self) = @_;	790	my ($self) = @_;
602		791
…		…
606	for (@$children) {	795	for (@$children) {
607	delete $_->{parent};	796	delete $_->{parent};
608	$_->hide;	797	$_->hide;
609	}	798	}
610		799
611	$self->check_size;	800	$self->realloc;
612	$self->update;
613	}	801	}
614		802
615	sub find_widget {	803	sub find_widget {
616	my ($self, $x, $y) = @_;	804	my ($self, $x, $y) = @_;
617		805
618	$x -= $self->{x};	806	$x -= $self->{x};
619	$y -= $self->{y};	807	$y -= $self->{y};
620		808
621	my $res;	809	my $res;
622		810
623	for (reverse @{ $self->{children} }) {	811	for (reverse $self->visible_children) {
624	$res = $_->find_widget ($x, $y)	812	$res = $_->find_widget ($x, $y)
625	and return $res;	813	and return $res;
626	}	814	}
627		815
628	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})	816	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
…		…
634	$_->draw for @{$self->{children}};	822	$_->draw for @{$self->{children}};
635	}	823	}
636		824
637	#############################################################################	825	#############################################################################
638		826
639	package CFClient::UI::Bin;	827	package CFPlus::UI::Bin;
640		828
641	our @ISA = CFClient::UI::Container::;	829	our @ISA = CFPlus::UI::Container::;
642		830
643	sub new {	831	sub new {
644	my ($class, %arg) = @_;	832	my ($class, %arg) = @_;
645		833
646	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	834	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
647		835
648	$class->SUPER::new (children => [$child], %arg)	836	$class->SUPER::new (children => [$child], %arg)
649	}	837	}
650		838
651	sub add {	839	sub add {
652	my ($self, $child) = @_;	840	my ($self, $child) = @_;
653		841
654	$self->{children} = [];	842	$self->SUPER::remove ($_) for @{ $self->{children} };
655
656	$self->SUPER::add ($child);	843	$self->SUPER::add ($child);
657	}	844	}
658		845
659	sub remove {	846	sub remove {
660	my ($self, $widget) = @_;	847	my ($self, $widget) = @_;
661		848
662	$self->SUPER::remove ($widget);	849	$self->SUPER::remove ($widget);
663		850
664	$self->{children} = [new CFClient::UI::Empty]	851	$self->{children} = [new CFPlus::UI::Empty]
665	unless @{$self->{children}};	852	unless @{$self->{children}};
666	}	853	}
667		854
668	sub child { $_[0]->{children}[0] }	855	sub child { $_[0]->{children}[0] }
669		856
670	sub size_request {	857	sub size_request {
671	$_[0]{children}[0]->size_request	858	$_[0]{children}[0]->size_request
672	}	859	}
673		860
674	sub size_allocate {	861	sub invoke_size_allocate {
675	my ($self, $w, $h) = @_;	862	my ($self, $w, $h) = @_;
676		863
677	$self->{children}[0]->configure (0, 0, $w, $h);	864	$self->{children}[0]->configure (0, 0, $w, $h);
		865
		866	1
678	}	867	}
679		868
680	#############################################################################	869	#############################################################################
681		870
		871	# back-buffered drawing area
		872
682	package CFClient::UI::Window;	873	package CFPlus::UI::Window;
683		874
684	our @ISA = CFClient::UI::Bin::;	875	our @ISA = CFPlus::UI::Bin::;
685		876
686	use CFClient::OpenGL;	877	use CFPlus::OpenGL;
687		878
688	sub new {	879	sub new {
689	my ($class, %arg) = @_;	880	my ($class, %arg) = @_;
690		881
691	my $self = $class->SUPER::new (%arg);	882	my $self = $class->SUPER::new (%arg);
692	}	883	}
693		884
694	sub update {	885	sub update {
695	my ($self) = @_;	886	my ($self) = @_;
696		887
697	$ROOT->on_refresh ($self => sub { $self->render_child });	888	$ROOT->on_post_alloc ($self => sub { $self->render_child });
698	$self->SUPER::update;	889	$self->SUPER::update;
699	}	890	}
700		891
701	sub size_allocate {	892	sub invoke_size_allocate {
702	my ($self, $w, $h) = @_;	893	my ($self, $w, $h) = @_;
703		894
704	$self->SUPER::size_allocate ($w, $h);
705	$self->update;	895	$self->update;
		896
		897	$self->SUPER::invoke_size_allocate ($w, $h)
706	}	898	}
707		899
708	sub _render {	900	sub _render {
		901	my ($self) = @_;
		902
709	$_[0]{children}[0]->draw;	903	$self->{children}[0]->draw;
710	}	904	}
711		905
712	sub render_child {	906	sub render_child {
713	my ($self) = @_;	907	my ($self) = @_;
714		908
715	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	909	$self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
716	glClearColor 0, 0, 0, 0;	910	glClearColor 0, 0, 0, 0;
717	glClear GL_COLOR_BUFFER_BIT;	911	glClear GL_COLOR_BUFFER_BIT;
718		912
		913	{
		914	package CFPlus::UI::Base;
		915
		916	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		917	(0, 0, $self->{w}, $self->{h});
		918
719	$self->_render;	919	$self->_render;
720	# glColorMask 1, 1, 1, 0;	920	}
721	# glEnable GL_BLEND;
722	# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
723	# glRasterPos 0, 0;
724	# glCopyPixels 0, 0, $self->{w}, $self->{h};
725	# glDisable GL_BLEND;
726	# glColorMask 1, 1, 1, 1;
727	};	921	};
728	}	922	}
729		923
730	sub _draw {	924	sub _draw {
731	my ($self) = @_;	925	my ($self) = @_;
732
733	my ($w, $h) = ($self->w, $self->h);
734		926
735	my $tex = $self->{texture}	927	my $tex = $self->{texture}
736	or return;	928	or return;
737		929
738	glEnable GL_BLEND;
739	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
740	glEnable GL_TEXTURE_2D;	930	glEnable GL_TEXTURE_2D;
741	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	931	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
742	glColor 0, 0, 0, 1;	932	glColor 0, 0, 0, 1;
743		933
744	$tex->draw_quad (0, 0, $w, $h);	934	$tex->draw_quad_alpha_premultiplied (0, 0);
745		935
746	glDisable GL_BLEND;
747	glDisable GL_TEXTURE_2D;	936	glDisable GL_TEXTURE_2D;
748	}	937	}
749		938
750	#############################################################################	939	#############################################################################
751		940
752	package CFClient::UI::ViewPort;	941	package CFPlus::UI::ViewPort;
753		942
754	our @ISA = CFClient::UI::Window::;	943	our @ISA = CFPlus::UI::Window::;
		944
		945	sub new {
		946	my $class = shift;
		947
		948	$class->SUPER::new (
		949	scroll_x => 0,
		950	scroll_y => 1,
		951	@_,
		952	)
		953	}
755		954
756	sub size_request {	955	sub size_request {
757	my ($self) = @_;	956	my ($self) = @_;
758		957
759	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	958	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
760	$self->child->configure (0, 0, @$self{qw(child_w child_h)});
761		959
762	@$self{qw(child_w child_h)}	960	$w = 10 if $self->{scroll_x};
763	}	961	$h = 10 if $self->{scroll_y};
764		962
		963	($w, $h)
		964	}
		965
765	sub size_allocate {	966	sub invoke_size_allocate {
766	my ($self, $w, $h) = @_;	967	my ($self, $w, $h) = @_;
767		968
		969	my $child = $self->child;
		970
		971	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
		972	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
		973
		974	$self->child->configure (0, 0, $w, $h);
768	$self->update;	975	$self->update;
		976
		977	1
769	}	978	}
770		979
771	sub set_offset {	980	sub set_offset {
772	my ($self, $x, $y) = @_;	981	my ($self, $x, $y) = @_;
773		982
…		…
775	$self->{view_y} = int $y;	984	$self->{view_y} = int $y;
776		985
777	$self->update;	986	$self->update;
778	}	987	}
779		988
780	# hmm, this does not work for topleft of $self... but we should not aks for that	989	# hmm, this does not work for topleft of $self... but we should not ask for that
781	sub _topleft {	990	sub coord2local {
782	my ($self, $x, $y) = @_;	991	my ($self, $x, $y) = @_;
783		992
784	$self->SUPER::_topleft ($x - $self->{view_x}, $y - $self->{view_y})	993	$self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
		994	}
		995
		996	sub coord2global {
		997	my ($self, $x, $y) = @_;
		998
		999	$x = List::Util::min $self->{w}, $x - $self->{view_x};
		1000	$y = List::Util::min $self->{h}, $y - $self->{view_y};
		1001
		1002	$self->SUPER::coord2global ($x, $y)
785	}	1003	}
786		1004
787	sub find_widget {	1005	sub find_widget {
788	my ($self, $x, $y) = @_;	1006	my ($self, $x, $y) = @_;
789		1007
790	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1008	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
791	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1009	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
792	) {	1010	) {
793	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	1011	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
794	} else {	1012	} else {
795	$self->CFClient::UI::Base::find_widget ($x, $y)	1013	$self->CFPlus::UI::Base::find_widget ($x, $y)
796	}	1014	}
797	}	1015	}
798		1016
799	sub _render {	1017	sub _render {
800	my ($self) = @_;	1018	my ($self) = @_;
801		1019
		1020	local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
		1021	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
		1022
802	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1023	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
803		1024
804	$self->SUPER::_render;	1025	$self->SUPER::_render;
805	}	1026	}
806		1027
807	#############################################################################	1028	#############################################################################
808		1029
809	package CFClient::UI::ScrolledWindow;	1030	package CFPlus::UI::ScrolledWindow;
810		1031
811	our @ISA = CFClient::UI::HBox::;	1032	our @ISA = CFPlus::UI::HBox::;
		1033
		1034	sub new {
		1035	my ($class, %arg) = @_;
		1036
		1037	my $child = delete $arg{child};
		1038
		1039	my $self;
		1040
		1041	my $slider = new CFPlus::UI::Slider
		1042	vertical => 1,
		1043	range => [0, 0, 1, 0.01], # HACK fix
		1044	on_changed => sub {
		1045	$self->{vp}->set_offset (0, $_[1]);
		1046	},
		1047	;
		1048
		1049	$self = $class->SUPER::new (
		1050	vp => (new CFPlus::UI::ViewPort expand => 1),
		1051	can_events => 1,
		1052	slider => $slider,
		1053	%arg,
		1054	);
		1055
		1056	$self->SUPER::add ($self->{vp}, $self->{slider});
		1057	$self->add ($child) if $child;
		1058
		1059	$self
		1060	}
		1061
		1062	#TODO# update range on size_allocate depending on child
		1063
		1064	sub add {
		1065	my ($self, $widget) = @_;
		1066
		1067	$self->{vp}->add ($self->{child} = $widget);
		1068	}
		1069
		1070	sub invoke_mouse_wheel {
		1071	my ($self, $ev) = @_;
		1072
		1073	return 0 unless $ev->{dy}; # only vertical movements
		1074
		1075	$self->{slider}->emit (mouse_wheel => $ev);
		1076
		1077	1
		1078	}
		1079
		1080	sub update_slider {
		1081	my ($self) = @_;
		1082
		1083	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
		1084	}
		1085
		1086	sub update {
		1087	my ($self) = @_;
		1088
		1089	$self->SUPER::update;
		1090
		1091	$self->update_slider;
		1092	}
		1093
		1094	sub invoke_size_allocate {
		1095	my ($self, $w, $h) = @_;
		1096
		1097	$self->update_slider;
		1098
		1099	$self->SUPER::invoke_size_allocate ($w, $h)
		1100	}
		1101
		1102	#############################################################################
		1103
		1104	package CFPlus::UI::Frame;
		1105
		1106	our @ISA = CFPlus::UI::Bin::;
		1107
		1108	use CFPlus::OpenGL;
812		1109
813	sub new {	1110	sub new {
814	my $class = shift;	1111	my $class = shift;
815		1112
816	my $self;
817
818	my $slider = new CFClient::UI::Slider
819	vertical => 1,
820	range => [0, 0, 1, 0.01], # HACK fix
821	connect_changed => sub {
822	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
823	},
824	;
825
826	$self = $class->SUPER::new (	1113	$class->SUPER::new (
827	vp => (new CFClient::UI::ViewPort),	1114	bg => undef,
828	slider => $slider,
829	@_,	1115	@_,
		1116	)
		1117	}
		1118
		1119	sub _draw {
		1120	my ($self) = @_;
		1121
		1122	if ($self->{bg}) {
		1123	my ($w, $h) = @$self{qw(w h)};
		1124
		1125	glEnable GL_BLEND;
		1126	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		1127	glColor_premultiply @{ $self->{bg} };
		1128
		1129	glBegin GL_QUADS;
		1130	glVertex 0 , 0;
		1131	glVertex 0 , $h;
		1132	glVertex $w, $h;
		1133	glVertex $w, 0;
		1134	glEnd;
		1135
		1136	glDisable GL_BLEND;
		1137	}
		1138
		1139	$self->SUPER::_draw;
		1140	}
		1141
		1142	#############################################################################
		1143
		1144	package CFPlus::UI::FancyFrame;
		1145
		1146	our @ISA = CFPlus::UI::Bin::;
		1147
		1148	use CFPlus::OpenGL;
		1149
		1150	sub new {
		1151	my ($class, %arg) = @_;
		1152
		1153	if ((exists $arg{label}) && !ref $arg{label}) {
		1154	$arg{label} = new CFPlus::UI::Label
		1155	align => 1,
		1156	valign => 0,
		1157	text => $arg{label},
		1158	fontsize => ($arg{border} || 0.8) * 0.75;
		1159	}
		1160
		1161	my $self = $class->SUPER::new (
		1162	# label => "",
		1163	fg => [0.6, 0.3, 0.1],
		1164	border => 0.8,
		1165	style => 'single',
		1166	%arg,
830	);	1167	);
831		1168
832	$self->{vp}->add ($self->{scrolled});
833	$self->add ($self->{vp});
834	$self->add ($self->{slider});
835
836	$self	1169	$self
837	}	1170	}
838		1171
839	#TODO# update range on size_allocate depeneing on child	1172	sub add {
840	# update viewport offset on scroll
841
842	#############################################################################
843
844	package CFClient::UI::Frame;
845
846	our @ISA = CFClient::UI::Bin::;
847
848	use CFClient::OpenGL;
849
850	sub new {
851	my $class = shift;
852
853	my $self = $class->SUPER::new (
854	bg => [1, 1, 1, 1],
855	border_bg => [1, 1, 1, 1],
856	border => 0.8,
857	@_
858	);
859
860	$self
861	}
862
863	sub _draw {
864	my ($self) = @_;	1173	my ($self, @widgets) = @_;
865		1174
866	my ($w, $h) = ($self->{w}, $self->{h});	1175	$self->SUPER::add (@widgets);
867		1176	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
868	glEnable GL_BLEND;
869	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
870	glEnable GL_TEXTURE_2D;
871	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
872
873	# glBegin GL_QUADS;
874	# glColor 0, 0, 0, 0;
875	# glVertex 0 , 0;
876	# glVertex 0 , $h;
877	# glVertex $w, $h;
878	# glVertex $w, 0;
879	# glEnd;
880
881
882	$self->child->draw;
883	glDisable GL_BLEND;
884	glDisable GL_TEXTURE_2D;
885	}
886
887	#############################################################################
888
889	package CFClient::UI::FancyFrame;
890
891	our @ISA = CFClient::UI::Bin::;
892
893	use CFClient::OpenGL;
894
895	my @tex =
896	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
897	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
898
899	sub new {
900	my $class = shift;
901
902	# TODO: user_x, user_y, overwrite moveto?
903
904	my $self = $class->SUPER::new (
905	bg => [1, 1, 1, 1],
906	border_bg => [1, 1, 1, 1],
907	border => 0.6,
908	can_events => 1,
909	@_
910	);
911
912	$self->{title} &&= new CFClient::UI::Label
913	align => 0,
914	valign => 1,
915	text => $self->{title},
916	fontsize => $self->{border};
917
918	$self
919	}	1177	}
920		1178
921	sub border {	1179	sub border {
922	int $_[0]{border} * $::FONTSIZE	1180	int $_[0]{border} * $::FONTSIZE
923	}	1181	}
924		1182
925	sub size_request {	1183	sub size_request {
926	my ($self) = @_;	1184	my ($self) = @_;
		1185
		1186	($self->{label_w}, undef) = $self->{label}->size_request
		1187	if $self->{label};
927		1188
928	my ($w, $h) = $self->SUPER::size_request;	1189	my ($w, $h) = $self->SUPER::size_request;
929		1190
930	(	1191	(
931	$w + $self->border * 2,	1192	$w + $self->border * 2,
932	$h + $self->border * 2,	1193	$h + $self->border * 2,
933	)	1194	)
934	}	1195	}
935		1196
936	sub size_allocate {	1197	sub invoke_size_allocate {
937	my ($self, $w, $h) = @_;	1198	my ($self, $w, $h) = @_;
938		1199
939	$h -= List::Util::max 0, $self->border * 2;	1200	my $border = $self->border;
		1201
940	$w -= List::Util::max 0, $self->border * 2;	1202	$w -= List::Util::max 0, $border * 2;
		1203	$h -= List::Util::max 0, $border * 2;
941		1204
942	$self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)	1205	if (my $label = $self->{label}) {
943	if $self->{title};	1206	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1207	$label->{h} = List::Util::min $h, $border;
		1208	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1209	}
944		1210
945	$self->child->configure ($self->border, $self->border, $w, $h);	1211	$self->child->configure ($border, $border, $w, $h);
946	}
947		1212
		1213	1
		1214	}
		1215
		1216	sub _draw {
		1217	my ($self) = @_;
		1218
		1219	my $child = $self->{children}[0];
		1220
		1221	my $border = $self->border;
		1222	my ($w, $h) = ($self->{w}, $self->{h});
		1223
		1224	$child->draw;
		1225
		1226	glColor @{$self->{fg}};
		1227	glBegin GL_LINE_STRIP;
		1228	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1229	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1230	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1231	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1232	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1233	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1234	glEnd;
		1235
		1236	if ($self->{label}) {
		1237	glTranslate $border * 2, 0;
		1238	$self->{label}->_draw;
		1239	}
		1240	}
		1241
		1242	#############################################################################
		1243
		1244	package CFPlus::UI::Toplevel;
		1245
		1246	our @ISA = CFPlus::UI::Bin::;
		1247
		1248	use CFPlus::OpenGL;
		1249
		1250	my $bg =
		1251	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
		1252	mipmap => 1, wrap => 1;
		1253
		1254	my @border =
		1255	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		1256	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
		1257
		1258	sub new {
		1259	my ($class, %arg) = @_;
		1260
		1261	my $self = $class->SUPER::new (
		1262	bg => [1, 1, 1, 1],
		1263	border_bg => [1, 1, 1, 1],
		1264	border => 0.6,
		1265	can_events => 1,
		1266	min_w => 64,
		1267	min_h => 32,
		1268	%arg,
		1269	);
		1270
		1271	$self->{title_widget} = new CFPlus::UI::Label
		1272	align => 0,
		1273	valign => 1,
		1274	text => $self->{title},
		1275	fontsize => $self->{border},
		1276	if exists $self->{title};
		1277
		1278	if ($self->{has_close_button}) {
		1279	$self->{close_button} =
		1280	new CFPlus::UI::ImageButton
		1281	path => 'x1_close.png',
		1282	on_activate => sub { $self->emit ("delete") };
		1283
		1284	$self->CFPlus::UI::Container::add ($self->{close_button});
		1285	}
		1286
		1287	$self
		1288	}
		1289
		1290	sub add {
		1291	my ($self, @widgets) = @_;
		1292
		1293	$self->SUPER::add (@widgets);
		1294	$self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
		1295	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
		1296	}
		1297
		1298	sub border {
		1299	int $_[0]{border} * $::FONTSIZE
		1300	}
		1301
		1302	sub size_request {
		1303	my ($self) = @_;
		1304
		1305	$self->{title_widget}->size_request
		1306	if $self->{title_widget};
		1307
		1308	$self->{close_button}->size_request
		1309	if $self->{close_button};
		1310
		1311	my ($w, $h) = $self->SUPER::size_request;
		1312
		1313	(
		1314	$w + $self->border * 2,
		1315	$h + $self->border * 2,
		1316	)
		1317	}
		1318
		1319	sub invoke_size_allocate {
		1320	my ($self, $w, $h) = @_;
		1321
		1322	if ($self->{title_widget}) {
		1323	$self->{title_widget}{w} = $w;
		1324	$self->{title_widget}{h} = $h;
		1325	$self->{title_widget}->invoke_size_allocate ($w, $h);
		1326	}
		1327
		1328	my $border = $self->border;
		1329
		1330	$h -= List::Util::max 0, $border * 2;
		1331	$w -= List::Util::max 0, $border * 2;
		1332
		1333	$self->child->configure ($border, $border, $w, $h);
		1334
		1335	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
		1336	if $self->{close_button};
		1337
		1338	1
		1339	}
		1340
		1341	sub invoke_delete {
		1342	my ($self) = @_;
		1343
		1344	$self->hide;
		1345
		1346	1
		1347	}
		1348
948	sub button_down {	1349	sub invoke_button_down {
949	my ($self, $ev, $x, $y) = @_;	1350	my ($self, $ev, $x, $y) = @_;
950		1351
951	my ($w, $h) = @$self{qw(w h)};	1352	my ($w, $h) = @$self{qw(w h)};
952	my $border = $self->border;	1353	my $border = $self->border;
953		1354
…		…
966	my ($ev, $x, $y) = @_;	1367	my ($ev, $x, $y) = @_;
967		1368
968	my $dx = $ev->{x} - $ox;	1369	my $dx = $ev->{x} - $ox;
969	my $dy = $ev->{y} - $oy;	1370	my $dy = $ev->{y} - $oy;
970		1371
971	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1372	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
972	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1373	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
		1374
973	$self->move ($wx + $dx * $mx, $wy + $dy * $my);	1375	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
974	$self->check_size;	1376	$self->realloc;
975	};	1377	};
976		1378
977	} elsif ($lr ^ $td) {	1379	} elsif ($lr ^ $td) {
978	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1380	my ($ox, $oy) = ($ev->{x}, $ev->{y});
979	my ($bx, $by) = ($self->{x}, $self->{y});	1381	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
981	$self->{motion} = sub {	1383	$self->{motion} = sub {
982	my ($ev, $x, $y) = @_;	1384	my ($ev, $x, $y) = @_;
983		1385
984	($x, $y) = ($ev->{x}, $ev->{y});	1386	($x, $y) = ($ev->{x}, $ev->{y});
985		1387
986	$self->move ($bx + $x - $ox, $by + $y - $oy);	1388	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
987	$self->update;	1389	# HACK: the next line is required to enforce placement
		1390	$self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
988	};	1391	};
		1392	} else {
		1393	return 0;
		1394	}
		1395
989	}	1396	1
990	}	1397	}
991		1398
992	sub button_up {	1399	sub invoke_button_up {
993	my ($self, $ev, $x, $y) = @_;	1400	my ($self, $ev, $x, $y) = @_;
994		1401
995	delete $self->{motion};	1402	! ! delete $self->{motion}
996	}	1403	}
997		1404
998	sub mouse_motion {	1405	sub invoke_mouse_motion {
999	my ($self, $ev, $x, $y) = @_;	1406	my ($self, $ev, $x, $y) = @_;
1000		1407
1001	$self->{motion}->($ev, $x, $y) if $self->{motion};	1408	$self->{motion}->($ev, $x, $y) if $self->{motion};
		1409
		1410	! ! $self->{motion}
		1411	}
		1412
		1413	sub invoke_visibility_change {
		1414	my ($self, $visible) = @_;
		1415
		1416	delete $self->{motion} unless $visible;
		1417
		1418	0
1002	}	1419	}
1003		1420
1004	sub _draw {	1421	sub _draw {
1005	my ($self) = @_;	1422	my ($self) = @_;
1006		1423
		1424	my $child = $self->{children}[0];
		1425
1007	my ($w, $h ) = ($self->{w}, $self->{h});	1426	my ($w, $h ) = ($self->{w}, $self->{h});
1008	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1427	my ($cw, $ch) = ($child->{w}, $child->{h});
1009		1428
1010	glEnable GL_BLEND;
1011	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1012	glEnable GL_TEXTURE_2D;	1429	glEnable GL_TEXTURE_2D;
1013	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1430	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1014		1431
1015	my $border = $self->border;	1432	my $border = $self->border;
1016		1433
1017	glColor @{ $self->{border_bg} };	1434	glColor @{ $self->{border_bg} };
1018	$tex[1]->draw_quad (0, 0, $w, $border);	1435	$border[0]->draw_quad_alpha (0, 0, $w, $border);
1019	$tex[3]->draw_quad (0, $border, $border, $ch);	1436	$border[1]->draw_quad_alpha (0, $border, $border, $ch);
1020	$tex[2]->draw_quad ($w - $border, $border, $border, $ch);	1437	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1021	$tex[4]->draw_quad (0, $h - $border, $w, $border);	1438	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1022		1439
1023	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1440	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1024	my $bg = $tex[0];	1441	glColor @{ $self->{bg} };
1025		1442
1026	# TODO: repeat texture not scale	1443	# TODO: repeat texture not scale
		1444	# solve this better(?)
1027	my $rep_x = $cw / $bg->{w};	1445	$bg->{s} = $cw / $bg->{w};
1028	my $rep_y = $ch / $bg->{h};	1446	$bg->{t} = $ch / $bg->{h};
1029
1030	glColor @{ $self->{bg} };
1031
1032	$bg->{s} = $rep_x;
1033	$bg->{t} = $rep_y;
1034	$bg->{wrap_mode} = 1;
1035	$bg->draw_quad ($border, $border, $cw, $ch);	1447	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
		1448	}
1036		1449
1037	glDisable GL_TEXTURE_2D;	1450	glDisable GL_TEXTURE_2D;
1038	glDisable GL_BLEND;
1039	}
1040		1451
1041	$self->{title}->draw if $self->{title};
1042
1043	$self->child->draw;	1452	$child->draw;
		1453
		1454	if ($self->{title_widget}) {
		1455	glTranslate 0, $border - $self->{h};
		1456	$self->{title_widget}->_draw;
		1457
		1458	glTranslate 0, - ($border - $self->{h});
		1459	}
		1460
		1461	$self->{close_button}->draw
		1462	if $self->{close_button};
1044	}	1463	}
1045		1464
1046	#############################################################################	1465	#############################################################################
1047		1466
1048	package CFClient::UI::Table;	1467	package CFPlus::UI::Table;
1049		1468
1050	our @ISA = CFClient::UI::Base::;	1469	our @ISA = CFPlus::UI::Base::;
1051		1470
1052	use List::Util qw(max sum);	1471	use List::Util qw(max sum);
1053		1472
1054	use CFClient::OpenGL;	1473	use CFPlus::OpenGL;
1055		1474
1056	sub new {	1475	sub new {
1057	my $class = shift;	1476	my $class = shift;
1058		1477
1059	$class->SUPER::new (	1478	$class->SUPER::new (
1060	col_expand => [],	1479	col_expand => [],
1061	@_	1480	@_,
1062	)	1481	)
1063	}
1064
1065	sub add {
1066	my ($self, $x, $y, $child) = @_;
1067
1068	$child->set_parent ($self);
1069	$self->{children}[$y][$x] = $child;
1070
1071	$child->check_size;
1072	}	1482	}
1073		1483
1074	sub children {	1484	sub children {
1075	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1485	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1076	}	1486	}
1077		1487
		1488	sub add {
		1489	my ($self) = shift;
		1490
		1491	while (@_) {
		1492	my ($x, $y, $child) = splice @_, 0, 3, ();
		1493	$child->set_parent ($self);
		1494	$self->{children}[$y][$x] = $child;
		1495	}
		1496
		1497	$self->{force_realloc} = 1;
		1498	$self->{force_size_alloc} = 1;
		1499	$self->realloc;
		1500	}
		1501
		1502	sub remove {
		1503	my ($self, $child) = @_;
		1504
		1505	# TODO: not yet implemented
		1506	}
		1507
1078	# TODO: move to container class maybe? send childs a signal on removal?	1508	# TODO: move to container class maybe? send children a signal on removal?
1079	sub clear {	1509	sub clear {
1080	my ($self) = @_;	1510	my ($self) = @_;
1081		1511
1082	my @children = $self->children;	1512	my @children = $self->children;
1083	delete $self->{children};	1513	delete $self->{children};
…		…
1085	for (@children) {	1515	for (@children) {
1086	delete $_->{parent};	1516	delete $_->{parent};
1087	$_->hide;	1517	$_->hide;
1088	}	1518	}
1089		1519
1090	$self->update;	1520	$self->realloc;
1091	}	1521	}
1092		1522
1093	sub get_wh {	1523	sub get_wh {
1094	my ($self) = @_;	1524	my ($self) = @_;
1095		1525
…		…
1121	(sum @$ws),	1551	(sum @$ws),
1122	(sum @$hs),	1552	(sum @$hs),
1123	)	1553	)
1124	}	1554	}
1125		1555
1126	sub size_allocate {	1556	sub invoke_size_allocate {
1127	my ($self, $w, $h) = @_;	1557	my ($self, $w, $h) = @_;
1128		1558
1129	my ($ws, $hs) = $self->get_wh;	1559	my ($ws, $hs) = $self->get_wh;
1130		1560
1131	my $req_w = sum @$ws;	1561	my $req_w = (sum @$ws) || 1;
1132	my $req_h = sum @$hs;	1562	my $req_h = (sum @$hs) || 1;
1133		1563
1134	# TODO: nicer code && do row_expand	1564	# TODO: nicer code && do row_expand
1135	my @col_expand = @{$self->{col_expand}};	1565	my @col_expand = @{$self->{col_expand}};
1136	@col_expand = (1) x @$ws unless @col_expand;	1566	@col_expand = (1) x @$ws unless @col_expand;
1137	my $col_expand = (sum @col_expand) || 1;	1567	my $col_expand = (sum @col_expand) || 1;
1138		1568
1139	# linearly scale sizes	1569	# linearly scale sizes
1140	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1570	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1141	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;	1571	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1142		1572
1143	CFClient::UI::harmonize $ws;	1573	CFPlus::UI::harmonize $ws;
1144	CFClient::UI::harmonize $hs;	1574	CFPlus::UI::harmonize $hs;
1145		1575
1146	my $y;	1576	my $y;
1147		1577
1148	for my $r (0 .. $#{$self->{children}}) {	1578	for my $r (0 .. $#{$self->{children}}) {
1149	my $row = $self->{children}[$r]	1579	my $row = $self->{children}[$r]
…		…
1163	}	1593	}
1164		1594
1165	$y += $row_h;	1595	$y += $row_h;
1166	}	1596	}
1167		1597
		1598	1
1168	}	1599	}
1169		1600
1170	sub find_widget {	1601	sub find_widget {
1171	my ($self, $x, $y) = @_;	1602	my ($self, $x, $y) = @_;
1172		1603
…		…
1191	}	1622	}
1192	}	1623	}
1193		1624
1194	#############################################################################	1625	#############################################################################
1195		1626
1196	package CFClient::UI::HBox;	1627	package CFPlus::UI::Box;
1197		1628
1198	# TODO: wrap into common Box base class
1199
1200	our @ISA = CFClient::UI::Container::;	1629	our @ISA = CFPlus::UI::Container::;
1201		1630
1202	sub size_request {	1631	sub size_request {
1203	my ($self) = @_;	1632	my ($self) = @_;
1204		1633
1205	my @alloc = map [$_->size_request], @{$self->{children}};	1634	$self->{vertical}
		1635	? (
		1636	(List::Util::max map $_->{req_w}, @{$self->{children}}),
		1637	(List::Util::sum map $_->{req_h}, @{$self->{children}}),
		1638	)
		1639	: (
		1640	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
		1641	(List::Util::max map $_->{req_h}, @{$self->{children}}),
		1642	)
		1643	}
1206		1644
		1645	sub invoke_size_allocate {
		1646	my ($self, $w, $h) = @_;
		1647
		1648	my $space = $self->{vertical} ? $h : $w;
		1649	my @children = $self->visible_children;
		1650
		1651	my @req;
		1652
		1653	if ($self->{homogeneous}) {
		1654	@req = ($space / (@children || 1)) x @children;
		1655	} else {
		1656	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
		1657	my $req = List::Util::sum @req;
		1658
		1659	if ($req > $space) {
		1660	# ah well, not enough space
		1661	$_ *= $space / $req for @req;
		1662	} else {
		1663	my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
		1664
		1665	$space = ($space - $req) / $expand; # remaining space to give away
		1666
		1667	$req[$_] += $space * $children[$_]{expand}
		1668	for 0 .. $#children;
		1669	}
1207	(	1670	}
1208	(List::Util::sum map $_->[0], @alloc),	1671
1209	(List::Util::max map $_->[1], @alloc),	1672	CFPlus::UI::harmonize \@req;
		1673
		1674	my $pos = 0;
		1675	for (0 .. $#children) {
		1676	my $alloc = $req[$_];
		1677	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
		1678
		1679	$pos += $alloc;
		1680	}
		1681
		1682	1
		1683	}
		1684
		1685	#############################################################################
		1686
		1687	package CFPlus::UI::HBox;
		1688
		1689	our @ISA = CFPlus::UI::Box::;
		1690
		1691	sub new {
		1692	my $class = shift;
		1693
		1694	$class->SUPER::new (
		1695	vertical => 0,
		1696	@_,
1210	)	1697	)
1211	}	1698	}
1212		1699
1213	sub size_allocate {
1214	my ($self, $w, $h) = @_;
1215
1216	($h, $w) = ($w, $h);
1217
1218	my $children = $self->{children};
1219
1220	my @h = map $_->{req_w}, @$children;
1221
1222	my $req_h = List::Util::sum @h;
1223
1224	if ($req_h > $h) {
1225	# ah well, not enough space
1226	$_ *= $h / $req_h for @h;
1227	} else {
1228	my $exp = List::Util::sum map $_->{expand}, @$children;
1229	$exp ||= 1;
1230
1231	for (0 .. $#$children) {
1232	my $child = $children->[$_];
1233
1234	my $alloc_h = $h[$_];
1235	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1236	$h[$_] = $alloc_h;
1237	}
1238	}
1239
1240	CFClient::UI::harmonize \@h;
1241
1242	my $y = 0;
1243	for (0 .. $#$children) {
1244	my $child = $children->[$_];
1245	my $h = $h[$_];
1246	$child->configure ($y, 0, $h, $w);
1247
1248	$y += $h;
1249	}
1250
1251	1
1252	}
1253
1254	#############################################################################	1700	#############################################################################
1255		1701
1256	package CFClient::UI::VBox;	1702	package CFPlus::UI::VBox;
1257		1703
1258	# TODO: wrap into common Box base class	1704	our @ISA = CFPlus::UI::Box::;
1259		1705
1260	our @ISA = CFClient::UI::Container::;	1706	sub new {
		1707	my $class = shift;
1261		1708
1262	sub size_request {	1709	$class->SUPER::new (
1263	my ($self) = @_;	1710	vertical => 1,
1264		1711	@_,
1265	my @alloc = map [$_->size_request], @{$self->{children}};
1266
1267	(
1268	(List::Util::max map $_->[0], @alloc),
1269	(List::Util::sum map $_->[1], @alloc),
1270	)	1712	)
1271	}	1713	}
1272		1714
1273	sub size_allocate {
1274	my ($self, $w, $h) = @_;
1275
1276	my $children = $self->{children};
1277
1278	my @h = map $_->{req_h}, @$children;
1279
1280	my $req_h = List::Util::sum @h;
1281
1282	if ($req_h > $h) {
1283	# ah well, not enough space
1284	$_ *= $h / $req_h for @h;
1285	} else {
1286	my $exp = List::Util::sum map $_->{expand}, @$children;
1287	$exp ||= 1;
1288
1289	for (0 .. $#$children) {
1290	my $child = $children->[$_];
1291
1292	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1293	}
1294	}
1295
1296	CFClient::UI::harmonize \@h;
1297
1298	my $y = 0;
1299	for (0 .. $#$children) {
1300	my $child = $children->[$_];
1301	my $h = $h[$_];
1302	$child->configure (0, $y, $w, $h);
1303
1304	$y += $h;
1305	}
1306
1307	1
1308	}
1309
1310	#############################################################################	1715	#############################################################################
1311		1716
1312	package CFClient::UI::Label;	1717	package CFPlus::UI::Label;
1313		1718
1314	our @ISA = CFClient::UI::Base::;	1719	our @ISA = CFPlus::UI::DrawBG::;
1315		1720
1316	use CFClient::OpenGL;	1721	use CFPlus::OpenGL;
1317		1722
1318	sub new {	1723	sub new {
1319	my ($class, %arg) = @_;	1724	my ($class, %arg) = @_;
1320		1725
1321	my $self = $class->SUPER::new (	1726	my $self = $class->SUPER::new (
1322	fg => [1, 1, 1],	1727	fg => [1, 1, 1],
		1728	#bg => none
		1729	#active_bg => none
1323	#font => default_font	1730	#font => default_font
		1731	#text => initial text
		1732	#markup => initial narkup
		1733	#max_w => maximum pixel width
		1734	#style => 0, # render flags
		1735	ellipsise => 3, # end
		1736	layout => (new CFPlus::Layout),
1324	fontsize => 1,	1737	fontsize => 1,
1325	text => "",
1326	align => -1,	1738	align => -1,
1327	valign => -1,	1739	valign => -1,
1328	padding => 2,	1740	padding_x => 2,
1329	layout => new CFClient::Layout,	1741	padding_y => 2,
1330	can_events => 0,	1742	can_events => 0,
1331	%arg	1743	%arg
1332	);	1744	);
1333		1745
1334	if (exists $self->{template}) {	1746	if (exists $self->{template}) {
1335	my $layout = new CFClient::Layout;	1747	my $layout = new CFPlus::Layout;
1336	$layout->set_text (delete $self->{template});	1748	$layout->set_text (delete $self->{template});
1337	$self->{template} = $layout;	1749	$self->{template} = $layout;
1338	}	1750	}
1339		1751
1340	$self->set_text (delete $self->{text}) if exists $self->{text};	1752	if (exists $self->{markup}) {
1341	$self->set_markup (delete $self->{markup}) if exists $self->{markup};	1753	$self->set_markup (delete $self->{markup});
		1754	} else {
		1755	$self->set_text (delete $self->{text});
		1756	}
1342		1757
1343	$self	1758	$self
1344	}
1345
1346	sub escape {
1347	local $_ = $_[1];
1348
1349	s/&/&amp;/g;
1350	s/>/&gt;/g;
1351	s/</&lt;/g;
1352
1353	$_[1]
1354	}	1759	}
1355		1760
1356	sub update {	1761	sub update {
1357	my ($self) = @_;	1762	my ($self) = @_;
1358		1763
1359	delete $self->{texture};	1764	delete $self->{texture};
1360	$self->SUPER::update;	1765	$self->SUPER::update;
1361	}	1766	}
1362		1767
		1768	sub realloc {
		1769	my ($self) = @_;
		1770
		1771	delete $self->{ox};
		1772	$self->SUPER::realloc;
		1773	}
		1774
1363	sub set_text {	1775	sub set_text {
1364	my ($self, $text) = @_;	1776	my ($self, $text) = @_;
1365		1777
1366	return if $self->{text} eq "T$text";	1778	return if $self->{text} eq "T$text";
1367	$self->{text} = "T$text";	1779	$self->{text} = "T$text";
1368		1780
1369	$self->{layout}->set_text ($text);	1781	$self->{layout}->set_text ($text);
1370		1782
1371	delete $self->{texture};	1783	delete $self->{size_req};
		1784	$self->realloc;
1372	$self->update;	1785	$self->update;
1373	$self->check_size;
1374	}	1786	}
1375		1787
1376	sub set_markup {	1788	sub set_markup {
1377	my ($self, $markup) = @_;	1789	my ($self, $markup) = @_;
1378		1790
1379	return if $self->{text} eq "M$markup";	1791	return if $self->{text} eq "M$markup";
1380	$self->{text} = "M$markup";	1792	$self->{text} = "M$markup";
1381		1793
		1794	my $rgba = $markup =~ /span.*(?:foreground|background)/;
		1795
1382	$self->{layout}->set_markup ($markup);	1796	$self->{layout}->set_markup ($markup);
1383		1797
1384	delete $self->{texture};	1798	delete $self->{size_req};
		1799	$self->realloc;
1385	$self->update;	1800	$self->update;
1386	$self->check_size;
1387	}	1801	}
1388		1802
1389	sub size_request {	1803	sub size_request {
1390	my ($self) = @_;	1804	my ($self) = @_;
1391		1805
		1806	$self->{size_req} ||= do {
1392	$self->{layout}->set_font ($self->{font}) if $self->{font};	1807	$self->{layout}->set_font ($self->{font}) if $self->{font};
1393	$self->{layout}->set_width ($self->{max_w} || -1);	1808	$self->{layout}->set_width ($self->{max_w} || -1);
		1809	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1810	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1394	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1811	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1395		1812
1396	my ($w, $h) = $self->{layout}->size;	1813	my ($w, $h) = $self->{layout}->size;
1397		1814
1398	if (exists $self->{template}) {	1815	if (exists $self->{template}) {
1399	$self->{template}->set_font ($self->{font}) if $self->{font};	1816	$self->{template}->set_font ($self->{font}) if $self->{font};
		1817	$self->{template}->set_width ($self->{max_w} || -1);
1400	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1818	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1401		1819
1402	my ($w2, $h2) = $self->{template}->size;	1820	my ($w2, $h2) = $self->{template}->size;
1403		1821
1404	$w = List::Util::max $w, $w2;	1822	$w = List::Util::max $w, $w2;
1405	$h = List::Util::max $h, $h2;	1823	$h = List::Util::max $h, $h2;
		1824	}
		1825
		1826	[$w, $h]
1406	}	1827	};
1407		1828
1408	(	1829	@{ $self->{size_req} }
1409	$w + $self->{padding} * 2,
1410	$h + $self->{padding} * 2,
1411	)
1412	}	1830	}
1413		1831
		1832	sub baseline_shift {
		1833	$_[0]{layout}->descent
		1834	}
		1835
1414	sub size_allocate {	1836	sub invoke_size_allocate {
1415	my ($self, $w, $h) = @_;	1837	my ($self, $w, $h) = @_;
1416		1838
		1839	delete $self->{ox};
		1840
1417	delete $self->{texture};	1841	delete $self->{texture}
		1842	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
		1843
		1844	1
1418	}	1845	}
1419		1846
1420	sub set_fontsize {	1847	sub set_fontsize {
1421	my ($self, $fontsize) = @_;	1848	my ($self, $fontsize) = @_;
1422		1849
1423	$self->{fontsize} = $fontsize;	1850	$self->{fontsize} = $fontsize;
		1851	delete $self->{size_req};
1424	delete $self->{texture};	1852	delete $self->{texture};
1425		1853
1426	$self->update;	1854	$self->realloc;
1427	$self->check_size;	1855	}
		1856
		1857	sub reconfigure {
		1858	my ($self) = @_;
		1859
		1860	delete $self->{size_req};
		1861	delete $self->{texture};
		1862
		1863	$self->SUPER::reconfigure;
1428	}	1864	}
1429		1865
1430	sub _draw {	1866	sub _draw {
1431	my ($self) = @_;	1867	my ($self) = @_;
1432		1868
		1869	$self->SUPER::_draw; # draw background, if applicable
		1870
1433	my $tex = $self->{texture} ||= do {	1871	my $size = $self->{texture} ||= do {
		1872	$self->{layout}->set_foreground (@{$self->{fg}});
1434	$self->{layout}->set_font ($self->{font}) if $self->{font};	1873	$self->{layout}->set_font ($self->{font}) if $self->{font};
1435	$self->{layout}->set_width ($self->{w});	1874	$self->{layout}->set_width ($self->{w});
		1875	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1876	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1436	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);	1877	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1437	new_from_layout CFClient::Texture $self->{layout}	1878
		1879	[$self->{layout}->size]
1438	};	1880	};
1439		1881
1440	glEnable GL_BLEND;	1882	unless (exists $self->{ox}) {
1441	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1442	glEnable GL_TEXTURE_2D;
1443	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1444
1445	glColor @{$self->{fg}};
1446
1447	$self->{ox} = int (
1448	$self->{align} < 0 ? $self->{padding}	1883	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1449	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1884	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1450	: ($self->{w} - $tex->{w}) * 0.5	1885	: ($self->{w} - $size->[0]) * 0.5);
1451	);
1452		1886
1453	$self->{oy} = int (
1454	$self->{valign} < 0 ? $self->{padding}	1887	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1455	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1888	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1456	: ($self->{h} - $tex->{h}) * 0.5	1889	: ($self->{h} - $size->[1]) * 0.5);
1457	);	1890	};
1458		1891
1459	$tex->draw_quad ($self->{ox}, $self->{oy});	1892	my $w = List::Util::min $self->{w} + 4, $size->[0];
		1893	my $h = List::Util::min $self->{h} + 2, $size->[1];
1460		1894
1461	glDisable GL_TEXTURE_2D;	1895	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1462	glDisable GL_BLEND;
1463	}	1896	}
1464		1897
1465	#############################################################################	1898	#############################################################################
1466		1899
1467	package CFClient::UI::EntryBase;	1900	package CFPlus::UI::EntryBase;
1468		1901
1469	our @ISA = CFClient::UI::Label::;	1902	our @ISA = CFPlus::UI::Label::;
1470		1903
1471	use CFClient::OpenGL;	1904	use CFPlus::OpenGL;
1472		1905
1473	sub new {	1906	sub new {
1474	my $class = shift;	1907	my $class = shift;
1475		1908
1476	$class->SUPER::new (	1909	$class->SUPER::new (
…		…
1480	active_fg => [0, 0, 0],	1913	active_fg => [0, 0, 0],
1481	can_hover => 1,	1914	can_hover => 1,
1482	can_focus => 1,	1915	can_focus => 1,
1483	valign => 0,	1916	valign => 0,
1484	can_events => 1,	1917	can_events => 1,
		1918	#text => ...
		1919	#hidden => "*",
1485	@_	1920	@_
1486	)	1921	)
1487	}	1922	}
1488		1923
1489	sub _set_text {	1924	sub _set_text {
…		…
1491		1926
1492	delete $self->{cur_h};	1927	delete $self->{cur_h};
1493		1928
1494	return if $self->{text} eq $text;	1929	return if $self->{text} eq $text;
1495		1930
1496	delete $self->{texture};
1497
1498	$self->{last_activity} = $::NOW;	1931	$self->{last_activity} = $::NOW;
1499	$self->{text} = $text;	1932	$self->{text} = $text;
1500		1933
1501	$text =~ s/./*/g if $self->{hidden};	1934	$text =~ s/./*/g if $self->{hidden};
1502	$self->{layout}->set_text ("$text ");	1935	$self->{layout}->set_text ("$text ");
		1936	delete $self->{size_req};
1503		1937
1504	$self->emit (changed => $self->{text});	1938	$self->emit (changed => $self->{text});
		1939
		1940	$self->realloc;
		1941	$self->update;
		1942	}
		1943
		1944	sub set_text {
		1945	my ($self, $text) = @_;
		1946
		1947	$self->{cursor} = length $text;
		1948	$self->_set_text ($text);
1505	}	1949	}
1506		1950
1507	sub get_text {	1951	sub get_text {
1508	$_[0]{text}	1952	$_[0]{text}
1509	}	1953	}
…		…
1514	my ($w, $h) = $self->SUPER::size_request;	1958	my ($w, $h) = $self->SUPER::size_request;
1515		1959
1516	($w + 1, $h) # add 1 for cursor	1960	($w + 1, $h) # add 1 for cursor
1517	}	1961	}
1518		1962
1519	sub size_allocate {
1520	my ($self, $w, $h) = @_;
1521
1522	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1523	}
1524
1525	sub set_text {
1526	my ($self, $text) = @_;
1527
1528	$self->{cursor} = length $text;
1529	$self->_set_text ($text);
1530	$self->update;
1531	}
1532
1533	sub key_down {	1963	sub invoke_key_down {
1534	my ($self, $ev) = @_;	1964	my ($self, $ev) = @_;
1535		1965
1536	my $mod = $ev->{mod};	1966	my $mod = $ev->{mod};
1537	my $sym = $ev->{sym};	1967	my $sym = $ev->{sym};
1538	my $uni = $ev->{unicode};	1968	my $uni = $ev->{unicode};
1539		1969
1540	my $text = $self->get_text;	1970	my $text = $self->get_text;
1541		1971
1542	if ($sym == 8) {	1972	if ($uni == 8) {
1543	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1973	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1544	} elsif ($sym == 127) {	1974	} elsif ($uni == 127) {
1545	substr $text, $self->{cursor}, 1, "";	1975	substr $text, $self->{cursor}, 1, "";
1546	} elsif ($sym == CFClient::SDLK_LEFT) {	1976	} elsif ($sym == CFPlus::SDLK_LEFT) {
1547	--$self->{cursor} if $self->{cursor};	1977	--$self->{cursor} if $self->{cursor};
1548	} elsif ($sym == CFClient::SDLK_RIGHT) {	1978	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1549	++$self->{cursor} if $self->{cursor} < length $self->{text};	1979	++$self->{cursor} if $self->{cursor} < length $self->{text};
1550	} elsif ($sym == CFClient::SDLK_HOME) {	1980	} elsif ($sym == CFPlus::SDLK_HOME) {
1551	$self->{cursor} = 0;	1981	$self->{cursor} = 0;
1552	} elsif ($sym == CFClient::SDLK_END) {	1982	} elsif ($sym == CFPlus::SDLK_END) {
1553	$self->{cursor} = length $text;	1983	$self->{cursor} = length $text;
		1984	} elsif ($uni == 21) { # ctrl-u
		1985	$text = "";
		1986	$self->{cursor} = 0;
1554	} elsif ($sym == 27) {	1987	} elsif ($uni == 27) {
1555	$self->emit ('escape');	1988	$self->emit ('escape');
1556	} elsif ($uni) {	1989	} elsif ($uni) {
1557	substr $text, $self->{cursor}++, 0, chr $uni;	1990	substr $text, $self->{cursor}++, 0, chr $uni;
		1991	} else {
		1992	return 0;
1558	}	1993	}
1559		1994
1560	$self->_set_text ($text);	1995	$self->_set_text ($text);
1561	$self->update;
1562	}
1563		1996
		1997	$self->realloc;
		1998
		1999	1
		2000	}
		2001
1564	sub focus_in {	2002	sub invoke_focus_in {
1565	my ($self) = @_;	2003	my ($self) = @_;
1566		2004
1567	$self->{last_activity} = $::NOW;	2005	$self->{last_activity} = $::NOW;
1568		2006
1569	$self->SUPER::focus_in;	2007	$self->SUPER::invoke_focus_in
1570	}	2008	}
1571		2009
1572	sub button_down {	2010	sub invoke_button_down {
1573	my ($self, $ev, $x, $y) = @_;	2011	my ($self, $ev, $x, $y) = @_;
1574		2012
1575	$self->SUPER::button_down ($ev, $x, $y);	2013	$self->SUPER::invoke_button_down ($ev, $x, $y);
1576		2014
1577	my $idx = $self->{layout}->xy_to_index ($x, $y);	2015	my $idx = $self->{layout}->xy_to_index ($x, $y);
1578		2016
1579	# byte-index to char-index	2017	# byte-index to char-index
1580	my $text = $self->{text};	2018	my $text = $self->{text};
1581	utf8::encode $text;	2019	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1582	$self->{cursor} = length substr $text, 0, $idx;	2020	$self->{cursor} = length $text;
1583		2021
1584	$self->_set_text ($self->{text});	2022	$self->_set_text ($self->{text});
1585	$self->update;	2023	$self->update;
		2024
		2025	1
1586	}	2026	}
1587		2027
1588	sub mouse_motion {	2028	sub invoke_mouse_motion {
1589	my ($self, $ev, $x, $y) = @_;	2029	my ($self, $ev, $x, $y) = @_;
1590	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#	2030	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
		2031
		2032	1
1591	}	2033	}
1592		2034
1593	sub _draw {	2035	sub _draw {
1594	my ($self) = @_;	2036	my ($self) = @_;
1595		2037
1596	local $self->{fg} = $self->{fg};	2038	local $self->{fg} = $self->{fg};
1597		2039
1598	if ($FOCUS == $self) {	2040	if ($FOCUS == $self) {
1599	glColor @{$self->{active_bg}};	2041	glColor_premultiply @{$self->{active_bg}};
1600	$self->{fg} = $self->{active_fg};	2042	$self->{fg} = $self->{active_fg};
1601	} else {	2043	} else {
1602	glColor @{$self->{bg}};	2044	glColor_premultiply @{$self->{bg}};
1603	}	2045	}
1604		2046
1605	glEnable GL_BLEND;	2047	glEnable GL_BLEND;
1606	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	2048	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1607	glBegin GL_QUADS;	2049	glBegin GL_QUADS;
1608	glVertex 0 , 0;	2050	glVertex 0 , 0;
1609	glVertex 0 , $self->{h};	2051	glVertex 0 , $self->{h};
1610	glVertex $self->{w}, $self->{h};	2052	glVertex $self->{w}, $self->{h};
1611	glVertex $self->{w}, 0;	2053	glVertex $self->{w}, 0;
…		…
1622	utf8::encode $text;	2064	utf8::encode $text;
1623		2065
1624	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2066	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1625	}	2067	}
1626		2068
1627	glColor @{$self->{fg}};
1628	glBegin GL_LINES;	2069	glBegin GL_LINES;
1629	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2070	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1630	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2071	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1631	glEnd;	2072	glEnd;
1632	}	2073	}
1633	}	2074	}
1634		2075
1635	package CFClient::UI::Entry;	2076	package CFPlus::UI::Entry;
1636		2077
1637	our @ISA = CFClient::UI::EntryBase::;	2078	our @ISA = CFPlus::UI::EntryBase::;
1638		2079
1639	use CFClient::OpenGL;	2080	use CFPlus::OpenGL;
1640		2081
1641	sub key_down {	2082	sub invoke_key_down {
1642	my ($self, $ev) = @_;	2083	my ($self, $ev) = @_;
1643		2084
1644	my $sym = $ev->{sym};	2085	my $sym = $ev->{sym};
1645		2086
1646	if ($sym == 13) {	2087	if ($sym == 13) {
1647	unshift @{$self->{history}},	2088	unshift @{$self->{history}},
1648	my $txt = $self->get_text;	2089	my $txt = $self->get_text;
		2090
1649	$self->{history_pointer} = -1;	2091	$self->{history_pointer} = -1;
1650	$self->{history_saveback} = '';	2092	$self->{history_saveback} = '';
1651	$self->emit (activate => $txt);	2093	$self->emit (activate => $txt);
1652	$self->update;	2094	$self->update;
1653		2095
1654	} elsif ($sym == CFClient::SDLK_UP) {	2096	} elsif ($sym == CFPlus::SDLK_UP) {
1655	if ($self->{history_pointer} < 0) {	2097	if ($self->{history_pointer} < 0) {
1656	$self->{history_saveback} = $self->get_text;	2098	$self->{history_saveback} = $self->get_text;
1657	}	2099	}
1658	if (@{$self->{history} || []} > 0) {	2100	if (@{$self->{history} || []} > 0) {
1659	$self->{history_pointer}++;	2101	$self->{history_pointer}++;
…		…
1661	$self->{history_pointer} = @{$self->{history} || []} - 1;	2103	$self->{history_pointer} = @{$self->{history} || []} - 1;
1662	}	2104	}
1663	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2105	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1664	}	2106	}
1665		2107
1666	} elsif ($sym == CFClient::SDLK_DOWN) {	2108	} elsif ($sym == CFPlus::SDLK_DOWN) {
1667	$self->{history_pointer}--;	2109	$self->{history_pointer}--;
1668	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2110	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1669		2111
1670	if ($self->{history_pointer} >= 0) {	2112	if ($self->{history_pointer} >= 0) {
1671	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2113	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1672	} else {	2114	} else {
1673	$self->set_text ($self->{history_saveback});	2115	$self->set_text ($self->{history_saveback});
1674	}	2116	}
1675		2117
1676	} else {	2118	} else {
1677	$self->SUPER::key_down ($ev);	2119	return $self->SUPER::invoke_key_down ($ev)
		2120	}
		2121
1678	}	2122	1
1679
1680	}	2123	}
1681		2124
1682	#############################################################################	2125	#############################################################################
1683		2126
1684	package CFClient::UI::Button;	2127	package CFPlus::UI::Button;
1685		2128
1686	our @ISA = CFClient::UI::Label::;	2129	our @ISA = CFPlus::UI::Label::;
1687		2130
1688	use CFClient::OpenGL;	2131	use CFPlus::OpenGL;
1689		2132
1690	my @tex =	2133	my @tex =
1691	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2134	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1692	qw(b1_button_active.png);	2135	qw(b1_button_active.png);
1693		2136
1694	sub new {	2137	sub new {
1695	my $class = shift;	2138	my $class = shift;
1696		2139
1697	$class->SUPER::new (	2140	$class->SUPER::new (
1698	padding => 4,	2141	padding_x => 4,
		2142	padding_y => 4,
1699	fg => [1, 1, 1],	2143	fg => [1, 1, 1],
1700	bg => [1, 1, 1, 0.2],
1701	active_fg => [0, 0, 1],	2144	active_fg => [0, 0, 1],
1702	can_hover => 1,	2145	can_hover => 1,
1703	align => 0,	2146	align => 0,
1704	valign => 0,	2147	valign => 0,
1705	can_events => 1,	2148	can_events => 1,
1706	@_	2149	@_
1707	)	2150	)
1708	}	2151	}
1709		2152
1710	sub button_up {	2153	sub invoke_button_up {
1711	my ($self, $ev, $x, $y) = @_;	2154	my ($self, $ev, $x, $y) = @_;
1712		2155
		2156	$self->emit ("activate")
1713	if ($x >= 0 && $x < $self->{w}	2157	if $x >= 0 && $x < $self->{w}
1714	&& $y >= 0 && $y < $self->{h}) {	2158	&& $y >= 0 && $y < $self->{h};
1715	$self->emit ("activate");	2159
1716	}	2160	1
1717	}	2161	}
1718		2162
1719	sub _draw {	2163	sub _draw {
1720	my ($self) = @_;	2164	my ($self) = @_;
1721		2165
1722	local $self->{fg} = $self->{fg};	2166	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1723		2167
1724	if ($GRAB == $self) {
1725	$self->{fg} = $self->{active_fg};
1726	}
1727
1728	glEnable GL_BLEND;
1729	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1730	glEnable GL_TEXTURE_2D;	2168	glEnable GL_TEXTURE_2D;
1731	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2169	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1732	glColor 0, 0, 0, 1;	2170	glColor 0, 0, 0, 1;
1733		2171
1734	$tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});	2172	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1735		2173
1736	glDisable GL_TEXTURE_2D;	2174	glDisable GL_TEXTURE_2D;
1737	glDisable GL_BLEND;
1738		2175
1739	$self->SUPER::_draw;	2176	$self->SUPER::_draw;
1740	}	2177	}
1741		2178
1742	#############################################################################	2179	#############################################################################
1743		2180
1744	package CFClient::UI::CheckBox;	2181	package CFPlus::UI::CheckBox;
1745		2182
1746	our @ISA = CFClient::UI::DrawBG::;	2183	our @ISA = CFPlus::UI::DrawBG::;
1747		2184
1748	my @tex =	2185	my @tex =
1749	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2186	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1750	qw(c1_checkbox_bg.png c1_checkbox_active.png);	2187	qw(c1_checkbox_bg.png c1_checkbox_active.png);
1751		2188
1752	use CFClient::OpenGL;	2189	use CFPlus::OpenGL;
1753		2190
1754	sub new {	2191	sub new {
1755	my $class = shift;	2192	my $class = shift;
1756		2193
1757	$class->SUPER::new (	2194	$class->SUPER::new (
1758	padding => 2,	2195	padding_x => 2,
		2196	padding_y => 2,
1759	fg => [1, 1, 1],	2197	fg => [1, 1, 1],
1760	active_fg => [1, 1, 0],	2198	active_fg => [1, 1, 0],
		2199	bg => [0, 0, 0, 0.2],
		2200	active_bg => [1, 1, 1, 0.5],
1761	state => 0,	2201	state => 0,
1762	can_hover => 1,	2202	can_hover => 1,
1763	@_	2203	@_
1764	)	2204	)
1765	}	2205	}
1766		2206
1767	sub size_request {	2207	sub size_request {
1768	my ($self) = @_;	2208	my ($self) = @_;
1769		2209
1770	($self->{padding} * 2 + 6) x 2	2210	(6) x 2
1771	}	2211	}
1772		2212
		2213	sub toggle {
		2214	my ($self) = @_;
		2215
		2216	$self->{state} = !$self->{state};
		2217	$self->emit (changed => $self->{state});
		2218	$self->update;
		2219	}
		2220
1773	sub button_down {	2221	sub invoke_button_down {
1774	my ($self, $ev, $x, $y) = @_;	2222	my ($self, $ev, $x, $y) = @_;
1775		2223
1776	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	2224	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1777	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	2225	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1778	$self->{state} = !$self->{state};	2226	$self->toggle;
1779	$self->emit (changed => $self->{state});	2227	} else {
		2228	return 0
		2229	}
		2230
1780	}	2231	1
1781	}	2232	}
1782		2233
1783	sub _draw {	2234	sub _draw {
1784	my ($self) = @_;	2235	my ($self) = @_;
1785		2236
1786	$self->SUPER::_draw;	2237	$self->SUPER::_draw;
1787		2238
1788	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;	2239	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1789		2240
1790	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	2241	my ($w, $h) = @$self{qw(w h)};
		2242
		2243	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1791		2244
1792	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	2245	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1793		2246
1794	glEnable GL_BLEND;	2247	my $tex = $self->{state} ? $tex[1] : $tex[0];
		2248
1795	glEnable GL_TEXTURE_2D;	2249	glEnable GL_TEXTURE_2D;
1796	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1797
1798	my $tex = $self->{state} ? $tex[1] : $tex[0];
1799
1800	$tex->draw_quad (0, 0, $s, $s);	2250	$tex->draw_quad_alpha (0, 0, $s, $s);
1801
1802	glDisable GL_TEXTURE_2D;	2251	glDisable GL_TEXTURE_2D;
1803	glDisable GL_BLEND;
1804	}	2252	}
1805		2253
1806	#############################################################################	2254	#############################################################################
1807		2255
1808	package CFClient::UI::Image;	2256	package CFPlus::UI::Image;
1809		2257
1810	our @ISA = CFClient::UI::Base::;	2258	our @ISA = CFPlus::UI::Base::;
1811		2259
1812	use CFClient::OpenGL;	2260	use CFPlus::OpenGL;
1813	use Carp qw/confess/;
1814		2261
1815	our %loaded_images;	2262	our %texture_cache;
1816		2263
1817	sub new {	2264	sub new {
1818	my $class = shift;	2265	my $class = shift;
1819		2266
1820	my $self = $class->SUPER::new (can_events => 0, @_);	2267	my $self = $class->SUPER::new (
		2268	can_events => 0,
		2269	@_,
		2270	);
1821		2271
1822	$self->{image} or confess "Image has 'image' not set. This is a fatal error!";	2272	$self->{path} || $self->{tex}
		2273	or Carp::croak "'path' or 'tex' attributes required";
1823		2274
1824	$loaded_images{$self->{image}} ||=	2275	$self->{tex} ||= $texture_cache{$self->{path}} ||=
1825	new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;	2276	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
1826		2277
1827	my $tex = $self->{tex} = $loaded_images{$self->{image}};	2278	Scalar::Util::weaken $texture_cache{$self->{path}};
1828		2279
1829	Scalar::Util::weaken $loaded_images{$self->{image}};	2280	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1830
1831	$self->{aspect} = $tex->{w} / $tex->{h};
1832		2281
1833	$self	2282	$self
1834	}	2283	}
1835		2284
		2285	sub STORABLE_freeze {
		2286	my ($self, $cloning) = @_;
		2287
		2288	$self->{path}
		2289	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2290
		2291	$self->{path}
		2292	}
		2293
		2294	sub STORABLE_attach {
		2295	my ($self, $cloning, $path) = @_;
		2296
		2297	$self->new (path => $path)
		2298	}
		2299
1836	sub size_request {	2300	sub size_request {
1837	my ($self) = @_;	2301	my ($self) = @_;
1838		2302
1839	($self->{tex}->{w}, $self->{tex}->{h})	2303	($self->{tex}{w}, $self->{tex}{h})
1840	}	2304	}
1841		2305
1842	sub _draw {	2306	sub _draw {
1843	my ($self) = @_;	2307	my ($self) = @_;
1844		2308
…		…
1851	glTranslate 0, -$self->{w}, 0;	2315	glTranslate 0, -$self->{w}, 0;
1852		2316
1853	($w, $h) = ($h, $w);	2317	($w, $h) = ($h, $w);
1854	}	2318	}
1855		2319
1856	glEnable GL_BLEND;
1857	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1858	glEnable GL_TEXTURE_2D;	2320	glEnable GL_TEXTURE_2D;
1859	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2321	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1860		2322
1861	$tex->draw_quad (0, 0, $w, $h);	2323	$tex->draw_quad (0, 0, $w, $h);
1862		2324
1863	glDisable GL_BLEND;
1864	glDisable GL_TEXTURE_2D;	2325	glDisable GL_TEXTURE_2D;
1865	}	2326	}
1866		2327
1867	#############################################################################	2328	#############################################################################
1868		2329
		2330	package CFPlus::UI::ImageButton;
		2331
		2332	our @ISA = CFPlus::UI::Image::;
		2333
		2334	use CFPlus::OpenGL;
		2335
		2336	my %textures;
		2337
		2338	sub new {
		2339	my $class = shift;
		2340
		2341	my $self = $class->SUPER::new (
		2342	padding_x => 4,
		2343	padding_y => 4,
		2344	fg => [1, 1, 1],
		2345	active_fg => [0, 0, 1],
		2346	can_hover => 1,
		2347	align => 0,
		2348	valign => 0,
		2349	can_events => 1,
		2350	@_
		2351	);
		2352	}
		2353
		2354	sub invoke_button_up {
		2355	my ($self, $ev, $x, $y) = @_;
		2356
		2357	$self->emit ("activate")
		2358	if $x >= 0 && $x < $self->{w}
		2359	&& $y >= 0 && $y < $self->{h};
		2360
		2361	1
		2362	}
		2363
		2364	#############################################################################
		2365
1869	package CFClient::UI::VGauge;	2366	package CFPlus::UI::VGauge;
1870		2367
1871	our @ISA = CFClient::UI::Base::;	2368	our @ISA = CFPlus::UI::Base::;
1872		2369
1873	use List::Util qw(min max);	2370	use List::Util qw(min max);
1874		2371
1875	use CFClient::OpenGL;	2372	use CFPlus::OpenGL;
1876		2373
1877	my %tex = (	2374	my %tex = (
1878	food => [	2375	food => [
1879	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2376	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1880	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2377	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1881	],	2378	],
1882	grace => [	2379	grace => [
1883	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2380	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1884	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2381	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1885	],	2382	],
1886	hp => [	2383	hp => [
1887	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2384	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1888	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2385	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1889	],	2386	],
1890	mana => [	2387	mana => [
1891	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2388	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1892	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2389	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1893	],	2390	],
1894	);	2391	);
1895		2392
1896	# eg. VGauge->new (gauge => 'food'), default gauge: food	2393	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
1956	my $ycut1 = max 0, min 1, $ycut;	2453	my $ycut1 = max 0, min 1, $ycut;
1957	my $ycut2 = max 0, min 1, $ycut - 1;	2454	my $ycut2 = max 0, min 1, $ycut - 1;
1958		2455
1959	my $h1 = $self->{h} * (1 - $ycut1);	2456	my $h1 = $self->{h} * (1 - $ycut1);
1960	my $h2 = $self->{h} * (1 - $ycut2);	2457	my $h2 = $self->{h} * (1 - $ycut2);
		2458	my $h3 = $self->{h};
		2459
		2460	$_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
1961		2461
1962	glEnable GL_BLEND;	2462	glEnable GL_BLEND;
1963	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	2463	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		2464	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1964	glEnable GL_TEXTURE_2D;	2465	glEnable GL_TEXTURE_2D;
1965	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2466	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1966		2467
1967	glBindTexture GL_TEXTURE_2D, $t1->{name};	2468	glBindTexture GL_TEXTURE_2D, $t1->{name};
1968	glBegin GL_QUADS;	2469	glBegin GL_QUADS;
…		…
1983		2484
1984	if ($t3) {	2485	if ($t3) {
1985	glBindTexture GL_TEXTURE_2D, $t3->{name};	2486	glBindTexture GL_TEXTURE_2D, $t3->{name};
1986	glBegin GL_QUADS;	2487	glBegin GL_QUADS;
1987	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2488	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
1988	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2489	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
1989	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2490	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
1990	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2491	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
1991	glEnd;	2492	glEnd;
1992	}	2493	}
1993		2494
1994	glDisable GL_BLEND;	2495	glDisable GL_BLEND;
1995	glDisable GL_TEXTURE_2D;	2496	glDisable GL_TEXTURE_2D;
1996	}	2497	}
1997		2498
1998	#############################################################################	2499	#############################################################################
1999		2500
2000	package CFClient::UI::Gauge;	2501	package CFPlus::UI::Gauge;
2001		2502
2002	our @ISA = CFClient::UI::VBox::;	2503	our @ISA = CFPlus::UI::VBox::;
2003		2504
2004	sub new {	2505	sub new {
2005	my ($class, %arg) = @_;	2506	my ($class, %arg) = @_;
2006		2507
2007	my $self = $class->SUPER::new (	2508	my $self = $class->SUPER::new (
…		…
2009	can_hover => 1,	2510	can_hover => 1,
2010	can_events => 1,	2511	can_events => 1,
2011	%arg,	2512	%arg,
2012	);	2513	);
2013		2514
2014	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2515	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2015	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2516	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2016	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");	2517	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2017		2518
2018	$self	2519	$self
2019	}	2520	}
2020		2521
2021	sub set_fontsize {	2522	sub set_fontsize {
…		…
2042	$self->{value}->set_text ($val);	2543	$self->{value}->set_text ($val);
2043	}	2544	}
2044		2545
2045	#############################################################################	2546	#############################################################################
2046		2547
2047	package CFClient::UI::Slider;	2548	package CFPlus::UI::Slider;
2048		2549
2049	use strict;	2550	use strict;
2050		2551
2051	use CFClient::OpenGL;	2552	use CFPlus::OpenGL;
2052		2553
2053	our @ISA = CFClient::UI::DrawBG::;	2554	our @ISA = CFPlus::UI::DrawBG::;
2054		2555
2055	my @tex =	2556	my @tex =
2056	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2557	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2057	qw(s1_slider.png s1_slider_bg.png);	2558	qw(s1_slider.png s1_slider_bg.png);
2058		2559
2059	sub new {	2560	sub new {
2060	my $class = shift;	2561	my $class = shift;
2061		2562
2062	# range [value, low, high, page]	2563	# range [value, low, high, page, unit]
2063		2564
2064	# TODO: 0-width page	2565	# TODO: 0-width page
2065	# TODO: req_w/h are wrong with vertical	2566	# TODO: req_w/h are wrong with vertical
2066	# TODO: calculations are off	2567	# TODO: calculations are off
2067	my $self = $class->SUPER::new (	2568	my $self = $class->SUPER::new (
2068	fg => [1, 1, 1],	2569	fg => [1, 1, 1],
2069	active_fg => [0, 0, 0],	2570	active_fg => [0, 0, 0],
		2571	bg => [0, 0, 0, 0.2],
		2572	active_bg => [1, 1, 1, 0.5],
2070	range => [0, 0, 100, 10],	2573	range => [0, 0, 100, 10, 0],
2071	req_w => $::WIDTH / 80,	2574	min_w => $::WIDTH / 80,
2072	req_h => $::WIDTH / 80,	2575	min_h => $::WIDTH / 80,
2073	vertical => 0,	2576	vertical => 0,
2074	can_hover => 1,	2577	can_hover => 1,
2075	inner_pad => 5,	2578	inner_pad => 0.02,
2076	@_	2579	@_
2077	);	2580	);
2078		2581
		2582	$self->set_value ($self->{range}[0]);
		2583	$self->update;
		2584
2079	$self	2585	$self
2080	}	2586	}
2081		2587
		2588	sub set_range {
		2589	my ($self, $range) = @_;
		2590
		2591	($range, $self->{range}) = ($self->{range}, $range);
		2592
		2593	if ("@$range" ne "@{$self->{range}}") {
		2594	$self->update;
		2595	$self->set_value ($self->{range}[0]);
		2596	}
		2597	}
		2598
		2599	sub set_value {
		2600	my ($self, $value) = @_;
		2601
		2602	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
		2603
		2604	$hi = $lo + 1 if $hi <= $lo;
		2605
		2606	$page = $hi - $lo if $page > $hi - $lo;
		2607
		2608	$value = $lo if $value < $lo;
		2609	$value = $hi - $page if $value > $hi - $page;
		2610
		2611	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
		2612	if $unit;
		2613
		2614	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
		2615
		2616	if ($value != $old_value) {
		2617	$self->emit (changed => $value);
		2618	$self->update;
		2619	}
		2620	}
		2621
2082	sub size_request {	2622	sub size_request {
2083	my ($self) = @_;	2623	my ($self) = @_;
2084		2624
2085	my $w = $self->{req_w};	2625	($self->{req_w}, $self->{req_h})
2086	my $h = $self->{req_h};
2087
2088	$self->{vertical} ? ($h, $w) : ($w, $h)
2089	}	2626	}
2090		2627
2091	sub button_down {	2628	sub invoke_button_down {
2092	my ($self, $ev, $x, $y) = @_;	2629	my ($self, $ev, $x, $y) = @_;
2093		2630
2094	$self->SUPER::button_down ($ev, $x, $y);	2631	$self->SUPER::invoke_button_down ($ev, $x, $y);
		2632
		2633	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
		2634
2095	$self->mouse_motion ($ev, $x, $y);	2635	$self->invoke_mouse_motion ($ev, $x, $y)
2096	}	2636	}
2097		2637
2098	sub mouse_motion {	2638	sub invoke_mouse_motion {
2099	my ($self, $ev, $x, $y) = @_;	2639	my ($self, $ev, $x, $y) = @_;
2100		2640
2101	if ($GRAB == $self) {	2641	if ($GRAB == $self) {
		2642	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
		2643
		2644	my (undef, $lo, $hi, $page) = @{$self->{range}};
		2645
		2646	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
		2647
		2648	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2649	} else {
		2650	return 0;
		2651	}
		2652
		2653	1
		2654	}
		2655
		2656	sub invoke_mouse_wheel {
		2657	my ($self, $ev) = @_;
		2658
		2659	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		2660
		2661	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);
		2662
		2663	! ! $delta
		2664	}
		2665
		2666	sub update {
		2667	my ($self) = @_;
		2668
		2669	delete $self->{knob_w};
		2670	$self->SUPER::update;
		2671	}
		2672
		2673	sub _draw {
		2674	my ($self) = @_;
		2675
		2676	unless ($self->{knob_w}) {
		2677	$self->set_value ($self->{range}[0]);
		2678
2102	my ($value, $lo, $hi, $page) = @{$self->{range}};	2679	my ($value, $lo, $hi, $page) = @{$self->{range}};
		2680	my $range = ($hi - $page - $lo) || 1e-100;
2103		2681
2104	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2682	my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2105		2683
2106	my $inner_pad_px = $self->_calc_inner_pad_px ($w);	2684	$self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2107	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right	2685	$self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2108		2686
2109	$x -= $inner_pad_px; # substract the padding	2687	$value = ($value - $lo) / $range;
2110	$x = $x * ($hi - $lo) / $inner_w + $lo;	2688	$value = $value * $self->{scale} + $self->{offset};
2111	$x = $lo if $x < $lo;
2112	$x = $hi - $page if $x > $hi - $page;
2113	$self->{range}[0] = $x;
2114		2689
2115	$self->emit (changed => $x);	2690	$self->{knob_x} = $value - $knob_w * 0.5;
2116	$self->update;	2691	$self->{knob_w} = $knob_w;
2117	}	2692	}
2118	}
2119
2120	# the inner_* stuff is for generating a padding for the slider handle,
2121	# so that the handle doesn't leave the texture. This calculation isn't 100%
2122	# correct propably, but it does the job for now
2123	sub _calc_inner_pad_px {
2124	my ($self, $w) = @_;
2125	($w / 100) * $self->{inner_pad} # % to pixels
2126	}
2127
2128	sub _draw {
2129	my ($self) = @_;
2130		2693
2131	$self->SUPER::_draw ();	2694	$self->SUPER::_draw ();
2132		2695
2133	my ($w, $h) = @$self{qw(w h)};	2696	glScale $self->{w}, $self->{h};
2134		2697
2135	if ($self->{vertical}) {	2698	if ($self->{vertical}) {
2136	# draw a vertical slider like a rotated horizontal slider	2699	# draw a vertical slider like a rotated horizontal slider
2137		2700
		2701	glTranslate 1, 0, 0;
2138	glRotate 90, 0, 0, 1;	2702	glRotate 90, 0, 0, 1;
2139	glTranslate 0, -$self->{w}, 0;
2140
2141	($w, $h) = ($h, $w);
2142	}	2703	}
2143		2704
2144	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	2705	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2145	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	2706	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2146		2707
2147	my ($value, $lo, $hi, $page) = @{$self->{range}};
2148
2149	$hi = $value + 1 if $lo == $hi;
2150
2151	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2152	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2153
2154	$page = int $page * $inner_w / ($hi - $lo);
2155	$value = int +($value - $lo) * $inner_w / ($hi - $lo);
2156
2157	$w -= $page;
2158	$page &= ~1;
2159	glTranslate $page * 0.5, 0, 0;
2160	$page ||= 2;
2161
2162	my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2163	my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2164
2165	glEnable GL_BLEND;
2166	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2167	glEnable GL_TEXTURE_2D;	2708	glEnable GL_TEXTURE_2D;
2168	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2709	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2169		2710
2170	# draw background	2711	# draw background
2171	$tex[1]->draw_quad (0, 0, $w, $h);	2712	$tex[1]->draw_quad_alpha (0, 0, 1, 1);
2172		2713
2173	# draw handle	2714	# draw handle
2174	$tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);	2715	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2175		2716
2176	glDisable GL_BLEND;
2177	glDisable GL_TEXTURE_2D;	2717	glDisable GL_TEXTURE_2D;
2178	}	2718	}
2179		2719
2180	#############################################################################	2720	#############################################################################
2181		2721
2182	package CFClient::UI::TextView;	2722	package CFPlus::UI::ValSlider;
2183		2723
2184	our @ISA = CFClient::UI::HBox::;	2724	our @ISA = CFPlus::UI::HBox::;
2185		2725
		2726	sub new {
		2727	my ($class, %arg) = @_;
		2728
		2729	my $range = delete $arg{range};
		2730
		2731	my $self = $class->SUPER::new (
		2732	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
		2733	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
		2734	to_value => sub { shift },
		2735	from_value => sub { shift },
		2736	%arg,
		2737	);
		2738
		2739	$self->{slider}->connect (changed => sub {
		2740	my ($self, $value) = @_;
		2741	$self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
		2742	$self->{parent}->emit (changed => $value);
		2743	});
		2744
		2745	# $self->{entry}->connect (changed => sub {
		2746	# my ($self, $value) = @_;
		2747	# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
		2748	# $self->{parent}->emit (changed => $value);
		2749	# });
		2750
		2751	$self->add ($self->{slider}, $self->{entry});
		2752
		2753	$self->{slider}->emit (changed => $self->{slider}{range}[0]);
		2754
		2755	$self
		2756	}
		2757
		2758	sub set_range { shift->{slider}->set_range (@_) }
		2759	sub set_value { shift->{slider}->set_value (@_) }
		2760
		2761	#############################################################################
		2762
		2763	package CFPlus::UI::TextScroller;
		2764
		2765	our @ISA = CFPlus::UI::HBox::;
		2766
2186	use CFClient::OpenGL;	2767	use CFPlus::OpenGL;
2187		2768
2188	sub new {	2769	sub new {
2189	my $class = shift;	2770	my $class = shift;
2190		2771
2191	my $self = $class->SUPER::new (	2772	my $self = $class->SUPER::new (
2192	fontsize => 1,	2773	fontsize => 1,
2193	can_events => 0,	2774	can_events => 1,
		2775	indent => 0,
2194	#font => default_font	2776	#font => default_font
2195	@_,	2777	@_,
2196		2778
2197	layout => (new CFClient::Layout),	2779	layout => (new CFPlus::Layout),
2198	par => [],	2780	par => [],
2199	height => 0,	2781	height => 0,
2200	children => [	2782	children => [
2201	(new CFClient::UI::Empty expand => 1),	2783	(new CFPlus::UI::Empty expand => 1),
2202	(new CFClient::UI::Slider vertical => 1),	2784	(new CFPlus::UI::Slider vertical => 1),
2203	],	2785	],
2204	);	2786	);
2205		2787
2206	$self->{children}[1]->connect (changed => sub { $self->update });	2788	$self->{children}[1]->connect (changed => sub { $self->update });
2207		2789
…		…
2213		2795
2214	$self->{fontsize} = $fontsize;	2796	$self->{fontsize} = $fontsize;
2215	$self->reflow;	2797	$self->reflow;
2216	}	2798	}
2217		2799
2218	sub text_height {	2800	sub size_request {
		2801	my ($self) = @_;
		2802
		2803	my ($empty, $slider) = @{ $self->{children} };
		2804
		2805	local $self->{children} = [$empty, $slider];
		2806	$self->SUPER::size_request
		2807	}
		2808
		2809	sub invoke_size_allocate {
		2810	my ($self, $w, $h) = @_;
		2811
		2812	my ($empty, $slider, @other) = @{ $self->{children} };
		2813	$_->configure (@$_{qw(x y req_w req_h)}) for @other;
		2814
		2815	$self->{layout}->set_font ($self->{font}) if $self->{font};
		2816	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
		2817	$self->{layout}->set_width ($empty->{w});
		2818	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
		2819
		2820	$self->reflow;
		2821
		2822	local $self->{children} = [$empty, $slider];
		2823	$self->SUPER::invoke_size_allocate ($w, $h)
		2824	}
		2825
		2826	sub invoke_mouse_wheel {
2219	my ($self, $text) = @_;	2827	my ($self, $ev) = @_;
		2828
		2829	return 0 unless $ev->{dy}; # only vertical movements
		2830
		2831	$self->{children}[1]->emit (mouse_wheel => $ev);
		2832
		2833	1
		2834	}
		2835
		2836	sub get_layout {
		2837	my ($self, $para) = @_;
2220		2838
2221	my $layout = $self->{layout};	2839	my $layout = $self->{layout};
2222		2840
		2841	$layout->set_font ($self->{font}) if $self->{font};
		2842	$layout->set_foreground (@{$para->{fg}});
2223	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2843	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2224	$layout->set_width ($self->{children}[0]{w});	2844	$layout->set_width ($self->{children}[0]{w} - $para->{indent});
2225	$layout->set_text ($text);	2845	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
		2846	$layout->set_markup ($para->{markup});
		2847
		2848	$layout->set_shapes (
		2849	map
		2850	+(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
		2851	@{$para->{widget}}
2226		2852	);
2227	($layout->size)[1]	2853
		2854	$layout
2228	}	2855	}
2229		2856
2230	sub reflow {	2857	sub reflow {
2231	my ($self) = @_;	2858	my ($self) = @_;
2232		2859
2233	$self->{need_reflow}++;	2860	$self->{need_reflow}++;
2234	$self->update;	2861	$self->update;
2235	}	2862	}
2236		2863
2237	sub size_allocate {	2864	sub set_offset {
		2865	my ($self, $offset) = @_;
		2866
		2867	# todo: base offset on lines or so, not on pixels
		2868	$self->{children}[1]->set_value ($offset);
		2869	}
		2870
		2871	sub current_paragraph {
		2872	my ($self) = @_;
		2873
		2874	$self->{top_paragraph} - 1
		2875	}
		2876
		2877	sub scroll_to {
2238	my ($self, $w, $h) = @_;	2878	my ($self, $para) = @_;
2239		2879
2240	$self->SUPER::size_allocate ($w, $h);	2880	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
2241		2881
2242	$self->{layout}->set_font ($self->{font}) if $self->{font};	2882	$self->{scroll_to} = $para;
2243	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2883	$self->update;
2244	$self->{layout}->set_width ($self->{children}[0]{w});	2884	}
2245		2885
2246	$self->reflow;	2886	sub clear {
		2887	my ($self) = @_;
		2888
		2889	my (undef, undef, @other) = @{ $self->{children} };
		2890	$self->remove ($_) for @other;
		2891
		2892	$self->{par} = [];
		2893	$self->{height} = 0;
		2894	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2247	}	2895	}
2248		2896
2249	sub add_paragraph {	2897	sub add_paragraph {
2250	my ($self, $color, $text) = @_;	2898	my $self = shift;
2251		2899
2252	#TODO: intelligently "reformat" paragraph	2900	for my $para (@_) {
		2901	$para = {
		2902	fg => [1, 1, 1, 1],
		2903	indent => 0,
		2904	markup => "",
		2905	widget => [],
		2906	ref $para ? %$para : (markup => $para),
		2907	w => 1e10,
		2908	wrapped => 1,
		2909	};
2253		2910
2254	my $height = $self->text_height ($text);	2911	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
		2912	push @{$self->{par}}, $para;
		2913	}
2255		2914
		2915	$self->{need_reflow}++;
		2916	$self->update;
		2917	}
		2918
		2919	sub scroll_to_bottom {
		2920	my ($self) = @_;
		2921
		2922	$self->{scroll_to} = $#{$self->{par}};
		2923	$self->update;
		2924	}
		2925
		2926	sub force_uptodate {
		2927	my ($self) = @_;
		2928
		2929	if (delete $self->{need_reflow}) {
		2930	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2931
		2932	my $height = 0;
		2933
		2934	for my $para (@{$self->{par}}) {
		2935	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		2936	my $layout = $self->get_layout ($para);
		2937	my ($w, $h) = $layout->size;
		2938
		2939	$para->{w} = $w + $para->{indent};
		2940	$para->{h} = $h;
		2941	$para->{wrapped} = $layout->has_wrapped;
		2942	}
		2943
		2944	$para->{y} = $height;
		2945	$height += $para->{h};
		2946	}
		2947
2256	$self->{height} += $height;	2948	$self->{height} = $height;
		2949	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2257		2950
2258	push @{$self->{par}}, [$height, $color, $text];	2951	delete $self->{texture};
		2952	}
2259		2953
2260	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];	2954	if (my $paridx = delete $self->{scroll_to}) {
2261	$self->{children}[1]->update;	2955	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		2956	}
2262	}	2957	}
2263		2958
2264	sub update {	2959	sub update {
2265	my ($self) = @_;	2960	my ($self) = @_;
2266		2961
…		…
2268		2963
2269	return unless $self->{h} > 0;	2964	return unless $self->{h} > 0;
2270		2965
2271	delete $self->{texture};	2966	delete $self->{texture};
2272		2967
2273	$ROOT->on_refresh ($self, sub {	2968	$ROOT->on_post_alloc ($self => sub {
2274	if (delete $self->{need_reflow}) {	2969	$self->force_uptodate;
2275	my $height = 0;
2276		2970
2277	$height += $_->[0] = $self->text_height ($_->[2])	2971	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2278	for @{$self->{par}};
2279		2972
2280	$self->{height} = $height;	2973	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2281
2282	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2283
2284	delete $self->{texture};
2285	}
2286
2287	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2288	glClearColor 0, 0, 0, 0;	2974	glClearColor 0, 0, 0, 0;
2289	glClear GL_COLOR_BUFFER_BIT;	2975	glClear GL_COLOR_BUFFER_BIT;
2290		2976
2291	glEnable GL_BLEND;	2977	package CFPlus::UI::Base;
2292	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	2978	local ($draw_x, $draw_y, $draw_w, $draw_h) =
2293	glEnable GL_TEXTURE_2D;	2979	(0, 0, $self->{w}, $self->{h});
2294	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2295		2980
2296	my $top = int $self->{children}[1]{range}[0];	2981	my $top = int $self->{children}[1]{range}[0];
2297		2982
		2983	my $paridx = 0;
		2984	my $top_paragraph;
		2985	my $top = int $self->{children}[1]{range}[0];
		2986
2298	my $y0 = $top;	2987	my $y0 = $top;
2299	my $y1 = $top + $self->{h};	2988	my $y1 = $top + $H;
2300		2989
2301	my $y = 0;
2302
2303	my $layout = $self->{layout};
2304
2305	$layout->set_font ($self->{font}) if $self->{font};
2306
2307	for my $par (@{$self->{par}}) {	2990	for my $para (@{$self->{par}}) {
2308	my $h = $par->[0];	2991	my $h = $para->{h};
		2992	my $y = $para->{y};
2309		2993
2310	if ($y0 < $y + $h && $y < $y1) {	2994	if ($y0 < $y + $h && $y < $y1) {
2311	$layout->set_text ($par->[2]);	2995	my $layout = $self->get_layout ($para);
2312		2996
2313	glColor @{ $par->[1] };	2997	$layout->render ($para->{indent}, $y - $y0);
2314	my ($W, $H) = $layout->size;	2998
2315	CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);	2999	if (my @w = @{ $para->{widget} }) {
		3000	my @s = $layout->get_shapes;
		3001
		3002	for (@w) {
		3003	my ($dx, $dy) = splice @s, 0, 2, ();
		3004
		3005	$_->{x} = $dx + $para->{indent};
		3006	$_->{y} = $dy + $y - $y0;
		3007
		3008	$_->draw;
		3009	}
		3010	}
2316	}	3011	}
2317		3012
2318	$y += $h;	3013	$paridx++;
		3014	$top_paragraph ||= $paridx if $y >= $top;
2319	}	3015	}
2320		3016
2321	glDisable GL_TEXTURE_2D;	3017	$self->{top_paragraph} = $top_paragraph;
2322	glDisable GL_BLEND;
2323	};	3018	};
2324	});	3019	});
2325	}	3020	}
2326		3021
		3022	sub reconfigure {
		3023	my ($self) = @_;
		3024
		3025	$self->SUPER::reconfigure;
		3026
		3027	$_->{w} = 1e10 for @{ $self->{par} };
		3028	$self->reflow;
		3029	}
		3030
2327	sub _draw {	3031	sub _draw {
2328	my ($self) = @_;	3032	my ($self) = @_;
2329		3033
2330	glEnable GL_BLEND;
2331	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2332	glEnable GL_TEXTURE_2D;	3034	glEnable GL_TEXTURE_2D;
2333	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3035	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2334	glColor 1, 1, 1, 1;	3036	glColor 0, 0, 0, 1;
2335	$self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	3037	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2336	glDisable GL_TEXTURE_2D;	3038	glDisable GL_TEXTURE_2D;
2337	glDisable GL_BLEND;
2338		3039
2339	$self->{children}[1]->draw;	3040	$self->{children}[1]->draw;
2340
2341	}	3041	}
2342		3042
2343	#############################################################################	3043	#############################################################################
2344		3044
2345	package CFClient::UI::Animator;	3045	package CFPlus::UI::Animator;
2346		3046
2347	use CFClient::OpenGL;	3047	use CFPlus::OpenGL;
2348		3048
2349	our @ISA = CFClient::UI::Bin::;	3049	our @ISA = CFPlus::UI::Bin::;
2350		3050
2351	sub moveto {	3051	sub moveto {
2352	my ($self, $x, $y) = @_;	3052	my ($self, $x, $y) = @_;
2353		3053
2354	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3054	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2382	glPopMatrix;	3082	glPopMatrix;
2383	}	3083	}
2384		3084
2385	#############################################################################	3085	#############################################################################
2386		3086
2387	package CFClient::UI::Flopper;	3087	package CFPlus::UI::Flopper;
2388		3088
2389	our @ISA = CFClient::UI::Button::;	3089	our @ISA = CFPlus::UI::Button::;
2390		3090
2391	sub new {	3091	sub new {
2392	my $class = shift;	3092	my $class = shift;
2393		3093
2394	my $self = $class->SUPER::new (	3094	my $self = $class->SUPER::new (
2395	state => 0,	3095	state => 0,
2396	connect_activate => \&toggle_flopper,	3096	on_activate => \&toggle_flopper,
2397	@_	3097	@_
2398	);	3098	);
2399		3099
2400	if ($self->{state}) {
2401	$self->{state} = 0;
2402	$self->toggle_flopper;
2403	}
2404
2405	$self	3100	$self
2406	}	3101	}
2407		3102
2408	sub toggle_flopper {	3103	sub toggle_flopper {
2409	my ($self) = @_;	3104	my ($self) = @_;
2410		3105
2411	# TODO: use animation	3106	$self->{other}->toggle_visibility;
2412	if ($self->{state} = !$self->{state}) {
2413	$CFClient::UI::ROOT->add ($self->{other});
2414	$self->{other}->move ($self->coord2global (0, $self->{h}));
2415	$self->emit ("open");
2416	} else {
2417	$CFClient::UI::ROOT->remove ($self->{other});
2418	$self->emit ("close");
2419	}
2420
2421	$self->emit (changed => $self->{state});
2422	}	3107	}
2423		3108
2424	#############################################################################	3109	#############################################################################
2425		3110
2426	package CFClient::UI::Tooltip;	3111	package CFPlus::UI::Tooltip;
2427		3112
2428	our @ISA = CFClient::UI::Bin::;	3113	our @ISA = CFPlus::UI::Bin::;
2429		3114
2430	use CFClient::OpenGL;	3115	use CFPlus::OpenGL;
2431		3116
2432	sub new {	3117	sub new {
2433	my $class = shift;	3118	my $class = shift;
2434		3119
2435	$class->SUPER::new (	3120	$class->SUPER::new (
2436	@_,	3121	@_,
2437	can_events => 0,	3122	can_events => 0,
2438	)	3123	)
2439	}	3124	}
2440		3125
2441	sub set_markup {	3126	sub set_tooltip_from {
2442	my ($self, $text) = @_;	3127	my ($self, $widget) = @_;
2443		3128
2444	$self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];	3129	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
2445	$self->{label}->set_markup ($text);	3130	if $widget->{tooltip} =~ /^#(.*)$/;
2446	$self->add ($self->{label});	3131
		3132	my $tooltip = $widget->{tooltip};
		3133
		3134	if ($ENV{CFPLUS_DEBUG} & 2) {
		3135	$tooltip .= "\n\n" . (ref $widget) . "\n"
		3136	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
		3137	. "req $widget->{req_w} $widget->{req_h}\n"
		3138	. "visible $widget->{visible}";
		3139	}
		3140
		3141	$tooltip =~ s/^\n+//;
		3142	$tooltip =~ s/\n+$//;
		3143
		3144	$self->add (new CFPlus::UI::Label
		3145	markup => $tooltip,
		3146	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
		3147	fontsize => 0.8,
		3148	style => 1, # FLAG_INVERSE
		3149	ellipsise => 0,
		3150	font => ($widget->{tooltip_font} || $::FONT_PROP),
		3151	);
2447	}	3152	}
2448		3153
2449	sub size_request {	3154	sub size_request {
2450	my ($self) = @_;	3155	my ($self) = @_;
2451		3156
2452	$self->child->set_max_size ($::WIDTH * 0.3);
2453
2454	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	3157	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2455		3158
2456	($w + 4, $h + 4)	3159	($w + 4, $h + 4)
2457	}	3160	}
2458		3161
2459	sub size_allocate {	3162	sub invoke_size_allocate {
2460	my ($self, $w, $h) = @_;	3163	my ($self, $w, $h) = @_;
2461		3164
2462	$self->SUPER::size_allocate ($w - 4, $h - 4);	3165	$self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
		3166	}
		3167
		3168	sub invoke_visibility_change {
		3169	my ($self, $visible) = @_;
		3170
		3171	return unless $visible;
		3172
		3173	$self->{root}->on_post_alloc ("move_$self" => sub {
		3174	my $widget = $self->{owner}
		3175	or return;
		3176
		3177	if ($widget->{visible}) {
		3178	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
		3179
		3180	($x, $y) = $widget->coord2global (-$self->{w}, 0)
		3181	if $x + $self->{w} > $self->{root}{w};
		3182
		3183	$self->move_abs ($x, $y);
		3184	} else {
		3185	$self->hide;
		3186	}
		3187	});
2463	}	3188	}
2464		3189
2465	sub _draw {	3190	sub _draw {
2466	my ($self) = @_;	3191	my ($self) = @_;
2467		3192
2468	glPushMatrix;
2469	glTranslate 0.375, 0.375;	3193	glTranslate 0.375, 0.375;
2470		3194
2471	my ($w, $h) = @$self{qw(w h)};	3195	my ($w, $h) = @$self{qw(w h)};
2472		3196
2473	glColor 1, 0.8, 0.4;	3197	glColor 1, 0.8, 0.4;
…		…
2484	glVertex 0 , $h;	3208	glVertex 0 , $h;
2485	glVertex $w, $h;	3209	glVertex $w, $h;
2486	glVertex $w, 0;	3210	glVertex $w, 0;
2487	glEnd;	3211	glEnd;
2488		3212
2489	glPopMatrix;	3213	glTranslate 2 - 0.375, 2 - 0.375;
2490		3214
2491	glTranslate 2, 2;
2492	$self->SUPER::_draw;	3215	$self->SUPER::_draw;
2493	}	3216	}
2494		3217
2495	#############################################################################	3218	#############################################################################
2496		3219
2497	package CFClient::UI::Face;	3220	package CFPlus::UI::Face;
2498		3221
2499	our @ISA = CFClient::UI::Base::;	3222	our @ISA = CFPlus::UI::DrawBG::;
2500		3223
2501	use CFClient::OpenGL;	3224	use CFPlus::OpenGL;
2502		3225
2503	sub new {	3226	sub new {
2504	my $class = shift;	3227	my $class = shift;
2505		3228
2506	$class->SUPER::new (	3229	my $self = $class->SUPER::new (
2507	aspect => 1,	3230	aspect => 1,
		3231	can_events => 0,
2508	@_,	3232	@_,
2509	)	3233	);
		3234
		3235	if ($self->{anim} && $self->{animspeed}) {
		3236	Scalar::Util::weaken (my $widget = $self);
		3237
		3238	$self->{timer} = Event->timer (
		3239	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
		3240	hard => 1,
		3241	interval => $self->{animspeed},
		3242	cb => sub {
		3243	++$widget->{frame};
		3244	$widget->update;
		3245	},
		3246	);
		3247	}
		3248
		3249	$self
2510	}	3250	}
2511		3251
2512	sub size_request {	3252	sub size_request {
2513	(32, 8)	3253	(32, 8)
2514	}	3254	}
2515		3255
		3256	sub update {
		3257	my ($self) = @_;
		3258
		3259	return unless $self->{visible};
		3260
		3261	$self->SUPER::update;
		3262	}
		3263
2516	sub _draw {	3264	sub _draw {
2517	my ($self) = @_;	3265	my ($self) = @_;
2518		3266
2519	return unless $::CONN;#d# manage and cache textures differently	3267	return unless $::CONN;
		3268
		3269	$self->SUPER::_draw;
		3270
		3271	my $face;
		3272
		3273	if ($self->{frame}) {
		3274	my $anim = $::CONN->{anim}[$self->{anim}];
		3275
		3276	$face = $anim->[ $self->{frame} % @$anim ]
		3277	if $anim && @$anim;
		3278	}
		3279
2520	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];	3280	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2521		3281
2522	# TODO animation
2523	if ($tex) {	3282	if ($tex) {
2524	glEnable GL_BLEND;
2525	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2526	glEnable GL_TEXTURE_2D;	3283	glEnable GL_TEXTURE_2D;
2527	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3284	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2528	glColor 1, 1, 1, 1;	3285	glColor 0, 0, 0, 1;
2529	$tex->draw_quad (0, 0, $self->{w}, $self->{h});	3286	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2530	glDisable GL_TEXTURE_2D;	3287	glDisable GL_TEXTURE_2D;
2531	glDisable GL_BLEND;
2532	}	3288	}
		3289	}
		3290
		3291	sub destroy {
		3292	my ($self) = @_;
		3293
		3294	$self->{timer}->cancel
		3295	if $self->{timer};
		3296
		3297	$self->SUPER::destroy;
2533	}	3298	}
2534		3299
2535	#############################################################################	3300	#############################################################################
2536		3301
2537	package CFClient::UI::InventoryItem;	3302	package CFPlus::UI::Buttonbar;
2538		3303
2539	our @ISA = CFClient::UI::HBox::;	3304	our @ISA = CFPlus::UI::HBox::;
2540		3305
2541	sub new {	3306	# TODO: should actually wrap buttons and other goodies.
2542	my $class = shift;
2543
2544	my %args = @_;
2545
2546	my $item = $args{item};
2547
2548	my $desc = $item->{nrof} < 2
2549	? $item->{name}
2550	: "$item->{nrof} $item->{name_pl}";
2551
2552
2553	my $self = $class->SUPER::new (
2554	can_hover => 1,
2555	can_events => 1,
2556	tooltip => (CFClient::UI::Label->escape ($desc)
2557	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2558	connect_button_down => sub {
2559	my ($self, $ev, $x, $y) = @_;
2560
2561	# todo: maybe put examine on 1? but should just be a tooltip :(
2562	if ($ev->{button} == 1) {
2563	$::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2564	} elsif ($ev->{button} == 2) {
2565	$::CONN->send ("apply $item->{tag}");
2566	} elsif ($ev->{button} == 3) {
2567	CFClient::UI::Menu->new (
2568	items => [
2569	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2570	[
2571	$item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2572	sub { $::CONN->send ("lock $item->{tag}") },
2573	],
2574	["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2575	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2576	["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2577	],
2578	)->popup ($ev);
2579	}
2580
2581	1
2582	},
2583	%args
2584	);
2585	$self->add(new CFClient::UI::Face
2586	can_events => 0,
2587	face => $item->{face},
2588	anim => $item->{anim},
2589	animspeed => $item->{animspeed});
2590	$self->add(new CFClient::UI::Label
2591	can_events => 0,
2592	text => $desc);
2593
2594	$self
2595	}
2596		3307
2597	#############################################################################	3308	#############################################################################
2598		3309
2599	package CFClient::UI::Inventory;
2600
2601	our @ISA = CFClient::UI::ScrolledWindow::;
2602
2603	sub new {
2604	my $class = shift;
2605
2606	my $self = $class->SUPER::new (
2607	scrolled => (new CFClient::UI::VBox),
2608	@_,
2609	);
2610
2611	$self
2612	}
2613
2614	sub set_items {
2615	my ($self, $items) = @_;
2616
2617	$self->{scrolled}->clear;
2618	return unless $items;
2619
2620	my @items = sort { $a->{type} <=> $b->{type} } @$items;
2621
2622	$self->{real_items} = \@items;
2623
2624	for my $item (@items) {
2625	my $desc = $item->{nrof} < 2
2626	? $item->{name}
2627	: "$item->{nrof} $item->{name_pl}";
2628
2629	$self->{scrolled}->add (new CFClient::UI::InventoryItem item => $item);
2630	}
2631
2632	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2633	}
2634
2635	sub size_request {
2636	my ($self) = @_;
2637	($self->{req_w}, $self->{req_h});
2638	}
2639
2640	#############################################################################
2641
2642	package CFClient::UI::Menu;	3310	package CFPlus::UI::Menu;
2643		3311
2644	our @ISA = CFClient::UI::FancyFrame::;	3312	our @ISA = CFPlus::UI::Toplevel::;
2645		3313
2646	use CFClient::OpenGL;	3314	use CFPlus::OpenGL;
2647		3315
2648	sub new {	3316	sub new {
2649	my $class = shift;	3317	my $class = shift;
2650		3318
2651	my $self = $class->SUPER::new (	3319	my $self = $class->SUPER::new (
2652	items => [],	3320	items => [],
2653	z => 100,	3321	z => 100,
2654	@_,	3322	@_,
2655	);	3323	);
2656		3324
2657	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3325	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
2658		3326
2659	for my $item (@{ $self->{items} }) {	3327	for my $item (@{ $self->{items} }) {
2660	my ($widget, $cb) = @$item;	3328	my ($widget, $cb, $tooltip) = @$item;
2661		3329
2662	# handle various types of items, only text for now	3330	# handle various types of items, only text for now
2663	if (!ref $widget) {	3331	if (!ref $widget) {
		3332	if ($widget =~ /\t/) {
		3333	my ($left, $right) = split /\t/, $widget, 2;
		3334
2664	$widget = new CFClient::UI::Label	3335	$widget = new CFPlus::UI::HBox
2665	can_hover => 1,	3336	can_hover => 1,
2666	can_events => 1,	3337	can_events => 1,
		3338	tooltip => $tooltip,
		3339	children => [
		3340	(new CFPlus::UI::Label markup => $left, expand => 1),
		3341	(new CFPlus::UI::Label markup => $right, align => +1),
		3342	],
		3343	;
		3344
		3345	} else {
		3346	$widget = new CFPlus::UI::Label
		3347	can_hover => 1,
		3348	can_events => 1,
2667	text => $widget;	3349	markup => $widget,
		3350	tooltip => $tooltip;
		3351	}
2668	}	3352	}
2669		3353
2670	$self->{item}{$widget} = $item;	3354	$self->{item}{$widget} = $item;
2671		3355
2672	$self->{vbox}->add ($widget);	3356	$self->{vbox}->add ($widget);
…		…
2684	# maybe save $GRAB? must be careful about events...	3368	# maybe save $GRAB? must be careful about events...
2685	$GRAB = $self;	3369	$GRAB = $self;
2686	$self->{button} = $ev->{button};	3370	$self->{button} = $ev->{button};
2687		3371
2688	$self->show;	3372	$self->show;
2689	$self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	3373	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2690	}	3374	}
2691		3375
2692	sub mouse_motion {	3376	sub invoke_mouse_motion {
2693	my ($self, $ev, $x, $y) = @_;	3377	my ($self, $ev, $x, $y) = @_;
2694		3378
2695	# TODO: should use vbox->find_widget or so	3379	# TODO: should use vbox->find_widget or so
2696	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	3380	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2697	$self->{hover} = $self->{item}{$HOVER};	3381	$self->{hover} = $self->{item}{$HOVER};
2698	}
2699		3382
		3383	0
		3384	}
		3385
2700	sub button_up {	3386	sub invoke_button_up {
2701	my ($self, $ev, $x, $y) = @_;	3387	my ($self, $ev, $x, $y) = @_;
2702		3388
2703	if ($ev->{button} == $self->{button}) {	3389	if ($ev->{button} == $self->{button}) {
2704	undef $GRAB;	3390	undef $GRAB;
2705	$self->hide;	3391	$self->hide;
2706		3392
2707	$self->emit ("popdown");	3393	$self->emit ("popdown");
2708	$self->{hover}[1]->() if $self->{hover};	3394	$self->{hover}[1]->() if $self->{hover};
		3395	} else {
		3396	return 0
		3397	}
		3398
2709	}	3399	1
2710	}	3400	}
2711		3401
2712	#############################################################################	3402	#############################################################################
2713		3403
2714	package CFClient::UI::Root;	3404	package CFPlus::UI::Multiplexer;
2715		3405
2716	our @ISA = CFClient::UI::Container::;	3406	our @ISA = CFPlus::UI::Container::;
2717		3407
2718	use CFClient::OpenGL;	3408	sub new {
		3409	my $class = shift;
2719		3410
2720	sub check_size {	3411	my $self = $class->SUPER::new (
		3412	@_,
		3413	);
		3414
		3415	$self->{current} = $self->{children}[0]
		3416	if @{ $self->{children} };
		3417
		3418	$self
		3419	}
		3420
		3421	sub add {
2721	my ($self) = @_;	3422	my ($self, @widgets) = @_;
2722		3423
		3424	$self->SUPER::add (@widgets);
		3425
		3426	$self->{current} = $self->{children}[0]
		3427	if @{ $self->{children} };
		3428	}
		3429
		3430	sub get_current_page {
		3431	my ($self) = @_;
		3432
		3433	$self->{current}
		3434	}
		3435
		3436	sub set_current_page {
		3437	my ($self, $page_or_widget) = @_;
		3438
		3439	my $widget = ref $page_or_widget
		3440	? $page_or_widget
		3441	: $self->{children}[$page_or_widget];
		3442
		3443	$self->{current} = $widget;
2723	$self->configure (0, 0, $self->{w}, $self->{h});	3444	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
		3445
		3446	$self->emit (page_changed => $self->{current});
		3447
		3448	$self->realloc;
		3449	}
		3450
		3451	sub visible_children {
		3452	$_[0]{current}
2724	}	3453	}
2725		3454
2726	sub size_request {	3455	sub size_request {
2727	my ($self) = @_;	3456	my ($self) = @_;
2728		3457
		3458	$self->{current}->size_request
		3459	}
		3460
		3461	sub invoke_size_allocate {
		3462	my ($self, $w, $h) = @_;
		3463
		3464	$self->{current}->configure (0, 0, $w, $h);
		3465
		3466	1
		3467	}
		3468
		3469	sub _draw {
		3470	my ($self) = @_;
		3471
		3472	$self->{current}->draw;
		3473	}
		3474
		3475	#############################################################################
		3476
		3477	package CFPlus::UI::Notebook;
		3478
		3479	our @ISA = CFPlus::UI::VBox::;
		3480
		3481	sub new {
		3482	my $class = shift;
		3483
		3484	my $self = $class->SUPER::new (
		3485	buttonbar => (new CFPlus::UI::Buttonbar),
		3486	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
		3487	# filter => # will be put between multiplexer and $self
		3488	@_,
		3489	);
		3490
		3491	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
		3492	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
		3493
		3494	$self
		3495	}
		3496
		3497	sub add {
		3498	my ($self, $title, $widget, $tooltip) = @_;
		3499
		3500	Scalar::Util::weaken $self;
		3501
		3502	$self->{buttonbar}->add (new CFPlus::UI::Button
		3503	markup => $title,
		3504	tooltip => $tooltip,
		3505	on_activate => sub { $self->set_current_page ($widget) },
		3506	);
		3507
		3508	$self->{multiplexer}->add ($widget);
		3509	}
		3510
		3511	sub get_current_page {
		3512	my ($self) = @_;
		3513
		3514	$self->{multiplexer}->get_current_page
		3515	}
		3516
		3517	sub set_current_page {
		3518	my ($self, $page) = @_;
		3519
		3520	$self->{multiplexer}->set_current_page ($page);
		3521	$self->emit (page_changed => $self->{multiplexer}{current});
		3522	}
		3523
		3524	#############################################################################
		3525
		3526	package CFPlus::UI::Selector;
		3527
		3528	use utf8;
		3529
		3530	our @ISA = CFPlus::UI::Button::;
		3531
		3532	sub new {
		3533	my $class = shift;
		3534
		3535	my $self = $class->SUPER::new (
		3536	options => [], # [value, title, longdesc], ...
		3537	value => undef,
		3538	@_,
		3539	);
		3540
		3541	$self->_set_value ($self->{value});
		3542
		3543	$self
		3544	}
		3545
		3546	sub invoke_button_down {
		3547	my ($self, $ev) = @_;
		3548
		3549	my @menu_items;
		3550
		3551	for (@{ $self->{options} }) {
		3552	my ($value, $title, $tooltip) = @$_;
		3553
		3554	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
		3555	}
		3556
		3557	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
		3558	}
		3559
		3560	sub _set_value {
		3561	my ($self, $value) = @_;
		3562
		3563	my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
		3564	or return;
		3565
		3566	$self->{value} = $item->[0];
		3567	$self->set_markup ("$item->[1] ⇓");
		3568	$self->set_tooltip ($item->[2]);
		3569	}
		3570
		3571	sub set_value {
		3572	my ($self, $value) = @_;
		3573
		3574	return unless $self->{value} ne $value;
		3575
		3576	$self->_set_value ($value);
		3577	$self->emit (changed => $value);
		3578	}
		3579
		3580	#############################################################################
		3581
		3582	package CFPlus::UI::Statusbox;
		3583
		3584	our @ISA = CFPlus::UI::VBox::;
		3585
		3586	sub new {
		3587	my $class = shift;
		3588
		3589	my $self = $class->SUPER::new (
		3590	fontsize => 0.8,
		3591	@_,
		3592	);
		3593
		3594	Scalar::Util::weaken (my $this = $self);
		3595
		3596	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
		3597
		3598	$self
		3599	}
		3600
		3601	sub reorder {
		3602	my ($self) = @_;
		3603	my $NOW = Time::HiRes::time;
		3604
		3605	# freeze display when hovering over any label
		3606	return if $CFPlus::UI::TOOLTIP->{owner}
		3607	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
		3608	values %{ $self->{item} };
		3609
		3610	while (my ($k, $v) = each %{ $self->{item} }) {
		3611	delete $self->{item}{$k} if $v->{timeout} < $NOW;
		3612	}
		3613
		3614	my @widgets;
		3615
		3616	my @items = sort {
		3617	$a->{pri} <=> $b->{pri}
		3618	or $b->{id} <=> $a->{id}
		3619	} values %{ $self->{item} };
		3620
		3621	$self->{timer}->interval (1);
		3622
		3623	my $count = 10 + 1;
		3624	for my $item (@items) {
		3625	last unless --$count;
		3626
		3627	my $label = $item->{label} ||= do {
		3628	# TODO: doesn't handle markup well (read as: at all)
		3629	my $short = $item->{count} > 1
		3630	? "<b>$item->{count} ×</b> $item->{text}"
		3631	: $item->{text};
		3632
		3633	for ($short) {
		3634	s/^\s+//;
		3635	s/\s+/ /g;
		3636	}
		3637
		3638	new CFPlus::UI::Label
		3639	markup => $short,
		3640	tooltip => $item->{tooltip},
		3641	tooltip_font => $::FONT_PROP,
		3642	tooltip_width => 0.67,
		3643	fontsize => $item->{fontsize} || $self->{fontsize},
		3644	max_w => $::WIDTH * 0.44,
		3645	fg => [@{ $item->{fg} }],
		3646	can_events => 1,
		3647	can_hover => 1
		3648	};
		3649
		3650	if ((my $diff = $item->{timeout} - $NOW) < 2) {
		3651	$label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
		3652	$label->update;
		3653	$label->set_max_size (undef, $label->{req_h} * $diff)
		3654	if $diff < 1;
		3655	$self->{timer}->interval (1/30);
		3656	} else {
		3657	$label->{fg}[3] = $item->{fg}[3] || 1;
		3658	}
		3659
		3660	push @widgets, $label;
		3661	}
		3662
		3663	$self->clear;
		3664	$self->SUPER::add (reverse @widgets);
		3665	}
		3666
		3667	sub add {
		3668	my ($self, $text, %arg) = @_;
		3669
		3670	$text =~ s/^\s+//;
		3671	$text =~ s/\s+$//;
		3672
		3673	return unless $text;
		3674
		3675	my $timeout = (int time) + ((delete $arg{timeout}) || 60);
		3676
		3677	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
		3678
		3679	if (my $item = $self->{item}{$group}) {
		3680	if ($item->{text} eq $text) {
		3681	$item->{count}++;
		3682	} else {
		3683	$item->{count} = 1;
		3684	$item->{text} = $item->{tooltip} = $text;
		3685	}
		3686	$item->{id} += 0.2;#d#
		3687	$item->{timeout} = $timeout;
		3688	delete $item->{label};
		3689	} else {
		3690	$self->{item}{$group} = {
		3691	id => ++$self->{id},
		3692	text => $text,
		3693	timeout => $timeout,
		3694	tooltip => $text,
		3695	fg => [0.8, 0.8, 0.8, 0.8],
		3696	pri => 0,
		3697	count => 1,
		3698	%arg,
		3699	};
		3700	}
		3701
		3702	$ROOT->on_refresh (reorder => sub {
		3703	$self->reorder;
		3704	});
		3705	}
		3706
		3707	sub reconfigure {
		3708	my ($self) = @_;
		3709
		3710	delete $_->{label}
		3711	for values %{ $self->{item} || {} };
		3712
		3713	$self->reorder;
		3714	$self->SUPER::reconfigure;
		3715	}
		3716
		3717	sub destroy {
		3718	my ($self) = @_;
		3719
		3720	$self->{timer}->cancel;
		3721
		3722	$self->SUPER::destroy;
		3723	}
		3724
		3725	#############################################################################
		3726
		3727	package CFPlus::UI::Inventory;
		3728
		3729	our @ISA = CFPlus::UI::Table::;
		3730
		3731	sub new {
		3732	my $class = shift;
		3733
		3734	my $self = $class->SUPER::new (
		3735	col_expand => [0, 1, 0],
		3736	items => [],
		3737	@_,
		3738	);
		3739
		3740	$self->set_sort_order (undef);
		3741
		3742	$self
		3743	}
		3744
		3745	sub update_items {
		3746	my ($self) = @_;
		3747
		3748	$self->clear;
		3749
		3750	my @item = $self->{sort}->(@{ $self->{items} });
		3751
		3752	my @adds;
		3753	my $row = 0;
		3754	for my $item ($self->{sort}->(@{ $self->{items} })) {
		3755	CFPlus::Item::update_widgets $item;
		3756
		3757	push @adds, 0, $row, $item->{face_widget};
		3758	push @adds, 1, $row, $item->{desc_widget};
		3759	push @adds, 2, $row, $item->{weight_widget};
		3760
		3761	$row++;
		3762	}
		3763
		3764	$self->add (@adds);
		3765	}
		3766
		3767	sub set_sort_order {
		3768	my ($self, $order) = @_;
		3769
		3770	$self->{sort} = $order ||= sub {
		3771	sort {
		3772	$a->{type} <=> $b->{type}
		3773	or $a->{name} cmp $b->{name}
		3774	} @_
		3775	};
		3776
		3777	$self->update_items;
		3778	}
		3779
		3780	sub set_items {
		3781	my ($self, $items) = @_;
		3782
		3783	$self->{items} = [$items ? values %$items : ()];
		3784	$self->update_items;
		3785	}
		3786
		3787	#############################################################################
		3788
		3789	package CFPlus::UI::SpellList;
		3790
		3791	our @ISA = CFPlus::UI::Table::;
		3792
		3793	sub new {
		3794	my $class = shift;
		3795
		3796	my $self = $class->SUPER::new (
		3797	binding => [],
		3798	commands => [],
		3799	@_,
		3800	)
		3801	}
		3802
		3803	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
		3804
		3805	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
		3806	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
		3807	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
		3808	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
		3809	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
		3810	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
		3811	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
		3812	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
		3813	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
		3814	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
		3815
		3816	sub rebuild_spell_list {
		3817	my ($self) = @_;
		3818
		3819	$CFPlus::UI::ROOT->on_refresh ($self => sub {
		3820	$self->clear;
		3821
		3822	return unless $::CONN;
		3823
		3824	$self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
		3825	$self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
		3826	$self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
		3827	$self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
		3828	$self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
		3829
		3830	my $row = 0;
		3831
		3832	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
		3833	my $spell = $self->{spell}{$_};
		3834
		3835	$row++;
		3836
		3837	my $spell_cb = sub {
		3838	my ($widget, $ev) = @_;
		3839
		3840	if ($ev->{button} == 1) {
		3841	$::CONN->user_send ("cast $spell->{name}");
		3842	} elsif ($ev->{button} == 2) {
		3843	$::CONN->user_send ("invoke $spell->{name}");
		3844	} elsif ($ev->{button} == 3) {
		3845	(new CFPlus::UI::Menu
		3846	items => [
		3847	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
		3848	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
		3849	],
		3850	)->popup ($ev);
		3851	} else {
		3852	return 0;
		3853	}
		3854
		3855	1
		3856	};
		3857
		3858	my $tooltip = (CFPlus::asxml $spell->{message}) . $TOOLTIP_ALL;
		3859
		3860	#TODO: add path info to tooltip
		3861	#$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
		3862
		3863	$self->add (0, $row, new CFPlus::UI::Face
		3864	face => $spell->{face},
		3865	can_hover => 1,
		3866	can_events => 1,
		3867	tooltip => $tooltip,
		3868	on_button_down => $spell_cb,
		3869	);
		3870
		3871	$self->add (1, $row, new CFPlus::UI::Label
		3872	expand => 1,
		3873	text => $spell->{name},
		3874	can_hover => 1,
		3875	can_events => 1,
		3876	tooltip => $tooltip,
		3877	on_button_down => $spell_cb,
		3878	);
		3879
		3880	$self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
		3881	$self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
		3882	$self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
		3883	$self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
		3884	}
		3885	});
		3886	}
		3887
		3888	sub add_spell {
		3889	my ($self, $spell) = @_;
		3890
		3891	$self->{spell}->{$spell->{name}} = $spell;
		3892	$self->rebuild_spell_list;
		3893	}
		3894
		3895	sub remove_spell {
		3896	my ($self, $spell) = @_;
		3897
		3898	delete $self->{spell}->{$spell->{name}};
		3899	$self->rebuild_spell_list;
		3900	}
		3901
		3902	sub clear_spells {
		3903	my ($self) = @_;
		3904
		3905	$self->{spell} = {};
		3906	$self->rebuild_spell_list;
		3907	}
		3908
		3909	#############################################################################
		3910
		3911	package CFPlus::UI::Root;
		3912
		3913	our @ISA = CFPlus::UI::Container::;
		3914
		3915	use List::Util qw(min max);
		3916
		3917	use CFPlus::OpenGL;
		3918
		3919	sub new {
		3920	my $class = shift;
		3921
		3922	my $self = $class->SUPER::new (
		3923	visible => 1,
		3924	@_,
		3925	);
		3926
		3927	Scalar::Util::weaken ($self->{root} = $self);
		3928
		3929	$self
		3930	}
		3931
		3932	sub size_request {
		3933	my ($self) = @_;
		3934
2729	($self->{w}, $self->{h})	3935	($self->{w}, $self->{h})
2730	}	3936	}
2731		3937
		3938	sub _to_pixel {
		3939	my ($coord, $size, $max) = @_;
		3940
		3941	$coord =
		3942	$coord eq "center" ? ($max - $size) * 0.5
		3943	: $coord eq "max" ? $max
		3944	: $coord;
		3945
		3946	$coord = 0 if $coord < 0;
		3947	$coord = $max - $size if $coord > $max - $size;
		3948
		3949	int $coord + 0.5
		3950	}
		3951
2732	sub size_allocate {	3952	sub invoke_size_allocate {
2733	my ($self, $w, $h) = @_;	3953	my ($self, $w, $h) = @_;
2734
2735	my $old_w = $self->{old_w};
2736	my $old_h = $self->{old_h};
2737
2738	if ($old_w && $old_h) {
2739	for my $child ($self->children) {
2740	$child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2741	$child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2742	$child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2743	$child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2744	$child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2745	$child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2746	$child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2747	$child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2748	}
2749	}
2750
2751	$self->{old_w} = $w;
2752	$self->{old_h} = $h;
2753	}
2754
2755	sub configure {
2756	my ($self, $x, $y, $w, $h) = @_;
2757
2758	$self->SUPER::configure ($x, $y, $w, $h);
2759		3954
2760	for my $child ($self->children) {	3955	for my $child ($self->children) {
2761	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3956	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2762		3957
2763	$X = List::Util::max 0, List::Util::min $w - $W, $X;	3958	$X = $child->{force_x} if exists $child->{force_x};
2764	$Y = List::Util::max 0, List::Util::min $h - $H, $Y;	3959	$Y = $child->{force_y} if exists $child->{force_y};
		3960
		3961	$X = _to_pixel $X, $W, $self->{w};
		3962	$Y = _to_pixel $Y, $H, $self->{h};
		3963
2765	$child->configure ($X, $Y, $W, $H);	3964	$child->configure ($X, $Y, $W, $H);
2766	}	3965	}
2767	}
2768		3966
2769	sub _topleft {	3967	1
		3968	}
		3969
		3970	sub coord2local {
2770	my ($self, $x, $y) = @_;	3971	my ($self, $x, $y) = @_;
2771		3972
2772	($x, $y)	3973	($x, $y)
2773	}	3974	}
2774		3975
		3976	sub coord2global {
		3977	my ($self, $x, $y) = @_;
		3978
		3979	($x, $y)
		3980	}
		3981
2775	sub update {	3982	sub update {
2776	my ($self) = @_;	3983	my ($self) = @_;
2777		3984
2778	$self->check_size;	3985	$::WANT_REFRESH++;
2779	::refresh ();
2780	}	3986	}
2781		3987
2782	sub add {	3988	sub add {
2783	my ($self, $child) = @_;	3989	my ($self, @children) = @_;
2784		3990
2785	# integerize window positions	3991	$_->{is_toplevel} = 1
2786	$child->{x} = int $child->{x};	3992	for @children;
2787	$child->{y} = int $child->{y};
2788		3993
2789	$self->SUPER::add ($child);	3994	$self->SUPER::add (@children);
		3995	}
		3996
		3997	sub remove {
		3998	my ($self, @children) = @_;
		3999
		4000	$self->SUPER::remove (@children);
		4001
		4002	delete $self->{is_toplevel}
		4003	for @children;
		4004
		4005	while (@children) {
		4006	my $w = pop @children;
		4007	push @children, $w->children;
		4008	$w->set_invisible;
		4009	}
2790	}	4010	}
2791		4011
2792	sub on_refresh {	4012	sub on_refresh {
2793	my ($self, $id, $cb) = @_;	4013	my ($self, $id, $cb) = @_;
2794		4014
2795	$self->{refresh_hook}{$id} = $cb;	4015	$self->{refresh_hook}{$id} = $cb;
2796	}	4016	}
2797		4017
		4018	sub on_post_alloc {
		4019	my ($self, $id, $cb) = @_;
		4020
		4021	$self->{post_alloc_hook}{$id} = $cb;
		4022	}
		4023
2798	sub draw {	4024	sub draw {
2799	my ($self) = @_;	4025	my ($self) = @_;
2800		4026
2801	while (my $rcb = delete $self->{refresh_hook}) {	4027	while ($self->{refresh_hook}) {
2802	$_->() for values %$rcb;	4028	$_->()
		4029	for values %{delete $self->{refresh_hook}};
2803	}	4030	}
		4031
		4032	if ($self->{realloc}) {
		4033	my %queue;
		4034	my @queue;
		4035	my $widget;
		4036
		4037	outer:
		4038	while () {
		4039	if (my $realloc = delete $self->{realloc}) {
		4040	for $widget (values %$realloc) {
		4041	$widget->{visible} or next; # do not resize invisible widgets
		4042
		4043	$queue{$widget+0}++ and next; # duplicates are common
		4044
		4045	push @{ $queue[$widget->{visible}] }, $widget;
		4046	}
		4047	}
		4048
		4049	while () {
		4050	@queue or last outer;
		4051
		4052	$widget = pop @{ $queue[-1] || [] }
		4053	and last;
		4054
		4055	pop @queue;
		4056	}
		4057
		4058	delete $queue{$widget+0};
		4059
		4060	my ($w, $h) = $widget->size_request;
		4061
		4062	$w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
		4063	$h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
		4064
		4065	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		4066	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		4067
		4068	$w = $widget->{force_w} if exists $widget->{force_w};
		4069	$h = $widget->{force_h} if exists $widget->{force_h};
		4070
		4071	if ($widget->{req_w} != $w || $widget->{req_h} != $h
		4072	|| delete $widget->{force_realloc}) {
		4073	$widget->{req_w} = $w;
		4074	$widget->{req_h} = $h;
		4075
		4076	$self->{size_alloc}{$widget+0} = $widget;
		4077
		4078	if (my $parent = $widget->{parent}) {
		4079	$self->{realloc}{$parent+0} = $parent
		4080	unless $queue{$parent+0};
		4081
		4082	$parent->{force_size_alloc} = 1;
		4083	$self->{size_alloc}{$parent+0} = $parent;
		4084	}
		4085	}
		4086
		4087	delete $self->{realloc}{$widget+0};
		4088	}
		4089	}
		4090
		4091	while (my $size_alloc = delete $self->{size_alloc}) {
		4092	my @queue = sort { $b->{visible} <=> $a->{visible} }
		4093	values %$size_alloc;
		4094
		4095	while () {
		4096	my $widget = pop @queue || last;
		4097
		4098	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
		4099
		4100	$w = 0 if $w < 0;
		4101	$h = 0 if $h < 0;
		4102
		4103	$w = max $widget->{min_w}, $w;
		4104	$h = max $widget->{min_h}, $h;
		4105
		4106	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4107	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4108
		4109	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		4110	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		4111
		4112	$w = int $w + 0.5;
		4113	$h = int $h + 0.5;
		4114
		4115	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
		4116	$widget->{old_w} = $widget->{w};
		4117	$widget->{old_h} = $widget->{h};
		4118
		4119	$widget->{w} = $w;
		4120	$widget->{h} = $h;
		4121
		4122	$widget->emit (size_allocate => $w, $h);
		4123	}
		4124	}
		4125	}
		4126
		4127	while ($self->{post_alloc_hook}) {
		4128	$_->()
		4129	for values %{delete $self->{post_alloc_hook}};
		4130	}
		4131
2804		4132
2805	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4133	glViewport 0, 0, $::WIDTH, $::HEIGHT;
2806	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4134	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2807	glClear GL_COLOR_BUFFER_BIT;	4135	glClear GL_COLOR_BUFFER_BIT;
2808		4136
2809	glMatrixMode GL_PROJECTION;	4137	glMatrixMode GL_PROJECTION;
2810	glLoadIdentity;	4138	glLoadIdentity;
2811	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;	4139	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2812	glMatrixMode GL_MODELVIEW;	4140	glMatrixMode GL_MODELVIEW;
2813	glLoadIdentity;	4141	glLoadIdentity;
2814		4142
		4143	{
		4144	package CFPlus::UI::Base;
		4145
		4146	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		4147	(0, 0, $self->{w}, $self->{h});
		4148
2815	$self->_draw;	4149	$self->_draw;
		4150	}
2816	}	4151	}
2817		4152
2818	#############################################################################	4153	#############################################################################
2819		4154
2820	package CFClient::UI;	4155	package CFPlus::UI;
2821		4156
2822	$ROOT = new CFClient::UI::Root;	4157	$ROOT = new CFPlus::UI::Root;
2823	$TOOLTIP = new CFClient::UI::Tooltip;	4158	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
2824		4159
2825	1	4160	1
2826		4161

Diff Legend

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