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.186 by root, Mon May 8 20:39:34 2006 UTC vs.
Revision 1.359 by root, Fri Dec 8 15:07:08 2006 UTC

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

Diff Legend

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