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.175 by root, Tue Apr 25 11:48:31 2006 UTC vs.
Revision 1.400 by root, Sat Jul 21 16:15:03 2007 UTC

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

Diff Legend

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