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.201 by root, Sat May 13 23:17:49 2006 UTC vs.
Revision 1.346 by root, Mon Aug 14 01:21:02 2006 UTC

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

Diff Legend

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